diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ac6a834 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +app-win/yong/ +app-win/nsis/*.exe +app-win/test/ \ No newline at end of file diff --git a/app-win/nsis/IniGetSectionNames.nsh b/app-win/nsis/IniGetSectionNames.nsh new file mode 100644 index 0000000..fe8ee24 --- /dev/null +++ b/app-win/nsis/IniGetSectionNames.nsh @@ -0,0 +1,55 @@ +!include LogicLib.nsh +!ifndef NSIS_CHAR_SIZE +!define NSIS_CHAR_SIZE 1 +!endif + +!define IniGetSectionNames "!insertmacro IniGetSectionNames " +!define IniGetSectionNames_StopEnum 'StrCpy $3 "$\n"' +!define /math _IniGetSectionNames_MAXCCH 0xffff - 1 ; Should be plenty + +!macro IniGetSectionNames _INI _FUNCNAME +!insertmacro _LOGICLIB_TEMP +GetFunctionAddress $_LOGICLIB_TEMP "${_FUNCNAME}" +Push "${_INI}" +Push $_LOGICLIB_TEMP +Call IniGetSectionNames +!macroend + +Function IniGetSectionNames +Exch $1 ; enumfunc +Push $0 ; str +Push $2 ; mem & tmp +Push $3 ; len +Exch 4 ; .ini on top of stack +System::Call '*(&t${_IniGetSectionNames_MAXCCH})i.r2' +System::Call 'kernel32::GetPrivateProfileSectionNames(ir2r0,i${_IniGetSectionNames_MAXCCH},ts)' +Push $2 +loop: + System::Call 'kernel32::lstrlen(t)(i$0)i.r3' ; (t) is here to trigger A/W detection + StrCmp $3 0 done + System::Call '*$0(&t${NSIS_MAX_STRLEN}.r2)' + IntOp $3 $3 + 1 +!if ${NSIS_CHAR_SIZE} > 1 + IntOp $3 $3 * ${NSIS_CHAR_SIZE} +!endif + IntOp $0 $0 + $3 + Push $0 ; Save + Push $1 ; Save + Push $2 + Call $1 + Pop $1 + Pop $0 + !ifdef IniGetSectionNames_StopEnum + ${If} $3 == "$\n" + System::Call '*$0(&i${NSIS_CHAR_SIZE} 0)' + ${EndIf} + !endif + Goto loop +done: +Pop $2 +System::Free $2 +Pop $2 +Pop $0 +Pop $1 +Pop $3 +FunctionEnd \ No newline at end of file diff --git a/xxxk-xkcommon/yong_thxnder_gb18030.nsi b/app-win/nsis/v1.x/xxxk_1.x_gb18030.nsi similarity index 100% rename from xxxk-xkcommon/yong_thxnder_gb18030.nsi rename to app-win/nsis/v1.x/xxxk_1.x_gb18030.nsi diff --git a/app-win/nsis/xxxk.nsi b/app-win/nsis/xxxk.nsi new file mode 100644 index 0000000..0798a4e --- /dev/null +++ b/app-win/nsis/xxxk.nsi @@ -0,0 +1,157 @@ +# 引入文件 +!include "MUI2.nsh" +!include "LogicLib.nsh" +!include "xxxkFuncBase.nsh" + +# 声明常量 +!define XXXK_NAME_CN "小小星空" +!define XXXK_NAME_EN "xxxk" +!define XXXK_VER "2.0.0.0" +!define XXXK_VER_DATE "20241117" +!define XXXK_URL_HOME "https://xkinput.github.io/xxxk-help" +!define XXXK_URL_DOWNLOAD "http://xxxk.ysepan.com" +!define XXXK_REG_ROOT "HKLM" +!define XXXK_REG_MAIN "Software\Microsoft\Windows\CurrentVersion\Uninstall" # 注意由于 NSIS 创建的安装包为 32 位，"Software\Microsoft" 会被重定向为 "Software\Wow6432Node\Microsoft" +!define XXXK_DIR_APP_WIN ".." +!define XXXK_DIR_DATA_BASE "..\..\data-base" +!define XXXK_DIR_DATA_SCHEMA "..\..\data-schema" + +# 设定安装程序属性 +RequestExecutionLevel highest +SetCompressor /SOLID lzma +InstallDir "$LOCALAPPDATA\${XXXK_NAME_EN}" +OutFile "${XXXK_NAME_CN}-v${XXXK_VER}-build${XXXK_VER_DATE}.exe" +Name "${XXXK_NAME_CN}" # 修改变量 $(^Name)。影响欢迎页的有关文本 +VIProductVersion "${XXXK_VER}" # 安装包的文件属性 > 详细信息 > 安装文件版本号 +VIAddVersionKey ProductVersion "${XXXK_VER}" # 安装包的文件属性 > 详细信息 > 产品版本号 +VIAddVersionKey ProductName "${XXXK_NAME_CN}" # 安装包的文件属性 > 详细信息 > 产品名称 + +# 声明页面 + +!define MUI_ICON "${XXXK_DIR_DATA_BASE}\skin\favicon.ico" # 安装程序的图标 + +!define MUI_ABORTWARNING # 用户关闭安装程序前弹出警告 + +!insertmacro MUI_PAGE_WELCOME + +!insertmacro MUI_PAGE_LICENSE "${XXXK_DIR_DATA_BASE}\README.txt" + +!insertmacro MUI_PAGE_COMPONENTS + +!define MUI_DIRECTORYPAGE_VARIABLE $INSTDIR # 绑定变量到目录选择页 +!insertmacro MUI_PAGE_DIRECTORY + +!insertmacro MUI_PAGE_INSTFILES + +!define MUI_FINISHPAGE_RUN $INSTDIR\yong.bat +!define MUI_FINISHPAGE_RUN_TEXT "运行输入法主程序" + +!define MUI_FINISHPAGE_TEXT "要以 TSF 模式（需安装了 TSF 模块）运行输入法，\ + $\n请在一个新的可键入文本的窗口中切换至 Yong 输入法键盘，\ + $\n再运行输入法主程序。" +!define MUI_FINISHPAGE_LINK '阅读在线文档' +!define MUI_FINISHPAGE_LINK_LOCATION "${XXXK_URL_HOME}/#/install?id=启动" +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_LANGUAGE "SimpChinese" + +# 显式区段（选框） +Section /o "标准安装（需管理员身份）" optStandard + AddSize 23810 # KB +SectionEnd +Section /o "便携安装" optPortable + AddSize 23113 # KB +SectionEnd + +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${optStandard} "为所有用户安装输入法主程序和 TSF 模块。$\n$\nTSF 模块能够把小小输入法注册到系统键盘，获得系统原生输入法级别的体验，但必须以管理员身份运行安装包。" + !insertmacro MUI_DESCRIPTION_TEXT ${optPortable} "仅释放主程序和星空方案，不写入注册表、不添加开始菜单、不注册 TSF 模块。$\n$\n仅适合想初步体验或者安装到U盘的用户。" +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +# 隐式区段（必发） + +!include "xxxkFuncChkInstDir.nsh" +!include "xxxkFuncKillYong.nsh" +!include "xxxkFuncAppFiles.nsh" +!include "xxxkFuncYongIni.nsh" +!include "xxxkFuncAppReg.nsh" +!include "xxxkFuncAppStartMenu.nsh" +!include "xxxkFuncTsf.nsh" +!include "xxxkFuncUninstaller.nsh" + +Section "-Main" + + Call xxxkFuncChkInstDir # 检查 $INSTDIR 和有关注册表项 + + Call xxxkFuncKillYong # 退出正在运行的主程序 + + Call xxxkFuncAppFiles # 释放或删除 app-win, data-base, data-schema 里的有关文件到 $INSTDIR + + Call xxxkFuncYongIni # 酌情恢复或删除 yong.ini 里的设置 + + ${IfNot} ${SectionIsSelected} ${optPortable} + Call xxxkFuncAppReg # 创建或删除注册表项 + Call xxxkFuncAppStartMenu # 创建或删除开始菜单 + Call xxxkFuncTsf # 释放或删除 app-win/tsf 里的文件，以及注册或注销 TSF 模块 + ${EndIf} + + Call xxxkFuncUninstaller # 创建卸载程序 + +SectionEnd + +# 回调函数 + +Function xxxkSubFuncInitCheckbox + Push "$R0" # 是否为管理员账户 + ${xxxkUserIsAdmin} $R0 + ${If} $R0 == "1" + SectionSetFlags ${optStandard} ${SF_SELECTED} + SectionSetFlags ${optPortable} 0 + ${Else} + SectionSetFlags ${optStandard} ${SF_RO} + SectionSetFlags ${optPortable} ${SF_SELECTED}|${SF_RO} + ${EndIf} + Pop $R0 +FunctionEnd + +Function xxxkSubFuncInitInstDir + ${If} ${SectionIsSelected} ${optPortable} + SetShellVarContext current + StrCpy $INSTDIR "$LOCALAPPDATA\${XXXK_NAME_EN}" + ${Else} + ClearErrors + ReadRegStr $INSTDIR "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "InstallLocation" # 尝试从已有注册表项（注意 "Software\Microsoft" 会被重定向为 "Software\Wow6432Node\Microsoft"）中读取安装路径，并赋值给变量 $INSTDIR + ${IfThen} ${Errors} ${|} StrCpy $INSTDIR "$PROGRAMFILES\${XXXK_NAME_EN}" ${|} + ${EndIf} +FunctionEnd + +Function .onInit + + Call xxxkSubFuncInitCheckbox + Call xxxkSubFuncInitInstDir + +FunctionEnd + +Function .onSelChange # 发生变化的区段索引存储在 $0 中 + + ${If} $0 == ${optPortable} + + ${If} ${SectionIsSelected} ${optPortable} + ${xxxkSetSectionState} ${optStandard} ${SF_SELECTED} "0" + ${Else} + ${xxxkSetSectionState} ${optPortable} ${SF_SELECTED} "1" + ${EndIf} + + ${ElseIf} $0 == ${optStandard} + + ${If} ${SectionIsSelected} ${optStandard} + ${xxxkSetSectionState} ${optPortable} ${SF_SELECTED} "0" + ${Else} + ${xxxkSetSectionState} ${optStandard} ${SF_SELECTED} "1" + ${EndIf} + + ${EndIf} + + Call xxxkSubFuncInitInstDir + +FunctionEnd diff --git a/app-win/nsis/xxxkFuncAppFiles.nsh b/app-win/nsis/xxxkFuncAppFiles.nsh new file mode 100644 index 0000000..7ee74f2 --- /dev/null +++ b/app-win/nsis/xxxkFuncAppFiles.nsh @@ -0,0 +1,128 @@ +!include "LogicLib.nsh" +!include "xxxkFuncBase.nsh" +#!define XXXK_DIR_APP_WIN ".." +#!define XXXK_DIR_DATA_BASE "..\..\data-base" +#!define XXXK_VER "1.0.6.0" +#!define XXXK_VER_DATE "20240415" +#!define XXXK_DIR_DATA_SCHEMA "..\..\data-schema" + +Function xxxkFuncAppFiles + + # 一、释放 app-win 里的文件（除了 tsf） + + # 1. 释放输入法主程序和功能模块（64位版）：app-win\yong\w64 → $INSTDIR\w64 + SetOutPath "$INSTDIR\w64" + File "${XXXK_DIR_APP_WIN}\yong\w64\libcloud.so" + File "${XXXK_DIR_APP_WIN}\yong\w64\libgbk.so" + File "${XXXK_DIR_APP_WIN}\yong\w64\libl.dll" + File "${XXXK_DIR_APP_WIN}\yong\w64\libmb.so" + File "${XXXK_DIR_APP_WIN}\yong\w64\yong.exe" + File "${XXXK_DIR_APP_WIN}\yong\w64\yong-config.exe" + File "${XXXK_DIR_APP_WIN}\yong\w64\yong-vim.exe" + + # 2. 释放输入法主程序和功能模块（32位版）以及有关的资源文件：app-win\yong → $INSTDIR + SetOutPath "$INSTDIR" + File "${XXXK_DIR_APP_WIN}\yong\libcloud.so" + File "${XXXK_DIR_APP_WIN}\yong\libgbk.so" + File "${XXXK_DIR_APP_WIN}\yong\libl.dll" + File "${XXXK_DIR_APP_WIN}\yong\libmb.so" + File "${XXXK_DIR_APP_WIN}\yong\yong.exe" + File "${XXXK_DIR_APP_WIN}\yong\yong-config.exe" + File "${XXXK_DIR_APP_WIN}\yong\yong-vim.exe" + File "${XXXK_DIR_APP_WIN}\yong\class.txt" + File "${XXXK_DIR_APP_WIN}\yong\normal.txt" + + # 二、释放 data-base 里的文件 + + # 3. 释放 xxxk 定制的有关资源文件：data-base → $INSTDIR + SetOutPath "$INSTDIR" + File "${XXXK_DIR_DATA_BASE}\bd.txt" + File "${XXXK_DIR_DATA_BASE}\bihua.bin" + File "${XXXK_DIR_DATA_BASE}\crab.txt" + File "${XXXK_DIR_DATA_BASE}\keyboard.ini" + File "${XXXK_DIR_DATA_BASE}\layout.txt" + File "${XXXK_DIR_DATA_BASE}\menu.ini" + WriteINIStr $INSTDIR\menu.ini "about" "exec" "$$MSG(v${XXXK_VER}-Build${XXXK_VER_DATE})" + File "${XXXK_DIR_DATA_BASE}\README.txt" + File "${XXXK_DIR_DATA_BASE}\urls.txt" + File "${XXXK_DIR_DATA_BASE}\yong.ini" + File "${XXXK_DIR_DATA_BASE}\xxxkCustomizableKeys.ini" + File "${XXXK_DIR_DATA_BASE}\yong.bat" + File "${XXXK_DIR_DATA_BASE}\yong-config.bat" + + # 4. 释放 xxxk 定制的皮肤、托盘和图标文件：data-base\skin → $INSTDIR\skin + SetOutPath "$INSTDIR\skin" + File "${XXXK_DIR_DATA_BASE}\skin\*.*" # 只打包文件，因此调试用的皮肤目录不会被打包 + + # 5. 释放 xxxk 定制的文档：data-base\doc → $INSTDIR\doc + SetOutPath "$INSTDIR\doc" + File /r "${XXXK_DIR_DATA_BASE}\doc\*.*" # 打包所有子文件和子目录 + + # 6. 释放 xxxk 定制的工具：data-base\tools → $INSTDIR\tools + SetOutPath "$INSTDIR\tools" + File /r "${XXXK_DIR_DATA_BASE}\tools\*.*" # 打包所有子文件和子目录 + + # 7. 释放 xxxk 定制的码表：data-base\mb → $INSTDIR\mb data-base\entry → $INSTDIR\entry + SetOutPath "$INSTDIR\mb" + File /r "${XXXK_DIR_DATA_BASE}\mb\*.*" # 打包所有子文件和子目录 + SetOutPath "$INSTDIR\entry" + File /r "${XXXK_DIR_DATA_BASE}\entry\*.*" # 打包所有子文件和子目录 + + # 三、释放 data-schema 里的文件 + + # 8. 释放码表：data-schema\方案名 → $INSTDIR + SetOutPath "$INSTDIR" + File /r "${XXXK_DIR_DATA_SCHEMA}\xkjd6\*.*" # 打包所有子文件和子目录 + File /r "${XXXK_DIR_DATA_SCHEMA}\xklb\*.*" # 打包所有子文件和子目录 + File /r "${XXXK_DIR_DATA_SCHEMA}\xkxb\*.*" # 打包所有子文件和子目录 + File /r "${XXXK_DIR_DATA_SCHEMA}\xkyb\*.*" # 打包所有子文件和子目录 + +FunctionEnd + +Function un.xxxkFuncAppFiles + + # 删除在程序目录下创建的输入法主程序的快捷方式（历史遗留） + Delete "$INSTDIR\*.lnk" + + # 8.7. 删除码表 + ${xxxkRMDir} "$INSTDIR\mb" # RMDir /r "$INSTDIR\mb" + ${xxxkRMDir} "$INSTDIR\entry" # RMDir /r "$INSTDIR\entry" + + # 6. 删除工具 + ${xxxkRMDir} "$INSTDIR\tools" # RMDir /r "$INSTDIR\tools" + + # 5. 删除文档 + ${xxxkRMDir} "$INSTDIR\doc" # RMDir /r "$INSTDIR\doc" + + # 4. 删除皮肤、托盘和图标文件 + ${xxxkRMDir} "$INSTDIR\skin" # RMDir /r "$INSTDIR\skin" + + # 3. 删除 xxxk 定制的有关资源文件 + Delete "$INSTDIR\bd.txt" + Delete "$INSTDIR\bihua.bin" + Delete "$INSTDIR\crab.txt" + Delete "$INSTDIR\keyboard.ini" + Delete "$INSTDIR\layout.txt" + Delete "$INSTDIR\menu.ini" + Delete "$INSTDIR\README.txt" + Delete "$INSTDIR\urls.txt" + Delete "$INSTDIR\yong.ini" + Delete "$INSTDIR\xxxkCustomizableKeys.ini" + Delete "$INSTDIR\yong.bat" + Delete "$INSTDIR\yong-config.bat" + + # 2. 删除输入法主程序和功能模块（32位版）以及有关的资源文件 + Delete "$INSTDIR\libcloud.so" + Delete "$INSTDIR\libgbk.so" + Delete "$INSTDIR\libl.dll" + Delete "$INSTDIR\libmb.so" + Delete "$INSTDIR\yong.exe" + Delete "$INSTDIR\yong-config.exe" + Delete "$INSTDIR\yong-vim.exe" + Delete "$INSTDIR\class.txt" + Delete "$INSTDIR\normal.txt" + + # 1. 删除输入法主程序和功能模块（64位版） + ${xxxkRMDir} "$INSTDIR\w64" # RMDir /r "$INSTDIR\w64" + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncAppReg.nsh b/app-win/nsis/xxxkFuncAppReg.nsh new file mode 100644 index 0000000..fc08d6a --- /dev/null +++ b/app-win/nsis/xxxkFuncAppReg.nsh @@ -0,0 +1,21 @@ +!include "LogicLib.nsh" +#!define XXXK_REG_ROOT "HKLM" +#!define XXXK_NAME_EN "xxxk" +#!define XXXK_VER "1.0.6.0" +#!define XXXK_REG_MAIN "Software\Microsoft\Windows\CurrentVersion\Uninstall" # 注意由于 NSIS 创建的安装包为 32 位，"Software\Microsoft" 会被重定向为 "Software\Wow6432Node\Microsoft" + +Function xxxkFuncAppReg + + WriteRegStr "HKCU" "Control Panel\Desktop" "LowLevelHooksTimeout" 0x000003E8 # 修复注册表 + WriteRegStr "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "DisplayName" "$(^Name)" + WriteRegStr "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "UninstallString" "$INSTDIR\uninstall.exe" + WriteRegStr "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "DisplayVersion" "${XXXK_VER}" + WriteRegStr "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "InstallLocation" "$INSTDIR" + +FunctionEnd + +Function un.xxxkFuncAppReg # 删除注册表项 + + DeleteRegKey "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncAppStartMenu.nsh b/app-win/nsis/xxxkFuncAppStartMenu.nsh new file mode 100644 index 0000000..c8cf7c0 --- /dev/null +++ b/app-win/nsis/xxxkFuncAppStartMenu.nsh @@ -0,0 +1,38 @@ +!include "x64.nsh" +#!define XXXK_NAME_EN "xxxk" +#!define XXXK_URL_HOME "https://xkinput.github.io/xxxk-help" +#!define XXXK_URL_DOWNLOAD "http://xxxk.ysepan.com" + +Function xxxkFuncAppStartMenu + + # 如果要创建自启动项，快捷方式名必须为yong.lnk 且位于用户开始菜单，以保持与 yong-config.exe 修改启动项的行为一致 + ; SetShellVarContext current + ; ${If} ${RunningX64} + ; CreateShortCut "$SMSTARTUP\yong.lnk" "$INSTDIR\w64\yong.exe" + ; ${Else} + ; CreateShortCut "$SMSTARTUP\yong.lnk" "$INSTDIR\yong.exe" + ; ${EndIf} + + SetShellVarContext all + RMDir /r "$SMPROGRAMS\${XXXK_NAME_EN}" + CreateDirectory "$SMPROGRAMS\${XXXK_NAME_EN}" + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\1.小小星空.lnk" "$INSTDIR\tools\bat\yong.bat" "" "$INSTDIR\yong.exe" + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\2.重置小小.lnk" "$INSTDIR\tools\bat\reset.bat" "" "$WINDIR\System32\SHELL32.dll" 238 + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\3.教程.lnk" "$INSTDIR\doc" "" "$WINDIR\System32\SHELL32.dll" 23 + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\4.官网.lnk" "${XXXK_URL_HOME}" "" "$WINDIR\System32\SHELL32.dll" 17 + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\5.网盘.lnk" "${XXXK_URL_DOWNLOAD}" "" "$WINDIR\System32\SHELL32.dll" 17 + CreateShortCut "$SMPROGRAMS\${XXXK_NAME_EN}\6.卸载.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" + +FunctionEnd + +Function un.xxxkFuncAppStartMenu # 删除快捷方式和开始菜单 + + # 二、删除自启动项 + SetShellVarContext current # yong-config 创建的启动项位于用户开始菜单 + Delete "$SMSTARTUP\yong.lnk" + + # 一、删除开始菜单 + SetShellVarContext all + RMDir /r "$SMPROGRAMS\${XXXK_NAME_EN}" # 删除开始->程序->小小星空 + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncBase.nsh b/app-win/nsis/xxxkFuncBase.nsh new file mode 100644 index 0000000..5bc4bf8 --- /dev/null +++ b/app-win/nsis/xxxkFuncBase.nsh @@ -0,0 +1,367 @@ +!include "LogicLib.nsh" +!include "EnumIni.nsh" # 有两个函数 ${EnumIniKey} 和 ${EnumIniValue}，但是前者有 bug 用不了 +!include "WordFunc.nsh" +!include "x64.nsh" + +# 提供一种比 RMDir /r "$INSTDIR\mb" 更安全的文件夹删除方法（不会删除符号链接） +# 调用方法：${xxxkRMDir} "目标文件夹路径" +# 所有参数均为传值 +!ifmacrondef xxxkMacroRMDir +!macro xxxkMacroRMDir argPath + ExecShellWait "" "cmd" `/c rmdir /s /q "${argPath}"` +!macroend +!endif +!ifndef xxxkRMDir +!define xxxkRMDir "!insertmacro xxxkMacroRMDir" +!endif + + +# 复制源 ini 文件中指定段的全部内容到目标 ini 文件里 +# 调用方法：${xxxkUpdateIniSection} "源ini路径" "目标ini路径" "段" +# 所有参数均为传值 +!ifmacrondef xxxkMacroUpdateIniSection +!macro xxxkMacroUpdateIniSection arg0 arg1 arg2 # "源ini路径" "目标ini路径" "段" + # 备份寄存器到栈顶 + Push "$R0" # 源ini + Push "$R1" # 目标ini + Push "$R2" # 段 + Push "$R3" # 键 + Push "$R4" # 值 + Push "$R5" # 计数器 + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Push "${arg1}" + Push "${arg2}" + Pop $R2 + Pop $R1 + Pop $R0 + + # 可以随意使用变量了（但不能使用形参） + StrCpy $R3 "" # 键 + StrCpy $R4 "" # 值 + StrCpy $R5 0 # 计数器 + + ${Do} + ${EnumIniValue} $R3 "$R0" "$R2" $R5 # 查询指定 INI 文件中指定节里的第N个键（从 0 开始计数），返回键名。如果查询失败（没有更多的键了），则返回空字符串，并设置错误标志 + ${If} $R3 == "" + ${Break} + ${Else} + IntOp $R5 $R5 + 1 + ReadINIStr $R4 "$R0" "$R2" "$R3" + WriteINIStr "$R1" "$R2" "$R3" "$R4" + ${EndIf} + ${Loop} + + # 恢复临时变量的原值，并传回返回值 + Pop $R5 + Pop $R4 + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 +!macroend +!endif +!ifndef xxxkUpdateIniSection +!define xxxkUpdateIniSection "!insertmacro xxxkMacroUpdateIniSection" # 提供更简单的调用方式 +!endif + + +# 复制源 ini 文件中指定段的全部内容到目标 ini 文件里（清空目标 ini 中原本的段） +# 调用方法：${xxxkReplaceIniSection} "源ini路径" "目标ini路径" "段" +# 所有参数均为传值 +!ifmacrondef xxxkMacroReplaceIniSection +!macro xxxkMacroReplaceIniSection arg0 arg1 arg2 # "源ini路径" "目标ini路径" "段" + DeleteINISec "${arg1}" "${arg2}" + ${xxxkUpdateIniSection} "${arg0}" "${arg1}" "${arg2}" +!macroend +!endif +!ifndef xxxkReplaceIniSection +!define xxxkReplaceIniSection "!insertmacro xxxkMacroReplaceIniSection" # 提供更简单的调用方式 +!endif + + +# 复制源 ini 文件中的指定键到目标 ini 文件里 +# 调用方法：${xxxkReplaceIniKey} "源ini路径" "目标ini路径" "段" "键" +# 所有参数均为传值 +!ifmacrondef xxxkMacroReplaceIniKey +!macro xxxkMacroReplaceIniKey arg0 arg1 arg2 arg3 # "源ini路径" "目标ini路径" "段" "键" + # 备份寄存器到栈顶 + Push "$R0" # 源ini + Push "$R1" # 目标ini + Push "$R2" # 段 + Push "$R3" # 键 + Push "$R4" # 值 + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Push "${arg1}" + Push "${arg2}" + Push "${arg3}" + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 + + # 可以随意使用变量了（但不能使用形参） + ReadINIStr $R4 "$R0" "$R2" "$R3" + ${If} ${Errors} + ${AndIf} $R4 == "" + DeleteINIStr "$R1" "$R2" "$R3" + ${Else} + WriteINIStr "$R1" "$R2" "$R3" "$R4" # 把某个键值对写入指定 INI 文件。 + ${EndIf} + + # 恢复临时变量的原值，并传回返回值 + Pop $R4 + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 +!macroend +!endif +!ifndef xxxkReplaceIniKey +!define xxxkReplaceIniKey "!insertmacro xxxkMacroReplaceIniKey" # 提供更简单的调用方式 +!endif + +# 在给定目录中，非递归式地寻找包含指定 [方案ID] 段的第一个 ini 文件。返回文件名。如果找不到，就返回空文件名并设置错误标记。 +# 调用方法：${xxxkFindIniContainingSchema} 返回值变量 "目录" "方案ID" +# 第一个参数传址，其余参数均为传值 +!ifmacrondef xxxkMacroFindIniContainingSchema +!macro xxxkMacroFindIniContainingSchema arg0 arg1 arg2 # 返回值变量 "目录" "方案ID" + # 备份要用到的临时变量 + Push "$R0" # 返回值变量 + Push "$R1" # 目录 + Push "$R2" # 方案ID" + Push "$R3" # 搜索句柄 + Push "$R4" # 文件名 + + # 获得传值型形参的值 + Push "${arg1}" + Push "${arg2}" + Pop $R2 + Pop $R1 + + # 可以随意使用寄存器变量了（但不能使用形参） + ClearErrors + ReadINIStr $R0 "$R1\$R2_entry.ini" "$R2" "name" + ${IfNot} ${Errors} + StrCpy $R0 "$R2_entry.ini" + ${Else} + FindFirst $R3 $R4 "$R1\*.ini" # 第一个变量代表本次搜索的句柄, 第二个变量代表文件名（不含路径），如果找不到文件了，其会被赋空值并设置错误标记。 + ${DoUntil} ${Errors} + ReadINIStr $R0 "$R1\$R4" "$R2" "name" + ${IfNot} ${Errors} + StrCpy $R0 "$R4" + ${Break} + ${EndIf} + FindNext $R3 $R4 + ${Loop} + FindClose $R3 + ${EndIf} + ${IfThen} $R0 == "" ${|} SetErrors ${|} + + # 恢复传值型形参和寄存器变量的原值，并传回返回值 + Pop $R4 + Pop $R3 + Pop $R2 + Pop $R1 + Push "$R0" + Exch + Pop $R0 + Pop ${arg0} +!macroend +!endif +!ifndef xxxkFindIniContainingSchema +!define xxxkFindIniContainingSchema "!insertmacro xxxkMacroFindIniContainingSchema" # 提供更简单的调用方式 +!endif + +# 将一个文件有规律地重命名为“原文件名.数字序号.del” +# 调用方法：${xxxkMarkFileAsDel} "文件路径" +# 所有参数均为传值的，无返回值 +!ifmacrondef xxxkMacroMarkFileAsDel +!macro xxxkMacroMarkFileAsDel arg0 # arg0 是文件路径 + # 备份要用到的临时变量 + Push "$R0" # 文件路径 + Push "$R1" # 计数器 + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Pop $R0 + + # 可以随意使用变量了（但不能使用形参） + StrCpy $R1 "0" + ${DoWhile} ${FileExists} "$R0.$R1.del" + IntOp $R1 $R1 + 1 + ${Loop} + Rename "$R0" "$R0.$R1.del" + + # 恢复临时变量的原值 + Pop $R1 + Pop $R0 +!macroend +!endif +!ifndef xxxkMarkFileAsDel +!define xxxkMarkFileAsDel "!insertmacro xxxkMacroMarkFileAsDel" # 提供更简单的调用方式 +!endif + +# 判断当前账户是否为管理员 +# 调用方法：${xxxkUserIsAdmin} 返回值变量 +# 参数均为传值 +!ifmacrondef xxxkMacroUserIsAdmin +!macro xxxkMacroUserIsAdmin arg0 # 可在宏体内用形如 ${arg0} 的形式引用形参。 + # 备份要用到的变量 + Push "$R0" # 返回值 + Push "$R1" # 账户类型 + + # 可以随意使用变量了（但不能使用形参） + StrCpy $R0 "0" + UserInfo::GetAccountType + Pop $R1 + ${If} $R1 == "Admin" + ${OrIf} $R1 == "Power" + StrCpy $R0 "1" + ${EndIf} + + # 恢复变量的原值，并传回返回值 + Pop $R1 + Push "$R0" + Exch + Pop $R0 + Pop ${arg0} +!macroend +!endif +# 提供更简单的调用方式 +!ifndef xxxkUserIsAdmin +!define xxxkUserIsAdmin "!insertmacro xxxkMacroUserIsAdmin" +!endif + +# 修改组件框的状态 +# 调用方法：${xxxkSetSectionState} ${区段ID} ${SF_XXX} 状态值 +# 参数均为传值。第一个参数表示目标组件框，第二个常量表示要修改的状态种类，第三个值表示要修改成什么值（1表示真，其余表示假）。 +!ifmacrondef xxxkMacroSetSectionState +!macro xxxkMacroSetSectionState arg0 arg1 arg2 # 可在宏体内用形如 ${arg0} 的形式引用形参。 + # 备份要用到的变量 + Push "$R0" # 区段ID + Push "$R1" # 状态种类 + Push "$R2" # 状态值 + Push "$R3" # 用来记录区段的初始 Flags + Push "$R4" # 用来记录区段的目标 Flags + + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Pop $R0 + Push "${arg1}" + Pop $R1 + Push "${arg2}" + Pop $R2 + + # 可以随意使用变量了（但不能使用形参） + SectionGetFlags $R0 $R3 + ${If} $R2 == "1" + IntOp $R4 $R3 | $R1 + ${Else} + IntOp $R4 4294967295 ^ $R1 # 这个大整数即是二进制下32位的1，用来生成掩码 + IntOp $R4 $R3 & $R4 + ${EndIf} + SectionSetFlags $R0 $R4 + + # 恢复变量的原值 + Pop $R4 + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 +!macroend +!endif +# 提供更简单的调用方式 +!ifndef xxxkSetSectionState +!define xxxkSetSectionState "!insertmacro xxxkMacroSetSectionState" +!endif + +# 根据给定 DataDir（程序目录），获取 HomeDir（配置目录）。一般 HomeDir 是 DataDir\.yong，但如果 DataDir 是 PROGRAMFILES 或 $PROGRAMFILES64 的后代目录，则 HomeDir 为 %APPDATA%\yong +# arg0 为返回值变量，如果失败，返回空值 +# arg1 为传值型形参，DataDir +# 调用方法：${xxxkGetHomeDir} 返回值变量 "DataDir" +!ifmacrondef xxxkMacroGetHomeDir +!macro xxxkMacroGetHomeDir arg0 arg1 + # 备份要用到的变量 + Push "$R0" # 返回值 + Push "$R1" # 形参，DataDir + Push "$R2" # 临时变量，标记是否为子目录 + + # 把传值型形参的值传给寄存器 + Push "${arg1}" + Pop $R1 + + # 可以随意使用变量了（但不能使用形参） + StrCpy $R0 "" + ${If} ${FileExists} "$R1\*" + ${WordFind} "$R1" "$PROGRAMFILES" "+1{" $R2 # 通过检测 $R1 是否以 $PROGRAMFILES 开头，来判断 $R1 是否在 $PROGRAMFILES（指 x86 的 Program Files 目录或 x64 的 Program Files(x86) 目录）下。如果检测成功，则返回变量值为空 + ${If} $R2 != "" + ${If} ${RunningX64} + ${WordFind} "$R1" "$PROGRAMFILES64" "+1{" $R2 # $PROGRAMFILES64 指 x64 的Program Files 目录 + ${EndIf} + ${EndIf} + + ${If} $R2 == "" + SetShellVarContext current + StrCpy $R0 "$APPDATA\yong" + ${Else} + StrCpy $R0 "$R1\.yong" + ${EndIf} + ${EndIf} + + # 恢复变量的原值，并传回返回值 + Pop $R2 + Pop $R1 + Push "$R0" + Exch + Pop $R0 + Pop ${arg0} +!macroend +!endif +!ifndef xxxkGetHomeDir +!define xxxkGetHomeDir "!insertmacro xxxkMacroGetHomeDir" # 提供更简单的调用方式 +!endif + +# 检测安装包是否拥有给定目录的写入权限。 +# arg0 为返回值变量，如果成功，返回 1，如果失败，返回 0 +# arg1 为传值型形参，给定目录 +# 调用方法：${xxxkHasWritePermissionOnDir} 返回值变量 "给定目录" +!ifmacrondef xxxkMacroHasWritePermissionOnDir +!macro xxxkMacroHasWritePermissionOnDir arg0 arg1 + # 备份要用到的变量 + Push "$R0" # 返回值 + Push "$R1" # 形参，给定目录 + Push "$R2" # 临时变量，存放文件句柄 + + # 把传值型形参的值传给寄存器 + Push "${arg1}" + Pop $R1 + + # 可以随意使用变量了（但不能使用形参） + CreateDirectory "$R1" # 副作用：可能会产生空文件夹 + ClearErrors + FileOpen $R2 "$R1\tmp.dat" "a" + FileClose "$R2" + Delete "$R1\tmp.dat" + ${If} ${Errors} + StrCpy $R0 "0" + ${Else} + StrCpy $R0 "1" + ${EndIf} + + # 恢复变量的原值，并传回返回值 + Pop $R2 + Pop $R1 + Push "$R0" + Exch + Pop $R0 + Pop ${arg0} +!macroend +!endif +!ifndef xxxkHasWritePermissionOnDir +!define xxxkHasWritePermissionOnDir "!insertmacro xxxkMacroHasWritePermissionOnDir" # 提供更简单的调用方式 +!endif \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncChkInstDir.nsh b/app-win/nsis/xxxkFuncChkInstDir.nsh new file mode 100644 index 0000000..1bfba39 --- /dev/null +++ b/app-win/nsis/xxxkFuncChkInstDir.nsh @@ -0,0 +1,55 @@ +!include "LogicLib.nsh" +#!define XXXK_REG_ROOT "HKLM" +#!define XXXK_NAME_EN "xxxk" +#!define XXXK_REG_MAIN "Software\Microsoft\Windows\CurrentVersion\Uninstall" # 注意 NSIS 安装包是 32 位程序，所以 "Software\Microsoft" 会被重定向为 "Software\Wow6432Node\Microsoft" + +Function xxxkFuncChkInstDir + + ${IfNot} ${SectionIsSelected} ${OptPortable} + + Push $R0 # 旧版 $INSTDIR + ReadRegStr $R0 "HKLM" "${XXXK_REG_MAIN}\小小键道3" "InstallLocation" + ${IfNot} ${Errors} + MessageBox MB_OK|MB_ICONEXCLAMATION "安装失败！$\n原因：检测到旧版小小键道3（$R0）。$\n为避免不可预料的冲突，请先将其卸载！" + Abort + ${EndIf} + + ReadRegStr $R0 "HKLM" "${XXXK_REG_MAIN}\小小键道6" "InstallLocation" + ${IfNot} ${Errors} + MessageBox MB_OK|MB_ICONEXCLAMATION "安装失败！$\n原因：检测到旧版小小键道6（$R0）。$\n为避免不可预料的冲突，请先将其卸载！" + Abort + ${EndIf} + + ReadRegStr $R0 "HKLM" "${XXXK_REG_MAIN}\小小星空" "InstallLocation" + ${IfNot} ${Errors} + MessageBox MB_OK|MB_ICONEXCLAMATION "安装失败！$\n原因：检测到旧版小小星空（$R0）。$\n为避免不可预料的冲突，请先将其卸载！" + Abort + ${EndIf} + + ReadRegStr $R0 "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "InstallLocation" + ${IfNot} ${Errors} + ${If} "$R0" != "$INSTDIR" + MessageBox MB_OK|MB_ICONEXCLAMATION "安装失败！$\n原因：检测到旧版小小星空，且其安装路径（$R0）与当前所选安装路径（$INSTDIR)不同。$\n为避免不可预料的冲突，请先将其卸载！" + Abort + ${EndIf} + ${EndIf} + + Pop $R0 + + ${EndIf} + + ${If} ${FileExists} "$INSTDIR\*.*" + ${If} ${Cmd} `MessageBox MB_YESNO|MB_ICONQUESTION "$INSTDIR 目录已存在，$\n继续安装可能导致原有文件被覆盖，或者因文件占用而安装失败。$\n确定要继续吗？" IDNO` + Abort + ${EndIf} + ${EndIf} + + Push "$R0" + ${xxxkHasWritePermissionOnDir} $R0 "$INSTDIR" + ${If} $R0 == "0" + MessageBox MB_OK|MB_ICONEXCLAMATION "安装失败！$\n原因：缺少对安装路径的写入权限。" + Abort + ${EndIf} + Pop $R0 + +FunctionEnd diff --git a/app-win/nsis/xxxkFuncKillYong.nsh b/app-win/nsis/xxxkFuncKillYong.nsh new file mode 100644 index 0000000..995e9c0 --- /dev/null +++ b/app-win/nsis/xxxkFuncKillYong.nsh @@ -0,0 +1,31 @@ +!include "LogicLib.nsh" + +!macro xxxkMacroKillYong + + # 变量 R0 用于记录 yong.exe 的句柄 + + ${Do} + + FindWindow $R0 "yong_main" + ${If} $R0 = 0 + ${Break} + ${Else} + SendMessage $R0 2 0 0 # 给窗口发送退出消息 + Sleep 500 + ${EndIf} + + ${Loop} + +!macroend + +Function xxxkFuncKillYong + + !insertmacro xxxkMacroKillYong + +FunctionEnd + +Function un.xxxkFuncKillYong + + !insertmacro xxxkMacroKillYong + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncTsf.nsh b/app-win/nsis/xxxkFuncTsf.nsh new file mode 100644 index 0000000..e16eda2 --- /dev/null +++ b/app-win/nsis/xxxkFuncTsf.nsh @@ -0,0 +1,111 @@ +!include "x64.nsh" +!include "WinVer.nsh" +!include "xxxkFuncBase.nsh" + +# 根据操作系统版本确定 TSF 模块文件（即 yong.dll 等）的合理安装目录。对于 Win8 及以上系统，TSF 模块文件必须在 $PROGRAMFILES（指 x86 的 Program Files 目录或 x64 的 Program Files(x86) 目录）中注册，才能在 Metro 应用中使用。 +# 调用方法：${xxxkGetTsfDir} "返回值变量" +# 所有参数均为传址的 +!ifmacrondef xxxkMacroGetTsfDir +!macro xxxkMacroGetTsfDir arg0 + # 备份要用到的临时变量 + Push "$R0" # 返回值变量 + + # 可以随意使用变量了（但不能使用形参） + ${If} ${AtLeastWin8} + StrCpy $R0 "$PROGRAMFILES\xxxk\tsf" + ${Else} + StrCpy $R0 "$INSTDIR\tsf" + ${EndIf} + + # 恢复临时变量的原值，并传回返回值 + Push "$R0" + Exch + Pop $R0 + Pop ${arg0} +!macroend +!endif +!ifndef xxxkGetTsfDir +!define xxxkGetTsfDir "!insertmacro xxxkMacroGetTsfDir" # 提供更简单的调用方式 +!endif + +# 将 TSF 模块文件（即 yong.dll 等）释放到指定目录 +# 调用方法：${xxxkTsfToFolder} "文件夹路径" +# 所有参数均为传值的，无返回值 +!ifmacrondef xxxkMacroTsfToFolder +!macro xxxkMacroTsfToFolder arg0 # arg0 是文件夹路径 + # 备份要用到的临时变量 + Push "$R0" # 文件夹路径 + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Pop $R0 + + # 可以随意使用变量了（但不能使用形参） + # 释放 TSF 模块：app-win\yong\tsf → 指定文件夹\tsf + SetOutPath "$R0" + File "${XXXK_DIR_APP_WIN}\yong\tsf\tsf-reg.exe" + File "${XXXK_DIR_APP_WIN}\yong\tsf\tsf-reg64.exe" + File "${XXXK_DIR_APP_WIN}\yong\tsf\install.bat" + File "${XXXK_DIR_APP_WIN}\yong\tsf\uninstall.bat" + # 由于原有的 yong.dll 和 yong64.dll 可能正被占用，需要先注销，再更名，再释放新文件 + ${If} ${FileExists} "$R0\yong.dll" + ${DisableX64FSRedirection} + ExecShellWait "open" "$R0\uninstall.bat" + ${EnableX64FSRedirection} + Sleep 1000 + ${xxxkMarkFileAsDel} "$R0\yong.dll" + ${xxxkMarkFileAsDel} "$R0\yong64.dll" + ${EndIf} + File "${XXXK_DIR_APP_WIN}\yong\tsf\yong.dll" + File "${XXXK_DIR_APP_WIN}\yong\tsf\yong64.dll" + Delete "$R0\*.del" + + # 恢复临时变量的原值 + Pop $R0 +!macroend +!endif +!ifndef xxxkTsfToFolder +!define xxxkTsfToFolder "!insertmacro xxxkMacroTsfToFolder" # 提供更简单的调用方式 +!endif + +Function xxxkFuncTsf + + Var /GLOBAL xxxkVarTsfDir + ${xxxkGetTsfDir} $xxxkVarTsfDir + + # app-win\yong\tsf → $xxxkVarTsfDir + ${xxxkTsfToFolder} "$xxxkVarTsfDir" + + ${DisableX64FSRedirection} + ExecShellWait "open" "$xxxkVarTsfDir\install.bat" + ${EnableX64FSRedirection} + +FunctionEnd + +Function un.xxxkFuncTsf + + Push "$R0" # 是否为管理员账户 + ${xxxkUserIsAdmin} $R0 + ${If} $R0 == "1" + + ${xxxkGetTsfDir} $xxxkVarTsfDir + + ${If} ${FileExists} "$xxxkVarTsfDir\uninstall.bat" + ${DisableX64FSRedirection} + ExecShellWait "open" "$xxxkVarTsfDir\uninstall.bat" + ${EnableX64FSRedirection} + ${xxxkRMDir} "$xxxkVarTsfDir" # RMDir /r "$xxxkVarTsfDir" + ${EndIf} + + ${If} ${FileExists} "$INSTDIR\tsf\uninstall.bat" + ${DisableX64FSRedirection} + ExecShellWait "open" "$INSTDIR\tsf\uninstall.bat" + ${EnableX64FSRedirection} + ${xxxkRMDir} "$INSTDIR\tsf" # RMDir /r "$INSTDIR\tsf" + ${EndIf} + + ${EndIf} + Pop $R0 + + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncUninstaller.nsh b/app-win/nsis/xxxkFuncUninstaller.nsh new file mode 100644 index 0000000..320def9 --- /dev/null +++ b/app-win/nsis/xxxkFuncUninstaller.nsh @@ -0,0 +1,62 @@ +!include "LogicLib.nsh" +!include "xxxkFuncBase.nsh" +#!define XXXK_REG_ROOT "HKLM" +#!define XXXK_NAME_EN "xxxk" +#!define XXXK_REG_MAIN "Software\Microsoft\Windows\CurrentVersion\Uninstall" # 注意由于 NSIS 创建的安装包为 32 位，"Software\Microsoft" 会被重定向为 "Software\Wow6432Node\Microsoft" + +Function xxxkFuncUninstaller + + WriteUninstaller "$INSTDIR\uninstall.exe" + +FunctionEnd + +Function un.onInit + + ${If} ${Cmd} `MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDNO` # 只支持单一结果常量匹配 + Abort + ${EndIf} + + Var /GLOBAL xxxkIsPortable + StrCpy $xxxkIsPortable "0" + Push "$R0" + ReadRegStr $R0 "${XXXK_REG_ROOT}" "${XXXK_REG_MAIN}\${XXXK_NAME_EN}" "InstallLocation" + ${If} $R0 != $INSTDIR + StrCpy $xxxkIsPortable "1" + ${EndIf} + Pop $R0 + + ${If} "$xxxkIsPortable" == "0" + Push "$R0" + ${xxxkUserIsAdmin} $R0 + ${If} $R0 != "1" + MessageBox MB_OK|MB_ICONEXCLAMATION "卸载失败！$\n原因：权限不足，需要管理员身份。" + Abort + ${EndIF} + Pop $R0 + ${EndIf} + +FunctionEnd + +Section "Uninstall" + + Call un.xxxkFuncKillYong + Call un.xxxkFuncAppFiles + Call un.xxxkFuncYongIni + ${If} "$xxxkIsPortable" == "0" + Call un.xxxkFuncTsf + Call un.xxxkFuncAppStartMenu + Call un.xxxkFuncAppReg + ${EndIf} + + Delete "$INSTDIR\uninstall.exe" # 删除自己 + +SectionEnd + +Function un.onUninstSuccess + + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除！\ + $\n安装目录如果有残留文件，重启后即可删除。" + + ExecShell "open" "$INSTDIR" # 打开给用户看 + +FunctionEnd \ No newline at end of file diff --git a/app-win/nsis/xxxkFuncYongIni.nsh b/app-win/nsis/xxxkFuncYongIni.nsh new file mode 100644 index 0000000..cc2b70a --- /dev/null +++ b/app-win/nsis/xxxkFuncYongIni.nsh @@ -0,0 +1,248 @@ +!include "LogicLib.nsh" +!include "IniGetSectionNames.nsh" +!include "xxxkFuncBase.nsh" +!include "WinVer.nsh" + +# 把 pinyin 方案添加到目标 yong.ini +# 调用方法：${xxxkAddPinyinToIni} "目标ini" +# 参数均为传值 +!ifmacrondef xxxkMacroAddPinyinToIni +!macro xxxkMacroAddPinyinToIni arg0 + # 备份要用到的变量 + Push "$R0" # 目标ini + + # 把传值型形参的值传给寄存器 + Push "${arg0}" + Pop $R0 + + # 可以随意使用变量了（但不能使用形参） + WriteINIStr "$R0" "IM" "default" "0" + WriteINIStr "$R0" "IM" "0" "pinyin" + ${xxxkReplaceIniSection} "$INSTDIR\entry\pinyin_entry.ini" "$R0" "pinyin" + + # 恢复变量的原值，并传回返回值 + Pop $R0 +!macroend +!endif +!ifndef xxxkAddPinyinToIni +!define xxxkAddPinyinToIni "!insertmacro xxxkMacroAddPinyinToIni" +!endif + +Function xxxkSubFuncAddSchemasToYongIniInTempDir + Push "$R0" # [IM]n 的 n + Push "$R1" # [IM]n 的值（即方案ID） + Push "$R2" # [方案ID] 段所在的 ini 文件名 + ${ForEach} $R0 0 999 + 1 + ReadINIStr $R1 "$xxxkVarHomeDir\yong.ini" "IM" "$R0" + ${IfNot} $R1 == "" + # 恢复 [IM]n + WriteINIStr "$TEMP\yong.ini" "IM" "$R0" "$R1" + # 恢复相应的 [方案ID] 段 + ${xxxkFindIniContainingSchema} $R2 "$INSTDIR\entry" "$R1" + ${IfNot} ${Errors} + ${xxxkReplaceIniSection} "$INSTDIR\entry\$R2" "$TEMP\yong.ini" "$R1" + ${Else} + ${xxxkReplaceIniSection} "$xxxkVarHomeDir\yong.ini" "$TEMP\yong.ini" "$R1" + ${EndIf} + ${Else} + ${Break} + ${EndIf} + ${Next} + Pop $R2 + Pop $R1 + Pop $R0 +FunctionEnd + +Function xxxkSubFuncChkSchemasInYongIniInTempDir + Push "$R0" + ReadINIStr $R0 "$TEMP\yong.ini" "IM" "0" + ${If} $R0 == "" + ${xxxkAddPinyinToIni} "$TEMP\yong.ini" + ${Else} + Push "$R1" # [IM]default 对应的 n + Push "$R2" # [IM]default 对应的方案ID + ReadINIStr $R1 "$xxxkVarHomeDir\yong.ini" "IM" "default" + ReadINIStr $R2 "$TEMP\yong.ini" "IM" "$R1" + ${IfNotThen} $R2 == "" ${|} WriteINIStr "$TEMP\yong.ini" "IM" "default" "$R1" ${|} + Pop $R2 + Pop $R1 + ${EndIf} + Pop $R0 +FunctionEnd + +Function xxxkSubFuncSetYongIniInTempDir + Delete "$TEMP\xxxkCustomizableKeys.ini" + ${If} ${FileExists} "$xxxkVarHomeDir\xxxkCustomizableKeys.ini" + CopyFiles /SILENT "$xxxkVarHomeDir\xxxkCustomizableKeys.ini" "$TEMP\xxxkCustomizableKeys.ini" + ${Else} + CopyFiles /SILENT "$INSTDIR\xxxkCustomizableKeys.ini" "$TEMP\xxxkCustomizableKeys.ini" + ${EndIf} + Push "$R0" # 段 + Push "$R1" # 键 + Push "$R2" # 值 + Push "$R3" # 计数器 + ${IniGetSectionNames} "$TEMP\xxxkCustomizableKeys.ini" xxxkSubFuncSetYongIniInTempDirCallBack + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 +FunctionEnd + +Function xxxkSubFuncSetYongIniInTempDirCallBack + + # 只能使用 $R0（段）、$R1（键）、$R2（值）、$R3（计数器）寄存器 + Pop $R0 # 段 + ${If} $R0 == "BAZ" + ${IniGetSectionNames_StopEnum} + ${ElseIf} $R0 == "IM" + ${OrIf} $R0 == "main" + ${OrIf} $R0 == "input" + ${OrIf} $R0 == "key" + ${OrIf} $R0 == "table" + StrCpy $R1 "" # 键 + StrCpy $R3 "0" # 计数器 + ${Do} + ${EnumIniValue} $R1 "$TEMP\xxxkCustomizableKeys.ini" "$R0" $R3 # 查询指定 INI 文件中指定节里的第N个键（从 0 开始计数），返回键名。如果查询失败（没有更多的键了），则返回空字符串，并设置错误标志 + ${If} $R1 == "" + ${Break} + ${Else} + IntOp $R3 $R3 + 1 + ${xxxkReplaceIniKey} "$xxxkVarHomeDir\yong.ini" "$TEMP\yong.ini" "$R0" "$R1" + ${EndIf} + ${Loop} + ${EndIf} + +FunctionEnd + +Function xxxkSubFuncYongIni + + # 目标：以 $INSTDIR\yong.ini 为蓝本构建一个 yong.ini， + # 尽可能地把先前已存在的 $xxxkVarHomeDir\yong.ini 的设置填入， + # 成为新的 $xxxkVarHomeDir\yong.ini。 + + # 如果 $xxxkVarHomeDir\yong.ini 不存在，为其补上 [IM]0，[IM]default 和 [pinyin] 段，结束整个流程；否则重建 $xxxkVarHomeDir\yong.ini。 + ${IfNot} ${FileExists} "$xxxkVarHomeDir\yong.ini" + ${xxxkAddPinyinToIni} "$INSTDIR\yong.ini" + Return + ${EndIf} + + # 重建开始：以 $INSTDIR\yong.ini 为模板（其没有 [IM]0-n，[IM]default，[方案ID]），建立$TEMP\yong.ini（将来要替换 $xxxkVarHomeDir\yong.ini 的） + Delete "$TEMP\yong.ini" + CopyFiles /SILENT "$INSTDIR\yong.ini" "$TEMP\yong.ini" + + # 把 $xxxkVarHomeDir\yong.ini 的 [IM]0-n 和对应的 [方案ID] 段（优先从 $INSTDIR\entry 提取）恢复到 $TEMP\yong.ini。 + Call xxxkSubFuncAddSchemasToYongIniInTempDir + + # 检查 $TEMP\yong.ini 中是否有 [IM]0， + # 如果没有：为其补上 [IM]0，[IM]default 和 [pinyin] 段。 + # 如果有：检查 $xxxkVarHomeDir\yong.ini 中 [IM]default 数值是否合理，如果合理，将 [IM]default 恢复到 $TEMP\yong.ini。 + Call xxxkSubFuncChkSchemasInYongIniInTempDir + + # 把 $xxxkVarHomeDir\yong.ini 剩下的 [IM],[main],[input],[key],[table] 段的部分设定（由 $TEMP\xxxkCustomizableKeys.ini 标记）恢复到 $TEMP\yong.ini。 + Call xxxkSubFuncSetYongIniInTempDir + + # 重建结束：把 $TEMP\yong.ini 作为新的 $xxxkVarHomeDir\yong.ini + CopyFiles /SILENT "$TEMP\yong.ini" "$xxxkVarHomeDir\yong.ini" + +FunctionEnd + +Function xxxkFuncYongIni + + Var /GLOBAL xxxkVarHomeDir + ${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR" + ${If} "$xxxkVarHomeDir" == "$INSTDIR\.yong" + ${OrIf} ${SectionIsSelected} ${optPortable} + Call xxxkSubFuncYongIni + ${Else} + # 获取每个用户的 $xxxkVarHomeDir，并依次调用 xxxkSubFuncYongIni + + SetShellVarContext current + Push "$R0" # 形如 C:\Users（Win7+）或 C:\Documents and Settings (XP-) + Push "$R1" # 搜索句柄 + Push "$R2" # 文件夹名 + Push "$R3" # 当前用户名 + ${GetParent} "$PROFILE" $R0 + UserInfo::GetName + Pop $R3 + ClearErrors + FindFirst $R1 $R2 "$R0\*.*" # 第一个变量代表本次搜索的句柄, 第二个变量代表文件名（不含路径），如果找不到文件了，其会被赋空值并设置错误标记。 + ${DoUntil} ${Errors} + ${If} ${FileExists} "$R0\$R2\*.*" + ${AndIf} "$R2" != "Public" + ${AndIf} "$R2" != "Default" + ${AndIf} "$R2" != "All Users" + ${AndIf} "$R2" != "$R3" + ${AndIf} "$R2" != ".." + ${AndIf} "$R2" != "." + ${If} ${AtLeastWin7} + StrCpy $xxxkVarHomeDir "$R0\$R2\AppData\Roaming" + ${Else} + StrCpy $xxxkVarHomeDir "$R0\$R2\Application Data" + ${EndIf} + Call xxxkSubFuncYongIni + ${EndIf} + FindNext $R1 $R2 + ${Loop} + FindClose $R1 + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 + + ${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR" + Call xxxkSubFuncYongIni + ${EndIf} + +FunctionEnd + +Function un.xxxkFuncYongIni + + ${If} ${Cmd} `MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "是否保留配置目录？" IDYES` # 只支持单一结果常量匹配 + Return + ${EndIf} + + ${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR" + ${If} "$xxxkVarHomeDir" == "$INSTDIR\.yong" + ${OrIf} "$xxxkIsPortable" == "1" + ${xxxkRMDir} "$xxxkVarHomeDir" # RMDir /r "$xxxkVarHomeDir" + ${Else} + # 获取每个用户的 $xxxkVarHomeDir，并依次删除配置目录 + + SetShellVarContext current + Push "$R0" # 形如 C:\Users（Win7+）或 C:\Documents and Settings (XP-) + Push "$R1" # 搜索句柄 + Push "$R2" # 文件夹名 + Push "$R3" # 当前用户名 + ${GetParent} "$PROFILE" $R0 + UserInfo::GetName + Pop $R3 + ClearErrors + FindFirst $R1 $R2 "$R0\*.*" # 第一个变量代表本次搜索的句柄, 第二个变量代表文件名（不含路径），如果找不到文件了，其会被赋空值并设置错误标记。 + ${DoUntil} ${Errors} + ${If} ${FileExists} "$R0\$R2\*.*" + ${AndIf} "$R2" != "Public" + ${AndIf} "$R2" != "Default" + ${AndIf} "$R2" != "All Users" + ${AndIf} "$R2" != "$R3" + ${AndIf} "$R2" != ".." + ${AndIf} "$R2" != "." + ${If} ${AtLeastWin7} + StrCpy $xxxkVarHomeDir "$R0\$R2\AppData\Roaming" + ${Else} + StrCpy $xxxkVarHomeDir "$R0\$R2\Application Data" + ${EndIf} + ${xxxkRMDir} "$xxxkVarHomeDir" # RMDir /r "$xxxkVarHomeDir" + ${EndIf} + FindNext $R1 $R2 + ${Loop} + FindClose $R1 + Pop $R3 + Pop $R2 + Pop $R1 + Pop $R0 + + ${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR" + ${xxxkRMDir} "$xxxkVarHomeDir" # RMDir /r "$xxxkVarHomeDir" + ${EndIf} + +FunctionEnd \ No newline at end of file diff --git a/xxxk-xkcommon/README.txt b/data-base/README.txt similarity index 100% rename from xxxk-xkcommon/README.txt rename to data-base/README.txt diff --git a/xxxk-xkcommon/bd.txt b/data-base/bd.txt similarity index 100% rename from xxxk-xkcommon/bd.txt rename to data-base/bd.txt diff --git a/xxxk-xkcommon/bihua.bin b/data-base/bihua.bin similarity index 100% rename from xxxk-xkcommon/bihua.bin rename to data-base/bihua.bin diff --git a/xxxk-xkcommon/crab.txt b/data-base/crab.txt similarity index 100% rename from xxxk-xkcommon/crab.txt rename to data-base/crab.txt diff --git a/xxxk-xkcommon/doc/LiangFenHandbook.pdf b/data-base/doc/LiangFenHandbook.pdf similarity index 100% rename from xxxk-xkcommon/doc/LiangFenHandbook.pdf rename to data-base/doc/LiangFenHandbook.pdf diff --git a/xxxk-xkcommon/doc/yong.chm b/data-base/doc/yong.chm similarity index 100% rename from xxxk-xkcommon/doc/yong.chm rename to data-base/doc/yong.chm diff --git a/xxxk-xkcommon/entry/pinyin_entry.ini b/data-base/entry/pinyin_entry.ini similarity index 100% rename from xxxk-xkcommon/entry/pinyin_entry.ini rename to data-base/entry/pinyin_entry.ini diff --git a/xxxk-xkcommon/keyboard.ini b/data-base/keyboard.ini similarity index 100% rename from xxxk-xkcommon/keyboard.ini rename to data-base/keyboard.ini diff --git a/xxxk-xkcommon/layout.txt b/data-base/layout.txt similarity index 80% rename from xxxk-xkcommon/layout.txt rename to data-base/layout.txt index cd9a173..0d7b781 100644 --- a/xxxk-xkcommon/layout.txt +++ b/data-base/layout.txt @@ -8,7 +8,7 @@ biaodian=1 a b b a -ļGB18030룬еעͣ벻ҪλעͣļʧЧ +ļڲGB18030룬еעͣ벻ҪλעͣļʧЧǰʧЧɾЧ upưʱЧ0Ϊʱ(Ĭ)1Ϊ̧ʱ lrǷ໥̺̣0Ϊ(Ĭ)1Ϊ keyΪӳİϣĬa-z;',./ diff --git a/xxxk-xkcommon/mb/english.txt b/data-base/mb/english.txt similarity index 100% rename from xxxk-xkcommon/mb/english.txt rename to data-base/mb/english.txt diff --git a/xxxk-xkcommon/mb/pinyin/pinyin_arg.txt b/data-base/mb/pinyin/pinyin_arg.txt similarity index 100% rename from xxxk-xkcommon/mb/pinyin/pinyin_arg.txt rename to data-base/mb/pinyin/pinyin_arg.txt diff --git a/xxxk-xkcommon/mb/pinyin/pinyin_overlay.ini b/data-base/mb/pinyin/pinyin_overlay.ini similarity index 100% rename from xxxk-xkcommon/mb/pinyin/pinyin_overlay.ini rename to data-base/mb/pinyin/pinyin_overlay.ini diff --git a/xxxk-xkcommon/mb/pinyin/pypre.bin b/data-base/mb/pinyin/pypre.bin similarity index 100% rename from xxxk-xkcommon/mb/pinyin/pypre.bin rename to data-base/mb/pinyin/pypre.bin diff --git a/xxxk-xkcommon/mb/pinyin/yong.txt b/data-base/mb/pinyin/yong.txt similarity index 100% rename from xxxk-xkcommon/mb/pinyin/yong.txt rename to data-base/mb/pinyin/yong.txt diff --git "a/xxxk-xkcommon/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" "b/data-base/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" similarity index 90% rename from "xxxk-xkcommon/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" rename to "data-base/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" index 8fe6f7e..59fa7d1 100644 --- "a/xxxk-xkcommon/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" +++ "b/data-base/mb/xkcommon/xkcommon_dict_o\345\274\225\345\257\274.txt" @@ -1,66 +1,132 @@ o $[o] -o $[f] -o $[ʽl] -o $[ļr] -o $[ƴעp] oo $[gw]$GO(https://xkinput.github.io/xxxk-help) +oogw $[ССǿҳ]$GO(https://xkinput.github.io/xxxk-help) +oogw $[ǿ뷨ҳ]$GO(https://xkinput.github.io) +oogw $[ССǿ]$GO(http://xxxk.ysepan.com) + oo $[mb]$GO(mb) -oo $[Ŀ¼ml]$GO(.) +oomb $[]$GO(mb) +# + +oo $[Ŀ¼ml]$GO() +ooml $[Ŀ¼]$GO() +ooml $[Ŀ¼]$GO($(_HOME)) + oo $[rm]$GO(https://xkinput.github.io/xxxk-help) -oo $[ССxx]$GO(tools\bat\yong-config.bat) -oo $[rq]$yyyy$mon$day -oo $[ʱsj]$hour:$min:$sec -oo $[xq]$WEEK +oorm $[߰ĵ]$GO(https://xkinput.github.io/xxxk-help) +oorm $[ذĵ]$GO(doc) -oorm $GO([Web],https://xkinput.github.io/xxxk-help) -oorm $GO([ذĵ],doc) -oogw $GO([ССǿҳ],https://xkinput.github.io/xxxk-help) -oogw $GO([ǿ뷨ҳ],https://xkinput.github.io) -oogw $GO([ССǿ],http://xxxk.ysepan.com) -oomb $GO([],mb) -ooml $GO([Ŀ¼],.) -ooml $GO([Ŀ¼],tools\bat\yongdir.bat) -ooxx $GO([СС],tools\bat\rerun.bat) -ooxx $GO([СС],tools\bat\yong-config.bat) -ooxx $GO([СС],tools\bat\reset.bat) -ooxx $GO([˳СС],tools\bat\quit.bat) +oo $[ССxx]$GO(tools/bat/yong-config.bat) +ooxx $[СС]$GO(tools/bat/yong-config.bat) +ooxx $[СС]$RELOAD() +ooxx $[СС]$GO(tools/bat/yong.bat) +ooxx $[˳СС]$GO(tools/bat/quit.bat) +ooxx $[ССã]$GO(tools/bat/reset.bat) +oo $[rq]$yyyy$mon$day oorq $yyyy$mon$day oorq $YYYY$MON$DAY oorq $yyyy-$mon0-$day0 oorq ũ$RIQI + +oo $[ʱsj]$hour:$min:$sec oosj $hour:$min:$sec + +oo $[xq]$WEEK ooxq $WEEK +o $[f] + of $[Բ()ys] +ofys 76 77 78 79 70 71 72 73 74 75 + of $[()ks] +ofks + of $[()ds] +ofds + of $[()zs] +ofzs + of $[޴()ld] +ofld 66 67 68 69 + of $[С()lx] +oflx 60 61 62 63 64 65 + of $[ϱ(01)sb] +ofsb 01 05 06 66 67 68 69 60 61 62 62 63 64 65 66 67 07 + of $[±(69)xb] +ofxb 69 60 61 62 63 64 65 66 67 68 68 69 60 61 62 64 65 66 67 68 69 60 61 62 63 64 65 66 + of $[λ(J)dw] +ofdw J K L M N O nm m g P Q R S T + of $[ƴ()py] +ofpy + of $[()hb] +ofhb $ 05 06 21 + of $[ͷ()jt] +ofjt J L K I 62 63 + of $[Ʊ()zb] +ofzb + of $[()ts] +ofts + of $[ע()zy] +ofzy + of $[ƫ()pp] +ofpp ܳ ح ڢ د ڥ ؼ + of $[()bd] +ofbd ۣ + of $[ѧ()sx] +ofsx M N O P Q R S + of $[ϣ()xd] +ofxd + of $[ϣС()xx] +ofxx + of $[()ed] +ofed + of $[С()ex] +ofex + of $[մ()rd] +ofrd ` c d + of $[С()rx] +ofrx a b f g + of $[齫(80)mj] +ofmj 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 + of $[˿(80)pk] +ofpk 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 87 88 89 80 81 82 83 84 85 86 87 88 89 80 83 84 85 86 87 88 89 80 81 82 83 84 85 86 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 + of $[հkb] +ofkb $[(200B)]67 +ofkb $[(200C)]6768 +ofkb $[(200D)]69 +ofkb $[(200E)]60 +ofkb $[(200F)]61 +ofkb $[(FEFF)]13 +ofkb $[Tab] + of $[IDC()id] +ofid ofa 38 30 32 34 36 38 30 34 36 38 32 32 30 ofb 39 31 33 35 37 39 31 35 37 39 33 33 31 @@ -88,7 +154,6 @@ ofw ofx 31 33 35 37 39 31 33 37 39 31 35 35 33 ofy 32 34 36 38 30 32 34 38 30 32 36 36 34 ofz 33 35 37 39 31 33 35 39 31 33 37 37 35 - ofaa A 32 34 36 38 30 32 34 38 30 32 36 36 34 ofbb B 33 35 37 39 31 33 35 64 31 33 37 37 35 ofcc C 34 36 38 30 32 34 36 30 32 65 38 38 67 @@ -116,44 +181,7 @@ ofxx X ofyy Y 36 38 30 32 34 36 38 32 34 36 30 30 38 ofzz Z 37 39 31 33 35 37 39 33 35 60 31 31 66 -ofys 76 77 78 79 70 71 72 73 74 75 -ofks -ofds -ofzs -ofld 66 67 68 69 -oflx 60 61 62 63 64 65 -ofsb 01 05 06 66 67 68 69 60 61 62 62 63 64 65 66 67 07 -ofxb 69 60 61 62 63 64 65 66 67 68 68 69 60 61 62 64 65 66 67 68 69 60 61 62 63 64 65 66 -ofdw J K L M N O nm m g P Q R S T -ofpy -ofhb $ 05 06 21 -ofjt J L K I 62 63 -ofzb -ofts -ofzy -ofpp ܳ ح ڢ د ڥ ؼ -ofbd ۣ -ofsx M N O P Q R S -ofxd -ofxx -ofed -ofex -ofrd ` c d -ofrx a b f g -ofmj 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 -ofpk 80 81 82 83 84 85 86 87 88 89 80 81 82 83 84 87 88 89 80 81 82 83 84 85 86 87 88 89 80 83 84 85 86 87 88 89 80 81 82 83 84 85 86 89 80 81 82 83 84 85 86 87 88 89 80 81 82 83 -ofid - -ofkb $[(200B)]67 -ofkb $[(200C)]6768 -ofkb $[(200D)]69 -ofkb $[(200E)]60 -ofkb $[(200F)]61 -ofkb $[(FEFF)]13 -ofkb $[Tab] - -ohkbd $| - +o $[ʽl] olalpha olbeta olgamma @@ -178,7 +206,6 @@ olphi olchi olpsi olomega - olsqrt oltimes oldiv @@ -200,7 +227,6 @@ ollfloor olrfloor 66 ollceil 63 olrceil 64 - olbecause oltherefore olin @@ -214,7 +240,6 @@ olsupseteq oliff 78 olimplies 77 olimpliedby 76 - olforall 66 olexist 69 ollor @@ -266,6 +291,48 @@ olrightleftarrows olleftrightharpoons 63 olrightleftharpoons 64 +o $[ƴעp] +opb +opp +opm +opf +opd +opt +opn +opl +opg +opk +opng 97 +oph +opj +opq +opgn 98 +opx +opzh +opch +opsh +opr +opz +opc +ops +opv 96 +opa +opo +ope +opai i i i i +opei i i i i +opao o o o o +opou u u u u +opan n n n n +open n n n n +opang ng ng ng ng +openg ng ng ng ng +opi +opu +opv +oper r r r r + +o $[ļr] ora ori oru @@ -1187,43 +1254,3 @@ orn orn 65 orn 51 orn 52 - -opb -opp -opm -opf -opd -opt -opn -opl -opg -opk -opng 97 -oph -opj -opq -opgn 98 -opx -opzh -opch -opsh -opr -opz -opc -ops -opv 96 -opa -opo -ope -opai i i i i -opei i i i i -opao o o o o -opou u u u u -opan n n n n -open n n n n -opang ng ng ng ng -openg ng ng ng ng -opi -opu -opv -oper r r r r diff --git "a/xxxk-xkcommon/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" "b/data-base/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" similarity index 66% rename from "xxxk-xkcommon/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" rename to "data-base/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" index 6b5f31c..f853935 100644 --- "a/xxxk-xkcommon/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" +++ "b/data-base/mb/xkcommon/xkcommon_dict_\345\210\206\345\217\267\345\274\225\345\257\274.txt" @@ -1,12 +1,12 @@ -;q $[$_] +;q $[?$_] ;qo $[07$_]07 -;w $[$_] +;w $[~$_] ;e $[س$_]$ENTER -;r $[$_]$LAST -;t $[$_]$BACKSPACE +;r $[ظ$_]$LAST +;t $[˸$_]$BACKSPACE(LAST) ;y $[$_] ;yo $[$_] -;u $GO(,tools\vbs\.vbs) +;u $[]$GO(action:undo) ;i $[$_] ;o $[$_] ;oo $[$_] @@ -14,16 +14,20 @@ ;a $[@$_]@ ;s $[&$_]& ;si $[$$$_]$ -;d $[ɾ$_]$DEL +;d $[ɾ$_]$DEL ;f $[$_] ;g $[$_] -;h $[ĩ$_]$END -;ho $[$_]$HOME +;h $[ĩ$_]$END +;ho $[$_]$HOME ;j $[#$_]# ;ji $[$_] +;jii $[01$_]01 ;jv $[$_] +;jvv $[03$_]03 ;ju $[$_] +;juu $[00$_]00 ;jo $[$_] +;joo $[02$_]02 ;ku $[($_)$_]($|) ;ki [$|] ;ko $[{$_}$_]{$|} diff --git a/data-base/menu.ini b/data-base/menu.ini new file mode 100644 index 0000000..f09e55f --- /dev/null +++ b/data-base/menu.ini @@ -0,0 +1,88 @@ +[root] +child=output im ooxx oomb ooml help tools + +[output] +name=⚠️TSF 模式未生效，改用外挂输出模式： +exec=$OUTPUT + +[im] +name=方案切换（Ctrl+Shift+H） +exec=$IMLIST + +[ooxx] +name=小小输入法主程序（ooxx） +child=config reload yong exit reset +[config] +name=配置小小（yong-config） +exec=$CONFIG +#$CONFIG会自动根据当前界面程序的位数判断调用哪一个 +[reload] +name=重载小小 +exec=$RELOAD +[yong] +name=重启小小 +exec=$GO(tools/bat/yong.bat) +[exit] +name=退出小小 +exec=$EXIT +[reset] +name=重置小小（慎用） +exec=$EXIT + +[oomb] +name=码表（oomb） +child=mb - jdol jdol2 ydol +[mb] +name=本地码表 +exec=$GO(mb) +[jdol] +name=在线码表简洁版（键道） +exec=$GO(https://docs.qq.com/form/fill/DRWlwcUplU3dzaEFq#/fill/resubmit) +[jdol2] +name=在线码表完整版（键道） +exec=$GO(https://docs.qq.com/sheet/BFdiXU0nyc1W1kwuZl3Gx31r2KLm2k3F8YzI4) +[ydol] +name=在线码表（一道） +exec=$GO(https://docs.qq.com/sheet/BkqgM135VoP52ib4661Iazqq3hik7F2ts2Au0) + +[ooml] +name=目录（ooml） +child=datadir homedir +[datadir] +name=程序目录 +exec=$GO() +[homedir] +name=配置目录 +exec=$GO($(_HOME)) + +[help] +name=帮助（oogw · oorm） +child=gw1 gw2 gw3 - rm - about +[gw1] +name=小小星空首页 · 在线帮助文档 +exec=$GO(https://xkinput.github.io/xxxk-help) +[gw2] +name=小小星空网盘 +exec=$GO(https://xxxk.ysepan.com/) +[gw3] +name=星空系列方案首页 +exec=$GO(https://xkinput.github.io/) +[rm] +name=本地帮助文档 +exec=$GO(doc) +[about] +name=关于小小星空 +exec=$MSG(v2.0.0.0-Build20241117) + +[tools] +name=其他工具 +child=stat keymap #xchr +[stat] +name=输入统计 +exec=$STAT +[keymap] +name=键盘图 +exec=$KEYMAP +[xchr] +name=符文角 +exec=$GO(tools/xchr/xchr.exe) diff --git a/xxxk-xkcommon/skin/DarkYellow.zip b/data-base/skin/DarkYellow.zip similarity index 100% rename from xxxk-xkcommon/skin/DarkYellow.zip rename to data-base/skin/DarkYellow.zip diff --git a/xxxk-xkcommon/skin/favicon.ico b/data-base/skin/favicon.ico similarity index 100% rename from xxxk-xkcommon/skin/favicon.ico rename to data-base/skin/favicon.ico diff --git a/xxxk-xkcommon/skin/xxxktray1.png b/data-base/skin/xxxktray1.png similarity index 100% rename from xxxk-xkcommon/skin/xxxktray1.png rename to data-base/skin/xxxktray1.png diff --git a/xxxk-xkcommon/skin/xxxktray2.png b/data-base/skin/xxxktray2.png similarity index 100% rename from xxxk-xkcommon/skin/xxxktray2.png rename to data-base/skin/xxxktray2.png diff --git a/data-base/tools/bat/quit.bat b/data-base/tools/bat/quit.bat new file mode 100644 index 0000000..5f2a9df --- /dev/null +++ b/data-base/tools/bat/quit.bat @@ -0,0 +1,4 @@ +@echo off +cd /d "%~dp0" +taskkill /f /im yong.exe 2>nul +exit \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/reset.bat b/data-base/tools/bat/reset.bat similarity index 86% rename from xxxk-xkcommon/tools/bat/reset.bat rename to data-base/tools/bat/reset.bat index d46c989..2a35122 100644 --- a/xxxk-xkcommon/tools/bat/reset.bat +++ b/data-base/tools/bat/reset.bat @@ -12,4 +12,4 @@ echo cd /d tools cd /d bat -call rerun.bat \ No newline at end of file +call yong.bat \ No newline at end of file diff --git a/data-base/tools/bat/yong-config.bat b/data-base/tools/bat/yong-config.bat new file mode 100644 index 0000000..77fe083 --- /dev/null +++ b/data-base/tools/bat/yong-config.bat @@ -0,0 +1,5 @@ +@echo off +cd /d "%~dp0" +if /i %PROCESSOR_ARCHITECTURE% EQU X86 ( cd /d ..\..) else (cd /d ..\..\w64) +start "" yong-config.exe +exit \ No newline at end of file diff --git a/data-base/tools/bat/yong.bat b/data-base/tools/bat/yong.bat new file mode 100644 index 0000000..3001901 --- /dev/null +++ b/data-base/tools/bat/yong.bat @@ -0,0 +1,6 @@ +@echo off +cd /d "%~dp0" +start "" /b /wait quit.bat +if /i %PROCESSOR_ARCHITECTURE% EQU X86 ( cd /d "..\..") else (cd /d "..\..\w64") +start "" yong.exe +exit \ No newline at end of file diff --git a/xxxk-xkcommon/urls.txt b/data-base/urls.txt similarity index 100% rename from xxxk-xkcommon/urls.txt rename to data-base/urls.txt diff --git a/data-base/xxxkCustomizableKeys.ini b/data-base/xxxkCustomizableKeys.ini new file mode 100644 index 0000000..418d590 --- /dev/null +++ b/data-base/xxxkCustomizableKeys.ini @@ -0,0 +1,35 @@ +# These keys will not be reset on updating xxxk. The values are arbitrary. +[IM] +filter=1 +skin=1 +onspot=1 +preedit=1 +cand=1 +keypad=1 +space=1 +s2t=1 +enter=1 +output=1 +[main] +tray=1 +noshow=1 +tran=1 +pos=1 +tip=1 +[input] +hint=1 +font=1 +root=1 +noshow=1 +[key] +CNen=1 +tEN=1 +switch=1 +switch_default=1 +filter=1 +s2t=1 +mshow=1 +trigger=1 +ishow=1 +page=1 +bihua=1 diff --git a/data-base/yong-config.bat b/data-base/yong-config.bat new file mode 100644 index 0000000..710ebf1 --- /dev/null +++ b/data-base/yong-config.bat @@ -0,0 +1,4 @@ +@echo off +cd /d "%~dp0" +start "" /wait /b tools\bat\yong-config.bat +exit \ No newline at end of file diff --git a/data-base/yong.bat b/data-base/yong.bat new file mode 100644 index 0000000..6521ba9 --- /dev/null +++ b/data-base/yong.bat @@ -0,0 +1,4 @@ +@echo off +cd /d "%~dp0" +start "" /wait /b tools\bat\yong.bat +exit \ No newline at end of file diff --git a/data-base/yong.ini b/data-base/yong.ini new file mode 100644 index 0000000..a1d332e --- /dev/null +++ b/data-base/yong.ini @@ -0,0 +1,44 @@ +#!/usr/bin/yong-config +#Yong输入法配置文件，优先级高于yong/yong.ini + +[DESC] +#配置文件版本 +version=2 + +[IM] +skin=skin/DarkYellow.zip +preedit=1 +cand=5 +CNen_commit=1 +en_commit_select=1 +en_degrade=1 +caps_bd=1 +s2t_m=1 +enable=1 +crab=crab.txt +ABCD=1 +keypad=2 + +[main] +menu=menu.ini +tip=1 + +[input] +hint=1 +fallback=TH-Tshyn-P0,TH-Tshyn-P1,TH-Tshyn-P2,TH-Tshyn-P16 +strip=10 6;14 10 + +[key] +CNen=SHIFT +tEN=LCTRL +switch=CTRL_SHIFT_H +dict=CTRL_/ +s2t=CTRL_SHIFT_J +keymap=CTRL_SHIFT_M +zi_switch=CTRL_SHIFT_D +clear_code=CTRL_BACKSPACE +move=CTRL_UP CTRL_DOWN + +[table] +zi_mode=2 +wildcard=~ diff --git "a/xxxk-xkcommon/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" "b/data-base/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" similarity index 100% rename from "xxxk-xkcommon/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" rename to "data-base/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" diff --git a/xxxk-xkcommon/yong.ini "b/data-base/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini" similarity index 100% rename from xxxk-xkcommon/yong.ini rename to "data-base/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini" diff --git "a/xxxk-schema-xkjd6/doc/\346\230\237\347\251\272\351\224\256\351\201\223\346\225\231\347\250\213.chm" "b/data-schema/xkjd6/doc/\346\230\237\347\251\272\351\224\256\351\201\223\346\225\231\347\250\213.chm" similarity index 100% rename from "xxxk-schema-xkjd6/doc/\346\230\237\347\251\272\351\224\256\351\201\223\346\225\231\347\250\213.chm" rename to "data-schema/xkjd6/doc/\346\230\237\347\251\272\351\224\256\351\201\223\346\225\231\347\250\213.chm" diff --git a/xxxk-schema-xkjd6/entry/xkjd6_entry.ini b/data-schema/xkjd6/entry/xkjd6_entry.ini similarity index 100% rename from xxxk-schema-xkjd6/entry/xkjd6_entry.ini rename to data-schema/xkjd6/entry/xkjd6_entry.ini diff --git a/xxxk-schema-xkjd6/mb/xkjd6/biang.bmp b/data-schema/xkjd6/mb/xkjd6/biang.bmp similarity index 100% rename from xxxk-schema-xkjd6/mb/xkjd6/biang.bmp rename to data-schema/xkjd6/mb/xkjd6/biang.bmp diff --git a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_arg.txt b/data-schema/xkjd6/mb/xkjd6/xkjd6_arg.txt similarity index 89% rename from xxxk-schema-xkjd6/mb/xkjd6/xkjd6_arg.txt rename to data-schema/xkjd6/mb/xkjd6/xkjd6_arg.txt index 9321e0e..1407136 100644 --- a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_arg.txt +++ b/data-schema/xkjd6/mb/xkjd6/xkjd6_arg.txt @@ -207,7 +207,6 @@ bhiuui bhiuuo bhiuvv bhiv -bhivui bhivuo bho bhoaoo @@ -217,7 +216,6 @@ bhuvui bhv bhvu bhvuia -bhvuia bhvuoi bj bji @@ -643,6 +641,8 @@ bsaiva bsau bsauvu bsav +bsava 04 +bsavai 04 bsavoa bsi bsia @@ -1182,6 +1182,8 @@ dbaooa dbaovi dbi dbioov +dbiu 18 +dbiuov 18 dbo dboa q dboaua q @@ -1888,8 +1890,6 @@ dwiava dwio dwioov dwiova -dwiu 18 -dwiuov 18 dwo dwoi dwoio H @@ -2435,7 +2435,7 @@ ekvvi ʾ ekvviu ʾ ekvviv ʽ ekvvu ] -ekvvui ] +ekvvuo ] ekvvv ekvvvi el ˵ @@ -2686,6 +2686,7 @@ exaavi exaoao ˫ exauvo exav +exavo exavu w exavua exavuo w @@ -2962,7 +2963,7 @@ fhov ի fhovu fhovua fhovvu ի -fhua +fhu fhuavv fj fja @@ -3000,10 +3001,9 @@ fjiaii fjiau fjiauo fjiauv -fjiav +fjiav fjiava fjiavo -fjiavo fjiavu fjiavv fjii ܽ @@ -3069,7 +3069,6 @@ fjovia fjoviv fjovv ߻ fjovvu ߻ -fjovvu ߼ fju fjua fjuaao @@ -3116,6 +3115,7 @@ fjvavi fjvavo fjvi fjvia +fjviai fjviav fjviu fjviuu @@ -3537,6 +3537,8 @@ friivo frio frioua friv ٺ +friva ۺ +frivai ۺ frivvv ٺ fro froa @@ -3563,8 +3565,6 @@ frvuau frvuu frvuua frvv -frvva ۺ -frvvai ۺ frvvvi frvvvv fs @@ -5136,6 +5136,8 @@ hmooi hmooii hmooio hmooui +hmoov +hmoovo hmou hmoui hmouia @@ -5831,6 +5833,8 @@ jdvvui je jea jeaova +jeav +jeavuo jei jeiu jeiuiv @@ -6195,8 +6199,8 @@ jkaavv jkai jkaia jkaiai -jkaii ؽ -jkaiia ؽ +jkaio ؽ +jkaioa ؽ jkaivv jkao jkaou @@ -7011,14 +7015,14 @@ jtioo jtioou jtiouv jtiuou -jtou +jto +jtou jtouaa jtoui jtouia jtouia jtouo ] jtouou ] -jtouu jtouua jtouv jtouvv @@ -8611,7 +8615,6 @@ lqvuov lqvv lqvvov lqvvu -lqvvua lr lro lrooia @@ -9116,8 +9119,6 @@ mjiua mjiuaa Ĵ mjiuao mjo Ķ -mjoa -mjoaao mjoi 87 mjoiaa 87 mjovia Ķ @@ -9902,6 +9903,8 @@ nwoavv nwu nwuauo nx +nxa +nxau nxauoa nxv nxvioa @@ -11034,7 +11037,7 @@ qkaavi qkaavu qkaavu qkai ؽ -qkaiia ؽ +qkaioa ؽ qkao qkaovo qkau @@ -13278,6 +13281,8 @@ wdvuav we wea weaova +weav +weavuo wei weiu weiuiv @@ -13313,6 +13318,7 @@ wfia wfiao wfiaoo wfiaoo +wfiavv W wfii ܹ wfiio wfiioi @@ -13450,7 +13456,6 @@ wjovio wjovv wjovvi wjovvu -wjovvu ߼ wjovvv wju wjua @@ -13739,9 +13744,7 @@ wpvv wpvviv wpvvvi wqo H -wqou _ wqouua H -wqouua _ wr wra wrauoa @@ -14615,7 +14618,7 @@ xjiavu xjiovi xjiv ٦ xjivii ٦ -xjov +xjo xjovii xju xjua @@ -14981,6 +14984,7 @@ xmo xmoa ڷ xmoaa xmoaaa +xmoaao xmoauv ڷ xmoav xmoavv @@ -15009,6 +15013,8 @@ xmovii xmovoi xmovu xmovuv +xmovv ߼ +xmovvu ߼ xmu xmua xmuai @@ -15445,9 +15451,8 @@ xzvuvu xzvv xzvva xzvvaa -xzvvi +xzvvi xzvvia -xzvvia xzvvio xzvvo xzvvoa @@ -16573,6 +16578,7 @@ ytiaou ͛ ytiav ytiavu ytiavv ԰ +ytiavv W ytii Է ytiiua Է ytiiv ܾ @@ -16646,6 +16652,7 @@ ywauai ywauv u ywauvv u ywav +ywavai 02 ywavou ywavv V ywavva V @@ -16736,7 +16743,7 @@ yyoo ӽ yyooaa ӽ yyooo yyooov -yyouu 17 +yyou 17 yyouua 17 yyov ӹ yyova Ӻ @@ -17275,12 +17282,6 @@ zzvu zzvuoo 94 zzvv b zzvvoo b -# ִ ---- -name: xkjd6.chaojizici -version: "Q1" -sort: original -... bcvuv Y bcvuvi bcvuvu Y @@ -17363,6 +17364,8 @@ glai glaiav 13 glii Ǒ gliiia Ǒ +gri u +griavv u grua 11 gruavi 11 grvu 10 @@ -17591,6 +17594,8 @@ wkao wkaouo wnaao 96 wnaaov 96 +wqou _ +wqouua _ wrio 39 wriouo 39 wwiio 85 @@ -17628,6 +17633,7 @@ xkuavo xkviii c xloav 23 xloavv 23 +xlouua _ xmaaui 87 xmiaia 78 xmoavu 81 @@ -17694,4 +17700,4 @@ zsovii zwvo zwvoou zyvo 42 -zyvoii 42 +zyvoii 42 \ No newline at end of file diff --git "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" similarity index 90% rename from "xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" rename to "data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" index 24f4b47..be4c2a1 100644 --- "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" +++ "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\345\244\247\350\257\215\345\272\223.txt" @@ -14,14 +14,14 @@ bbbu bbc bbck bbcu װ -bbcy -bbcyo +bbcy bbd Ͳ bbda 첻 bbdb bbdd ߰ߵ bbddu 汾 bbde +bbdi ᲻ bbdj bbdn ٰ bbdq ص @@ -40,6 +40,7 @@ bbem bbemo ʲô bbemv bbemvv ˪ +bbeo ղ bbeu ˱ɽ bbev ˵ bbevu ٰʮ @@ -173,6 +174,7 @@ bbyq bbyv Ҫ bbyx Ӱ bbz 뱲 +bbzh ں bbzi ݰ bbzm ô bbzp @@ -183,6 +185,7 @@ bcbc bcbcu ˴˱˴ bcbf bcbg +bcbgi bcbh bcbk bcbl @@ -241,7 +244,6 @@ bcgev bcgf bcgh bcgj -bcgl bcgm ݸĿ bcgp bcgt @@ -272,7 +274,6 @@ bcjp bcjq bcjr bcjs -bcjw bck ֿ bckd bcke @@ -402,7 +403,8 @@ bdd bdda õ bddb bddc -bddd +bddd +bdddo bdde bddeo bddev @@ -564,6 +566,7 @@ bdnc bdnl bdnm bdnq Ť +bdnqo bdns bdny Ū bdnz @@ -664,6 +667,7 @@ bdxl bdxm bdxmo bdxn ð +bdxo bdxq εض bdxqi ε bdxs @@ -674,7 +678,6 @@ bdxx bdxxi ε bdxxo bdxy -bdxz bdy Ӧ bdyb bdyd @@ -817,6 +820,7 @@ beq beqd beqf ʤ䷳ beqg +beqi beqj beqm ô beqo @@ -829,6 +833,7 @@ beqyi ber berh κ berhv ʳ˼̻ +beri ʪ bero berv berx ʤ @@ -945,6 +950,7 @@ bfdv bfdva bfdvu ٷֵ bfdw +bfdwo bfdx ٷϴ bfdy ᶯ bfdz 쵽 @@ -957,8 +963,7 @@ bfe bfeb ˰ bfed bfedo -bfee -bfeev +bfee bfef ɽ bfefv ʤ bfeg ˥ @@ -1000,13 +1005,14 @@ bfff bffj bffji ֮ bffjv ֪ -bffjvi ܽ bffk ֻ bffki ָ bffl bffm ״ bffn -bffp ෿ +bffni +bffp 巿 +bffpv ෿ bffq ֢֮ bffs 취 bffsu ䷢ @@ -1033,6 +1039,7 @@ bfge bfgea bfgj bfgl +bfgn bfgt bfgv Ź bfgw @@ -1074,7 +1081,8 @@ bfje bfjev 峵 bfjf bfjg 뾶 -bfjh +bfjh +bfji bfjj bfjjv ֪ͼ bfjk ༶ @@ -1094,6 +1102,7 @@ bfjro bfjrou bfjs bfjso +bfjsv bfjt ֪ bfju ׷Ѿ bfjv ż @@ -1138,6 +1147,7 @@ bflkv bflkvv bfll bfllo +bfllu · bflm bflo bflp @@ -1241,7 +1251,6 @@ bfsc bfse ɫ bfsf ֪ bfsh ֪ -bfsj bfsk bfsl bfsp ɥ @@ -1267,6 +1276,7 @@ bftm bftp bftpo bftq +bftu ״ͼ bftv bftw bfty Ͱ @@ -1288,7 +1298,6 @@ bfwn bfwo ը bfwp bfws -bfwsa bfwt 봬 bfww ί bfwx 崲 @@ -1315,6 +1324,7 @@ bfxm bfxo ը bfxou ѩ bfxq +bfxqo bfxs bfxv ־ bfxw ѵ @@ -1348,6 +1358,7 @@ bfys bfysv bfyt Բ bfytv ֵһ +bfyu צ bfyv bfyvo bfyvv רҵ @@ -1470,7 +1481,8 @@ bgfjo bgfjoa bgfk bgfko ָ -bgfm ״ +bgfm ״ +bgfmo ״ bgfn bgfnu bgfo @@ -1483,12 +1495,13 @@ bgft bgftv ֮ͽ bgfv 淶 bgfw -bgfx ״ +bgfx ״ +bgfxo ״ bgfy bgfyo bgfyou bgfyv -bgfz +bgfz bgfzo bgg bggb @@ -1539,6 +1552,7 @@ bgjev bgjf bgjg bgjh +bgjha bgjj bgjjv ٸн bgjk @@ -1551,7 +1565,6 @@ bgjlo bgjm bgjmv ʼį bgjn -bgjno bgjp bgjq bgjr @@ -1595,7 +1608,7 @@ bglo bglp bglq bglr -bglso +bgls bglt bglv bglva @@ -1833,8 +1846,7 @@ bhcw bhcz ٲ bhd bhdb ׶ -bhdd ׶ -bhddo 仯 +bhdd 仯 bhde ׵ bhdea ܵ bhdg ׶ @@ -1844,6 +1856,8 @@ bhdi bhdj ٶ bhdji ݶ bhdjia ڶ +bhdju ׶ +bhdjuu ׶ bhdjv ٶ bhdk ׵ bhdl ٶ @@ -2048,7 +2062,8 @@ bhldv bhle bhlea bhleo 绤ʦ -bhlf +bhlf +bhlfu bhlg bhlgv bhlh @@ -2260,6 +2275,7 @@ bhxy bhy bhya bhyb +bhyba bhyd bhye ҵ bhyev Ҷ @@ -2422,6 +2438,7 @@ bjefv bjeg ˧ bjeh ɹ bjei +bjeii Ž bjej bjeji bjejio ʱ @@ -2489,6 +2506,7 @@ bjfkva bjfkvi ֵ bjfkvo ֻ bjfkvu ֧ +bjfkvu ֪ bjfkvv bjfl ׽ bjflo ؾ֮· @@ -2604,6 +2622,7 @@ bjjcv bjjcvu bjjd bjjdv +bjjdvo bjje bjjev bjjf @@ -2805,7 +2824,6 @@ bjqc bjqd bjqdo ս bjqe -bjqev bjqf ռ bjqg bjqgv @@ -2883,8 +2901,7 @@ bjrv bjry bjryv bjryva -bjryvv Ƚ -bjryvvi +bjryvv bjrz bjs bjsb @@ -2924,6 +2941,7 @@ bjth bjthi ̬ bjtho ̥ bjtj ͼ +bjtjo bjtk bjtl bjtm @@ -3023,7 +3041,6 @@ bjxlo bjxlv bjxlvi bjxlvo ȼ -bjxlvou bjxlvu bjxm bjxmv @@ -3203,6 +3220,7 @@ bkds bkdso ش bkdsov ش bkdt ׶ +bkdw ص bkdy ɶҡ bkdya bkdz ̵ @@ -3219,6 +3237,7 @@ bkef bkej bkejo bkeju +bkejuo bkejv bkek bkeko @@ -3289,6 +3308,7 @@ bkgev bkgevi ȸ bkgevv ȸ bkgf ʸ +bkgh ʸ bkgj ǹ bkgja ٹ bkgl ܹ @@ -3371,6 +3391,7 @@ bkkjvv bkkl ɿ bkkm ȿ bkkp +bkkr ܿ bkkt ǿ bkkv ɿ bkkvv ɿ @@ -3440,6 +3461,7 @@ bkn bknb ܲ bkne bknf +bknfo bknfv ת bknk bknkv @@ -3657,6 +3679,7 @@ bkzjv bkzk bkzl bkzlo +bkzloo bkzlv bkzz blb ܲ @@ -3682,6 +3705,7 @@ blbz blc blch blchu +blchuu blcj ߴͽ blck bld @@ -3718,13 +3742,14 @@ bleh blej blek ʿ bleka ʴ -blekuo ʶ +bleku ʶ blel ˶ bles ɱ blesv ¶ɫ bleu blev blevu ʵ +blevv ˮ bley ʥĸԺ blf ˷ blfd @@ -3755,6 +3780,7 @@ blge blgei blgh blgi +blgia ˹ blgj blgju Ž blgjv ¶ @@ -3772,6 +3798,7 @@ blgy blgyu 칫Ԣ blh blhb +blhd blhe blhh blhj ۼ @@ -3779,7 +3806,7 @@ blhju blhl blhn blhq 뢻 -blhqv 뢻 +blhqa 뢻 blhu blhv ϻ blhw @@ -3806,6 +3833,7 @@ bljki bljku bljl bljp +bljq bljs blju · bljv @@ -3815,9 +3843,9 @@ bljxu bljy bljz blk 뿪 -blka +blka +blkai blke -blkea blkh blkha blkj @@ -3875,7 +3903,6 @@ blny blp Ʒ blpe blpj -blpk Ƥ blpl blpm Ƭ blpmv Ƭ @@ -3938,6 +3965,7 @@ blwf blwi blwj blwji ά +blwjiv blwjv Ϊ blwk blwn @@ -4072,7 +4100,7 @@ bmedu bmej bmeja bmek -bmekaa ʬ +bmeka ʬ bmeki ʿ bmeko ʶ bmekv ʬ @@ -4087,13 +4115,13 @@ bmez bmezv bmf bmfb ׺ -bmfd -bmfdv ë֮ +bmfd ë֮ bmfe bmff 㷹 bmffv æ֮ bmfh կ bmfho խ +bmfi bmfj bmfji bmfjo 主 @@ -4177,6 +4205,7 @@ bmjko bmjl bmjla ߾ bmjlo ž +bmjloa bmjlv bmjlvo bmjm ߼ @@ -4202,7 +4231,6 @@ bmkf bmkg bmkj ߿ bmkm ߿ -bmks ߿ bmkt bmkx ߿ bmky @@ -4285,6 +4313,7 @@ bmqqi bmqqv ı bmqr ֤ bmqro ֤ +bmqs ߿ bmqx ǿ bmqxv bmqy @@ -4757,6 +4786,7 @@ bphb bphe bphl bpho ƽ +bphu ƽ bphw bphz bpj ų @@ -5109,6 +5139,7 @@ bsbk bsbm ˱ bsbs ְ bsbsa Ͱ +bsbsaa 0404 bsbsi Ѱ bsbsii ΰ bsbso @@ -5123,9 +5154,9 @@ bscb bsce ˲ bsck ˴ bscr ˲ -bscs bscw ˴ bscz β +bsd bsdc ε bsdd Ͷ bsdg Ƕ @@ -5133,6 +5164,7 @@ bsdh bsdj ˶ bsdjv Զ bsdk ε +bsdkv ҵ bsdl Ѷ bsdm ˵ bsdr ǵ @@ -5231,6 +5263,7 @@ bsjjii bsjk bsjka ͻ bsjku ˼ +bsjkv л bsjl Ծ bsjm μ bsjmi ν @@ -5378,6 +5411,7 @@ bswo bswp bswr ɫȾ bsws ˲ +bswso bsww λ bswy bswz ճ @@ -5472,7 +5506,7 @@ btp btq ͻȪ btqj ̫ btqn ȡů -btqyo +btqy btr ͬ btrl btrq ͨ @@ -5483,6 +5517,7 @@ bttk bttn ͷ̽ bttw btw ͷ +btwu btwv Ϊ btx Э btxd ѩ @@ -5509,7 +5544,6 @@ bwbhu bwbhv Բ bwbj bwbji -bwbjiv bwbjo bwbjv bwbjvo Ųһ @@ -5533,6 +5567,7 @@ bwcei bwcf bwcfi bwcfu +bwch bwck bwcki bwcp @@ -5551,6 +5586,7 @@ bwdka bwdl bwdlv ޵ bwdm +bwdmv bwdp bwdr bwds @@ -5809,6 +5845,7 @@ bwpfo bwpg ƽ bwph ƽ bwphi +bwpj bwpk bwpl bwpm ƭ @@ -6102,6 +6139,7 @@ bxqji bxql ȥ bxqu Ѫ bxqv ȥ +bxqvo ȫ bxqvv ȥ bxqy bxqyv @@ -6113,6 +6151,7 @@ bxsq bxt ͬ bxtu bxtv +bxtvo bxw ϣ bxwe ѧ bxweu ³ @@ -6130,6 +6169,7 @@ bxxv bxxvi а bxxx ѩ bxy Ҫ +bxyf ܶԶ֮ bxyg мһ bxyi ҵ bxyj ϧһд @@ -6197,6 +6237,7 @@ byfv byfvi ҵ byfw зζ byfy Ҫ +byfyi רҵ byg Ӧ byge Ӧ bygi ˹ @@ -6407,6 +6448,7 @@ bzek bzeki ʪ bzekio ʱ bzekiu +bzeko ʳ bzel bzen bzep @@ -6428,6 +6470,7 @@ bzfj bzfji bzfjo bzfju +bzfjuu bzfjv ֮ bzfk ֽ bzfki ֵ @@ -6471,8 +6514,7 @@ bzgy bzgyu bzgz bzh ں -bzhd -bzhdo +bzhd bzhe bzheo bzhf @@ -6543,6 +6585,7 @@ bzk bzkb bzkd bzke +bzkea bzkf bzkg bzkj @@ -6573,6 +6616,7 @@ bzlkoo bzlku bzll bzlli +bzllu bzllv bzlm bzlp @@ -6630,6 +6674,7 @@ bzpg bzph bzpj bzpk +bzpka Ƥ bzpku Ƥ bzpl bzpm Ƭ @@ -6778,6 +6823,7 @@ bzydu bzye ҵ bzyeu ҹ bzyf +bzyfi bzyfo bzyfu bzyg Ӧ @@ -7178,7 +7224,6 @@ cetg ceth ̨ cetp cewf -cewh cewj cewl cewn @@ -7226,7 +7271,6 @@ cfbzi cfce β cfcf Ӳ cfcj ϴ -cfcl δ cfcw д cfd ص cfdb ֫ϱ @@ -7288,8 +7332,7 @@ cfhj cfhl һ cfhn к cfhq л -cfhr κ -cfhro Һ +cfhr Һ cfhy к cfhz Һ cfhzo @@ -7430,6 +7473,7 @@ cfzs cfzw cfzz cgb ɲ +cgba cgbd Ÿ߰˶ cgbe Ӹ cgbei Ӹ˵ @@ -7444,6 +7488,7 @@ cgl cglf и cgn Ź cgq ι +cgqv Ź cgt ι cgx Ÿ cgy ŸӦ @@ -7569,6 +7614,7 @@ chgq chgr Ÿ chgt ˹ chgtu ʹ +chgtuu ʹ chgw Ÿ chgx ɹ chgz Ÿ @@ -7630,6 +7676,7 @@ chkl chkm ɿ chkn ſ chkp ſ +chkr ȿ chks ʿ chkt ƿ chkx ɿ @@ -7785,7 +7832,9 @@ chxe chxf Ű chxg chxh ѧ -chxj · +chxhu Ѫ +chxj ɶ +chxju · chxk ϵ chxl chxli Ӻζ @@ -7934,7 +7983,7 @@ cjms cjmw ü cjmz ë cjn ӽ -cjne +cjnk cjpb Ʒ cjpg ƿ cjpj @@ -8039,6 +8088,7 @@ ckdk ckdko ε ckdm ʵ ckdmu ǵ +ckdmv ŵ ckdr ˵ ckdt ˶ ckdz ̵ @@ -8071,7 +8121,6 @@ ckfe ckff ˷ ckffo η ckfj ͸ -ckfji ŷ ckfjo ʸ ckfjv Ÿ ckfk ְ @@ -8224,6 +8273,7 @@ ckqli ckqlo ckqm ǰ ckqn +ckqnv ckqp γ ckqr ֤ ckqy @@ -8289,6 +8339,7 @@ ckxj ckxjo ɶ ckxk ckxko Ϫ +ckxkv ckxl ckxlo ckxm @@ -8442,7 +8493,6 @@ clls cllt cllx clm û -clmc clmg ûй clml ĥ clmq @@ -8562,10 +8612,11 @@ cmy cmyb cmye һ cmyx çӢ -cncf ᯲ cnck β +cncl δ cncn cne ʹ +cnen ᯲ cneq ʱ cng ܹ cngp ᯸ @@ -8926,6 +8977,7 @@ ctk ctke ͷʼ ctl ͷ ctlg ͷ +ctlv ͨ ctlw ͷ¶β ctm ctmd ı @@ -9236,7 +9288,6 @@ cylx cyly cylyi cylz -cylzo cym cymb cymg @@ -9279,6 +9330,7 @@ cytd cytdi ͷ cytf ̸ cytm +cyto ͼ cyts cytsi cytsio @@ -9543,7 +9595,6 @@ dbc dbce Բ dbcea Բ dbch Բ -dbcj dbck Դ dbcl Դ dbcv ײ @@ -9572,8 +9623,8 @@ dbdq dbdr Ե dbds Դ dbdsa Դ -dbdt dbdu ò +dbduv dbdv 󲿶 dbdvu 󱿵 dbdvv @@ -9617,6 +9668,7 @@ dbfjo dbfk dbfka dbfl +dbfm ײ dbfn Է dbfp Է dbfpv ѷ @@ -9628,6 +9680,7 @@ dbfvo dbfvv ذש dbfw Է dbfwv ѷ +dbfx ײ dbfy dbfz dbg չ @@ -9653,6 +9706,7 @@ dbhq dbhqa Ի dbhr dbht һ +dbhta Ի dbhv dbhz Ժ dbj @@ -9694,6 +9748,7 @@ dbkt dbky Կ dbkz Կ dbl +dblc dbld dbldv е dbldvv ˵ @@ -10011,7 +10066,6 @@ dcpj dcpk Ƥ dcpw dcq -dcqb dcqc dcqe dcqeo @@ -10025,6 +10079,7 @@ dcqku dcqkuv dcql ȡ dcqm Dz +dcqmo Ǩ dcqn dcqni ֡ dcqq @@ -10035,6 +10090,7 @@ dcrd dcrj dcrji dcrn +dcrnu dcse ɫ dcsj dcsk ˿ @@ -10076,17 +10132,14 @@ dcxe dcxf dcxh Ѫ dcxj -dcxl dcxm dcxs dcxt ѣ -dcxw ѱ dcxx dcxy С dcxyu dcy ԭ dcyb ӡ -dcybo dcyf dcyfo dcyh @@ -10116,6 +10169,7 @@ ddbgv ddbh ddbhu ddbj +ddbjo ° ddbk ddbka ddbko @@ -10234,6 +10288,7 @@ dder ddera dderv ddes ɳ +ddesi ɲ ddeso ɱ ddeu ddev @@ -10265,7 +10320,6 @@ ddfmo ddfn ddfnv ddfp -ddfpa ddfpo ddfr ddfro @@ -10317,12 +10371,10 @@ ddhbu ddhe ddhea ddhf ظ -ddhfi ظ ddhg ddhh ddhhi ddhi -ddhj ddhl 绰 ddhli ddhn @@ -10379,6 +10431,7 @@ ddjxo ddjxu ddjxuo õ ddjz +ddk ׿ ddkd ޢ ddkdo ddkdu @@ -10390,7 +10443,6 @@ ddkf ddkfv ddkg ddkh -ddki ׿ ddkj ddkl ddkm @@ -10405,9 +10457,7 @@ ddld ddldi 쵼 ddle ddlev -ddlf -ddlg -ddlga +ddlg ddlh ddlk ddlko @@ -10435,9 +10485,9 @@ ddly ddlz ddm ddmc -ddmd ij +ddmd ﵽĿ +ddmdi 綯 ddmdu -ddmdv ﵽĿ ddmj Ŀ ddmm ddmmo ܵ @@ -10454,6 +10504,7 @@ ddmw ddmwu ddmz ñ ddn +ddna ɶ ddnf ddnh ddnj ŭ @@ -10478,6 +10529,7 @@ ddpl ddpla ddplv ddpm Ƭ +ddpma Ƭ ddpr ddps ddpt ƽ̨ @@ -10506,8 +10558,8 @@ ddqlv ddqm Ƿ ddqn ddqo -ddqp -ddqpa +ddqp +ddqpa ddqpaa ddqq ĵȷȷ ddqr @@ -10576,11 +10628,11 @@ ddwu ddwv ddww Ϊ ddwwu δ -ddwwua ξ ddwwuv Ϊ ddwx ѧ ddwy ddwz +ddx ddxc Ц ddxcv ddxd Ź @@ -10597,9 +10649,7 @@ ddxl ddxm ddxs ddxso -ddxsu ddxt ѡ -ddxu ddxw Ѷ ddxwi ഫ ddxwo ϵ @@ -10638,11 +10688,10 @@ ddylv ddym һ ddyp ddypi һ -ddys ѹ -ddysv ѿ +ddys ѿ +ddysa ѹ ddyt Ը -ddyw -ddywa +ddyw ddyx һЦ ddyy ddyyi Ӿ @@ -10694,13 +10743,13 @@ ded dedb ö dedbu Ķ dedc ߴߴ -dedd ¶ dede õ dedf Ǵ dedg Ķ dedi ۵ dedia dedj ֶ +dedju ¶ dedjv ִ dedl ö dedm Ƕîî @@ -10727,7 +10776,6 @@ def defb ת defd defdo ʱը -defe defg defj ɷ羰 defju ܽ @@ -10740,6 +10788,7 @@ defs defsu · defy defyu +defz deg degf ӹ degl ¹ @@ -10762,7 +10811,7 @@ dehq dehqu » dehqui Ļ dehu ʱ -dehvo ʵ +dehv ʵ dehx û dehxv »С dehy ĺ @@ -10844,9 +10893,9 @@ depuo deq deqb deqc -deqe -deqeu -deqgi +deqe +deqg +deqh deqi ³ deqj deqk @@ -10861,6 +10910,7 @@ deqru dequ Ǯ dequo ʱ deqy +deqz der derc derg @@ -10906,6 +10956,7 @@ dexp dexq dext ѡ dexw +dexx ն dexz dey deya ˮ @@ -10948,6 +10999,7 @@ dezy dezz dfb 緹 dfba ձ +dfbf dfbg dfbga dfbh @@ -11146,7 +11198,6 @@ dfjn dfjp dfjq dfjqi -dfjqo ƽ dfjr dfjs dfjsa @@ -11247,6 +11298,7 @@ dfqgi dfqh ȴ dfqj dfqk +dfqko dfqku dfqkuu dfql @@ -11373,7 +11425,6 @@ dfyio dfyk һ dfyki dfyko -dfyl dfyp dfyq ֮ dfys @@ -11479,7 +11530,8 @@ dgf dgfd dgfe dgfev -dgff +dgff +dgffo dgfh կ dgfhi к dgfi @@ -11540,6 +11592,7 @@ dgjc dgjco dgjd dgje +dgjeu 箼 dgjf dgjg dgjj @@ -11577,7 +11630,7 @@ dglkov dglkv dgll dglo ݹ -dglq ߹ȥ +dglq dgls ˹ dglu dglv @@ -11646,7 +11699,7 @@ dgqt dgqx ǹ dgqxu dgqy ۹ -dgr ¹ +dgr dgra Ǹ dgrf Ȼ dgrj @@ -11654,6 +11707,7 @@ dgrk dgrn dgrni dgrp +dgru ¹ dgrx عϡ dgs ˾ dgsj @@ -11897,6 +11951,7 @@ dhjhv dhji 绰 dhjj dhjk +dhjki dhjl ƺ dhjm dhjp @@ -12022,6 +12077,7 @@ dhrnv dhrz Ժ dhrzu dhs +dhsa dhse ɫ dhsf ɡ dhsfa ɢ @@ -12216,6 +12272,7 @@ djei djej djejo djejoo +djeju ೤ʱ djek djen djena @@ -12275,11 +12332,13 @@ djgx djgy djgz ȸ djh Һ +djhb djhd djhdu ƺ djhe ɺ djhh djhi +djhj djhl ʻ djhn ʺ djhq @@ -12342,12 +12401,15 @@ djld djldi djle djlf +djlfu +djlg djlh djli djlia djlj djlja djljo +djljv · djlk djlku djll @@ -12366,6 +12428,7 @@ djm djmb djmc djmd ij +djmdu ij djmg djmh djmj ľ @@ -12402,6 +12465,7 @@ djqg djqh ծ djqj ע djqjv ס +djqjvv djqk djqku djqkv @@ -12409,6 +12473,7 @@ djql djqm Ǯ djqmi djqn +djqp djqq djqv djqw ͼȤζ @@ -12428,6 +12493,7 @@ djse djsh djsj djsk +djskv djsp djsw djsy @@ -12469,6 +12535,7 @@ djwsi djwsu djwt ɴ djww Ϊ +djwwu ξ djwwv djwx djwy @@ -12496,6 +12563,7 @@ djxm djxq djxs djxsa İ +djxsu djxu Ϸ djxuu djxw Ѵ @@ -12527,6 +12595,7 @@ djys djysa ѻ djyu djyui +djyw djyx Ϸ djyy djyz ҩ @@ -12566,25 +12635,22 @@ dkbz dkbzo װ dkbzu ۡ dkbzv ر -dkbzvi ر dkc Կڴ dkcb δ dkce ײ dkcf ز dkch ز dkck ش -dkckvv ش +dkckv ش dkcp ײ dkcpo ײ dkcpv ز -dkcpvi ز dkcr ײ dkcri Ͳ dkcrv ز dkcz ز dkdb ж dkdc ͵ -dkdd ۶ dkde ص dkdf ׵ dkdg ֶ @@ -12592,6 +12658,7 @@ dkdga dkdh ش dkdhv 󿪴 dkdj Ͷ +dkdjo ۶ dkdk ܵ dkdka ε dkdki ͵ @@ -12856,6 +12923,7 @@ dkqji dkqju dkqk dkqko +dkqkoa dkqkov dkqkv dkql @@ -12999,6 +13067,7 @@ dkzk dkzko dkzku dkzl +dkzp ز dkzr dkzz dkzzo @@ -13325,6 +13394,7 @@ dlthua dlthuu dlthv dlti ·ͼ +dltio dltj ͼ dltjv ƽ dltm @@ -13470,6 +13540,7 @@ dmdyv dmdz ߵ dmdzi 㵽 dmdzia 絼 +dme dmeb ˮ dmed dmedu ıƶ @@ -13487,9 +13558,8 @@ dmes dmf Ĵָ dmfb ׺ dmfd -dmfe -dmfei -dmfeio +dmfe +dmfei dmfeo dmff ䷶ dmfh Ӳ @@ -13510,7 +13580,8 @@ dmfx dmfy dmfyi ü dmfyo -dmfz +dmfz +dmfzi dmg dmge dmgf @@ -13574,6 +13645,7 @@ dmjq dmjr dmjs dmjso +dmjt Ȧ dmjv dmjvu dmjw @@ -13653,12 +13725,11 @@ dmpw dmpz dmpzi dmq ľ -dmqci +dmqc dmqd dmqdi dmqe -dmqei -dmqeio +dmqei dmqeo dmqf վ dmqfv ĿǰΪֹ @@ -13686,7 +13757,9 @@ dmqs dmqt Ȧ dmqti ȯ dmqy ü -dmqz +dmqyu ûע +dmqz +dmqzi dmr æ dmre dmrf ȼ @@ -13975,6 +14048,7 @@ dpqk dpqki dpqkio dpqkiv +dpqkv dpqm ǰ dpqn dpqp @@ -14012,6 +14086,7 @@ dpwl dpws dpwu Ƥ dpww ί +dpwwi λ dpwwv λ dpwz dpwzi @@ -14038,7 +14113,8 @@ dpyf dpyg Ӧ dpyh dpyk -dpyl +dpyl +dpyli dpyp dpyt Ա dpyy @@ -14077,8 +14153,7 @@ dqdv dqdz dqe dqed -dqej ೤ʱ -dqejv ǧ +dqej ǧ dqek ʧ dqev dqex @@ -14123,11 +14198,11 @@ dqli dqlj · dqlm dqlv +dqm dqmg dqmm dqmq dqms -dqmv dqn dqp Ȩ dqpb @@ -14199,6 +14274,7 @@ drbn drbr ʲ drbw ȱ drbz DZ +drcb ˥ drch Ʋ drck ȴ drcku ȴ @@ -14219,8 +14295,7 @@ drdy drdz ȵ dre Ȼ dref ɽ -dreg ˥ -dregi ܹ +dreg ܹ dreh ˮ drej drek @@ -14328,7 +14403,6 @@ drq drqe drqei drqf յ -drqg drqj drqk drqp @@ -14433,6 +14507,7 @@ dsbhvi dsbj dsbjv dsbjvo +dsbjvv dsbk dsbl dsblv @@ -14449,8 +14524,9 @@ dsbsv dsbsva dsbu dsbuv -dsbw +dsbw dsbwv +dsbwvi dsbx ˿ dsbxo ˿ dsbz @@ -14509,8 +14585,9 @@ dsdkvu dsdkvv dsdl dsdm -dsdmv +dsdmv dsdmva +dsdmvi dsdp  dsds dsdsi @@ -14723,7 +14800,6 @@ dsje dsjei  dsjev dsjf -dsjfi dsjg dsjgi dsjh @@ -14868,7 +14944,8 @@ dslzvu dsm dsmb dsmc -dsmd ı +dsmd +dsmdv ı dsmf dsmg dsmgv @@ -14927,7 +15004,6 @@ dsph dsphv dsphva dsphvi -dspj dspk dspl dspm Ƭ @@ -14949,6 +15025,7 @@ dsqd dsqe dsqei dsqf ս +dsqfi dsqfv չ dsqg dsqgv @@ -14958,7 +15035,6 @@ dsqj dsqji ס dsqju dsqk -dsqk dsqki dsqkiu dsqkiv @@ -15116,6 +15192,7 @@ dsxhvv dsxj dsxjv dsxk ϲ +dsxki Ϸ dsxkv Ϸ dsxl dsxlv @@ -15171,6 +15248,7 @@ dsykvv dsyl dsyli dsylv +dsylvi dsylvo dsylvu dsyp @@ -15213,6 +15291,7 @@ dszy dszz dszzv dszzvu +dszzvv dtb ̤ dtbd dtbf ̰ @@ -15239,12 +15318,12 @@ dtdco dtdcu ̵ dtdcuu dtde ̵ -dtdeo ˵ dtdg ϶ dtdh ϴ dtdha д dtdhu dtdk ˵ +dtdko ˵ dtdl dtdm ϵ dtdmo ˵ @@ -15352,6 +15431,7 @@ dtkh dtkj ̿ dtkt ̿ dtky ̿ +dtkz ο dtl ͷ dtlc dtld @@ -15378,7 +15458,7 @@ dtly dtmd dtmg dtmj ľ -dtml ģ +dtmji ģ dtmm dtmn dtms @@ -15518,8 +15598,10 @@ dwbn dwbv dwbw ݱ dwc +dwce ײ dwch dwcj ش +dwcji dwck ݴ dwcl ٴ dwclo ޴ @@ -15534,6 +15616,7 @@ dwdl dwdlu dwdm ׵ dwdn 󳳴 +dwdt dwdu γ dwdv ߶ dwdw 󳹴 @@ -15872,7 +15955,6 @@ dycz dyd һ dyda һ dydb ҡ -dydd dyde dydeo dydev @@ -15880,6 +15962,7 @@ dydg dydh dydi 㵺 dydj +dydjv dydk dydp dydr @@ -15916,10 +15999,12 @@ dyekvo dyel һ dyen dyep +dyepo dyer dyes ɳ dyeu dyeuv һ +dyeuvo dyev Լ dyex ˫ܰ dyf һ @@ -16220,6 +16305,7 @@ dyxdv dyxdvv а dyxe dyxev ϣ +dyxeva dyxf dyxfa dyxfv @@ -16235,7 +16321,6 @@ dyxm dyxmu dyxq dyxs -dyxsv dyxu dyxuv һ dyxuvo Ԫ @@ -16264,6 +16349,7 @@ dyyio dyyk dyyku dyyl +dyylo dyyp dyypv dyys @@ -16367,7 +16453,7 @@ dzepo dzeq ˢ dzew dzf ֯ -dzfbi ׷ +dzfb ׷ dzfe dzfei ֮ dzff @@ -16542,6 +16628,7 @@ dzpp dzpw dzpz dzq +dzqa dzqc dzqco dzqd @@ -16605,6 +16692,7 @@ dztua dzty ʹ dztyo ͳ dztz +dzw dzwb dzwd dzwe @@ -16621,7 +16709,6 @@ dzws dzwsi dzwsii dzwsiv -dzwv dzww λ dzwx dzx ѧ @@ -16630,9 +16717,7 @@ dzxc dzxca dzxd л dzxf -dzxg dzxh ѧ -dzxha dzxj dzxk ϲ dzxki @@ -16670,7 +16755,7 @@ dzyj dzyk dzyl dzyp -dzyru һ +dzyr һ dzyt Ա dzyw dzyx Ϸ @@ -17054,6 +17139,7 @@ ebsr ʿ ebsy ˮ ebt 鱨̯ ebta ˫̥ +ebtao ˮ ebtd ˮͷ ebtda ˮ ebtf ˮ̶ @@ -17123,7 +17209,8 @@ ebyj ebyk ˯ ebyki ˯ ebyl ˮ -ebyla ˮٶ +ebyla ˮԡ +ebylai ˮٶ ebyp ˮ ebypa ˮ ebys ˮѹ @@ -17147,6 +17234,7 @@ ebzka ˮ ebzl ʧ ebzo ɹ ebzp ˮ +ebzt ˮ ebzz ˮ ecb ˮʱ ecbl ز¶ @@ -17276,6 +17364,7 @@ edeka edekaa ʬ edeki edekio ʱ +edekiu edeko edekoo ʫ eden @@ -17614,6 +17703,7 @@ edr edrd edre edrf Ⱦ +edri ɽ edrj edrju edrjuv ɱ @@ -17762,7 +17852,7 @@ edyku edykv edyl edyli -edylo ˵е +edylo edyp edypi edys Ѻ @@ -17939,9 +18029,9 @@ eejku eejkuo ʮҾſ eejl eejm +eejmi ۼ eejmu eejo -eejp 糤 eejq ߾ eejqv ־ eejr @@ -18071,7 +18161,8 @@ eery eese ɫ eesj eesja -eesk +eesk +eesku eesy eet ̨ eetb @@ -18125,7 +18216,8 @@ eexq ɱ eexs eexsi eexu ɱ -eexw ˶ʿѧλ +eexw ʳά +eexwv ˶ʿѧλ eexx eexxi eexxii @@ -18409,7 +18501,7 @@ eflxo eflxu ʮָ efly eflya ˮ -efm ĩ +efm ô efmb ɽ efmg ɽ efmgo ʵ @@ -18418,7 +18510,6 @@ efmj ɽķ efmm efmn ɽ efmno -efmo ô efmr ɽ efmw ɽ efmy ʼû @@ -18480,7 +18571,7 @@ efrs efrw ʼΪ efrx efry ʼһ -efs +efs ˮɫ efse ɽɫ efsj efsk ˼ @@ -18550,7 +18641,7 @@ efxw efxx ɽ efxxi ʦѧУ efxz ɽ -efy ʼ +efy efyb ɽ efyd ɽ efydo @@ -18567,7 +18658,6 @@ efyku efyl efyli ɽ efylu -efyo efyp ɽ efypa efypi ɽ @@ -18610,6 +18700,7 @@ egcf ˥ egch ˧ egcz ˥ egd +egda ˮ egdb ʶ egdc ˦ egdd ˤ @@ -18714,6 +18805,7 @@ egti ˯ egtk ˥ egtl ˦ egtt +egty ͬ egwe ˦ egwh ʬδ egwp ˥ @@ -18742,7 +18834,7 @@ egyiv egyp ֹƷ egyx ԹӤ egzh ˤ -egzk ˥ +egzho ˥ ehb 񻰰 ehbe ˵ ehbj ᱳ @@ -18755,6 +18847,7 @@ ehbxo ehby ʬҰ ehc Ϻ ehcf Ƹ +ehck ɸ ehd ʺϵ ehdd ߵ ehde ɹ @@ -18842,6 +18935,7 @@ ehjo ˵ ehjp ɹ ehjq ɸ ehjqo +ehjqu ɫ ehjv ɺ ehjx Ϻͨѧ ehjy Ա @@ -18918,7 +19012,8 @@ ehxa ehxd Ϻ ehxdo ᰲ ehxg ϰ -ehxjo ѧ +ehxi ˯ +ehxj ѧ ehxk ɸ ehxo ehxt ɸѡ @@ -18977,6 +19072,7 @@ ejbw ejbwu ejbz ejbza 鱨 +ejbzu ejce ejch ߲ ejck @@ -19132,7 +19228,9 @@ ejfyi ejfyo ejfyv ³ ejg ʮ -ejga ˮ +ejga ˫ڹ +ejgao ˮ +ejgau ˫ع ejgb ejgd ejgdv @@ -19499,8 +19597,9 @@ ejww ejwwv ejwwva ejwy -ejx +ejx ejxa ˫ +ejxai ռ ejxb ejxbi ejxbo ϸ @@ -19629,6 +19728,7 @@ ekbd ʶ ekbf ʯ ekbfa ʬ ekbfo ԰ +ekbfv ʯ ekbg ʿ ekbh ʧ ekbj Dz @@ -19699,6 +19799,7 @@ ekdja ʪ ekdjo Զ ekdk ʦ ekdka ʪ +ekdki ʷ ekdko ʵ ekdku ʧ ekdl ¶ @@ -19722,6 +19823,7 @@ ekdsoi ʩ ekdt ʱ ekdtv ¶ ekdw ʮ +ekdwv ʯ ekdy ʯ ekdyi ʹ ekdz @@ -20039,6 +20141,7 @@ ekke ʱ ekkei ʳ ekkev ʯ ekkf Կ +ekkfo ʵ ekkg ʯ ekkgo п ekkh ʯ @@ -20073,6 +20176,7 @@ eklh eklha ʻ eklhi ʷ eklj ʵ¼ +ekljv ʯ· eklk ʵ eklka ʻ eklki @@ -20089,6 +20193,7 @@ eklkvv ekll ʧ eklm ʧ eklmo +eklmoa eklmu ʧ eklmuv ʮ eklp @@ -20140,6 +20245,7 @@ eknk eknki ʹ eknl Ů eknli Ů +eknlo Ů eknm ʮ eknmo ʱ eknr @@ -20222,6 +20328,7 @@ ekqno ekqnu ʧ ekqp г ekqpi ʦ +ekqpo ekqpu ʮ ekqq ekqqo @@ -20332,7 +20439,6 @@ ekwjo ʵ ekwjou ʵ ekwju ʧ ekwjuu -ekwjuu ekwjuv ʮ ekwjv ekwjvu @@ -20485,7 +20591,7 @@ ekyso ʩѹ ekysov ѹ ekysv ʯ ekyt ʮԪ -ekytu ʦԺ +ekyti ʦԺ ekyw ʫ ekywo ʱ ekyx ӡ @@ -20646,7 +20752,7 @@ ellaa ʪ ellb ˵ elle ˵ ellh ˵ -ellio ɵ +elli ɵ ellk ˵ ello ells ˵ @@ -21089,7 +21195,6 @@ encr encz end endc -endd ende endf endg @@ -21097,6 +21202,7 @@ endh endj endja endjo +endjou endk endl endlu ʮ궯 @@ -21168,7 +21274,6 @@ enfkou enfl enflo enfm ״ -enfmi ݷׯ enfn enfnu enfp @@ -21177,7 +21282,6 @@ enfs enfsi enfso enfx ״ -enfxi ݷׯ enfy enfya eng Ǹ @@ -21226,6 +21330,7 @@ enhqa enhqi 껨 enhqo enhqu ţＦ +enhr κ enht enhw enhwo @@ -21549,7 +21654,7 @@ epcz epd ʳƷ epdb ̶ epdc ϵ -epdd ϶ +epdci ϵ epde ϵ epdei ˵ epdf ϵ @@ -21558,6 +21663,7 @@ epdh epdho ̴ epdj ̶ epdji Ͷ +epdjiu ϶ epdk ϵ epdm ̵ epdp ϵ @@ -22060,7 +22166,6 @@ eqpl ˣ eqq ˮ eqqc ˣ eqqe ˬ -eqqeo ˬ eqqk ˢ eqqm ˣǮ eqqr սȺ @@ -22272,7 +22377,7 @@ erhqu erht erhw erhz -erhzuo +erhzu erj ˫н erjb ʡ erjbu @@ -22286,7 +22391,7 @@ erjg ʥ erjgu erjguo ʤ erjj ʤ -erjjoa 缺 +erjjo 缺 erjju erjjuo erjk @@ -22379,7 +22484,6 @@ ernj ʢŭ ernk ernl ʥŮ ernlu ʣŮ -ernlv ernm ʢ erns ernw ʡ @@ -22427,6 +22531,7 @@ erqt ʤȯ erqx ǻ errd erre +errev errj errju errk @@ -22501,10 +22606,12 @@ erxhv erxhvu ź erxj erxk Ϣ +erxku Ϣ erxkv Ϣ erxl erxm ʥ erxmu +erxmui erxmv erxn ʥ erxq @@ -22526,6 +22633,7 @@ erydv erye ҵ eryf eryfu +eryfuu eryfv ʢ eryg Ӳ eryh @@ -22696,6 +22804,7 @@ eskn ɷ eskr ɳ eskx ɰ esky ɱ +esl eslb ɳ esld ɳ© esle ɵ @@ -22708,7 +22817,6 @@ eslka ɳ eslki ɯ eslkv ɰ eslkvv ɰ -eslo eslp ɳ eslq ɳ esls ɳ @@ -22753,6 +22861,7 @@ esqm esqo ˼ esqp ɴ esqq ɳ +esqqa ɳ esqz ɱ esqza ɴ esr @@ -22778,7 +22887,8 @@ estm ɳ estp ɰ ests ɱ esty ɳͭ -eswb δ +eswb ɳ +eswbu δ eswe ɲ esweu ɷ eswl ɱ @@ -22854,7 +22964,7 @@ etd ʵ etda ˫ͨ etdi ete ʽ -eteii ʳ +etei ʳ eteo ʵ etep ˩ etet @@ -22933,7 +23043,6 @@ ewbk ˭ ewbl ʮǧ ewbm ˳ ewbo λ -ewboi λ ewbs ˭ ewbw ˭ ewck ˳ @@ -23138,6 +23247,7 @@ ewzk ˳ ewzs ˱ exb ° exba ˮԱ +exbav ˫° exbb ˫ exbc ˫ exbe ʮ @@ -23367,6 +23477,7 @@ exsk ˬ exsl ˫ ext ͷ extb ˫ +extd ˫ͷ extg ˫ͣ exth ˫̥ extj ˫ͼ @@ -23471,7 +23582,6 @@ eydw eye һ eyea ˫ˮ eyeaa -eyeao eyeb Ʊ eyee ʹ˵ eyef @@ -23500,6 +23610,7 @@ eyfiu eyfiua ʹ÷ eyfn eyfo +eyfoa ʵ eyfq dz eyfu eyfuu ʮ· @@ -23547,9 +23658,9 @@ eynl ɳ eynx ʹ eyp ˫Ƥ eypa ˫Ƶ -eype ʹƵ eypi Ƥ eypio Ӱ +eypl ʹƵ eypo ʵƷ eypoa Ʒ eypoo Ƶ @@ -23578,6 +23689,7 @@ eyr eyra eyri ʹ eys ɶ˼ +eysa ˮ eyt ʾͼ eyta ̨ eytg ͨ @@ -23738,6 +23850,7 @@ ezjf ezjh پ ezjj ٳ ezjk ռ +ezjku ezjl ܾ ezjm ټ ezjmo ռ @@ -23769,6 +23882,7 @@ ezld ezldi ezle ezleo +ezlg ezlh ezlj ¼ ezlk @@ -23779,6 +23893,7 @@ ezlli ʦ ezlm ezlq ezls +ezlu ezlx ezlz ezm ô @@ -23795,6 +23910,7 @@ ezms ezmy ô ezmz ë ezn ˭ +ezna ʼ eznf eznfu eznh @@ -24029,7 +24145,6 @@ fblm ׷ fblo fblq ׸ fblu -fblw ׵ fblx ֱ fbm fbmj ׷Ľ @@ -24076,7 +24191,7 @@ fbsk ׷˼ fbsl ׷ fbsn б˽ fbsy ׷Դ -fbsyuu ˼ +fbsyu ˼ fbt fbtb ׹ fbtj ׶ͻ @@ -24344,7 +24459,7 @@ fdnf fdng fdnm fdns -fdnw +fdnsu fdp fdpk Ƥ fdpp @@ -24352,6 +24467,7 @@ fdpu fdq Ŵ fdqa յվ fdqai վ +fdqav ׬Ǯ fdqb fdqc fdqd ֵڴ @@ -24398,6 +24514,7 @@ fdtj fdtm fdtp شͻ fdtz +fdw fdwd 秳 fdwe ۳ fdwf @@ -24445,6 +24562,7 @@ fdyd fdye ҹ fdyei fdyeiu ֵһ +fdyf fdyg ҵһ fdyj fdyk һ @@ -24540,6 +24658,7 @@ fedx fedxo Ц fedy ⶰ fedz +fedzi ۵ fedzo ⵹ fee ֻ˵ feea ɹ˪ @@ -24549,7 +24668,6 @@ feee feef feefo ɽ feefoo -feei feej feeji feejo @@ -24664,12 +24782,12 @@ fejd fejdo feje ⳵ fejei ʰ -fejeo ų fejev ת˲ fejg ֪ʶṹ feji fejj fejja +fejji ׳Ƴ fejju ֱ㼺 fejjuo ֪ʶ fejk ⼸ @@ -24677,7 +24795,6 @@ fejko fejl fejlu ֪ʶ fejm -fejmi ۼ fejmo fejn ֪ʶ fejp ⳡ @@ -24714,6 +24831,7 @@ fele felf felfu ˮת felh +feli felj · felk felki @@ -24721,6 +24839,7 @@ felko felkv ת뿪 felm felq +fels felt felu ʿ felua ˮ @@ -24728,7 +24847,6 @@ feluv felw felwo felx -felxo fely £ fem feme ô @@ -24737,11 +24855,9 @@ femg femi feml ĥ femli -femlo femm femn femo ˵ -femp æ femr fems ĺ femu ֪ʶ @@ -24834,7 +24950,6 @@ few fewd ڳ fewdo ҵ fewe ⳵ -feweo ų fewf fewfo fewg ɽɽ @@ -24980,7 +25095,6 @@ ffdhu ffdj ffdji ffdk -ffdko ffdl ffdli ޴½ ffdm @@ -25034,7 +25148,6 @@ ffer ffes ɱ ffeso ɶ ffesu ɵ -ffeu ծ ffez fff ַ fffb ֮ @@ -25067,7 +25180,8 @@ fffm fffp fffr fffs -fffsu +fffsu թ +fffsua ffft ת ffftu ת fffu ֪֮ @@ -25147,7 +25261,8 @@ ffjd ffjdo ̶ֳ ffje ffjf ߼ -ffjg ֧ +ffjg Ǹ +ffjgu ֧ ffjh ffjj ffjja @@ -25227,6 +25342,7 @@ fflq ffls fflt fflu +fflui ծ fflv fflw fflwo @@ -25516,6 +25632,7 @@ fgbf fgbj й fgbl fgbr +fgbu fgby fgc йش fgd ¹ @@ -25540,6 +25657,7 @@ fgea fged йȷ fgee fgef ط +fgefu Ǹת fgeh ʱ fgehi й fgehii йϺ @@ -25566,6 +25684,8 @@ fgfe ק fgff fgfj йо fgfji йξ +fgfju +fgfo ڹ fgfw ǷΧ fgfy Ҫ fgfyi й @@ -25586,6 +25706,7 @@ fggmi fggq й fggr й fggt йʹ㲥̨ +fggu ɹ fggy йԺ fgh й fghi й @@ -25647,6 +25768,7 @@ fgqf fgqj קס fgqk ק fgqko +fgqo ڹ fgqx ֺ fgqxi йѧ fgqy ֺ @@ -25657,11 +25779,11 @@ fgrd fgrdo ˵ fgrg й񹲺͹ fgrh ٻ +fgrhi й fgri й fgrj йž fgrm й fgrx йѧ -fgrxi й fgry йЭ̻ fgs ֹ˾ fgt @@ -25759,6 +25881,7 @@ fhela fhf fhff ի fhfh խխ +fhfi л fhfj խ fhfk ժ fhfy լ @@ -25781,7 +25904,7 @@ fhjdu fhjj ժ fhjk լ fhjko խ -fhjl ժ +fhjl խ fhjla ӳ fhjs ծ fhjz ժ @@ -25795,6 +25918,8 @@ fhlf fhlj ժ¼ fhlk ծ fhlp ϻƪ +fhlpo պ«ư +fhlr fhlu fhlua λ fhlv ת @@ -25865,6 +25990,7 @@ fhwb fhwe fhwh կ fhwhi лĻ +fhwhiv fhwj ծ fhwju ֻ߽ fhwm л @@ -25949,6 +26075,7 @@ fjd fjda ֽ fjdc fjdd dz +fjdda ޼ʵ fjde fjdeo fjdf @@ -26096,6 +26223,7 @@ fjfko fjfkov ֳ fjfku ֵ fjfkv ְ +fjfkvu fjfl fjfla ֮ fjfm װ @@ -26208,7 +26336,8 @@ fjjho fjjj fjjja fjjji в׼ -fjjjoa +fjjjiu +fjjjo fjjju fjjjua fjjjv @@ -26336,6 +26465,7 @@ fjmmi fjmmiv fjmmv fjmo ը +fjmr fjms fjmsa fjmsu @@ -26429,6 +26559,7 @@ fjqy fjqz fjqzu fjr dz +fjra 㽭 fjrd fjrf Ȼ fjrfu ȼ @@ -26560,6 +26691,7 @@ fjxo fjxq fjxqi fjxqv רѧ +fjxqvi fjxs fjxsa Ѿ˼ fjxsi @@ -26592,7 +26724,7 @@ fjydu fjye ҵ fjyf fjyfi dz -fjyfo ζ +fjyfo һ fjyfu fjyfv fjyg Ӥ @@ -26735,7 +26867,6 @@ fkdb ֻ fkdbu ֧ fkdd Ƕ fkddi ֹ -fkddo ֮ fkde ֵ fkdea ֯ fkdei ָ @@ -26753,6 +26884,7 @@ fkdhi ָ fkdi ۿ۵ fkdj ƶ fkdjo ֻ +fkdjou ֮ fkdk ֮ fkdki õ fkdku ʵ @@ -26773,7 +26905,6 @@ fkds ֱ fkdso ֮ fkdsv fkdt ֮ -fkdw ֻ fkdy ƶ fkdyo ֻ fkdz ֪ @@ -26805,8 +26936,7 @@ fkeji fkejo ֮ fkejoa ֮ fkejoo ֻ -fkejov ֮ -fkejovi ſֽ +fkejov ſֽ fkeju ֱ fkejua ֧ fkejui ֱ @@ -26952,6 +27082,7 @@ fkgx ֮ fkgxo ֮ fkgy ְ fkgyo ֮ +fkgyu ֱ fkgz ֮ fkgzv fkgzvo ְ @@ -27051,7 +27182,6 @@ fkjmoi ֮ fkjmu ʼ fkjmui ʼ fkjn ֱ -fkjni ָ fkjno ֮ fkjnov ֮ fkjp ֮ @@ -27106,6 +27236,7 @@ fkky ָ fkkya Ϳ fkkyu ƿ fkkz ֻ +fkkzu ˿ fkl ֿ fklc fklcu ֪ @@ -27142,6 +27273,7 @@ fklqu ֱ fklqua ֧ fklr fklru ֧ +fkls ֱ fklt fklto ֮ fklw ֮ @@ -27251,6 +27383,7 @@ fkqj ֩ fkqji ֹס fkqjo ֮ fkqjoi ֮ +fkqjoo fkqjou ֻ fkqju ֧ fkqjui ס @@ -27272,7 +27405,7 @@ fkqmo ֻǷ fkqmv Ǹ fkqn ָ fkqp ֽ -fkqpa +fkqpa fkqpi ִ fkqpu fkqpv ְ @@ -27369,6 +27502,7 @@ fktyva fktz ָ fkw ؿζ fkwd ֯ +fkwda ֽ fkwdo ֮ fkwf ֻ fkwh ֮ @@ -27528,7 +27662,7 @@ fkyf ֱ fkyfo ֻ fkyfoi ֮ fkyfoo ֮ -fkyfuo ֧ +fkyfu ֧ fkyg ֹӯ fkygi ֹӮ fkygo ֻӦ @@ -27633,6 +27767,7 @@ fldku fldm fldmi fldo +fldoi ״ fldoo ֮ fldq fldr @@ -27867,7 +28002,6 @@ fly flyb flybi ӡ flyd -flyda flydi flye ү flyei ֥ @@ -28086,6 +28220,7 @@ fmq fmqa Ȩ fmqc ׯ fmqe װ +fmqi fmqj ׯ fmqk װ fmqm װǶ @@ -28096,7 +28231,6 @@ fmqo fmqq ȫ fmqqi ײ fmqqu -fmqr װ֡ fmqu ĸ fmqua fmqv ֳ @@ -28564,6 +28698,7 @@ fpbfa fpbg fpbh fpbj +fpbjo fpbl fpblo fpbm @@ -28647,7 +28782,6 @@ fpfki fpfko fpfkou ֪ fpfl -fpflu ݷ fpfm ײ fpfp fpfpi @@ -28864,6 +28998,7 @@ fpwj fpwja fpwl fpwn +fpwna fpwp fpwr fpws @@ -28979,8 +29114,7 @@ fqep fqepi ִˮƽ fqeq չʱ fqet չͷ -fqeu ծ -fqeuv +fqeu fqf fqfa չ fqfd ץ @@ -29041,7 +29175,6 @@ fqjl ץ fqjm צ fqjo ڼ fqjq ץ -fqjs צ fqju ׽ fqjui ѽ fqjv ޼ @@ -29062,6 +29195,7 @@ fqli fqliu ǩ fqll ծ fqlt üͷ +fqlu ծ fqlv fqlz ץ fqm @@ -29124,7 +29258,6 @@ fqwl ץ fqwli ץ fqwm ִΪ fqwo -fqws צ fqx ϯ fqxb ץ fqxc ץС @@ -29163,6 +29296,7 @@ fqzwu fqzx frb ˰ frbc +frbf frbg 財 frbj 첹 frbk @@ -29192,10 +29326,11 @@ frdgi frdh 綫 frdj frdji +frdjiu ۺ frdju frdjv -frdjvu ۺ frdk +frdkv frdm frdr frds @@ -29249,7 +29384,6 @@ frfr frfra ֮ frfs բ frfsv ⷢ -frft 贫 frfx װ frfxu ֪֪治֪ frfy @@ -29332,7 +29466,8 @@ frle frlev frlf frlg -frlj ٺ» +frlj · +frlji ٺ» frlk frlku frlkui @@ -29509,6 +29644,7 @@ fryt fryw frywu fryy ӵ +fryyi Ӽ fryz frzb frzh @@ -29564,7 +29700,7 @@ fsdca fsdd fsdda fsde -fsdeau +fsdea fsdeu է fsdf ը fsdfi @@ -29588,12 +29724,12 @@ fsdy fsdyi գ fsdz fsdzi ա +fse ɥ fseb ˮ fsed fsedi fsee fsef -fsei ɥ fsej fseja fsejav @@ -29633,6 +29769,7 @@ fsfka fsfkai ָ fsfkau fsfkv ե֭ +fsfkvu fsfn fsfna fsfp @@ -29653,11 +29790,11 @@ fsgeao fsgeav fsgei fsgeo ը -fsgev դ fsgf fsgfv ե fsgj fsgja +fsgji fsgl fsgla fsglo ը @@ -29733,6 +29870,7 @@ fsjka fsjkaa fsjkav fsjko ը +fsjkov բ fsjkv fsjkvv fsjm է @@ -29769,7 +29907,6 @@ fskt fskti fskw fskx -fsky fsl fslc fsld ը @@ -29817,7 +29954,6 @@ fsmka fsml û fsmlv Ĥ fsmm -fsmmv fsmn բ fsmna fsmno @@ -29841,7 +29977,6 @@ fsnki fsnkia fsnl Ů fsnm -fsnp fsnt էů fsnz fspc Ʊ @@ -29849,6 +29984,7 @@ fspg fsph fspha fsphaa +fsphai fspj է fspk ơ fspl @@ -30055,7 +30191,6 @@ ftde ת ftdea ׬ ftdeau ׬ ftdh ת -ftdhi ftdhv ־ͬ ftdhva ftdk ר @@ -30076,7 +30211,7 @@ ftef ר ftej ר ftejv ת ftek ת -ftelvv ר˶ +ftel ר˶ ften ת fter ת ftes רɱ @@ -30108,7 +30243,6 @@ ftgfv ת ftgj ת ftgjv ת ftgl ת -ftgli ftgo ֻṩ ftgp ת ftgq ծ̨ @@ -30183,6 +30317,7 @@ ftle ׬ ftlf ר ftlh ת ftlha ׬ +ftlhi ftlj ת¼ ftljv ת¯ ftlk ר @@ -30312,6 +30447,7 @@ fty ֹʹҩ ftyb תӡ ftybi ͬһ ftybv ת +ftybvo ת ftyd ר ftydv ת ftye רҵ @@ -30334,6 +30470,7 @@ ftz ftzd ר ftzdv ת ftze ר +ftzf ftzh ת ftzi ftzj ת @@ -30344,6 +30481,7 @@ ftzr ת fwb İ fwbc fwbci DZ +fwbcu ʱ fwbf IJֵ fwbg β fwbh ǰ @@ -30374,7 +30512,6 @@ fwdc fwdd ɵ fwde ɵ fwdea ɵ -fwdei ǵ fwdeo ϵ fwdeu ʵ fwdev ֲսʬ @@ -30530,7 +30667,8 @@ fwkx fwky ǿ fwkz ǿ fwl ֧ -fwlb +fwlb +fwlba fwlc fwlco fwld ۳Ͷ @@ -30591,7 +30729,6 @@ fwp fwpb Ʒ fwpba fwpc Ʊ -fwpcu ʱ fwpf fwpj fwpl @@ -30737,6 +30874,7 @@ fwyg fwyh Ծ fwyha Խ fwyk +fwyki fwykv fwyl fwylu @@ -30829,6 +30967,7 @@ fxel ׳˶ fxen װ fxeo Щ fxeoi Щ +fxeoo fxep װ fxepi ײ fxepii ײ @@ -30990,7 +31129,6 @@ fxqmo ױǰ fxqn ײ fxqno װ֡ fxqq ײ -fxqr װ֡ fxqv У fxqvi س fxqw ׮Ⱥ @@ -31138,7 +31276,8 @@ fybs fybt 칫 fybu ư fybv ְҵ -fybw ձ +fybw б +fybwa ձ fyby ױԺ fybz б fybzo һ @@ -31183,6 +31322,7 @@ fydi fydj ж fydji ж fydju ض +fydjuo ض fydk ֵ fydki е fydko @@ -31222,7 +31362,6 @@ fydy fydyu Ҫԭ fydz յ fye Ҳ -fyea ѿ fyed fyee fyef ɽ @@ -31239,7 +31378,6 @@ fyek fyeka fyeki ʵ fyekiv ʽ -fyeku ʰ fyel ˵ fyeli ˵ fyem ˪ @@ -31295,6 +31433,7 @@ fyfli fyfm һ fyfmi װ fyfmu Ҫ +fyfmuo װ fyfn з fyfni з fyfo һ @@ -31365,6 +31504,7 @@ fyhq fyhqu ֻ fyht л fyhtv תƻ +fyhu Ż fyhv רҵ fyhvi ְҵ fyhw һ @@ -31382,11 +31522,10 @@ fyjeoa fyjev ְҵ fyjf в fyjg -fyjh о +fyjh Ƽʻ fyjho ͺ fyjhov ͻ -fyjhu Ƽʻ -fyjhuv Ҫ +fyjhu Ҫ fyji գۼ fyjj г fyjju 꽻 @@ -31472,6 +31611,7 @@ fykyoa fykyov fykz п fyl ӳ +fyla ѿ fylb fylc fyld @@ -31521,7 +31661,8 @@ fyme fymh fymj Ŀ fymk -fyml Ħ +fyml ĩ +fymli Ħ fymm fymma fymn @@ -31818,6 +31959,7 @@ fyyz fyyzi ҩ fyz fyzb ߱ +fyzbu fyzd fyzdo ӵ fyze @@ -31933,14 +32075,15 @@ fzfp fzfr з fzfu fzfy -fzfyu fzfz +fzfzi fzfzo fzfzu fzg תظ fzgb й fzgd ҹ fzge Ҹ +fzgeu fzgf и fzgj չ fzgji й @@ -31982,6 +32125,7 @@ fzjb fzjbo ս fzjd Խ fzje ճ +fzjeo ų fzjg Ҿ fzjh ӳɻ fzjj ҳ @@ -31998,6 +32142,7 @@ fzjp fzjq վ fzjr ҳ fzjs м +fzjsu צ fzju fzjw Ծ fzjwo Ѿ @@ -32025,7 +32170,6 @@ fzlei fzleo fzlf fzlg -fzlga fzlgi fzlgo گ fzlgoa @@ -32060,6 +32204,7 @@ fzml fzmm fzmn fzmni +fzmp æ fzms fzmw û fznh Ű @@ -32104,6 +32249,7 @@ fzqwi fzqx ǽ fzqy fzqz +fzqzi fzqzo fzr fzrd ε @@ -32131,6 +32277,7 @@ fzty fzw ָΪ fzwd ҳ fzwe ճ +fzweo ų fzwg fzwj fzwk ճ @@ -32138,6 +32285,7 @@ fzwl fzwp fzws Ҳ fzwsu +fzwsuo צ fzwt Դ fzwto ֻδ fzww ޱ @@ -32476,6 +32624,7 @@ gbqz gbr gbrd gbrf Ȼ +gbri gbrj gbrl gbrn @@ -32485,6 +32634,7 @@ gbsb gbsj gbsju gbsk ˼ +gbski ˾ gbsl gbslu gbst @@ -32528,7 +32678,7 @@ gbxb gbxbu gbxc У gbxd з -gbxei Сʱ +gbxe Сʱ gbxf 鰸 gbxfa ı״ gbxfo @@ -32587,7 +32737,6 @@ gbzki gbzku gbzl gbzp -gbzpi gbzv ϲ gbzw gbzy @@ -32676,8 +32825,7 @@ gdex gdexo ߵѧ gdf ط gdfd ߶ȷ -gdfe -gdfeo ߶ +gdfe ߶ gdff gdfg ק gdfgu Ŵй @@ -32693,6 +32841,7 @@ gdfuv gdfw gdfx ״ gdfy +gdfz gdg ߵ͸ gdga ¶ gdgb @@ -32738,6 +32887,7 @@ gdjb gdjc gdjd gdje +gdjea 箶̼ gdjeo ߵȽ gdjf ߶ȼ gdjg @@ -32830,6 +32980,7 @@ gdqku gdql gdqm gdqn +gdqo ض gdqq gdqr gdqs @@ -32841,6 +32992,7 @@ gdqvu gdqw ׼ gdqx Ǻ gdqy ŵ +gdqz gdr gdrd gdre @@ -32848,6 +33000,7 @@ gdrf gdrj gdrk gdrn +gdro 㶫 gdrt gdru Ŵ gdrz @@ -33270,7 +33423,6 @@ gexf gexg gexgv gexh  -gexho Ѫ gexj gexjv gexjvu @@ -33341,6 +33493,7 @@ gfbe gfbeo бҵ gfbf Ұ gfbg β +gfbgv ɱ gfbi ް gfbj ɲ gfbk ұ @@ -33664,13 +33817,13 @@ gfxc gfxcv Ц gfxd л gfxda д -gfxdu Ѫ gfxdv Щ gfxdvo Ż gfxg gfxh ΰ gfxha ѧ gfxhau Ұ +gfxhu Ѫ gfxj ˶ gfxk ϴ gfxkv ϵ @@ -33743,8 +33896,10 @@ ggdda ggdf ֵ ggdh մ ggdl ɶ +ggdlo ǹ׶ ggdm յ ggdv ܸܵ +ggdvi й ggdy ն ggdz ֵ gge @@ -33811,6 +33966,7 @@ ggkh ggkl ĸ￪ ggl ggld +ggldo ǹ۶ ggle gglea gglk @@ -34225,7 +34381,6 @@ gjdbu gjdc ŵ gjdd õ gjddo ƶ -gjddu ȶ gjddv оõ gjde ɵ gjdei Ҵ @@ -34241,6 +34396,7 @@ gjdiao gjdj ¶ gjdji ƶ gjdju Ŷ +gjdjuu ȶ gjdk ȵ gjdku ȵ gjdkuv ʵ @@ -34293,6 +34449,7 @@ gjeko gjeku gjekuo ʫ gjel ˵ +gjelu ˷ gjen gjeni ֽˮ gjenu @@ -34304,6 +34461,7 @@ gjeq gjer gjera ¾ gjes ɳ +gjesv ɲ gjet gjev gjew @@ -34332,6 +34490,7 @@ gjfm gjfmu װ gjfn ɷ gjfni Ƿ +gjfniu gjfnu ɷ gjfo ǽ gjfp · @@ -34452,7 +34611,6 @@ gjjlia gjjm ̼ gjjmi һ gjjmu Ž -gjjn ʳ gjjo ߾ gjjov ػ gjjq ž @@ -34460,6 +34618,7 @@ gjjqi gjjqio һ gjjr ų gjjri ʽ +gjjru ʳ gjjs ɼ gjjsi Ǽ gjjsii @@ -34707,7 +34866,6 @@ gjxk gjxka Ϣ gjxku ϡ gjxkv ϧ -gjxl gjxn Ŷ gjxo ؼ gjxoa @@ -34746,6 +34904,7 @@ gjyw gjywo ߳һ gjyx Ӱ gjyy +gjyya gjyyo Ӷ gjyz Ҫ gjz ؼ @@ -34812,6 +34971,7 @@ glby glbz glbzv glbzvi +glbzvo glc glcb glce @@ -34825,7 +34985,6 @@ glcy glcz gld glda -gldd glde gldeo ¥ gldeou @@ -34833,6 +34992,7 @@ gldf gldg gldj gldji +gldjiu gldjv gldjva ˶ gldk @@ -35171,6 +35331,7 @@ glxd glxdo Ю glxf glxg +glxgi glxh ѧ glxhv glxj @@ -35216,15 +35377,16 @@ glzj glzji glzk glzki +glzkia glzkio glzp glzw glzz glzzi glzzv +gmb gmbc gmbf -gmbi gmbj 㲶 gmbk gmbl 㲥 @@ -35283,6 +35445,7 @@ gmer gmes gmet ˩ gmew ˳ +gmex ٤ gmf gmfb ׶ gmfd @@ -35480,6 +35643,7 @@ gmxyv gmy û gmyb gmyd +gmydi gmye Ұ gmyf gmyfo @@ -35771,6 +35935,7 @@ gpkj gpkq տ gpks տ gpkz տ +gpl gpld gpldi ¶ gpldu @@ -35812,6 +35977,7 @@ gppn gppp gppr gppz +gppzi gpq Ʊ gpqb gpqc @@ -35988,6 +36154,7 @@ gqhl gqhn κ gqhq һ gqhqi һ +gqhqu λ gqht ѻ gqhy Һ gqhz Һ @@ -36046,6 +36213,7 @@ gqph gqpk Ƥ gqpl gqpm Ƭ +gqpmu Ƭ gqpr gqq gqqc @@ -36102,9 +36270,11 @@ gqxc gqxd Ь gqxh Ұ gqxhi ѥ +gqxhu gqxj Ӷ gqxl gqxm ȫ +gqxmv gqxn Ѷ gqxo gqxq Ĵ @@ -36401,6 +36571,8 @@ gsgx gsgy ɫ gsh ٻ gsj ܻ +gsjk ߴ +gsky gsl gslb ˽ gslc @@ -36832,7 +37004,6 @@ gwdy gwdz gwe λ gweb ˭ -gweba ˮ gwee ᳹ʵʩ gweeo ʲô gwef ᴩʼ @@ -36847,8 +37018,7 @@ gwfd gwfdv ΪҪ gwfe gwff -gwfj -gwfjo +gwfj gwfn gwfs gwfsv @@ -36868,8 +37038,7 @@ gwgp gwgq gwgw gwh Ļ -gwhb -gwhba +gwhb gwhd ij gwhe gwht @@ -36966,11 +37135,9 @@ gwyaoo gwyf ֮ gwyi Ժ gwyk -gwyl -gwyli Ժ -gwyliu Ժ +gwyl Ժ +gwyli Ժ gwyo -gwyp gwys ѹ gwyt Բ gwyta Զ @@ -37062,6 +37229,7 @@ gxff gxfh լ gxfj ⸴ gxfji +gxfjo 㸮 gxfk gxfo Ѫ֬ gxfoa @@ -37275,6 +37443,7 @@ gxy gxya ¶Ժ gxyb gxyd +gxydi gxye Ұ gxyf gxyfa @@ -37343,6 +37512,7 @@ gydf gydfv gydg gydh ж +gydhi gydhu õ绰 gydj gydjv @@ -37427,6 +37597,7 @@ gyfm gyfn gyfnv gyfp +gyfpi gyfpu gyfpv gyfpvv @@ -37449,6 +37620,7 @@ gyfz gyg Ӧ gygd gygdu и +gyge gygf gygg gygi й @@ -37472,6 +37644,7 @@ gygy gygyu gygyv gygz +gygzi gyh ҵ gyhb gyhbu @@ -37695,6 +37868,7 @@ gysju gysjv gysk ˾ gysku ˽ +gysl gysw gysx gysy @@ -37702,7 +37876,8 @@ gyt gytb gytd ͷ gytdu Ͷ -gytf ̲ +gytf ̯ +gytfv ̲ gytg ͢ gytj ͼ gytji ͼ @@ -37858,6 +38033,7 @@ gzdko gzdm gzdmi gzdmii +gzdmo ߵ gzdp ߵ gzdq 㶪 gzdr ߵ @@ -37885,7 +38061,6 @@ gzeja gzejv ʱ gzek gzeku ʾ -gzel ˷ gzem ˫ gzen gzep @@ -37905,6 +38080,7 @@ gzfdvi gzfe gzfev ʽ gzff 㷴 +gzffo ߷ gzffv gzfh ի gzfj ߷ @@ -38348,6 +38524,7 @@ hbeki hbekii ʦ hbekio hbel ˵ +hbem βʳ hben hbeni hbenio @@ -38433,8 +38610,7 @@ hbhd hbhe غ hbhea hbhei -hbheiv ᲻ -hbheivi ϲ +hbheiv ϲ hbhf Ӻ hbhfo ں hbhg ٻ @@ -38478,6 +38654,7 @@ hbjciu hbjcv ҽ hbjd hbje س +hbjf Ҳ hbjg ؾ hbjgi ؾ hbjgu վ @@ -38487,7 +38664,6 @@ hbjji hbjk 㼯 hbjki ػ hbjkii Ἧ -hbjkiu hbjkv ݼ hbjl hbjli @@ -38605,6 +38781,7 @@ hbnr hbns hbnt ů hbny Ū +hbnya ŧ hbnyv ũ hbnz hbp ڰƬ @@ -38645,6 +38822,7 @@ hbqx hbqz hbqzo hbr +hbra hbrd hbre hbrev ˵ @@ -38728,6 +38906,7 @@ hbxj hbxk ϴ hbxl hbxm +hbxo Ь hbxq hbxqa ȥ hbxqi @@ -39058,9 +39237,9 @@ hdp hdpc Ʊ hdpg ƺ hdph -hdpj hdpk hdpl +hdplv hdpm Ƭ hdps hdpy ܶ @@ -39132,8 +39311,7 @@ hdwn hdwp hdwpu hdws -hdwt -hdwti ش +hdwt ش hdwtu ܶ hdww hdwx @@ -39433,8 +39611,7 @@ hekx heky ǿ hel hele -heleu -heleuu +heleu helf helg helh @@ -39486,7 +39663,6 @@ henp henr hent ů henw -heny Ū hep Ƭ hepf hepfv Ʋ @@ -39689,6 +39865,7 @@ hezz hfb ܷ hfbf hfbg +hfbgo hfbj Ų hfbjo ֮ hfbk @@ -40070,7 +40247,6 @@ hgdi hgdm hgdp hgds ˹ -hgdx ۵ϵ hgdz hge ع hgeb ˮ @@ -40159,6 +40335,7 @@ hgtj hgtk ۵ hgtl عͷ hgtq عͷȥ +hgtx ۵ϵ hgw hgwg hgww ί @@ -40195,7 +40372,7 @@ hgzf hgzg ع hgzk hgzx ڹ -hhba +hhb hhbb hhbd ڲ hhbf û @@ -40254,6 +40431,7 @@ hhdya hhdz hhdza hhe ӻ +hhea ʯ hheb ˮ hhed hhee ƺ @@ -40271,6 +40449,7 @@ hhep hhepa hher ʣ hheu ܺ +hhew hhez hhf غ hhfd @@ -40382,6 +40561,7 @@ hhlh hhlj · hhlja ½ hhlk +hhlka hhll hhlla ¿ hhlli @@ -40628,6 +40808,7 @@ hjdm hjdq س hjds hjdt +hjdu ܳ hjdw hjdy hjdz @@ -40640,10 +40821,13 @@ hjedv hjee hjef hjej +hjeja óʱ +hjeju ܳʱ hjejv ƽʱ hjek ʿ hjeka hjeki ʳ +hjeko hjeku hjekuu hjekv @@ -40717,7 +40901,6 @@ hjgy hjgyi hjgz hjh üһ -hjha üһ hjhb hjhd hjhe @@ -40791,6 +40974,7 @@ hjlb hjlc hjld ½ս hjle +hjleu hjlf hjlg hjlh @@ -40829,6 +41013,7 @@ hjmm hjmn hjmr hjms +hjmsi hjmw hjmy ܾû hjmz è @@ -40986,6 +41171,7 @@ hjyfo hjyg Ӧ hjyh ܾԺ hjyi Ժ +hjyj ܳһʱ hjyk hjyl hjyli ĽҰ @@ -41035,6 +41221,7 @@ hkf hkg hkgs չ˾ hkh Ͽں +hkhi hkhl hkht պ hkj ڿƼ @@ -41134,10 +41321,12 @@ hlel hlen hlep hler ʤ +hleu ʽ hlew hlez hlf ׷ hlfa ˷ +hlfc ֮ hlfd hlfdo hlfe @@ -41157,6 +41346,7 @@ hlfw hlfy hlfyo hlg +hlga ֹ hlgb hlgg hlgh @@ -41190,7 +41380,6 @@ hlhqa hlhqi ȥ hlhqo hlhqov ȥ -hlhqovo ȥ hlhr hlht hlhto Ϳ @@ -41216,7 +41405,8 @@ hljj hljja hljk hljka -hljko +hljko +hljkoa hljl hljm hljma @@ -41284,6 +41474,7 @@ hlnk hlnm hlnq ţ hlnr +hlny Ū hlp hlpb Ʒ hlpc Ʊ @@ -41799,7 +41990,6 @@ hnfx hnfy hnfz hng Ǹ -hnga hngb ܹ hngd ܹ hngf ܸ @@ -41997,10 +42187,12 @@ hpbf hpbl hpbu ձ hpbw +hpbwu б hpce hpch hpck д hpdj +hpdm hpdp е hpds hpdt @@ -42053,6 +42245,7 @@ hpl hplc hpld hplj · +hpll hplu Ư hpm ƽ hpmj ĸ @@ -42138,7 +42331,8 @@ hqbz hqbzi hqce hqcf -hqch +hqch +hqchi hqcj hqck hqckv @@ -42169,7 +42363,6 @@ hqdr hqdri hqds hqdt -hqdu ܳ hqdy hqdyi hqdyiv 䶾Ҳ @@ -42185,14 +42378,13 @@ hqebv hqebvv ʱ hqec hqed ǹʵ +hqedv hqee hqeev ˵ hqef ɽ hqej -hqeja óʱ -hqejau +hqeja hqejo -hqeju ܳʱ hqek ʯ hqeka ʯ hqeki @@ -42254,6 +42446,7 @@ hqfy hqfyo hqfyv hqfz +hqfzi hqg hqga hqgb @@ -42342,7 +42535,7 @@ hqjt hqju hqjw hqjx -hqjz +hqjxi hqkb hqkd hqke @@ -42380,7 +42573,8 @@ hqlmi hqlo hqlp hqlpv Ƥ -hqlq +hqlq +hqlqi hqls hqlw hqlwa @@ -42408,9 +42602,9 @@ hqmy hqmz è hqn hqnc -hqne hqnf hqnk +hqnki hqnm hqnr hqns @@ -42419,6 +42613,7 @@ hqny hqnyi ũ hqp hqpb Ʒ +hqpc ư hqpf hqpg ƿ hqpgi @@ -42460,6 +42655,7 @@ hqqtvo hqqx ǻ hqqxi ǿ hqqz +hqqzi hqrb hqre hqrf Ȼ @@ -42515,7 +42711,6 @@ hqww hqwwi Ϊ hqwwv Ϊ hqwy -hqwz hqx hqxb hqxc @@ -42562,8 +42757,8 @@ hqye hqyf hqyfi hqyg Ӣ -hqyh Լ -hqyj ܳһʱ +hqyh Լ +hqyhi Լ hqyk hqyka hqyki @@ -42681,7 +42876,7 @@ hrjs hrjsv hrjw 㴺 hrjx Ὥ -hrka ˿ +hrk ˿ hrkd hrke hrkf ῴ @@ -42799,7 +42994,7 @@ hsdh hsdk hsds hse ʽ -hsfj +hsfj hsfl hsft ɫ֮ͽ hsfw @@ -42834,6 +43029,7 @@ hspk hspko Ƥ hsq hsqj ɨǧ +hsqk hsqm Ƿ hsr hss ɫ @@ -43163,16 +43359,18 @@ htylo htyp htypv htys +htysi ɫ htyt ԭ htyti Ԫ htytia Դ htytv Ը +htyu htyw ͨ htyy htyz ҩ htz ̫ htzb -htzev +htze htzk htzl htzli @@ -43325,6 +43523,7 @@ hwjd hwje ڳ hwjea 鳵 hwjev 공 +hwjf ڲ hwjg ھ hwjgi ھ hwjh @@ -43556,6 +43755,7 @@ hwyya hwyyo hwyyov Թ hwyz Ҥ +hwz hwzb hwzh hwzk @@ -43695,7 +43895,7 @@ hxhxa hxhxao ðð hxhxo ̻ hxhy ĺ -hxhyao ѧ +hxhya ѧ hxj ij hxjb ƽ hxjbi ձ @@ -43931,6 +44131,7 @@ hxys hxyt ԭ hxyu Ҫ hxyuv ѩ +hxyv С hxyw hxywi ѧҩ hxyx һЦ @@ -43968,6 +44169,7 @@ hycb hycbu ΰ hyce hych +hyci Ҭ hycr hycz ݦ hyd е @@ -44150,6 +44352,7 @@ hymm hymn hymr hyms +hymv hymw ÷ hymy û hymz ë @@ -44359,7 +44562,7 @@ hzdja hzdjaa ö hzdjav ö hzdjo -hzdk õ +hzdk õ hzdka õ hzdl ö hzdm õ @@ -44390,7 +44593,7 @@ hzej hzek hzeka ʹ hzekao ʫ -hzekou ʸ +hzeko ʸ hzekv ʱ hzel ˵ hzem ˬ @@ -44419,6 +44622,7 @@ hzfm hzfn hzfp hzfs +hzfsa ÷ hzft ת hzfw ķ hzfwu Ϊ @@ -44716,6 +44920,7 @@ hzy hzyb hzyd hzydv +hzye Ү hzyf hzyfo hzyg Ӳ @@ -44820,7 +45025,6 @@ jbdov jbdp jbdpi jbdr -jbdri jbds jbdt jbdtu @@ -44830,6 +45034,7 @@ jbdvv jbdw jbdwv λ jbdy +jbdyv jbdz jbdza jbdzi @@ -45050,8 +45255,9 @@ jbjl jbjla jbjli jbjlu -jbjm -jbjmv +jbjm +jbjmi +jbjmv jbjn jbjo jbjoo 粢 @@ -45222,6 +45428,7 @@ jbqo jbqov Dzס jbqovv Dz jbqp +jbqpv jbqq jbqqa ס jbqqi @@ -45431,6 +45638,7 @@ jcbx jcbz jcc Ӳ jccb +jcce У jccf в jcch ̲ jcchu Ų @@ -45525,6 +45733,7 @@ jcfl jcflu jcfm ׯ jcfn Ƿ +jcfni jcfp jcfq צ jcfr @@ -45539,6 +45748,7 @@ jcfwo jcfx ׯ jcfy jcfz گ +jcfzu צ jcg ع jcgb jcgbo @@ -45695,6 +45905,7 @@ jclwu jclx jcly jclz +jclzu jcmb jcmc jcmd @@ -45721,6 +45932,7 @@ jcns jcnso jcnw jcnx +jcnxu jcny ũ jcnz jcpc Ʊ @@ -45774,6 +45986,7 @@ jcqw У׼ jcqx ǿ jcqy jcqz گ +jcqzu צ jcr jcrd jcrda @@ -45842,6 +46055,7 @@ jcwf jcwg Ҳ jcwh jcwj +jcwjo jcwk dz jcwl jcwlu @@ -45868,7 +46082,6 @@ jcxco jcxd е jcxdo ж jcxdu Ь -jcxe jcxf ̰ jcxg jcxga @@ -45965,9 +46178,11 @@ jdbp jdbpi Ұ jdbs jdbsu ְ -jdbv ̲ +jdbv +jdbvu ̲ jdbw 䱸 jdbwi +jdbwiv 籮 jdbx 𶫲 jdby ᶨ jdbya @@ -45995,8 +46210,7 @@ jddau jddb jddc jddci -jddd 綼 -jdddv +jddd jdde jddea jddeu @@ -46011,6 +46225,7 @@ jddhv jddi jddj jddji +jddjiu 綼 jddju ⶾ jddjv 䶾 jddjva @@ -46234,6 +46449,7 @@ jdjqv jdjr ߳ jdjra jdjrai +jdjrau ׳ jdjs ڼ jdjsa jdjsi Ӽ @@ -46587,6 +46803,7 @@ jdzh jdzk jdzl jdzr е +jdzs jdzy jeb ± jeba ˮ @@ -46618,6 +46835,7 @@ jebx jeby Ժ jebz ² jec +jeca ʻ jecf Ƹ jeck jecl @@ -46725,6 +46943,7 @@ jegr jegt jegu ʮ jegw ظλ +jegwo ¹ jegx jegy jegya @@ -46794,12 +47013,12 @@ jejuuv jejw jejx jejy ˮԨ +jek jekd jekdu ֿɵ jeke jekf jekh -jeki jekj jekju ֿɼ jekm @@ -46982,10 +47201,10 @@ jexb jexc jexci jexcv ijն +jexcvi jexd ж jexf jexg -jexh jexi jexj jexl ʱ @@ -47025,6 +47244,7 @@ jeyt jeyu jeyuo ʱ jeyuv ʿ +jeyv jeyw Ϊ jeyx ϰ jeyy @@ -47242,6 +47462,7 @@ jfr jfrb ձ jfre ʥ jfrj +jfrjo jfrl jfrq jfrqu ֹ @@ -47320,6 +47541,7 @@ jfyii jfyk jfyl jfyli ¶ +jfylo jfyo jfyov ְ jfyp @@ -47857,6 +48079,7 @@ jgxi jgxj jgxk ϲ jgxko ϸ +jgxkv Ϣ jgxm jgxma jgxmai @@ -47926,6 +48149,7 @@ jgz jgzd jgzh jgzj +jgzjo jgzk jgzko jgzku @@ -48149,6 +48373,7 @@ jhqp jhqpa jhqr ֢ jhqt Ȯ +jhqv jhqx ǽ jhqy jhqyv @@ -48322,6 +48547,7 @@ jjdgv jjdh jjdi ׼ jjdj +jjdja jjdk jjdl 𼦶 jjdli ɵ· @@ -48625,8 +48851,7 @@ jjla jjlao ¼ jjld jjlda ֵ -jjldo ¶ -jjldou ҳ +jjldo ҳ jjle jjlea jjlf @@ -48636,6 +48861,7 @@ jjlho jjlhv jjlj · jjlja ¯ +jjljo ¶ jjlk jjlka jjlku @@ -48794,6 +49020,7 @@ jjt jjta jjtb jjtc +jjtca jjtd ͷ jjtdi ͷ jjtdu ƶ @@ -48881,7 +49108,8 @@ jjxii jjxj jjxja ѧ jjxjo ƽ -jjxju ½ +jjxju +jjxjua ½ jjxk Ϣ jjxka ϯ jjxkaa Ϸ @@ -48891,6 +49119,7 @@ jjxl jjxlu jjxm jjxma +jjxmaa jjxmo jjxq jjxs @@ -49029,6 +49258,7 @@ jkcw jkcwu jkcy jkcz +jkczv jkd Ŀ jkdb jkdbu @@ -49048,10 +49278,9 @@ jkdfv jkdg ȶ jkdga jkdgv -jkdh ϵ +jkdh jkdha ؽ -jkdhu -jkdhui +jkdhu jkdhuu jkdhv jkdj @@ -49106,6 +49335,7 @@ jkdzv jke Ϳʼ jkea jkeb ˮ +jkeba ˮ jkebo ˰ jked jkedo @@ -49177,6 +49407,7 @@ jkffv jkfj jkfja ̸ jkfjai ׿ +jkfjai jkfju jkfjuo jkfjv @@ -49293,6 +49524,7 @@ jkhwv jkhx jkhz Ǻ jkhzu +jkhzua ϵ jkhzv jkjb jkjba @@ -49596,6 +49828,7 @@ jkqtv jkqu Ǯ jkqw ׼ jkqwi Ⱥ +jkqwu Ⱥ jkqwv Ⱥ jkqx ǹ jkqxv ǿ @@ -49642,7 +49875,6 @@ jkski jksku jkskua ˾ jksl -jksp jkst jkstu jksy @@ -49814,6 +50046,7 @@ jkykva jkyl jkyla jkylav +jkylav jkyli jkyliu jkylo @@ -49829,10 +50062,10 @@ jkyp jkypa jkypao jkypo -jkys ѹ +jkys ѹ jkysa Ѽ -jkysi ѹ -jkysii Ѻ +jkysi Ѻ +jkysu ѹ jkyt Ե jkyta Ժ jkytav Ԫ @@ -49863,6 +50096,7 @@ jkzk jkzki jkzkia jkzl +jkzlo jkzlu jkzlv jkzlvo @@ -49959,8 +50193,8 @@ jles jlev jlex ˬ jlf ÷ -jlfd -jlfdo է +jlfd է +jlfdv jlfe jlfeo ֮ʳ jlff ٷ @@ -49985,10 +50219,9 @@ jlfsu jlfu jlfx Щ jlfy -jlfya +jlfya jlfyai -jlfyau -jlfyauo +jlfyau jlfyo jlfyu jlfyv @@ -50259,6 +50492,7 @@ jlyko jlykv jlyl jlyla +jlyli jlym jlyp jlys Ѻ @@ -50562,6 +50796,7 @@ jmjlo jmjloi jmjlv jmjm +jmjma dzdz jmjmi jmjmii jmjn 鳼 @@ -50612,7 +50847,7 @@ jmldi jmldiv jmldv © jmle -jmlfa +jmlf jmlg jmlh jmlhi @@ -50654,6 +50889,7 @@ jmml jmmla Ĭ jmmm jmmmo +jmmmv jmmn jmms jmmw @@ -50944,12 +51180,12 @@ jncp jncw ´ jncz jnd ô -jndd jnde ĵ jndg jndi ܵ jndj jndji +jndjiu jndk jndm jndmo ĵ @@ -50963,7 +51199,6 @@ jnef jnej jnek jneka -jneku jnekv jnel ˵ jnem ˪ @@ -51070,7 +51305,6 @@ jnlu jnlv jnlw jnlwa -jnlx jnly jnlya jnlyu @@ -51197,7 +51431,6 @@ jnzi jnziu jnzk jnzl -jnzlu jnzs jnzu Ů jnzv ŵ @@ -51232,7 +51465,6 @@ jpd jpdb jpdc jpdd -jpddo jpde jpdei jpdeo @@ -51240,7 +51472,9 @@ jpdf jpdg jpdh jpdj +jpdjo jpdk +jpdku jpdl ƪ jpdr jpds @@ -51388,7 +51622,7 @@ jpl jpla jplb jplc -jpldu ƪ +jpld ƪ jple jpleu jplf @@ -51432,8 +51666,7 @@ jpmp jpms jpmz ë jpmzu ì -jpnf -jpnfo +jpnf jpng jpnl jpnm @@ -51512,6 +51745,7 @@ jptgu jptgua ͡ jpth ̬ jptj ; +jptju ͼ jptm jptp jpty ͨ @@ -51603,6 +51837,7 @@ jpyv jpyw jpyy jpyz Ҫ +jpyzu jpz jpzb jpzd @@ -51655,6 +51890,7 @@ jqcl jqcla jqco ߴ jqcr Ų +jqcro jqcw ô jqd ס jqda @@ -51968,6 +52204,7 @@ jqqk jqqka jqqko jqqkov +jqqku jqqkv jqql ȥ jqqli @@ -52038,6 +52275,7 @@ jqw jqwd ɳ jqwe ɳ jqwf +jqwi ׿dz jqwj jqwk ͳ jqwku ų @@ -52085,7 +52323,7 @@ jqxki jqxl jqxm jqxn ɶ -jqxo Щ +jqxo ǿ jqxou jqxov ȷ jqxs @@ -52155,7 +52393,6 @@ jqzli jqzlo jqzlu jqzr -jqzro jqzx jqzy jqzz @@ -52226,6 +52463,7 @@ jrek jreko ʵ jreku ʽ jrekui +jrekuo jrekv jrem jremv ˫ @@ -52372,6 +52610,7 @@ jrlq jrlu jrlx jrlxo +jrlxu jrly jrlz jrm @@ -52505,7 +52744,6 @@ jrxfv jrxg jrxgv jrxgvo -jrxh Ͱ jrxi ѧ jrxk Ϯ jrxkv @@ -52533,6 +52771,7 @@ jryf jryg Ӧ jryk jryku +jrykui Ͱ jrykuv jrykv jryl @@ -52553,8 +52792,8 @@ jrzh jrzhv jrzj jrzjv -jrzk -jrzkv +jrzk +jrzkv jrzl jrzlu jrzu @@ -52653,6 +52892,7 @@ jsen jseo jsep jser +jseri jses jsez jsf @@ -52693,6 +52933,7 @@ jsfxo jsfxoo ׯ jsfy jsfya +jsfyai jsfyi jsfz jsg @@ -52748,6 +52989,7 @@ jsje jsjea ݳ jsjf Ҳ jsjg Ҿ +jsjga Ӿ jsjgv ξ jsji jsjj @@ -52761,6 +53003,7 @@ jsjlo jsjlou jsjlv о jsjm Ӽ +jsjmi ׼ jsjn ҳ jsjp ҳ jsjpa ӳ @@ -52804,6 +53047,7 @@ jslk jslka jslki jslm +jslq jsls jslw jslwi @@ -52875,6 +53119,7 @@ jsql jsqm Ǯ jsqma Ǯ jsqmi Ǯ +jsqmv ǯ jsqn jsqp ҳ jsqq @@ -52930,6 +53175,7 @@ jswji jswjiu δ jswk ӳ jswm Ӵ +jswmi ״ jswn jswp jswr @@ -52939,6 +53185,7 @@ jswti jsww λ jswwa Ϊ jswx Ӵ +jswxi ״ jswy ٳ jswyi ׳ jswz ٳ @@ -53052,6 +53299,7 @@ jtdy jte ͷ jteb ˰ jted ̤ʵ +jtedo jtee jteg ͨ¹ jteh ͥ @@ -53289,13 +53537,14 @@ jwcp jwcz jwd γ jwdb -jwdd -jwddi ֵ +jwdd ֵ +jwddu ׵ jwde jwdea jwdf jwdg jwdj +jwdjv jwdk jwdm Ŵ jwdo @@ -53476,6 +53725,7 @@ jwjya jwjyi Ϊ jwjz jwk +jwkb jwkd jwke jwkf @@ -53607,7 +53857,7 @@ jwsw jwsz ɩ jwszi ԭ jwt -jwtaio ΰͥ +jwta ΰͥ jwtc jwtcv ͼ jwtd ͷ @@ -53683,6 +53933,7 @@ jwxxo jwxy jwxyv jwy Ա +jwya γ jwyb jwyba jwybv ӡ @@ -53747,6 +53998,7 @@ jxbmi jxbq Ͳ jxbs jxbv ް +jxbvo ı jxbvv е jxbw jxbwa @@ -53896,7 +54148,7 @@ jxhxi jxhy 筺 jxhyo ӳ jxhz -jxhzao +jxhza jxj jxja С jxjb @@ -54110,6 +54362,7 @@ jxwz jxx jxxb jxxba +jxxbai н jxxc У jxxd Ÿ jxxda б @@ -54371,6 +54624,7 @@ jyt jytb ͻ jytf jyth ̬ +jytk ͷ jytt Ө͸ jytu jytv Ծͤ @@ -54436,6 +54690,7 @@ jzbs jzbw jzbx 겻 jzbz +jzbzv jzc ڴ jzce jzch @@ -54521,7 +54776,6 @@ jzg jzga ӹ jzgb jzgd -jzge jzgf jzgj jzgl @@ -54679,6 +54933,7 @@ jzre jzrea jzrf Ȼ jzrk +jzrm jzrn jzrna jzrp @@ -55438,7 +55693,6 @@ kep kepc Ʊ kepf kepg ƾ -keph kepj kepl kepr @@ -55463,6 +55717,7 @@ keql keqlv ȥ keqm ǰ keqn +keqo ˮս keqp Ƴ keqpo keqq @@ -55619,6 +55874,7 @@ kfbl kfbm kfbn kfbo ȱ +kfboo װ kfbq Ʋס kfbqo ڸdz kfbs @@ -55942,6 +56198,7 @@ kgjf kgjg 龥 kgjj kgjk +kgjki kgjm kgjp 쳩 kgjr @@ -56178,6 +56435,7 @@ khjt khjw khjx khjxv +khjxva khjy khjz khk 亣 @@ -56328,6 +56586,7 @@ khyfv khyg Ӫ khyh Խ khyk +khyo ҵ khyp khyt Դ khytv Ԫ @@ -56639,7 +56898,6 @@ kjzz kkb kkbb Ŀİ kkbbv ĿİͰ -kkcc kkd ڵ kkdd տյ kke ˭ @@ -56667,10 +56925,12 @@ kkqq kkqt ̸ kkry տҲ kkt +kkth ɿк kktt ޿ kkw 쳵 kkwp տƾ kkww ӿ +kkwwo kkx ɿ kkxb kkxq ధ @@ -56933,6 +57193,7 @@ kmww kmwwv kmwx kmwz +kmx kmxc Ц kmxd к kmxh ѧ @@ -57003,7 +57264,7 @@ knq knqd knqe knqg -knqgio +knqgi knql knqq knr ţ @@ -57071,6 +57332,7 @@ kphb kphe kphf kphfi +kphi Ƭ kphj ƺ쳾 kphl kphr @@ -57152,6 +57414,7 @@ kpy kpyd kpye ƪʼ kpyf +kpyfi kpyg Ӣ kpyk kpyl @@ -57243,6 +57506,7 @@ kqqp kqqx ǹ kqr kqrj +kqrn kqs ɫ kqsk ˾ kqt @@ -57264,6 +57528,7 @@ kqyh kqyho kqyl kqyli +kqyo ȫ kqyt Ժ kqyz ҫ kqzb @@ -57327,7 +57592,6 @@ ksbsi ksbw ksbz ksck -kscs kscz ksdh ksds @@ -57382,6 +57646,7 @@ ksny kspf ksph kspm Ƭ +ksps ksq ksqj ס ksqk @@ -57405,8 +57670,10 @@ kswi kswk kswki ksws +kswso ksww λ ksx +ksxd Ѫ ksxj ksxk ksxn @@ -57418,7 +57685,6 @@ kszh kszj kszji kszk -kszki kszl kszq ktb ͨ @@ -57471,18 +57737,19 @@ ktjb ktjd ktjk  ktjko -ktjl ̫ +ktjl +ktjlo ̫ ktjm ktjo յ ktjp ktjq ؽȡ ktjr ktjs +ktk ȿ ktkd ktkf  ktkl ktkm -ktko ȿ ktkt ktkx ktl ͨ @@ -57582,8 +57849,8 @@ kwhj kwhl kwj kwjb -kwjc kwjg +kwjh kwjj kwjl kwjlo @@ -57844,6 +58111,7 @@ kxwm kxwn kxwp kxwt +kxwv kxww Ϊ kxwwv kxwx @@ -57869,7 +58137,6 @@ kxyev kxyf kxyj ѧо kxyl ڿ -kxyo ҵ kxyw kxyy kxyz ҧ @@ -57893,6 +58160,7 @@ kybm kybmv Ա kybq kybs հ +kybw ձ kybz ձ kyc Դ kyce ղ @@ -57909,6 +58177,7 @@ kydhv kydk յ kydl ն kydm յ +kydmo յ kydo kydp յ kydpo յ @@ -57919,7 +58188,6 @@ kydt kydv ƶ kydy ն kydya ׶ -kydyi kydz ׵ kydzo յ kye ˵ @@ -58007,6 +58275,7 @@ kyjp kyjpi س kyjq վ kyjr ճ +kyjro ճ kyjs ؼ kyjsa ׼ kyjso ռ @@ -58112,6 +58381,7 @@ kytg kytj ͼ kytk kyty Ͱ +kytyi kyw ҹ kywe ճ kywf @@ -58160,6 +58430,7 @@ kyye kyyf kyyfi kyyg Ӱ +kyyi һ kyyj Ԥ kyyl kyylo @@ -58197,6 +58468,7 @@ kzdm kzdmu kzdp kzds +kzdt kzdz kze kzeb ˮ @@ -58338,7 +58610,8 @@ lbbc lbbd ٱ lbbg ܲ lbbh ְ -lbbi +lbbi 0404 +lbbio lbbj lbbk ֱ lbbku DZ @@ -58366,6 +58639,7 @@ lbdl lbdm ֵ lbdo 䲻 lbdov +lbdov lbds ִ lbdsv մ lbdv ֲ @@ -58623,6 +58897,7 @@ lcdev lcdf ϵ lcdg ϶ lcdk ̵ +lcdp ˵ lcds ɴ lcdt ˶ lcdy ɶ @@ -58999,7 +59274,7 @@ ldqn ldqna © ldqp ldqpv ¥ -ldqqa © +ldqq © ldqr © ldqt Ȯ ldqv @@ -59147,7 +59422,6 @@ lede ledf ʦ ledj ֶ ledm ˵ -ledp ˵ ledx С ledy ֶ ledyv ֶҪӲ @@ -59164,8 +59438,7 @@ leekuv leem ʷʹ leeo ʫʫ leeq ʷʱ -lees ɳ -leesu ʦ +lees ʦ leeu ʵ˵ leeui ɽ leeuu ʺ @@ -59188,7 +59461,6 @@ legl leglu ֹ legt ֹ legv ʷ -legy ֹ legz ָ leh » lehe ֺ @@ -59199,7 +59471,6 @@ lehu lehui ʦ lehz ߻ lej ɼ -lejb ս lejd ʷ׶ lejh ʷ lejhu ߲ @@ -59250,7 +59521,6 @@ leqa leqaa ˮ leqe leqea ˮ -leqg leqj ס leql Ȥ leqm ʷ֤ @@ -59275,7 +59545,6 @@ leskv lesl leso ʮ let -letg ͤ letj letjv ʷ letm @@ -59348,6 +59617,7 @@ lfcw lfcz lfd lfdc õ +lfdci lfde lfdei lfdf @@ -59508,7 +59778,6 @@ lfqx lfr ϸ lfrd lfrj -lfrl lfrn lfse ɫ lfsf ɢ @@ -59518,7 +59787,6 @@ lfsl lfsw ݥ lft lftc -lftci lftd ͷ lftdo lftf ̳ @@ -59680,7 +59948,6 @@ lgjci lgjd lgjdv lgje 鳵 -lgjg ⾵ lgjk lgjka lgjkv 㼸 @@ -59702,7 +59969,6 @@ lgjz lgk lgkd lgke -lgkf ⿲ lgkg lgkh lgks 쿨 @@ -60030,6 +60296,7 @@ lhjrv lhjs Լ lhjsv lhju Ϻ +lhjui ϻ lhjw lhjx lhjxi Խ @@ -60111,6 +60378,7 @@ lhqt lhqv lhqva lhqvi 㻨Ǯ +lhqw lhqx lhqy lhqz @@ -60297,11 +60565,10 @@ ljfs ¯ ljfw · ljfwo · ljfy · -ljg +ljg ۳ɹ ljgb · ljgf « ljgh ­ -ljgi ۳ɹ ljgj ¶ ljgji ­ ljgl · @@ -60328,6 +60595,7 @@ ljhqi « ljhqu ³ ljhu ϼһ ljhv 仰 +ljhvo ljhw · ljhy ® ljhz ½ @@ -60399,11 +60667,11 @@ ljmj ljmjv ¶ ljmk ³ ljml ½ĩ +ljmla ¾û ljmm · ljmmi ± ljmn ¯ ljmp ³ç -ljmw ¾û ljmx ljmz ߣè ljn ϴŮ @@ -60441,6 +60709,7 @@ ljqm ¯ǰ ljqo ljqp · ljqr · +ljqs · ljqt »Ȱ ljqu ϳ ljqw ¹Ⱥ @@ -60448,8 +60717,8 @@ ljqx ­ǻ ljqy ljr ljra ̾ -ljrd ¹ -ljrdi ± +ljrd ± +ljrdo ¹ ljrf 䳰ȷ ljri ljrj ¼ @@ -60529,7 +60798,7 @@ ljyj ljyk · ljyl ljylo · -ljylua ³ԥ +ljylu ³ԥ ljyo ljyp ljyt ·Զ @@ -60581,8 +60850,7 @@ lkcw lkd ￴ lkdb lkdc -lkdd -lkddo +lkdd lkde lkdeo lkdeou @@ -60591,6 +60859,7 @@ lkdg lkdh lkdj lkdjo +lkdjv lkdk lkdki lkdko @@ -60742,7 +61011,7 @@ lkjwu lkjx lkjxa 콭 lkjz -lkk Ͽ +lkk ɿ lkkb lkkbv lkkd @@ -60758,7 +61027,6 @@ lkl lklb ݰ lklc lkle -lkleo lklf Ŀķ lklfu ҿķ lklg @@ -60910,6 +61178,7 @@ lktt lktw lktz lkw +lkwb lkwd lkwe lkwf @@ -60984,6 +61253,7 @@ lkyg lkygv Ӱ lkyh Լ lkyhi Լ +lkyho lkyk lkyko lkykoa @@ -61052,6 +61322,7 @@ llbw llcc ʲݲ llcf IJ llck Ŵ +llcko llcp ɲ llcy ̴ llcz ̲ @@ -61180,6 +61451,7 @@ llhm llhq ̻ llhqi 仨 llhqu Ȼ +llhv llhx llj lljb @@ -61289,6 +61561,7 @@ llp llpf llpfa llpg +llph llpk Ƥ llpl llpz @@ -61358,7 +61631,6 @@ llttv lltx ϵ lltxa ͬ lltxai -llty ͬ llw llwd ߲嵶 llwda ޳ @@ -61414,6 +61686,7 @@ llyb llyba llyd llyda +llydo llye Ҷ llyea Ҷ llyei ҵ @@ -61485,6 +61758,7 @@ lmdfo lmdg lmdgi ۹ lmdh +lmdi ķ lmdj lmdja lmdk ٿ @@ -61595,13 +61869,13 @@ lmje lmjev lmjf lmjg -lmjh lmjj lmjk lmjka lmjkv lmjl lmjm +lmjo ķ lmjp lmjq lmjr @@ -61662,6 +61936,7 @@ lmmw lmmwi ù lmn Ů lmnf +lmnh lmnk lmnm lmns @@ -61955,7 +62230,6 @@ lpwx lpwy dz lpwz ˳ lpxb -lpxd а lpxh Ѩ lpxj 辶 lpxk Ϫ @@ -61971,6 +62245,7 @@ lpyk lpyl lpys lpysv +lpysvv а lpyt ԰ lpyy lpz @@ -62317,7 +62592,6 @@ lqxb lqxc У lqxd к lqxe -lqxf lqxg lqxga lqxh ѧ @@ -62435,8 +62709,7 @@ lrhw lrj ˼ lrjb lrjc -lrjf -lrjfo ·˽֪ +lrjf ·˽֪ lrjg 侲 lrjgv ⾵ lrjk @@ -62448,6 +62721,7 @@ lrjx lrjy ˾ lrjz 䳰 lrkf ܨ +lrkfv ⿲ lrkj lrkjo lrl @@ -62475,6 +62749,7 @@ lrpk lrqd ٤ lrqe lrqf ս +lrqfo lrqg lrqh ȴ lrqj ס @@ -62566,6 +62841,7 @@ lsdy lsdz lsdzi lse +lsea ʯ lsed lsedo lsee ¹˭ @@ -62657,7 +62933,7 @@ lslx lsly £ lsm ˿ĸ lsmc -lsmeo ô +lsme ô lsmf lsmk lsml ģ @@ -62676,6 +62952,7 @@ lsp lspc Ʊ lspg ƽ lspk Ƥ +lspu ɫ lsq ǰ lsqe lsqj @@ -62717,6 +62994,7 @@ lswm lswp lsws ˹ά˹ lsww ζ +lswwu ζ lswx lswy lsx п @@ -62732,6 +63010,7 @@ lsy lsyd Ӧ lsyf lsyh +lsyl lsyp lsyv lsyw @@ -62961,6 +63240,7 @@ lttb lttc lttd Ͷ lttdu +lttf ҵ lttg ͣ ltth ̧ lttj Ϳ @@ -63032,6 +63312,7 @@ ltzh ltzi ltzj ltzk +ltzku ltzl ltzp ltzs @@ -63142,7 +63423,7 @@ lwhe lwhg ۻ lwhh ׺ lwhj ޺ۼ -lwhja +lwhjo lwhk Ļ lwhl ۻ lwhn @@ -63404,17 +63685,20 @@ lxdt lxdtv lxdv ϵ lxdw +lxdwo lxdy lxdz lxe lxeb ˮ lxed +lxee lxef ɽ lxefo ɽ lxefv lxeh ɹ lxei ˮ lxej +lxejo lxejv ϵʵ lxek ʳ lxeko ʦ @@ -63717,7 +64001,6 @@ lxtmoi lxto ·ͼ lxtp lxtv -lxtw lxty Ͳ lxtyv Ͱ lxtz @@ -63834,11 +64117,11 @@ lycyv lyd Զ lyda ¼ lydao ¼Ӱ -lydd lyde lydf lydg lydgo ·ж +lydj lydr lyds lydt ¢ @@ -63871,9 +64154,8 @@ lyfm lyfo һ lyfoo lyfp ÷ -lyfq צ -lyfqa ְȨ -lyfqao ֹ +lyfq ְȨ +lyfqa ֹ lyfr lyfv һ lyfw @@ -63882,6 +64164,7 @@ lyfya lyfyu lyfz lyfzo ֮ +lyfzv צ lyg һ lygd lygdo һǶ @@ -64011,6 +64294,7 @@ lytm ¡ lytmu lyto lytp +lytpv Ū lytr lytu һ lytua @@ -64029,7 +64313,7 @@ lywp lyws lywt ¤ lywx -lyx һЩ +lyx һЩ lyxb о lyxd lyxe ʽ @@ -64044,8 +64328,7 @@ lyxko lyxl lyxlo · lyxn ¡ -lyxo һЩ -lyxoa Ь +lyxo Ь lyxou lyxr һЩ lyxs Ϻ @@ -64208,7 +64491,7 @@ lzgr lzgru Ϲ lzgt Ϲ lzgu ʸ -lzgwu Ϲ +lzgw Ϲ lzgx Ϲ lzgy Ϲ lzgyi ͹ @@ -64369,6 +64652,7 @@ lztd lztdo lztdu ͷ lztg +lztgu ͤ lzth ̫ lzthu ̬ lztj @@ -64546,8 +64830,9 @@ mbl mbla mble mblk ° -mblo ¥ -mblou +mblo +mblu ë +mblv ľ mbm ææ mbmb mbmd @@ -64855,11 +65140,11 @@ mdmda IJIJ mdmdo mdmdoo mdmdv +mdml û mdmm ı mdmn mdmr mdms -mdmw û mdmx ûûС mdnf ij mdnl ijŮ @@ -65291,7 +65576,6 @@ mgch mgck mgcku mgd -mgdd mgde mgdeo mgdf @@ -65302,6 +65586,7 @@ mgdh mgdi þ mgdj mgdja û +mgdjo mgdk mgdm mgdo @@ -65636,6 +65921,7 @@ mhdkv mhdl mhdm mhdma +mhdmv mhdo mhdr mhds @@ -65926,6 +66212,7 @@ mjfb ľ׵ mjfd mjff ĸ mjfj Ļ +mjfju mjfk Ĵָ mjfki Ĺ־ mjfkv ľ @@ -65974,6 +66261,7 @@ mjhq ļ mjhr ľ mjhro mjhu ÿ仰 +mjhv ģ mjj Ҿ mjjb ĸ mjjc ĸ @@ -66351,7 +66639,7 @@ mkqk mkqki mkql ȡ mkqn -mkqpo +mkqp mkqq mkqz mkrf Ȼ @@ -66389,6 +66677,7 @@ mkwf mkwj mkwk ׳ mkwn +mkwno mkwp mkwt ش mkww λ @@ -66401,8 +66690,7 @@ mkxdv ÷ mkxf ԰ mkxg mkxh Ѩ -mkxj ն -mkxjo ׶ +mkxj ׶ mkxk ϡ mkxm mkxq @@ -66507,6 +66795,7 @@ mledoi ħ mlee ˫ mlef ħ mlej ħ +mleji Ī mlejv ģ mlek ģʽ mleka Į @@ -66601,7 +66890,7 @@ mljji Ĩ mljk ī mljki ī mljkiu Ī -mljkoo ĥߴ +mljko ĥߴ mljl Ĭ mljm ħ mljmo ĥ @@ -66693,13 +66982,13 @@ mlpk ĤƤ mlpko ĥƤ mlpl ĥ mlpm ģƬ +mlpmi ĨƬ mlpmu ĤƬ mlq mlqe mlqeu ʷ mlqg mlqj ī -mlqji Ī mlqjv ÷ mlqk Ĭ mlqki Ĩ @@ -66748,6 +67037,7 @@ mlsko Ħ˹ mlskoa Ħ˿ mlsl mlslo Ħ +mlsp Īɣ mlst Ĭ mlsv mlsw ĥ @@ -66771,6 +67061,7 @@ mltyu ë mlw ά mlwd Ī mlwf Ħ +mlwfv ģ mlwj ħ mlwja Į mlwk û @@ -66783,8 +67074,8 @@ mlwv mlww ĩβ mlwwv ĩλ mlwx ĥ -mlxa û -mlxaa ŷ +mlx û +mlxa ŷ mlxai mlxav ûϵ mlxb Ī @@ -66942,7 +67233,6 @@ mmhf mmhfa üëһץ mmhg 廳 mmhh -mmhha mmhho Ժ mmhhv ģģ mmhhva 溣 @@ -67038,6 +67328,7 @@ mmpc mmpf mmph mmpk Ƥ +mmpm Ƭ mmpn mmpp mmpw @@ -67049,6 +67340,7 @@ mmqfv mmqj mmqjo ĩ mmqk +mmqkv mmql ȥ mmqlv mmqm ǰ @@ -67171,7 +67463,6 @@ mnbk mnbl mnbm ű mnbs Ű -mncf Ѳ mnck Ŵ mnd mndb Ŷ @@ -67194,6 +67485,7 @@ mnef mnej mnek mnen +mneni Ѳ mnep mner mnero @@ -67579,6 +67871,7 @@ mrfw mrfx ײ mrfy mrfz +mrfzi mrg ˹ mrgd ɹ mrge θ @@ -67590,6 +67883,7 @@ mrgt mrgy ͹ mrgyo mrgyv +mrh 续 mrhb λ mrhd ͺ mrhe ͺ @@ -67598,7 +67892,6 @@ mrhf mrhh ջƻ mrhj ͻ mrhl ͻ -mrho 续 mrhq λ mrhqi Ȼ mrht λ @@ -68011,6 +68304,7 @@ msyd msydv msye Ү msyea Ҳ +msyf msyg Ӭ msyh Լ msyk @@ -68503,6 +68797,7 @@ mwxg û mwxga û mwxh ѧ mwxj ÷ +mwxjo ն mwxk ûϷ mwxko ϵ mwxkv ÷ @@ -68568,6 +68863,7 @@ mwzy ÿ mwzz û mxb Բ mxbi ī +mxbj ѩ mxbo ϸ mxbx ض mxd û뵽 @@ -68620,6 +68916,7 @@ mxro mxs û˼ mxt mxta Ϸ +mxto mxw ûϣ mxwl δ mxwt ijЩ @@ -68656,6 +68953,7 @@ mydd û mydda ûдﵽ myde ûж mydf ûеط +mydh ûеĻ mydl ûе mydo һ mydoo @@ -68665,7 +68963,6 @@ mydx û mydxa ûж mye myea û˭ -myeao myeav û myeh û˵ myej ûʱ @@ -68739,6 +69036,7 @@ myks myl myla û mylaa ԡ¶ +mylao myld ûϵ mylq mylx ûϵ @@ -68971,7 +69269,8 @@ mzmzu ëë mzmzuu èë mzng ë mznj èū -mznk ë +mznk è +mznku ë mznl èŮ mznm ï mznp ë @@ -69167,7 +69466,6 @@ nbzz ncbj ncbk ncbr -ncbz ncc ² ncd ɴ⵳ ncdf @@ -69199,6 +69497,7 @@ ncj ncjc ncjj ũ徭 ncjk +ncjl ncjm ncjmo ũ ncjz @@ -69415,7 +69714,6 @@ neqo neqoo ʱ ner ˰ neru -nery nes ɢ nese Ů nesei @@ -69432,7 +69730,6 @@ neygi neygu Ѹ neyw Ϊ nez ʵ -nezk nfb ֪ nfbb б nfbf Ѱ @@ -69679,10 +69976,9 @@ nfsj nfsk nfsr ɮ nfsy -nft ţ +nft nftd Ͷ nfte -nftg nfth ̧ nftj ͼ nftk @@ -69774,6 +70070,7 @@ ngbb ngbe Ǹ ngbk ngbl +ngbs š ngcw ngd ũ ngda Ŷ @@ -69877,6 +70174,7 @@ ngtc ngtd ngte Ĺ˪ ngtg +ngtu ţ ngw ngwd ngwj @@ -69977,8 +70275,8 @@ nhll nhlu Ի· nhlw nhlwv -nhlx -nhlxa +nhlx +nhlxv nhlz nhm nhmf @@ -70358,6 +70656,7 @@ nkrna nkrni nkrp nkrx ҿϴ +nkry nks nksh ĺ nksj @@ -70454,6 +70753,7 @@ nkzhi nkzk nkzka nkzko +nkzkoa nkzl nkzw nkzz @@ -70580,10 +70880,12 @@ nlqn Ů nlqna Ů nlqq Ů nlqt ŮȨ +nlqta Ůȭ nlqx Ůǻ nlqxa Ůǽ nlr nlrd Ů +nlrj ŵ nlrl ų nlrn Ů nls Ũ @@ -70695,6 +70997,7 @@ nmekuv nmel û nmen nmer +nmev ˮ nmez nmf nmfc Ũīز @@ -70716,8 +71019,7 @@ nmfn nmfp 뷻 nmfpu 귽 nmfr -nmfs -nmfsi  +nmfs  nmfw nmfx ׯ nmfy @@ -70756,7 +71058,8 @@ nmja nmjb nmjbu nmjbui -nmjc 꽹 +nmjc ճ +nmjcu 꽹 nmjd nmjda ô nmjdi Ǿ @@ -70776,6 +71079,7 @@ nmjl ճ nmjm nmjmu nmjmui +nmjo Ŵ׼ nmjp  nmjq nmjqu @@ -70912,6 +71216,7 @@ nmyluu nmyo ũҵ nmyq ŭĿԲ nmys ѹ +nmysv nmyt ôһ nmyu Ĥ nmyx ôһЩ @@ -70921,6 +71226,7 @@ nmzh nmzj nmzji Լ nmzk +nmzl ճ nmzo nmzr nmzw @@ -71117,6 +71423,7 @@ nqpr ţ nqps ţ nqq nqqe Ť +nqqeu ʢ nqqj Ťס nqqk ţ nqql Ť @@ -71444,7 +71751,6 @@ nslxa nsly nslz nsme ô -nsmeao nsmf nsmh nsmk @@ -71666,8 +71972,7 @@ nwekio nwem ˫ nwen nwep -nwer ʡ -nweri +nwer nwew Ϊʳ nwex ˫ nwff ڷ @@ -71842,6 +72147,7 @@ nwww nwx ϳ nwxb nwxc +nwxg ʡ nwxj ڶ nwxji ڶ nwxl @@ -71915,6 +72221,7 @@ nxmn nxn Щ nxnd ѵ nxnx +nxnxa ݋ nxpy Ů nxpz nxqb @@ -72057,6 +72364,7 @@ nyjfv Ū nyjg ũ nyjj Ū nyjja Խ +nyjjo ũ nyjk ũ nyjl ũ nyjm ũ @@ -72136,8 +72444,7 @@ nyt nytf Ũ̵ nytm ũ nyto һ -nytp Ū -nytpa Ũ +nytp Ũ nytr Ū nyty Ūͨ nyw һλ @@ -72359,6 +72666,7 @@ pbcd ƴ pbcj pbck Ƶ pbcl ƴ +pbct ƴ pbcy ɴ pbcz ձ pbd ձ @@ -72521,6 +72829,7 @@ pbxk Ʒϵ pbxs ƶ pbxt Ƹѡ pbxx Ʒ +pbxxi Ƶ pbxxo ձ pbxy ƶ pby ڱӪ @@ -72534,7 +72843,6 @@ pbyy Ƹ pbyyo ձ pbz ư pbzb ƶ -pbzf ƴ pbzh pbzj Ʒ pbzk ƴ @@ -72566,6 +72874,7 @@ pcfr Ʈ pcft Ʈת pcfw Ʈ pcgl Ʈ +pcgla pcgn Ʊ pcgz Ʈ pch Ƥ @@ -72587,6 +72896,7 @@ pcjn Ʈ pcjp pcjs Ʊ pcjt Ʈ +pcjw pckd Ʊ pcke ο pckt Ʊ @@ -72684,6 +72994,7 @@ pdg ƽ pdh » pdhl ƽȻ pdhz Ʋ +pdj ׼ pdjd ʽ pdjk pdjm Ƴ @@ -72873,6 +73184,7 @@ pfmm pfn pfnk pfnm +pfnv ䷽ pfny Ū pfp ֻ pfpf @@ -73056,7 +73368,6 @@ pgje ƽ pgjf ƽ pgjg ƽ pgjgo ƿ -pgjh pgjj pgjk pgjkv ƽ @@ -73295,6 +73606,7 @@ phjji phjjia ij phjk ż phjki Ļ +phjku Ȼ phjl ƾ phjli ٽ phjm ɼ @@ -73354,6 +73666,7 @@ phqb phqe phqj פ phqk +phqki phql ȥ phqli ȥ phqm Dz @@ -73439,6 +73752,7 @@ pjbw pjbz ̱ pjce ղ pjch Ѳ +pjck pjcy ʹ pjcz ̲ pjd ơƶ @@ -73459,6 +73773,8 @@ pjee pjef pjeh ɹ pjeho ɸ +pjehoo ɹ +pjej pjek ʵ pjeko pjel ˷ @@ -73466,6 +73782,7 @@ pjep pjepv ƽˮƽ pjes ɱ pjev ƽ +pjez pjf ƽֵ pjfd pjfe @@ -73499,6 +73816,7 @@ pjhli pjhq ˻ pjhz ׺ pjj ⳥ +pjja pjjc ս pjjd ˽ pjjdv Ƽɵ @@ -73612,7 +73930,6 @@ pjww pjwx ̴ pjwy ƾԲ pjx ƽ -pjxc pjxd д pjxf հ pjxg @@ -73621,6 +73938,7 @@ pjxj pjxjo ն pjxk pjxko ϵ +pjxkov pjxl pjxlv ƽ pjxm @@ -73775,7 +74093,6 @@ pkmq pkms ƥ pkmw pkmz Ƥë -pknf pknk pknn Ƥ pknp Ƥ @@ -73867,7 +74184,6 @@ pkyz pkzh pkzj pkzk Ʀ -pkzl pkzp Ƣ plb ϱ plbg Ʊ @@ -73884,6 +74200,7 @@ pldd plde Ƶ pldf Ƶ pldfo ޴ +pldi Ƶ pldj ¶ pldk µ pldl Ķ @@ -73937,7 +74254,6 @@ pljf pljh ľ pljj Ƴ pljk ƻ -pljku Ȼ pljl ľ pljlv ƾ pljm Ƽ @@ -73999,6 +74315,7 @@ plq plqd plqf plqh ȱ +plqi plqj plqk plql ȥ @@ -74037,6 +74354,7 @@ plwwv plwx ƴ plwz Ƴ plxc +plxcv plxd Ь plxf ư plxj Ŷ @@ -74096,6 +74414,7 @@ pmer ƫ pmes ƫ pmez ƫ pmf +pmfd pmff ƫ pmfj ƪ pmfk ƫִ @@ -74294,6 +74613,7 @@ pnfs pngj pngt pnhb +pnhj pnhl pnhq 軨 pnhy @@ -74321,6 +74641,7 @@ pnqx pnqxu ǻ pnr Ů pnrj +pnrn pnsf ɢ pnsj pnsk @@ -74514,6 +74835,7 @@ prds prdw Ȼ prdz pre Ʃ˵ +preb ˮ pred pree pref ɽ @@ -74645,7 +74967,6 @@ psbz psch ² pscj ´ psck ´ -pscs ž pscy ´ pscz Dz psd ˿ @@ -74721,7 +75042,6 @@ pskd pske pskf ¿ pskh ¿ -pskhi ǿ pskj ¿ pskl psks @@ -74810,6 +75130,7 @@ pswl pswlo ſ psws pswso +pswsoo ž psww Ϊ pswy pswz ³ @@ -74835,6 +75156,7 @@ psyp psys ѽ psyt Զ psyy +psyyu Ӿ psz pszd pszdi @@ -74913,7 +75235,6 @@ pwcy pwd ҵ pwdb pwdc -pwdd 㶼 pwde pwdh pwdhi @@ -74953,12 +75274,10 @@ pwgl pwgm pwgn pwgq -pwgw pwgx pwgy 湫 pwh ί pwhe -pwhh ⻹ pwhj 㻤 pwhq 仨 pwht 廷 @@ -74967,8 +75286,10 @@ pwhz pwj pwjb pwje 䳵 +pwjf pwjg 侵 pwjh +pwjk pwjm pwjmi 彣 pwjn @@ -75173,6 +75494,7 @@ pzdzoa pzeb ˮ pzeba ˮ pzed +pzedo pzee pzen pzep @@ -75264,6 +75586,7 @@ pzmm pzms pzmz ê pznc +pznf pznh Ժ pznq pzp Ʒ @@ -75285,6 +75608,7 @@ pzqlu pzqm Ǯ pzqn pzqp +pzqpo ڳ pzqq pzqt Ȧ pzrj @@ -75386,7 +75710,7 @@ qbebo qbed qbedi qbedio -qbedoi +qbedo qbef qbeg qbei Ҳ˵ @@ -75460,6 +75784,7 @@ qbhx qbj ˽ qbjb ׽ qbjc ڽ +qbjcv ܴ qbjd ׽ qbje ޳ qbjea @@ -75475,6 +75800,7 @@ qbjm qbjmv ټ qbjn ֳ qbjo ǰ +qbjou ׼ qbjr س qbjs ׼ qbjt ׾ @@ -75552,7 +75878,6 @@ qbqoa qbqou ׼ qbqoui Ǯ qbqov վס -qbqq ܴ qbqr qbqs Ǣ qbqt Ȩ @@ -75712,12 +76037,10 @@ qcgp qcgr ø qcgw ˹ qcgy Ź -qcgyv ظԭ qch ע qchb Ȼ qche ɺ qchf ź -qchfv ź qchg ˻ qchl λ qcht ɻ @@ -75777,6 +76100,7 @@ qcns qcp qcpf qcph +qcphv qcpk Ƥ qcpl qcq @@ -75975,10 +76299,10 @@ qdnk qdnl ų qdno qdnr +qdp qdpf qdpl qdpm Ƭ -qdpo qdq Ƶ qdqa qdqav Ŵǧ @@ -76133,6 +76457,7 @@ qedv ǣ qedw qedy ⶰ qedz +qedzi ۵ qedzo ⵹ qee ʵ qeeb ˮ @@ -76141,7 +76466,6 @@ qeee qeef qeefo ɽ qeefoo -qeei qeej qeejo qeek @@ -76250,8 +76574,7 @@ qejd qejdi ȫ qejdo qeje ⳵ -qejeo ų -qejeov ǰ +qejeo ǰ qejev ʵ qejj qejk ⼸ @@ -76291,6 +76614,7 @@ qelei qelev ɽˮ qelf qelh +qeli qelj · qelk qelki @@ -76298,11 +76622,11 @@ qelko qelm qelo ʾ¼ qelq +qels qelt qelw qelwo qelx -qelxo qely £ qelyv qem ˵ @@ -76312,11 +76636,9 @@ qemg qemi qeml ĥ qemli -qemlo qemm qemn qemo -qemp æ qemq qemr qems ĺ @@ -76411,7 +76733,6 @@ qewd qewdo ҵ qewdv ʦʵ qewe ⳵ -qeweo ų qeweu ǧɽˮ qewf qewfo @@ -76428,8 +76749,7 @@ qewno qews qewso qeww λ -qewx ۴ -qewxv +qewx qewy ۳ qex ʵ qexb ʮ @@ -76663,8 +76983,7 @@ qfhz ս qfhzo վ qfj ػ qfjb ռ -qfjc ճ -qfjcv װ +qfjc װ qfjd վ qfjdo ̶ֳ qfje ս @@ -76696,6 +77015,7 @@ qfjvo qfjw ξֳί qfjx տ qfjxi ս +qfjxio պ qfjxv ξѧ qfjy ξίԱ qfk ο @@ -76715,8 +77035,7 @@ qfky ռ qfkyo qfl סլ¥ qfla ǿ -qfld չ¶ -qflda +qfld qfle ռ qfleo վ qflf չ @@ -76754,6 +77073,7 @@ qfmw չü qfmz ձñ qfn ׳ qfnk մ +qfnm ճ qfnn ǧŵŵ qfns ղ qfnw վ @@ -77068,6 +77388,7 @@ qgfmo qgfmv ׳ qgfn qgfni ȫΧ +qgfo ڹ qgfp qgfpv qgfq Թ @@ -77323,6 +77644,7 @@ qgqlvi qgqm Ƿ qgqn qgqno +qgqo ڹ qgqp qgqq qgqqa @@ -77401,6 +77723,7 @@ qgtp qgtr qgts qgtso +qgtt qgtx گ qgty ͭ qgtyo ͬ @@ -77551,6 +77874,7 @@ qgzp qgzv ǹ qgzz qgzzo +qgzzv qhb qhbe qhbev а @@ -77626,6 +77950,7 @@ qhfk ȷ֪ qhfki ժ qhfkv ȴֻ qhfs ȱ +qhfv ִ qhfw ȴ qhfy լ qhg @@ -77658,7 +77983,7 @@ qhjd ի qhjj ժ qhjk լ qhjko խ -qhjl ժ +qhjl խ qhjm ȴ qhjo ȯ qhjou ǰ @@ -77689,6 +78014,8 @@ qhlki ծ qhlm ȴ qhlmu ȱ qhlo +qhlp պ«ư +qhlr qhlw ȷ qhlwi ժ qhlx ȱ @@ -77768,6 +78095,7 @@ qhtu ǩ qhw ǰ qhwf ޷ qhwh կ +qhwhi qhwhu ǧ qhwj ծ qhwjv ȴ @@ -77861,7 +78189,6 @@ qjbmv qjbp qjbq мܲס qjbs -qjbsu qjbw qjbx qjbz 鱦 @@ -77955,7 +78282,7 @@ qjeq qjes ɰ qjeso ɱ qjev -qjew ʽ΢ +qjew qjez qjf ȫҸ qjfb ׺ @@ -77996,6 +78323,7 @@ qjfro qjfs פ qjfso  qjfsu +qjfu ŷ qjfv ഺ qjfw qjfwu @@ -78008,6 +78336,7 @@ qjga qjgd qjgdv ǣҶ qjge +qjgeo qjgev qjgf qjgfu @@ -78171,6 +78500,7 @@ qjly qjlz qjm ׼ĸ qjmb +qjmbi ס qjmc qjmd ı qjmdu @@ -78184,6 +78514,7 @@ qjmm qjmmi qjmn qjmo +qjmv ȡ qjmw פ qjmx ǧЦ qjmy ǿ @@ -78244,11 +78575,13 @@ qjqpi qjqq qjqr qjqt Ȩ +qjqv ȡ qjqw Ⱥ qjqx ǽ qjqz qjqzo ֤ȷ qjr +qjra 㽭 qjrd qjrdu qjrf ȼ @@ -78419,13 +78752,14 @@ qjzb ס qjzd qjzh ס qjzho -qjzhu +qjzhu qjzj פ qjzk qjzka ע qjzko qjzkoa qjzku +qjzkui qjzkv qjzl qjzo վ @@ -78612,6 +78946,7 @@ qkgz qkh qkhb ڻ qkhbi +qkhbu qkhd qkhdv qkhe @@ -78664,7 +78999,6 @@ qkjjv qkjk 漣 qkjki qkjku -qkjkuu qkjkuv qkjkuv qkjkv @@ -78692,6 +79026,7 @@ qkjs qkjso qkjsv qkjt ߾ +qkjv ȡ qkjw ۾ qkjwi ޭ qkjx @@ -78868,6 +79203,7 @@ qksk qkskv qkskva ˾ qksl +qksp qksr Ǩɧ qkst qksy @@ -79223,7 +79559,6 @@ qlk qlkb qlkd qlke ȥ -qlkeu qlkf ȥ qlkg qlkj @@ -79378,7 +79713,6 @@ qlww Ȥζ qlwwv λ qlwwvu ί qlwx ȥ -qlwxo qlwy qlwyi · qlwyv ȥ @@ -79469,6 +79803,7 @@ qmbwo ǫ qmby ò qmbz Ǯ qmbzu ǩ +qmbzuo Ƿ qmc ô qmce ǰ qmceo ǰ @@ -79479,6 +79814,7 @@ qmcko ǫ qmcl ǰ qmcp DZ qmcr dz +qmcru ǧ qmcw DZ qmcz qmd ô @@ -79573,6 +79909,7 @@ qmfl Ȯ qmfm Ǯׯ qmfn ͷ qmfo ô +qmfoo ש qmfp ǰ qmfq ȫ淢չ qmfqo ǰצ @@ -79820,6 +80157,7 @@ qmsy Dz qmsyi ȫ qmt Ħ qmtb ǰ +qmtbu ǩ qmtc Ƿ qmtd ǰͷ qmtdo ǰ @@ -80028,6 +80366,7 @@ qnen qnenu qnep qneq ˢ +qner qnes ɵ qnez qnfb ׷ @@ -80085,7 +80424,7 @@ qnh ǣţ qnhb qnhd qnhe -qnheiv +qnhei qnhf qnhg 滵 qnhh @@ -80097,7 +80436,8 @@ qnhm qnhn qnhq 滰 qnht 滶 -qnhtv +qnhtv +qnhtvo qnhx qnhy ף qnhz @@ -80231,7 +80571,6 @@ qnqt qnqu qnqw ׼ qnqx ǿ -qnqy qnqz qnr qnrj @@ -80239,6 +80578,7 @@ qnrk qnrn qnrp qnry +qns ɭ qnsb qnsbu qnsf ɢ @@ -80247,7 +80587,6 @@ qnsj ֡ qnsk ˿ qnsl qnsp ɤ -qnsu ɭ qnsw qnsy qnsyu @@ -80301,7 +80640,6 @@ qnxgu qnxguu qnxh 氮 qnxha ѩ -qnxhu 氮 qnxhv 䰮 qnxj qnxjv @@ -80395,7 +80733,6 @@ qpdy qpdyi qpdz ǵ qpdzu -qpdzuu qpe ǹ qpeb ˮ qpei ʽ @@ -80403,7 +80740,7 @@ qpej qpeja qpejv qpek -qpekui +qpeku qpep qper qpez @@ -80419,7 +80756,6 @@ qpfja qpfk ֽ qpfm ׯ qpfp ˷ -qpfpu qpfr Ƿ qpfs · qpfw ŷ @@ -80429,6 +80765,7 @@ qpg qpgb ƹ qpgd ʹ qpge Ÿ +qpgg qpgj ƹ qpgl Ź qpgli @@ -80467,6 +80804,7 @@ qpjlo qpjm ̽ qpjma qpjmu +qpjp qpjr ³ qpjru qpjs Ǽ @@ -80531,16 +80869,14 @@ qpqb qpqe qpqeu qpqeuu -qpqg qpqj qpqk qpqka -qpqkuu +qpqku qpqm Ǯ qpqmv ǹ qpqn qpqp -qpqpu qpqq qpqr ֤ qpqt Ȩ @@ -80550,13 +80886,13 @@ qprn qpsf qpsw qpsy +qpt ȫƽ̨ qptd qptda ͷ qptf ̲ qptg ͣ qptgi qpth ̨ -qpti ȫƽ̨ qptj ȫг qptm qpty ʹ @@ -80574,6 +80910,7 @@ qpwx qpwz dz qpx qpxb +qpxba н qpxd Ь qpxf ְ qpxh ϰ @@ -80603,7 +80940,6 @@ qpyp qpys qpyt Ԫ qpyy -qpyz qpzb qpzd qpze @@ -80687,7 +81023,6 @@ qqer qqerv ʤ qqet վ˵ qqeu -qqev ȷ qqey qqez Ȣ qqf @@ -80713,7 +81048,6 @@ qqfq qqfr qqfs qqfsv -qqfv ִ qqfw qqfwi ȫΧ qqfx װ @@ -80789,11 +81123,11 @@ qqjqv qqjr qqjs ֤ȯ qqjw -qqjx qqjy ֤ȯ qqjyv ȨǮ qqjz ǫǫ qqk ڿ +qqkb qqke qqkg qqkj @@ -80817,6 +81151,7 @@ qqlov ׼ȷ qqlr qqlrv Ȼ qqlv +qqlvv ȷ qqlw qqlx qqlxv Ѫ @@ -80949,6 +81284,7 @@ qqxv ȵ qqxw Ѵ qqxx qqxxv ڰ +qqxxva qqy ע qqya qqyb @@ -81188,6 +81524,7 @@ qrkev qrkg qrkh qrkhi +qrkhv qrkj qrkq qrkw @@ -81199,7 +81536,6 @@ qrlg qrlh qrlj · qrlk -qrll ֡ qrlm qrlq qrlqv @@ -81381,7 +81717,7 @@ qrydv qrydvi qrye ҹ qryeo ʩ -qryev а +qryev ҵ qryf qryfo ֤ qryfoo ں @@ -81465,6 +81801,7 @@ qsmxv qsn ɣ qsp ȥƤ qspf +qspfi qspp ɪ qsq Ǯǿ qsqc ǡ @@ -81599,6 +81936,7 @@ qtfr ȫ qtfs ȭ qtfsi ȫ qtfsv Ȩթ +qtft ȫ qtfw ȫ qtfy Ȩ qtfyi Ȧ @@ -81831,8 +82169,7 @@ qtwlo ǰ; qtwn ȫ qtwp ȭ qtwpi ȫ -qtwt ȫ -qtwtv +qtwt qtww Ȩ qtwwa Ȱο qtwx ǧͷ @@ -81921,11 +82258,11 @@ qwda ǿ qwdc Ⱥ qwdd ׼ qwdda Ⱥ -qwde ׼ qwdg ׼ qwdh ȹ qwdj ׼ qwdk ȹ +qwdko ׼ qwdm ׼ qwdr ܴ qwdy ŵϦ @@ -81977,6 +82314,7 @@ qwhw Ⱥ qwhz Ⱥ qwj Ⱥļ qwja ޼ +qwjao DZ qwjc ׼ qwjcv ᳵ qwjd 㳲 @@ -82008,7 +82346,7 @@ qwly Ⱥ qwm λ qwmg Ⱥ qwmo ǰ -qwmp Ⱥå +qwmr Ⱥå qwmz Ⱥê qwn qwnc Ⱥ @@ -82019,6 +82357,7 @@ qwp qwpj ׼ qwq վ qwqg Ⱥ +qwqga Ⱥ qwqh ׼ȷ qwqj Ⱥ qwqk ׼ @@ -82323,6 +82662,7 @@ qxpc qxpf qxpg ǿƽ qxph +qxpk ǽƤ qxpl ǿ qxpr Ƨ qxpz ǹ @@ -82528,6 +82868,7 @@ qyem qyeo Ը qyeoa Ҳ qyeoao +qyeou qyeov qyeovo ˵ qyet ע @@ -82597,6 +82938,7 @@ qyjov qyjp ҪƷ qyjpo  qyjq  +qyjv qyjx qyjy  qyjyo ҪԱ @@ -82702,7 +83044,6 @@ qywq qywqo ζ qywt һ qywto Ҫ -qywv qywy ǧ qywyv Ϊ qyx @@ -82716,6 +83057,7 @@ qyxq qyxqa עⰲȫ qyxs Ͽ qyxt Ѭ +qyxv qyxw qyxx qyxxo @@ -82766,7 +83108,7 @@ qzbfiv qzbfo հ qzbg б qzbj Ӱټ -qzbjv Ҳ +qzbji Ҳ qzbk ձ qzbl ײ qzbm ұ @@ -82842,12 +83184,13 @@ qzfo qzfp ҷ qzfr з qzfy -qzfyu qzfz +qzfzi qzfzo qzgb й qzgd ҹ qzge Ҹ +qzgeu qzgf и qzgj չ qzgji й @@ -82859,6 +83202,7 @@ qzgt qzgx ҹ qzgy й qzgyi й +qzgyv ظԭ qzgz ո qzgzo گ qzhb һ @@ -82885,6 +83229,7 @@ qzjb qzjbo ս qzjd Խ qzje ճ +qzjeo ų qzjg Ҿ qzjj ҳ qzjjo ճ @@ -82924,7 +83269,6 @@ qzlei qzleo qzlf qzlg -qzlga qzlgi qzlgo گ qzlgoa @@ -82953,6 +83297,7 @@ qzml qzmm qzmn qzmni +qzmp æ qzms qzmw û qzn Ƿ @@ -82994,6 +83339,7 @@ qzqw qzqwi ȹ qzqx ǽ qzqz +qzqzi qzqzo qzr qzre @@ -83006,8 +83352,7 @@ qzsk qzt ǰͳ qztd ͷ qztdi -qzth ̧ -qzthv ̰ +qzth ̰ qztj ͼ qztk qztl · @@ -83017,6 +83362,7 @@ qzty qzw ǧ qzwd ҳ qzwe ճ +qzweo ų qzwg qzwj qzwk ճ @@ -83310,12 +83656,13 @@ rdtc rdtd ͷ rdtf ̻ rdtk +rdtka rdtp rdty ʹ rdwf rdwm rdws -rdwti ⴮ +rdwt ⴮ rdx ȵż rdxb rdxf ⰸ @@ -83325,7 +83672,6 @@ rdxm rdxy ȵЧӦ rdy ȴ rdyf -rdyk rdyl rdyli ȴ rdyp @@ -83349,7 +83695,8 @@ rebx rebxi recg Ҳٸ rech Ȳ -reck ȴ +reck ȴ +recki ȴ recr Ȳ red ʶ redb @@ -83448,6 +83795,7 @@ remn remw ý remz ë ren +renf renj ŭ renk renm @@ -83614,6 +83962,7 @@ rfyj rfyk Ȼ rfyka Ⱦ rfyr ոһ +rfyw Ӳ rfz ˷ rfze Ȼ rgb Dz @@ -83745,6 +84094,7 @@ rjbv rjbw 类 rjce rjcea +rjcf rjck rjcp rjcw @@ -83818,8 +84168,9 @@ rjfz rjg ȼӹ rjgd 鹵 rjgdu -rjge +rjge rjgea +rjgeu rjgf rjgj rjgja @@ -84012,6 +84363,7 @@ rjwk rjwm 촯 rjwp rjws 뾳 +rjwsu rjww Χ rjwwa Ϊ rjwwav δ @@ -84295,6 +84647,7 @@ rllq rllx rlmh rlmj ľ +rlmt ˹ͬ rlmz ñ rlnb rlnk @@ -84436,7 +84789,7 @@ rnde rndea ̵ rndei ˵ rndeiu ʵ -rndeou ϵ +rndeo ϵ rndf ʵ rndg ϶ rndgi ˶ @@ -84777,7 +85130,6 @@ rpxm rpy Ʒҵ rpzh rpzl -rqcl rqd rqe ȫʳ rqeg @@ -84961,7 +85313,7 @@ rtgxi rtgy rtgz rth ͨ -rthe +rthl rthm rthq rthx @@ -84994,7 +85346,7 @@ rtpg rtpk Ƥ rtpm Ƭ rtq -rtqjv +rtqj rtql rtqm Ǧ rtqz @@ -85072,7 +85424,7 @@ rwrz rwse ɫ rwsf rwsk ˿ -rwwa +rww rwwr rwww λ rwwz @@ -85119,8 +85471,8 @@ rxrg rxss rxsx rxt ͼ -rxw rxwg δ +rxww Ϊ rxx ٰ rxxb rxxx ն @@ -85536,6 +85888,7 @@ sbpk sbpl sbpm Ƭ sbpz +sbpza sbq sbqc sbqe @@ -85759,7 +86112,6 @@ sejai sejd ɫ sejh ɫ sejk ɫ -sejq ɫ sek seke Ŀ sekg ɫ @@ -85785,6 +86137,7 @@ senh senl senz ɦŪ sepj ɫ +sepk ɫ sepr ɫ seq ʳ seqg ɫ @@ -85876,7 +86229,7 @@ sfcwv sfcy sfd ֪ sfdb -sfdd +sfdd sfddu ֪ sfddv sfde @@ -85884,6 +86237,7 @@ sfdf ɢ sfdg sfdgv sfdh +sfdj sfdk sfdkv sfdl @@ -86040,6 +86394,7 @@ sfkev ɢ sfkg sfkh ɢ sfkq +sfks ˹ҿ˹ sfky sfkz sflc @@ -86145,15 +86500,15 @@ sfsx sfsz ɩ sft ˾ sftc -sftd +sftd ͷ +sftdv sftf ̽ sftg sfth ̨ sftj Ϳ sftjv ɢͼ sftk -sftki -sftkv +sftkv sftl sftm sfto ͷ @@ -86188,6 +86543,7 @@ sfxcv sfxe sfxf sfxg +sfxgv ʡ sfxh ɢѧ sfxhv sfxj @@ -86610,7 +86966,8 @@ sjwnv sjwp sjws ٲ sjwsi -sjwti Ľų +sjwt Ľų +sjwv dz sjww sjwz ճ sjx @@ -86752,6 +87109,7 @@ skff skfh ˽լ skfhv լ skfj ˽ +skfji ŷ skfk ֫ skfka ˿֯ skfki ˼֮ @@ -87071,6 +87429,7 @@ skxd ˽Э skxf skxg skxgi +skxgu ˽ skxh Ѩ skxha ˿Ѫ skxj ˿ @@ -87167,7 +87526,6 @@ slei slej sleju slek ʾ -sleki sleko ʹ sleku ʧ slekuo ʩ @@ -87364,6 +87722,7 @@ slwev slwj slwju slwk +slwki slwm slwn slwp @@ -87432,6 +87791,7 @@ smb smbf ˷ smbi ɨ smd ˼ܴ +smdl Ŵ smdy ҽ smep smepv @@ -87463,6 +87823,7 @@ smyd smydi һ smydu ûе smyi ĦҮ +smym snb snbh ɭ snd ˹ŵ @@ -87521,8 +87882,8 @@ spfju ɥ spfk ɣֲ spfy ɥ spgl ɣ +sph Ƭ sphh ɣ -sphv Ƭ spjb ɥ spjk ɣ spjm ɣ @@ -87780,11 +88141,11 @@ stgf stgl stgn stgq +sth ; sthl sthm sthq 㻰 sthqv ữ -sthv ; sthx sthz stj ͷ @@ -88177,8 +88538,7 @@ sylm syls sylt sylx -syly -sylyv +syly sylz symd ij symg @@ -88441,6 +88801,7 @@ tbdy tbdz Ƶ tbdza ˵ tbdzi Ƶ +tbdzia Ƶ tbdziv Ƶ tbe ̸ tbea ̨ @@ -88450,6 +88811,7 @@ tbed tbee tbef ɾ tbei +tbeiv tbej Ա̳ tbek tbeku @@ -88596,6 +88958,7 @@ tbqwo tbr Ͷ tbra tbrc Ȳ +tbrd tbre tbrf Ȼ tbrj @@ -88702,6 +89065,7 @@ tccl tccp tccz tcd ٶ +tcdc tcdd tcde tcdf @@ -88813,6 +89177,7 @@ tcljv tclk tclku tclkuv +tcll tclm tclw tclx @@ -88834,16 +89199,17 @@ tcpc tcpk Ƥ tcpw tcq ̽ +tcqb tcqc ٬ tcqe tcqei tcqf ս tcqg +tcqi tcqk tcqko tcql ȥ -tcqm Ǩ -tcqmo ǰ +tcqm ǰ tcqn ֡ tcqno tcqo @@ -88886,6 +89252,7 @@ tcwt tcww ζ tcwy tcxb +tcxbo н tcxc С tcxd г tcxf @@ -88903,6 +89270,7 @@ tcxq tcxs tcxso tcxt ѡ +tcxw ѱ tcxx tcy Ǵ tcyb @@ -89584,6 +89952,7 @@ tese tesf ɢ test tet ͷ +tetc ص tete tetg tetk @@ -89758,6 +90127,7 @@ tfjm ̽ tfjp tfjq ̽ tfjqo ͷؽ +tfjqou ƽ tfjr ̹ tfjrv ̹ tfjs ̸ @@ -90155,6 +90525,7 @@ tgqn ͣ tgqno tgqp tgqpo ͥ +tgqpoa tgqq tgqr ֤ tgqt ͦȫ @@ -90348,8 +90719,7 @@ thfya ̨ thfz ̨ thg thgb ̫ -thgd ̫ -thgdv ඥ +thgd ඥ thge ̨ thgeo ͯ thgf @@ -90474,6 +90844,7 @@ thnfa ̨ thng ̩ thnh ͽκ thnk ̫ +thnl ̩ŵ thnm ̫ thnn ̫ thnq ̫ţ @@ -90641,6 +91012,7 @@ tjbsi ͼ tjbw tjbz ͼ tjbzi ͼ +tjbziu ͹ tjc ͦ tjcb ´ tjce ͼ @@ -90701,6 +91073,7 @@ tjepa Ϳ tjeq Ϳˢ tjer ͽ tjes ɱ +tjeu س tjev tjez ͳ tjf ͳƷ @@ -90733,7 +91106,8 @@ tjfy ; tjfyi ͼ tjfyiu ͼ tjg Ƽ -tjgd +tjgd +tjgdv tjge ͼ tjgf ͻ tjgh Ϳ @@ -90780,6 +91154,7 @@ tjjj ͻ tjjji ͹ tjjjo ³ tjjjou ͻ +tjjjv tjjk ͻ tjjki ͼ tjjkv @@ -90939,6 +91314,7 @@ tjx tjxa ͳѧ tjxb ͼ tjxd ż +tjxdo Ѫ tjxdv ̹ tjxe ͳʾ tjxei Ͷʯ @@ -90948,16 +91324,15 @@ tjxfu tjxg ͼ tjxgu ͽ tjxgv -tjxh Ѫ tjxj ͽ tjxk ͻϮ -tjxl tjxm ͹ tjxmi ͹ tjxmo ͻ tjxmov ͻ tjxn ͼ tjxs +tjxv tjxx ͼ tjxz ͹ tjy Ὠ @@ -91055,7 +91430,6 @@ tkfkiu tkfkiv ְ tkfko ּ tkfn -tkfp tkfr tkfs 巣 tkfsi ᷨ @@ -91142,6 +91516,7 @@ tkm tkmg tkmgo tkmj Ŀ +tkmk п tkmm tkmn tkmt ˹̹ @@ -91251,6 +91626,7 @@ tkyfo tkyg ݺ tkyi ѿ tkyk +tkyko tkyl tkys tkyt Ժ @@ -91406,7 +91782,6 @@ tllwi tlly tlm ľ tlmb -tlme ĭ tlmf tlmg tlmh ľ @@ -91529,7 +91904,6 @@ tlxw tlxx tly tlyb -tlybi ӡ tlyd tlydi tlye Һ @@ -91576,8 +91950,7 @@ tmcp tmcw tmd ǵ tmda ǵ -tmdd 춼 -tmddv +tmdd tmde tmdf tmdg 춨 @@ -91689,6 +92062,7 @@ tmhu ͸ tmhw tmhx tmhy +tmhyv tmhz tmj ͬ˾ tmjb @@ -91696,6 +92070,7 @@ tmjc tmjd tmjdi Ǿ tmjdv +tmjdvv tmje 쳵 tmjei Ǿ tmjf @@ -91818,6 +92193,7 @@ tmqn tmqq tmqr tmqt Ȩ +tmqu tmqy tmqz tmr @@ -91973,10 +92349,9 @@ tpbz tpcf tpcj Ǵ tpck ´ -tpcp tpcw tpd ͻƵ -tpddo Ƕ +tpdd Ƕ tpde ̵ tpdf ǵ tpdh ƴ @@ -92133,6 +92508,7 @@ tpx ͻ tpxb tpxe tpxh Ѫ +tpxi ͶƱ tpxk Ϫ tpxl ͷѪ tpxm @@ -92161,6 +92537,7 @@ tpz tpzb tpzh tpzk +tpzp tqb ս tqbx ͼذ tqc @@ -92168,8 +92545,7 @@ tqd ̽ tqdl ͨ tqdm tqdo ȭ -tqe س -tqev ̫ʵ +tqe ̫ʵ tqex ̸˵ tqf ս tqfy ̽׷ @@ -92265,7 +92641,6 @@ trlf trlj ¼ trly trmd ̹Ȼ -trmf trnl Ų trph trq Ȼ @@ -92420,6 +92795,7 @@ tsheo tshf tshh tshho +tshl tshn tshno tshp @@ -92906,6 +93282,7 @@ txrvu txs ж txst ж˹̩ txsw ߯˹֮ +txt ͼ txtd ͬͬ txtf ͷ txtj ٢ @@ -92983,13 +93360,13 @@ tydc ͬ tydca ͳ tydci ͭ tydd ͨ -tydda ͨ tyddv ҡض tyde ʹ tydf Բط tydg ͬ tydh ͬ tydj ͨ +tydja ͨ tydk ͨ tydl tydm ͨ @@ -93022,6 +93399,7 @@ tyeka ͨʷ tyekao ͨʶ tyeki ͬ tyekio ͬ +tyeko ʹʧ tyel ͨ˵ tyen ͨ tyep ͬ @@ -93030,6 +93408,7 @@ tyeq ͬһʱ tyeqa ͨˢ tyer ͬ tyeri ͬ +tyero ͯ tyev ̫ԭ tyeva ̫ tyew ͨ˳ @@ -93124,6 +93503,7 @@ tyhw ͨ tyhwi ͬ tyhy ͨ tyhz ͬ +tyhzi tyj tyjb ͬ tyjc ʹ @@ -93224,7 +93604,7 @@ tymg ͬ tymga ͨ tymh ͨ tymj ͬĸ -tyml ͭģ +tymji ͭģ tymm Ͱ tymn ͬ tymr ͬ @@ -93259,6 +93639,7 @@ typm ͨƪ typr ͨ typw ͳ typz ͬ +typzi ͭ tyq ֢ tyqb ͨ tyqbu ͽ @@ -93336,6 +93717,7 @@ tywf tywh ͬ tywj ͬ tywjo ͯ޼ +tywjov ʹ tywk ͨ tywki ͬ tywko ʹ @@ -93345,9 +93727,11 @@ tywmi ͬ tywn ͬ tywni ͬ tywp ͨ +tywpa ͨ tywpi ͬ tyws ͭ -tywt ͭ +tywt ͬ +tywti ͭ tyww ͬΪ tywwi ͬλ tywx ͬ @@ -93361,7 +93745,6 @@ tyxc ͨ tyxca ͨ tyxd ͯЬ tyxdo ʹŹ -tyxe ʹ tyxf ͬ tyxfi ͬ tyxg ͬ @@ -93450,13 +93833,13 @@ tzcz tzd ̫ӵ tzdc ӵ tzdd ׵ -tzdda ն tzde ׵ tzdev tzdg Ӷ tzdh ֵһ +tzdj ն tzdk յ -tzdka ͵ +tzdki ͵ tzds ִ tzdsv ״ tzdw Ӷ @@ -93618,6 +94001,7 @@ tzsl tzst tztd ͷ tztdo +tzte tzth ̭ tztj tztjv ͼ @@ -93685,7 +94069,6 @@ wbd wbdc wbde wbdeo  -wbdf wbdh wbdi ٵ wbdiv @@ -93780,6 +94163,7 @@ wblq wblu ΢¯ wblv ޱ wblw +wblwv ׵ wbly wblz wblzo Բ˶ @@ -93797,6 +94181,7 @@ wbpf wbph wbpl wbpr +wbpz wbq 治 wbqe wbqg @@ -93822,6 +94207,7 @@ wbtc wbtd ͷ wbtdi ͷ wbtdu ͷ +wbtf wbtj Ȳƽ wbtk wbtp @@ -93864,6 +94250,7 @@ wbxy wbxyu ҲҪ wby ҲҪ wbyb +wbyd İ wbyf wbyl Ҫ wbyp @@ -93912,7 +94299,8 @@ wdbf wdbl ﲦ wdbo Եñ wdbu ȶ -wdbv ̲ +wdbv +wdbvu ̲ wdbw ﱸ wdbz 걨 wdce @@ -94161,6 +94549,7 @@ wdys wdysu ҵ˼ wdyt Թ wdyv δ +wdyvo wdyw wdyx ޶ż wdyxv ޵ @@ -94428,9 +94817,9 @@ wewxvv wex wexc wexci +wexcv wexf wexg -wexh wexj wexm wexs @@ -94441,7 +94830,7 @@ wey weyb weyd weye ҹ -weyeoi ˮ +weyeo ˮ weyg Ӫ weygu һ weyh Ժ @@ -94557,7 +94946,6 @@ wffb wffbu ֮ wffd wffdv -wffdvo wffe wffei wffeo @@ -94570,7 +94958,6 @@ wffj wffju ΢ַ wffk wffm ֪֮Ļ -wffmv ֪֮Ļ wffn wffo Է wffp @@ -94719,8 +95106,7 @@ wfmh wfmj Ķ wfmk wfmkv Ī -wfmm -wfmmv +wfmm wfmn wfms wfmsv @@ -94818,6 +95204,7 @@ wftz wfwd ȴ wfwe wfwf +wfwfa wfwfv wfwfvo wfwg 书 @@ -94897,6 +95284,7 @@ wfyl wfylo wfylv wfyq Ϊ֮һ +wfys ֮ wfyt Ԫ wfytv Դ wfyx һ @@ -95089,6 +95477,7 @@ whfo whfp ⷽ whfpu whfr +whfs ⷢ whft ⴫ whfw ĻΧ whfz @@ -95395,6 +95784,7 @@ wjdb wjdc ޵ wjdcv ޾ wjdd 䶷 +wjddu ׵ wjde wjdf wjdg ݶ @@ -95439,6 +95829,7 @@ wjdy wjdyu ڶ wjdz 赸 wjdzo +wjdzoo wjdzv wje Ҿ wjeb ˯ @@ -95588,6 +95979,7 @@ wjhe wjheu ں wjhf 人 wjhfv ޺ +wjhfvo wjhh ޺ wjhj غ wjhji ߺ @@ -95786,6 +96178,7 @@ wjng wjnh wjnk wjnko +wjnku wjnl Ů wjnlv Ů wjnm @@ -96071,6 +96464,7 @@ wjzkv أ wjzkvo wjzl wjzlv +wjzo wjzp wjzpv wjzs @@ -96093,6 +96487,7 @@ wkbnv wkbp wkbr ޿ײ wkbs ԰ +wkbsa ߰ wkbw ౳ wkbwo wkbz Ա @@ -97062,6 +97457,7 @@ wndg wndgo ʶ wndh ´ wndj ¶ +wndjo Ķ wndk ĵ wndm ĵ wndp ĵ @@ -97297,6 +97693,7 @@ wnwl wnwlo wnwlv Ϊ wnwm ´ +wnwmo Ĵ wnwn wnwna wnwno @@ -97307,6 +97704,7 @@ wnws wnwt 봨 wnww wnwx ´ +wnwxo Ĵ wnwy ó wnx ά wnxb ܰ @@ -97371,7 +97769,7 @@ wpbn wpbs wpbsv wpbw -wpbz +wpbz wpbzi wpch wpck @@ -97430,7 +97828,6 @@ wpfr wpfra wpfs wpfsv -wpft wpfw wpfwi wpfwia @@ -97975,8 +98372,8 @@ wsg wsgd ڹ wsgdi 蹸 wsge ڸ -wsgj ܹ -wsgjv ˼ +wsgj ˼ +wsgji ܹ wsgl wsglv ߹ wsgn ڸ @@ -97998,7 +98395,7 @@ wshq wshqi 廭 wshqii 軨 wshqii 廨 -wshtu Ĺܺˮ +wsht Ĺܺˮ wshz wshzi ں wshzv @@ -98263,6 +98660,7 @@ wtdeo wtdf wtdg wtdh +wtdhi wtdj Ĺؼ wtdk wtdku @@ -98320,6 +98718,7 @@ wtge wtgf wtgh wtgl +wtgli wtgn ͳ wtgt wtgw @@ -98373,7 +98772,6 @@ wtldu wtlf wtlg wtlh -wtlhi wtlho wtlj · wtlm @@ -98473,6 +98871,7 @@ wtxh wtxj wtxk Ϣ wtxki Ϸ +wtxku wtxm wtxmi wtxs @@ -98498,7 +98897,6 @@ wtyw wtyy wtyyi ͳ wtyz ҥ -wtzf wtzh wtzk wtzp @@ -98554,12 +98952,12 @@ wwcro ζ wwcw ΢ wwcy Ϊ wwcz ι +wwczu ΢ wwd ν wwdb wwdc ΢ -wwdd Ϊ -wwddu ΢ -wwdduu ׵ +wwdd ΢ +wwddu ׵ wwde Ϊ wwdeu wwdev δ @@ -98575,6 +98973,7 @@ wwdja ά wwdjao γ wwdji Χ wwdjo Ω +wwdjou Ϊ wwdjv δ wwdk Ϊ wwdl Ϊ @@ -98641,6 +99040,7 @@ wwex Ϊ˪ wwey wwez ΢ wwf +wwfb β׵ wwfd wwfdu ΢ wwfe Χ @@ -98778,6 +99178,7 @@ wwjhi wwji ļ wwjk Σ wwjka ά +wwjkao β wwjko Ϊ wwjkoa Ϊ wwjku Σ @@ -98798,6 +99199,7 @@ wwjmva Υ wwjn ΢ wwjp δ wwjpi θ +wwjpiv Χ wwjq δ wwjqi Χκ wwjqv ζȫ @@ -99025,6 +99427,7 @@ wwsk Ϊ˽ wwsl wwsli ή wwslia η +wwslu ΢ wwss ηη wwssu wwst θ @@ -99167,7 +99570,6 @@ wwyfiv Χ wwyfu Σ wwyg Ϊӭ wwyh ΥԼ -wwyho Ϊ wwyk Ψһ wwyka wwyki @@ -99213,7 +99615,6 @@ wwzlv δ wwzlvi δ wwzp θ wwzr Ϊ -wwzro ζ wwzw Ϊ wwzx wwzy δ @@ -99394,6 +99795,7 @@ wxra wxrc ˲ wxrf Ȼ wxrj +wxrjo wxrk wxru wxs ˹ @@ -99533,9 +99935,9 @@ wyee wyef ɽ wyeh ɹ wyej -wyek ʵ -wyeku -wyekui ʰ +wyek +wyeko ʵ +wyeku ʰ wyel ˵ wyen wyenu @@ -99591,6 +99993,7 @@ wygj wygl wyglu ҵ wygm ع +wygn ظ wygp wygs Թɫ wygv ù @@ -99699,8 +100102,8 @@ wymgio wymh wymhu ҹλ wymhua +wymj ģ wymk -wyml ģ wyms wymw wymy û @@ -99802,7 +100205,6 @@ wyww wywwv ԩ޳ wywy wywz Ӱ -wywzv Ӱ wyx wyxb wyxc @@ -99898,6 +100300,7 @@ wzbs wzbt ȱ˹̹ wzbw wzbz +wzbzv wzc wzce wzch @@ -99962,6 +100365,7 @@ wzfev wzff wzffo wzfg ק +wzfh 丽 wzfj wzfk ֵ wzfko @@ -99979,7 +100383,6 @@ wzfyu wzg Ϊ wzgb wzgd -wzge wzgf wzgj wzgl @@ -100112,7 +100515,6 @@ wzqfv wzqg wzqgv wzqh ǧ -wzqhv ǧ wzqj ס wzqk wzqka @@ -100122,7 +100524,6 @@ wzql wzqm ǰ wzqmu ǰ wzqp -wzqpv wzqr wzqru wzqt ηDZ @@ -100165,7 +100566,6 @@ wztk wztl wztm wztmv -wzto ζ wztr wzts wzty ʹ @@ -100360,7 +100760,7 @@ xbff xbffo · xbfh ծ xbfi С -xbfio ֽ +xbfiu ֽ xbfj ŷ xbfjo ĸ xbfjoa ĸ @@ -100371,6 +100771,7 @@ xbfkou xbfl ŷ xbflo ׾ xbfm װ +xbfmi ݷׯ xbfmo ׯ xbfn п xbfp · @@ -100388,6 +100789,7 @@ xbfva xbfw xbfwo ķ xbfx װ +xbfxi ݷׯ xbfxo ׯ xbfxv ֮ xbfy @@ -100406,9 +100808,9 @@ xbgm xbgp ¸ xbgq ¹ xbgr Ĺ -xbgt Ź +xbgt ¹ +xbgti Ź xbgto ¹ -xbgw н xbgx ¹ xbgxv ҵѧ xbgy н @@ -100558,6 +100960,7 @@ xbltv xblu xblui ϣ xblv ² +xblvu xblw xblwo xblwu ϣ @@ -100580,6 +100983,7 @@ xbmk xbml ħ xbmm xbmn +xbmnu ض xbmp ç xbmr xbms @@ -100784,7 +101188,8 @@ xbyq а xbyr xbys ѿ xbyt Ը -xbyti +xbyti Դ +xbytiv xbyv xbyvv Ҫ xbyw @@ -100834,13 +101239,13 @@ xcbn С xcbp Ф xcbs У xcbsi С -xcbw С +xcbw С +xcbwi С xcbz С xcbzi С xcbzii xcbziu С xcc ˴Ҵ -xcce У xcch С xcck xccl С @@ -100967,11 +101372,13 @@ xcgl Ч xcgli С xcglu Ц xcgm С +xcgma xcgp С xcgq xcgt С xcgw xcgx С +xcgxa xcgy У xcgyi С xcgz С @@ -101021,7 +101428,6 @@ xcjg Т xcjgi С xcjh С xcjj -xcjji xcjju Ц xcjk xcjki С @@ -101062,7 +101468,8 @@ xckj Ц xckl С xckm С xckp С -xcks С +xcks У +xcksi С xckt С xckw С xckx С @@ -101161,6 +101568,7 @@ xcpgia С xcph С xcpj С xcpk С +xcpki Ƥ xcpl С xcpm СƬ xcpn Ц @@ -101356,6 +101764,7 @@ xcyku Ц xcykv Уҽ xcyl С xcyli С +xcylii С xcyliu С xcylo Ĵ xcylu Ц @@ -101470,6 +101879,7 @@ xded Я xdedo д xdedv ʪ xdee б +xdeev Ь xdeh Сʱ xdeho ʱ xdehv ִ @@ -102043,7 +102453,6 @@ xegy xegz xeh Сʱ xehd ѧ -xehf xehg xehj xehl С» @@ -102400,13 +102809,14 @@ xffj xffjv ֮ xffk xffko ֵ +xffkoi ָ xffkou ֪ xffl ׿ xffm װ xffmo ׮ xffn xffo · -xffooi װ +xffoo װ xffp xffpo xffq ץ @@ -102698,7 +103108,6 @@ xfyloo xfyn ֮ xfyp xfys ѹ -xfysv ֮ xfyx ֮Ч xfyxo ֮ xfyy ӿ @@ -102730,7 +103139,6 @@ xgbm xgbmv ز xgbp ˰ xgbs а -xgbw б xgbz DZ xgce в xgcf β @@ -102802,7 +103210,7 @@ xgfg xgfh ռ xgfj Ҹ xgfk -xgfkau ֱ +xgfka ֱ xgfko xgfku ֹ xgfkv @@ -102925,7 +103333,8 @@ xglku xgll xgllo xgllu -xglm +xglm +xglmo xglo xglq xgls @@ -102943,6 +103352,7 @@ xgmm xgmp â xgms xgmsv +xgmv xgmw ú xgmy ӯ xgmz ò @@ -103348,6 +103758,7 @@ xhgzo xhh ЦǺ xhhb ѧ xhhbu +xhhbv xhhd ѩ xhhe xhheu @@ -103363,6 +103774,7 @@ xhho xhhp xhhq ѩ xhhqo ѧ +xhhqoi xhhqu xhhqui xhhr @@ -103373,7 +103785,6 @@ xhhu Ц xhhv ݺ xhhw xhhwi -xhhwv xhhy Ѫ xhhyu xhhz @@ -103382,6 +103793,7 @@ xhhzoo ѧ xhhzoo xhhzoo xhj ؼ +xhja Ѱ xhjb xhjbo ѧ xhjc @@ -103397,6 +103809,7 @@ xhjgi xhjh »ɺ xhji СƳ xhjj Ѩ +xhjji xhjju ѭ xhjk ѧ xhjki @@ -103460,7 +103873,6 @@ xhld xhle xhlei xhleo ѧ -xhleu xhlg ѧ xhlgu xhlgv ѩ @@ -103550,7 +103962,6 @@ xhpg xhpgu xhph ѧ xhpk -xhpki Ƥ xhpl Ѫ xhplu xhpm ѩƬ @@ -103636,6 +104047,7 @@ xhsw xhsy ѩ xht ϲ xhtc ѩ +xhtci xhtcu xhtcuu Ѫ xhtd ͷ @@ -103725,6 +104137,7 @@ xhxhuo Ѫ xhxhuu xhxi xhxia С +xhxii λϪ xhxio С xhxj xhxk ѧϰ @@ -103749,8 +104162,7 @@ xhyb ѩ xhyc лҰ xhycv ໥ xhyd -xhydo ѧ -xhydov ѧ +xhydo ѧ xhydu xhye ѪҺ xhyeo ѧҵ @@ -103761,6 +104173,7 @@ xhyfo xhyg Ӥ xhygi ѦӨ xhyh +xhyhu xhyk xhyko ѧ xhykov ѧҽ @@ -103788,7 +104201,6 @@ xhytv ѩԭ xhyv Ӧ xhyw xhyx С -xhyxi С xhyxo » xhyxv ໥Ӱ xhyy @@ -103799,7 +104211,6 @@ xhza xhzd xhzdo »ֵ xhze -xhzf xhzh ѩ xhzhi xhzi С @@ -103814,6 +104225,7 @@ xhzl xhzla Ѱ xhzr xhzs ѧ +xhzsi xhzy xhzyv ໥ xjb Լ۱ @@ -103879,6 +104291,7 @@ xjds xjdt xjdv ̾ xjdva ֽ׶ +xjdvo ȵ xjdx ³´л xjdy xjdyv @@ -104000,6 +104413,7 @@ xjje xjjeu Ƚ xjjf xjjg +xjjgv xjji С xjjia С xjjiaa С @@ -104177,15 +104591,15 @@ xjsv xjsw xjsy xjsz ɩ -xjt +xjt Ľʹ xjtc +xjtd ͷ xjtf ̸ xjtg xjtgv xjth ̥ xjtj Ⱦ xjtk -xjto Ľʹ xjtp xjts xjtsv @@ -104281,6 +104695,7 @@ xjz xjze xjzh xjzhv +xjzi С xjzj xjzk xjzkv @@ -104397,7 +104812,9 @@ xkfj ϱ xkfjo xkfjv xkfk ϸ +xkfki ֽ xkfl ϴ +xkflo xkfm װ xkfn ϸ xkfna ϸ @@ -104451,6 +104868,7 @@ xkhfv xkhh xkhj xkhja ϴ +xkhjaa xkhl Ϩ xkhlv ϲ xkhm j @@ -104468,7 +104886,6 @@ xkhwa ϸ xkhx j xkhz ϲ xkhza ϴ -xkhzu ϵ xkj ¿Ƽ xkjb xkjbi @@ -104497,6 +104914,7 @@ xkjj xkjjo xkjjv xkjk Ϯ +xkjka ϴ xkjku ϣ xkjkuo Цڳ xkjl ϲ @@ -104544,6 +104962,7 @@ xklj xklja ϸ· xklk Ϭ xklka ϴ +xklkaa xklkai Ϸ xklko xkll @@ -104580,6 +104999,7 @@ xkmr xkms ϣ xkmsa Ϸ xkmw ϴú +xkmwv ÷ xkmz ϸë xkmzo è xkn @@ -104665,8 +105085,8 @@ xksf xksj ϰ xksja ϸ xksjo O@ -xksk -xkska ϸ˿ +xksk ϸ˿ +xkskv xksl ϸ xksp ϲɥ xkss @@ -104690,6 +105110,7 @@ xktl ϴ xktm xktp ϲ xktpo Ŀ +xkts xkty ϵͳ xktz xkwb ϴ @@ -104781,6 +105202,7 @@ xkyla ϸ xkylao ϸ xkylu ϵ xkylv +xkylvo xkyp Ϧ xkypo xkypv @@ -104845,6 +105267,7 @@ xldca Ѥ xldd Եõ xlde xldg +xldh xldi С˵ xldii ޵ xldj @@ -104891,6 +105314,7 @@ xler xleu ʯ xleua Ѫʷ xlev +xlevi ʱ xlew ˳ xlf ѧ׷ xlfd @@ -105190,7 +105614,6 @@ xlyt xlyta Ե xlyto һ xlytoa һ -xlytv xlyv Ӫ xlyvi ŷ xlyw @@ -105217,11 +105640,11 @@ xmbf xmbg ڱ xmbgo ܱ xmbh ԰ +xmbho ԰ xmbi С xmbk ȱ xmbm ȱ xmbmv ֱ -xmbq Ѫ xmbs Ȱ xmbw ȱ xmbwi ɱ @@ -105326,8 +105749,7 @@ xmfko xmfku ֪ xmfkv ְ xmfkvi ֵ -xmfl -xmfli ɷ +xmfl ɷ xmflv ֮ xmfm ״ xmfma װ @@ -105348,6 +105770,7 @@ xmfxa xmfxu ֮ xmfy xmfz +xmfzu xmg СĢ xmgb Թ xmgd ޹ @@ -105389,11 +105812,12 @@ xmhq xmhqo л xmhqu ׻ xmht Ȼ +xmhw Ժ xmhx Ȼ xmhy ʺ xmhz ˺ xmhza ޺ -xmj ŷ +xmj ŷ٤ xmjb ֽ xmjba ݽ xmjbu Ƚ @@ -105402,6 +105826,7 @@ xmjc xmjd ν xmjdi ؽ xmjdii ɽ +xmjdo è xmjdv ֽ xmje г xmjf ޲ @@ -105411,6 +105836,7 @@ xmjgi xmjgo xmjh Ⱦ xmjho Ľʺ +xmji С׽ xmjj ׳ xmjjo Գ xmjjv ֳ @@ -105435,6 +105861,7 @@ xmjrau xmjri س xmjs ּ xmjsa ޼ +xmju ٤ xmjv xmjw վ xmjx Ƚ @@ -105526,7 +105953,7 @@ xmpg xmpk xmpm ƭ xmpp òƽƽ -xmpq Ѫ +xmpq Ѫ xmpw xmpz xmq ݡ @@ -105571,6 +105998,7 @@ xmqw xmqx xmqy xmqz +xmqzu xmr ϯĽ xmrb xmrd @@ -105879,7 +106307,9 @@ xptw xpw ƨ xpxf ƶ xpxl ƤЦ +xpxla xpxlo ƤЦ +xpxlv ¡ xpxp xpy С xpyi С @@ -105907,6 +106337,7 @@ xqcf xqch xqck ޴ xqcl ޴ +xqcu xqd ȫ xqdc xqdd 㶺 @@ -105942,7 +106373,6 @@ xqel xqeli Я xqen xqer ȤʹȻ -xqeri ʡ xqeu xqev xqevu @@ -106031,6 +106461,7 @@ xqkb xqkd xqke ݿ xqkf ݿ +xqko ȫ xqky ҿ xql xqld ¥ @@ -106149,6 +106580,7 @@ xqwf xqwfa xqwfi xqwj ȥ޼ +xqwjo ߶ xqwk ߳ xqwki ޳ xqwm 崲 @@ -106163,10 +106595,10 @@ xqwy xqx С xqxb xqxd Ь -xqxe ߶ -xqxeo ȫϵ +xqxe ȫϵ xqxg xqxgi +xqxgii ʡ xqxh ѧ xqxho Ȥ xqxhu ѪծѪ @@ -106236,6 +106668,7 @@ xrf xrfe ֹˮ xrff Ƿ xrfq Ѫ֮ +xrfx ΰ xrg θ xrh ʺ xrhf Ѫ @@ -106308,6 +106741,7 @@ xsbnv xsbs ° xsbsa xsbsav +xsbt ˹ xsbw ± xsbz xsbzv ± @@ -106327,7 +106761,6 @@ xsdc Ϲ xsdd µ xsdda xsddau -xsddv ¶ xsde ŵ xsdea xsdf µ @@ -106341,6 +106774,7 @@ xsdi xsdj ¶ xsdja xsdjv ¶ +xsdjvu ¶ xsdk µ xsdka xsdl @@ -106489,6 +106923,7 @@ xsjb xsjbi Ϲ xsjc ½ xsjca +xsjci Ϻ xsjd ½ xsjda xsjdv ½ @@ -106519,6 +106954,7 @@ xsjs xsjsv ¼ xsjsva ¼ xsjt ¾ +xsjv ɣ xsjw ´ xsjwo ѧ˼ xsjx ½ @@ -106579,7 +107015,8 @@ xslsvo xslt Ϲ xslu xsluv ˹½ -xslw Ϲ +xslw +xslwi Ϲ xslx xsly xslz @@ -106716,6 +107153,7 @@ xstmv xstp xsts xstw +xstwu ˾Τ xsty ͬ xstz xsw ˼ά @@ -106831,6 +107269,7 @@ xszkva ϻ xszl xszp xszs H +xszt xtb ̨ xtbc ѡ xtbf ˷ @@ -107105,6 +107544,7 @@ xtyj xtyk xtyl ѡ xtyp +xtypu ѡ xtys xtyt ԯ xtyw ѣ @@ -107378,6 +107818,7 @@ xwyl ѷ xwyli xwyo Ա xwyp ѱ +xwypa Ѳ xwyt һ xwyx 쳹 xwz ϴ @@ -107422,7 +107863,7 @@ xxbsa xxbu ѪС xxbua Ѫϸ xxbuu а -xxbvu +xxbv xxbw xxbwu xxbwui @@ -107559,6 +108000,7 @@ xxfh xxfi Сϱ xxfio з xxfj +xxfja xxfju ΰ³ xxfjv xxfjvv ศ @@ -107586,9 +108028,9 @@ xxfxv xxfy xxfz xxg ʸ -xxgb Ѫܲ -xxgba -xxgbu +xxgb +xxgbu +xxgbui xxgd 빺 xxge xxgei @@ -107922,7 +108364,6 @@ xxsb xxsf ɢ xxsh xxsj -xxsju xxsk xxskv ˼ xxskvv @@ -108068,7 +108509,6 @@ xxydo xxydu xxydv xxye Ұ -xxyea Ұ xxyeo ѧ xxyeu Ҷ xxyeua Һ @@ -108253,11 +108693,13 @@ xyhw xyhx ۻ xyhz ׺ xyj ϴ» +xyja Ѳ xyjb ؽ xyjbi ¾ xyjd ֽ xyjf óϷ xyjg ؾ +xyjh ӳɻ xyji С۾ xyjia С xyjk ؼ @@ -108266,7 +108708,6 @@ xyjl xyjm ۽ xyjma ħ xyjo һ -xyjp ۳ xyjq г xyjqv ӳȤ xyju Ѫѹ @@ -108317,6 +108758,7 @@ xyp xypf ҶƤ xyph xypj ظ +xypm Ƭ xypp ӿ xypw xyq Ҫ @@ -108333,6 +108775,7 @@ xyqo xyqp ֳ xyqpa xyqpv У԰Ƹ +xyqpvu ۳ xyqq xyqu xyqv һվ @@ -108350,10 +108793,12 @@ xys С xysb xyse xysg +xysj ѧ xysk xysm Ŷѽ˹ xyst ˹̹ xysy +xysyo ѧ xysz ɩ xyt һ xytd ͸ @@ -108432,6 +108877,7 @@ xyyk xyyl xyym Գ xyyo ѽѽ +xyyoo ӰҺ xyyp xyyq xyyu Ц @@ -108615,6 +109061,7 @@ xzyb xzybu һ xzyd xzye ҹ +xzyei Ҷ xzyf Ӣ xzyj Ѿ xzyk @@ -108785,6 +109232,7 @@ ybfv Զ ybfva а취 ybfvi һץ ybfvv һٷ +ybfvvo 巿 ybfw ybfx װ ybfy @@ -108856,6 +109304,7 @@ ybjevu һ ybjf ybjfi ۲IJ ybjg +ybjgo 񿾮 ybjh ybjha ybji ۲ @@ -109094,11 +109543,13 @@ ybwwav ybwz ӡ ybx Ҳ ybxb +ybxba ybxc Ч ybxca Ц ybxd ӡŷ ybxda ybxe ӡ +ybxeo Ŷ ybxf ybxg ybxga @@ -109111,10 +109562,9 @@ ybxgu ӡ ybxj ybxji ybxk ϵ -ybxl Ŷ +ybxl б ybxla ybxli -ybxlv б ybxm ybxma ybxmaa @@ -109779,7 +110229,7 @@ ydqla ydqlav ȥ ydqli ȥ ydqliv Ȥ -ydqlvv ȥ +ydqlv ȥ ydqm Ǯ ydqma Ǯ ydqmau Ƿ @@ -109864,6 +110314,7 @@ ydtl ydtm ydtma ydto ԩͷ +ydtoo Ķ ydtp ydts ydtsi @@ -110211,8 +110662,8 @@ yegg Ҳ yeggi Ұ yegh Ҳ yegi -yegj Ҵ -yegjv +yegj +yegji Ҵ yegl Ұ yegm ҹ yegn ҵ @@ -110423,7 +110874,6 @@ yeqq һ yeqt ҰȮ yeqtv һ yeqx ʳס -yeqxo ʳס yeqy Ҳ yer yerc Ҳ @@ -110614,6 +111064,7 @@ yfbju yfbjv һ֪ yfbk ұ yfbki ڱ +yfbku ӱ yfbl ݲ yfbli ۲ yfblo ̲ @@ -110996,6 +111447,7 @@ yfql yfqli ǧ yfqm ǰ yfqn +yfqna yfqp yfqq yfqr ֤ @@ -111045,6 +111497,7 @@ yftd yftdv yftf ̸ yftg ͤ +yftgi i yftgv һͨ yfth ̨ yfthv ̨ @@ -111188,6 +111641,7 @@ yfyp yfypv yfyr гһ yfyro Ӧԣ +yfyrv һһ yfys yfysi ѹ yfysu Ʒ @@ -111309,6 +111763,7 @@ ygejv һ ygejvi һ ygek Ӱ ygeki Ӣʽ +ygekiv өʯ ygeko Ӧ ygekoo Ӧ ygekv Ӳ @@ -111539,6 +111994,7 @@ ygpq ygpr Ӳ ygpw Ӣ ygpwi Ӣ +ygpy и ygq и ygqb ӭ ygqe ӭ @@ -111802,6 +112258,7 @@ yhenu yhep Ծ yher Ծ yheru +yhes ɳ yheu ӡ˰ yhez Խ yhf @@ -111840,6 +112297,7 @@ yhgw yhgx ¹ yhgy ¹ yhgyu ¹ +yhgyuv ֹ yhgyv Խ yhgz Խ yhgza Լ @@ -111971,6 +112429,7 @@ yhqfa Լս yhqfv Խս yhqfvi ػ yhqg Լ +yhqgu yhqh ȱ yhqj yhqk @@ -112182,6 +112641,7 @@ yjge ҹ yjgk һǿ yjh һ仰 yjha ݳ +yjhaa κ yjhao Ҳͻ yjhf Լ裬ʹ yjhh @@ -112247,6 +112707,7 @@ yjn Ҳ yjng Ѿܹ yjnr о yjp Һ +yjpu yjq о yjqa ݽ yjqav λս @@ -112369,7 +112830,6 @@ ykbno ykbp һ ykbs һ ykbsa ԰ -ykbsaa β ykbw һ ykbwa ѱ ykbwai Ա @@ -112394,7 +112854,7 @@ ykcka ykcki ykckii ykckv һ -ykcl Ѵ +ykcl һ ykcp ykcr һ ykcs һ @@ -112455,6 +112915,7 @@ ykdr һ ykds Ѵ ykdso ykdsv һ +ykdsva һ ykdsvv ҽ ykdt һ ykdta @@ -112540,11 +113001,10 @@ ykenv һ ykep ykepo ykeq һˢ -yker һ -ykerv ҽ -ykervu һ +yker ҽ +ykerv һ +ykervv һ ykes һ -ykesv һɲ ykev һˮ ykevv һ ykew һ˲ @@ -112802,7 +113262,6 @@ ykjmvi һ ykjmvo һ ykjmvu һ ykjmvu һ -ykjn ykjp 쳣 ykjpo ˲ ykjpv һ @@ -112812,6 +113271,7 @@ ykjqv һ ykjr ykjra ѳ ykjro +ykjrou ykjrv һ ykjrvu һ ykjrvv ƿ @@ -112939,6 +113399,7 @@ ykmh ykmho ykmhv һ ykmj һĻ +ykmja ĸ ykmjv һĶ ykmk ykmki ޲ @@ -112953,6 +113414,7 @@ ykmr ykmrv һ ykms ykmso +ykmsu ykmsv һ ykmsva һ ykmv п @@ -113138,7 +113600,7 @@ ykskv һ˿ ykskvv һ yksl һ ykslv һ -yksta +ykst ykstv һ yksy yksz һɨ @@ -113175,7 +113637,7 @@ yktmi yktp һ yktpv һ yktr -ykts һ +ykts yktt ykttv һ yktv һͷ @@ -113378,7 +113840,7 @@ ykyp һ ykypa ykypi ykypo -ykypva ߮ +ykypv ߮ ykypvo ҽ ykys ѽ ykyt ҽԺ @@ -113415,6 +113877,7 @@ ykzko ykzkv һ ykzl һ ykzla +ykzli ykzlo ykzlv һ ykzp @@ -113534,6 +113997,7 @@ ylepa yleq ˢ yler ylero +yleru ylerv yles ɳ ylev һ· @@ -113570,8 +114034,7 @@ ylfna Ԥ ylfnu ylfo · ylfp Ԥ -ylfq צ -ylfqo Ҷ֪ +ylfq Ҷ֪ ylfr ylfra ylfru @@ -113591,6 +114054,7 @@ ylfyou ylfyu ylfyuu ylfz Ԥ +ylfzv צ ylg ylgd Ԥ ylgdu 㹳 @@ -113611,7 +114075,7 @@ ylgp ԡ ylgpa ylgpu ylgt -ylgvv һ +ylgv һ ylgw ǹ ylgx ylgy 빲 @@ -113882,7 +114346,6 @@ ylse ylsea ylsf ɡ ylsh Ԥ -ylsho ylsj ylsjo ylsk ˿ @@ -113930,7 +114393,7 @@ ylwk ylwka ξ ylwkaa ԡ ylwku -ylwkvv ܯ +ylwkv ܯ ylwl ylwlv ylwlvu @@ -114117,6 +114580,7 @@ ymev Ҫô ymew Ӣ ymf һ ymfc һ֮ +ymfe һθ ymfi Ӣ ymfj һ֮ ymfm ë @@ -114464,8 +114928,8 @@ yppb yppc Ʊ yppf yppg ƽ -ypph -yppho +ypph +ypphi yppj yppjv yppk Ƥ @@ -114495,6 +114959,7 @@ ypql ypqn ypqo ӦƸ ypqp +ypqpv ypqq ypqqv ѻƬս ypqr @@ -114558,6 +115023,8 @@ ypxj ypxk Ϫ ypxl ypxla +ypxlo +ypxlv ypxm ypxs Ϻ ypxx @@ -114738,10 +115205,12 @@ yqyl yqylv yqyq ȡ yqyqa սս +yqyqao Բȱ yqyqv һһ yqyqva һһ yqyr гһ -yqyrv +yqyrv һһ +yqyrvv yqyv Ҫע yqyvi yqyvo @@ -114854,6 +115323,7 @@ ysdf Ѽ ysdh ѹ ysdj Ƕ ysdk ѹ +ysdkv ŵ ysdm ŵ ysdmv ѹ ysdp ǵ @@ -114886,8 +115356,7 @@ ysfe ѹ ysfj Ѽ ysfjv ѹ ysfk ѹ -ysfkv -ysfkvv +ysfkv ysfl ɢ ysflv ˿ ysfn @@ -114961,7 +115430,6 @@ yskj ѹ yskq ѹ yskt Ѻ ysky ¿ -yskyv ysl ɫ yslb ˹ ysld ѹ @@ -114989,6 +115457,7 @@ ysmg ysmj Ĺ ysmk ysml ѹģ +ysmm ysmn ysmr ysms @@ -115129,6 +115598,7 @@ yszk Ѽ yszki yszl yszw Ϊ +ytb α ytbc ԭ ytbd Զ ytbf ԭ @@ -115141,7 +115611,6 @@ ytblv Զ ytbn ԭ ytbp Բ ytbt һһ -ytbu α ytbv ͬ ytbw ԭ ytbwv @@ -115231,6 +115700,7 @@ ytfxo ytfxv ԭ״ ytfy ԰ ytfya Ժ +ytfyo ԩ ytfyv ԭ ytg Ҫͨ ytgb Բ @@ -115311,7 +115781,7 @@ ytjq Ԯ ytjr Զ ytjs ԭ ytjso ԩ -ytjsva ԭ +ytjsv ԭ ytju ̫ ytjv һ ytjvu @@ -115438,7 +115908,8 @@ ytsd Ԩ޴ ytse ԭɫ ytsev һ̶ˮ ytsj Ԫ -ytsjv Ԫ +ytsjv ԭ +ytsjvo ԭ ytsk ԩ ytsl Ժ ytt һ @@ -115806,7 +116277,6 @@ ywsyv һ ywt ywtb ywtd ͷ -ywtda ywtdv ywtf ̯ ywtg ͤ @@ -115857,6 +116327,7 @@ ywxk ywxl ywxlo Ŷ ywxm +ywxo ywxq Ϊ ywxs ϼ ywxsv һ޶ @@ -115884,7 +116355,6 @@ ywyo ywyov γҩ ywyp ywypi -ywyr һһ ywyw ywywi ҫ ywyx @@ -115993,6 +116463,7 @@ yxjfv yxji ȼ yxjj ѩ yxjm Ӣ۾ +yxjo yxjv ½ yxjvo ҽѧ yxjvoi Ԫ @@ -116202,8 +116673,7 @@ yydya yydyi yydyo yydyv ԶԶ -yydyvv ԶԶ -yydyvva һһӦ +yydyvv һһӦ yydz õ yydza yydzu õ @@ -116386,6 +116856,7 @@ yyjro ҹ yyjs ü yyjso yyjt ͨ +yyjta yyjv ѹѹ yyjw ӽ yyjwa β׽ײ @@ -116514,9 +116985,9 @@ yys yysb yysd ˼ yyse ɫ +yysei ӵ yysev ˼ yysf ָ -yysh ӵ yysi Ӫ yysii Ӫҵ yysj ӹ @@ -116655,6 +117126,7 @@ yyyii ӪҵԱ yyyiv ҡһҡ yyyk yyyka Ӿ +yyykao yyyko ӹҽ yyyku yyyl @@ -116778,6 +117250,7 @@ yzeni ҡ yzep ҧ yzepu yzeq Ҫˣ +yzes Ҫɶ yzew Ң˴ yzez Ҫ yzf ֯ @@ -116799,8 +117272,8 @@ yzfp ҩ yzfpi ҩ yzfq Ҫץ yzfs Ҫ -yzfsv Ҫ -yzfsvi Ҫ +yzfsi ҩ +yzfsv Ҫ yzft Ҫת yzfv ԭ yzfw ҩ @@ -116989,6 +117462,7 @@ yzqhv yzqj ҧס yzqji ҡ yzqjv һǧ +yzqjvv yzqk yzql Ҫȥ yzqm ҪǮ @@ -117040,6 +117514,7 @@ yztl Ҫ yztm Ҫ yztr yzts Ҫ +yztsa Լ yztw yzty ʹ yztz Ҫ @@ -117335,6 +117810,7 @@ zbny zbnz zbp ̲Ʒ zbpb ƶ +zbpc ư zbpg ƽ zbph zbpk Ƥ @@ -117601,7 +118077,6 @@ zdpl zdpm ƫ zdpmv zdq -zdqa ׬Ǯ zdqb zdqc zdqe @@ -117768,7 +118243,6 @@ zenr zep ˮƽ zepw zeq -zeqc zeqg ʳ zeqk zeqka @@ -117910,7 +118384,6 @@ zflk zflq zfls zflu -zflx zfm 游ĸ zfmb Ŀ zfmd Ŀ @@ -118010,7 +118483,6 @@ zgfoi zgfu Թ״ zgfy Ը zgfyo ߷Ժ -zgg ܹ zgh ܹ zgj ߹ zgja ӹ @@ -118021,6 +118493,7 @@ zgjj zgjl ӹ zgjlo ߼¼ zgjo ܹھ +zgjoi ܹ zgjoo ߼ zgjooa ߳ zgjooi ؼ @@ -118105,6 +118578,7 @@ zhdk zhdkv ڵ zhdl ٶ zhdm ڵ +zhdo õ zhdp ٵ zhdr ٵ zhdrv ڵ @@ -118317,7 +118791,7 @@ zhqev zhqf ս zhqg zhqj פ -zhqji +zhqji zhqju Իǰ zhqk zhqkv @@ -118832,7 +119306,6 @@ zkgju zkgm Ϲ zkgn ָ zkgt Թ -zkgw Ը zkgx Ϲ zkgy ӹ zkgya ӹ @@ -118983,6 +119456,7 @@ zkqg zkqj zkqji zkqjii +zkqjiu zkqjo zkqju zkqk @@ -119332,6 +119806,7 @@ zlm zlmf zlmh Ż zlmj ľ +zlml ĥ zlmm zlmr zlmri @@ -119346,14 +119821,15 @@ zlnf zlnk zlny Ū zlnz +zlp Ƭ zlpb Ʒ zlpc Ʊ zlpf zlph zlphv -zlpo ƪ zlpw zlqb +zlqc zlqe zlqei zlqeio @@ -119546,6 +120022,7 @@ zms zmt ý zmw ô zmx ô +zmxe ĸɳ zmxx ijЩ zmy ô zmyd ô @@ -119617,13 +120094,13 @@ zpeb zpek ʽ zpen zpf -zpfd 갷 zpfj อ zpg ĸ zpgh zpgt ߹ zph ƻ zphb ߻ +zphj غ zphl zphq ໰ zphqi Ứ @@ -119643,6 +120120,7 @@ zpmh zpmk zpmw ú zppb Ʒ +zppk 갷 zpq Ʒչ zpqc zpqg @@ -119760,6 +120238,7 @@ zrbk zrbl zrbm zrbq Ȼ +zrbr ղײ zrc Ȼ zrch zrcj @@ -120018,6 +120497,7 @@ zsmz zsn Ů zsnm zsnmv +zsnp zsnr զ zspb Ʒ zspc Ʊ @@ -120292,7 +120772,6 @@ zwyf zwyfa zwyfi Ϊһ zwyg Ϊһ -zwygi Ϊһ zwyk zwym ӳî zwyt ͻ @@ -120411,7 +120890,7 @@ zydj zydl ܶ zydm ܵ zydn һΧ -zydov һ +zydo һ zydp ݵ zydr zydt ܶ @@ -120547,6 +121026,7 @@ zylx zyly ¼ zylz zylzi +zylzo zym zymc zymj Ŀ @@ -120788,7 +121268,7 @@ zzkd zzke zzkf 翴 zzkh 俪 -zzkka γLL +zzkk γLL zzkm zzkp 㿷 zzkr diff --git "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" similarity index 89% rename from "xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" rename to "data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" index e5ae0b0..b47b29c 100644 --- "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" +++ "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_RIMEJD\347\256\200\347\240\201.txt" @@ -100,6 +100,7 @@ z զ # һ y q +j # bs ek @@ -153,7 +154,7 @@ fmwh gdp ֵ # ʾ a ^ -a S +a 20 a a a ] @@ -169,7 +170,6 @@ v ʿ v һ v W # ƫ -a 20 aaa aaiv aaoiuo @@ -260,7 +260,7 @@ vu vui vviv 59 vvvuo 67 -# sbb +#630 ba baa ༶ bai @@ -890,4 +890,4 @@ zva zvi zvo zvu -zvv ߽ +zvv ߽ \ No newline at end of file diff --git "a/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" new file mode 100644 index 0000000..d750d95 --- /dev/null +++ "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" @@ -0,0 +1,15 @@ +bxoooa $[bing]$FILE(mb/xkjd6/biang.bmp) +oojp $[ͼ]$GO(skin/xkjd6_keymap.png) +oomb $[]$GO(https://docs.qq.com/form/fill/DRWlwcUplU3dzaEFq#/fill/resubmit) +oomb $[]$GO(https://docs.qq.com/sheet/BFdiXU0nyc1W1kwuZl3Gx31r2KLm2k3F8YzI4) + +oyk +oxj +osf +osk +owj +olq +oqk +obs +ojq +oek \ No newline at end of file diff --git "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" "b/data-schema/xkjd6/mb/xkjd6/xkjd6_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" similarity index 100% rename from "xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" rename to "data-schema/xkjd6/mb/xkjd6/xkjd6_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" diff --git a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_overlay.ini b/data-schema/xkjd6/mb/xkjd6/xkjd6_overlay.ini similarity index 100% rename from xxxk-schema-xkjd6/mb/xkjd6/xkjd6_overlay.ini rename to data-schema/xkjd6/mb/xkjd6/xkjd6_overlay.ini diff --git a/xxxk-schema-xkjd6/skin/xkjd6_keymap.png b/data-schema/xkjd6/skin/xkjd6_keymap.png similarity index 100% rename from xxxk-schema-xkjd6/skin/xkjd6_keymap.png rename to data-schema/xkjd6/skin/xkjd6_keymap.png diff --git "a/xxxk-schema-xklb/doc/\346\230\237\347\251\272\344\270\244\347\254\224\346\225\231\347\250\213.chm" "b/data-schema/xklb/doc/\346\230\237\347\251\272\344\270\244\347\254\224\346\225\231\347\250\213.chm" similarity index 100% rename from "xxxk-schema-xklb/doc/\346\230\237\347\251\272\344\270\244\347\254\224\346\225\231\347\250\213.chm" rename to "data-schema/xklb/doc/\346\230\237\347\251\272\344\270\244\347\254\224\346\225\231\347\250\213.chm" diff --git a/xxxk-schema-xklb/entry/xklb_entry.ini b/data-schema/xklb/entry/xklb_entry.ini similarity index 100% rename from xxxk-schema-xklb/entry/xklb_entry.ini rename to data-schema/xklb/entry/xklb_entry.ini diff --git a/xxxk-schema-xklb/mb/xklb/xklb_arg.txt b/data-schema/xklb/mb/xklb/xklb_arg.txt similarity index 100% rename from xxxk-schema-xklb/mb/xklb/xklb_arg.txt rename to data-schema/xklb/mb/xklb/xklb_arg.txt diff --git "a/data-schema/xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" "b/data-schema/xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" new file mode 100644 index 0000000..fec2a61 --- /dev/null +++ "b/data-schema/xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" @@ -0,0 +1,13 @@ +bxoooa $[bing]$FILE(mb/xkjd6/biang.bmp) +oojp $[ͼ]$GO(skin/xklb_keymap.png) + +oyi +ove +osa +osi +owu +oli +oqi +oba +oji +osii diff --git "a/xxxk-schema-xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" "b/data-schema/xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" similarity index 100% rename from "xxxk-schema-xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" rename to "data-schema/xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" diff --git "a/xxxk-schema-xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" "b/data-schema/xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" similarity index 100% rename from "xxxk-schema-xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" rename to "data-schema/xklb/mb/xklb/xklb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" diff --git "a/xxxk-schema-xklb/mb/xklb/xklb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" "b/data-schema/xklb/mb/xklb/xklb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" similarity index 100% rename from "xxxk-schema-xklb/mb/xklb/xklb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" rename to "data-schema/xklb/mb/xklb/xklb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" diff --git a/xxxk-schema-xklb/mb/xklb/xklb_overlay.ini b/data-schema/xklb/mb/xklb/xklb_overlay.ini similarity index 100% rename from xxxk-schema-xklb/mb/xklb/xklb_overlay.ini rename to data-schema/xklb/mb/xklb/xklb_overlay.ini diff --git a/xxxk-schema-xklb/skin/xklb_keymap.png b/data-schema/xklb/skin/xklb_keymap.png similarity index 100% rename from xxxk-schema-xklb/skin/xklb_keymap.png rename to data-schema/xklb/skin/xklb_keymap.png diff --git "a/xxxk-schema-xkxb/doc/\346\230\237\347\251\272\346\230\237\347\254\224\346\225\231\347\250\213.txt" "b/data-schema/xkxb/doc/\346\230\237\347\251\272\346\230\237\347\254\224\346\225\231\347\250\213.txt" similarity index 100% rename from "xxxk-schema-xkxb/doc/\346\230\237\347\251\272\346\230\237\347\254\224\346\225\231\347\250\213.txt" rename to "data-schema/xkxb/doc/\346\230\237\347\251\272\346\230\237\347\254\224\346\225\231\347\250\213.txt" diff --git a/xxxk-schema-xkxb/entry/xkxb_entry.ini b/data-schema/xkxb/entry/xkxb_entry.ini similarity index 100% rename from xxxk-schema-xkxb/entry/xkxb_entry.ini rename to data-schema/xkxb/entry/xkxb_entry.ini diff --git a/xxxk-schema-xkxb/mb/xkxb/xkxb_arg.txt b/data-schema/xkxb/mb/xkxb/xkxb_arg.txt similarity index 100% rename from xxxk-schema-xkxb/mb/xkxb/xkxb_arg.txt rename to data-schema/xkxb/mb/xkxb/xkxb_arg.txt diff --git "a/data-schema/xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" "b/data-schema/xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" new file mode 100644 index 0000000..85b63db --- /dev/null +++ "b/data-schema/xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" @@ -0,0 +1,13 @@ +bxoooa $[bing]$FILE(mb/xkjd6/biang.bmp) +oojp $[ͼ]$GO(skin/xkxb_keymap.png) + +oyi +ovu +osj +osi +owu +olq +oqi +oba +ojq +osij \ No newline at end of file diff --git "a/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\345\244\247\350\257\215\345\272\223.txt" "b/data-schema/xkxb/mb/xkxb/xkxb_dict_\345\244\247\350\257\215\345\272\223.txt" similarity index 100% rename from "xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\345\244\247\350\257\215\345\272\223.txt" rename to "data-schema/xkxb/mb/xkxb/xkxb_dict_\345\244\247\350\257\215\345\272\223.txt" diff --git "a/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" "b/data-schema/xkxb/mb/xkxb/xkxb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" similarity index 100% rename from "xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" rename to "data-schema/xkxb/mb/xkxb/xkxb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" diff --git "a/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\347\256\200\347\240\201.txt" "b/data-schema/xkxb/mb/xkxb/xkxb_dict_\347\256\200\347\240\201.txt" similarity index 100% rename from "xxxk-schema-xkxb/mb/xkxb/xkxb_dict_\347\256\200\347\240\201.txt" rename to "data-schema/xkxb/mb/xkxb/xkxb_dict_\347\256\200\347\240\201.txt" diff --git a/xxxk-schema-xkxb/mb/xkxb/xkxb_overlay.ini b/data-schema/xkxb/mb/xkxb/xkxb_overlay.ini similarity index 100% rename from xxxk-schema-xkxb/mb/xkxb/xkxb_overlay.ini rename to data-schema/xkxb/mb/xkxb/xkxb_overlay.ini diff --git a/xxxk-schema-xkxb/skin/xkxb_keymap.png b/data-schema/xkxb/skin/xkxb_keymap.png similarity index 100% rename from xxxk-schema-xkxb/skin/xkxb_keymap.png rename to data-schema/xkxb/skin/xkxb_keymap.png diff --git "a/xxxk-schema-xkyb/doc/\346\230\237\347\251\272\344\270\200\347\254\224\346\225\231\347\250\213.chm" "b/data-schema/xkyb/doc/\346\230\237\347\251\272\344\270\200\347\254\224\346\225\231\347\250\213.chm" similarity index 100% rename from "xxxk-schema-xkyb/doc/\346\230\237\347\251\272\344\270\200\347\254\224\346\225\231\347\250\213.chm" rename to "data-schema/xkyb/doc/\346\230\237\347\251\272\344\270\200\347\254\224\346\225\231\347\250\213.chm" diff --git a/xxxk-schema-xkyb/entry/xkyb_entry.ini b/data-schema/xkyb/entry/xkyb_entry.ini similarity index 100% rename from xxxk-schema-xkyb/entry/xkyb_entry.ini rename to data-schema/xkyb/entry/xkyb_entry.ini diff --git a/xxxk-schema-xkyb/mb/xkyb/xkyb_arg.txt b/data-schema/xkyb/mb/xkyb/xkyb_arg.txt similarity index 100% rename from xxxk-schema-xkyb/mb/xkyb/xkyb_arg.txt rename to data-schema/xkyb/mb/xkyb/xkyb_arg.txt diff --git "a/data-schema/xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" "b/data-schema/xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" new file mode 100644 index 0000000..cc84931 --- /dev/null +++ "b/data-schema/xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" @@ -0,0 +1,14 @@ +bxoooa $[bing]$FILE(mb/xkjd6/biang.bmp) +oojp $[ͼ]$GO(skin/xkyb_keymap.png) +oomb $[]$GO(https://docs.qq.com/sheet/BkqgM135VoP52ib4661Iazqq3hik7F2ts2Au0) + +oyi +ovu +osj +osi +owu +olq +oqi +oba +ojq +osii diff --git "a/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" "b/data-schema/xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" similarity index 100% rename from "xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" rename to "data-schema/xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\347\256\200\347\240\201.txt" diff --git "a/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" "b/data-schema/xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" similarity index 100% rename from "xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" rename to "data-schema/xkyb/mb/xkyb/xkyb_dict_\345\244\232\345\244\232\350\257\215\347\273\204.txt" diff --git "a/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" "b/data-schema/xkyb/mb/xkyb/xkyb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" similarity index 100% rename from "xxxk-schema-xkyb/mb/xkyb/xkyb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" rename to "data-schema/xkyb/mb/xkyb/xkyb_dict_\345\255\227\346\265\267\344\270\244\345\210\206.txt" diff --git a/xxxk-schema-xkyb/mb/xkyb/xkyb_overlay.ini b/data-schema/xkyb/mb/xkyb/xkyb_overlay.ini similarity index 100% rename from xxxk-schema-xkyb/mb/xkyb/xkyb_overlay.ini rename to data-schema/xkyb/mb/xkyb/xkyb_overlay.ini diff --git a/xxxk-schema-xkyb/skin/xkyb_keymap.png b/data-schema/xkyb/skin/xkyb_keymap.png similarity index 100% rename from xxxk-schema-xkyb/skin/xkyb_keymap.png rename to data-schema/xkyb/skin/xkyb_keymap.png diff --git "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" "b/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" deleted file mode 100644 index 8ef96b0..0000000 --- "a/xxxk-schema-xkjd6/mb/xkjd6/xkjd6_dict_o\345\274\225\345\257\274.txt" +++ /dev/null @@ -1,15 +0,0 @@ -bxoooa $[bing]$FILE(mb\xkjd6\biang.bmp) -oojp $GO([ͼ],skin\xkjd6_keymap.png) -oomb $GO([],https://docs.qq.com/form/fill/DRWlwcUplU3dzaEFq#/fill/resubmit) -oomb $GO([],https://docs.qq.com/sheet/BFdiXU0nyc1W1kwuZl3Gx31r2KLm2k3F8YzI4) - -oyk -oxj -osf -osk -owj -olq -oqk -obs -ojq -oek \ No newline at end of file diff --git "a/xxxk-schema-xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" "b/xxxk-schema-xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" deleted file mode 100644 index 43bd6e4..0000000 --- "a/xxxk-schema-xklb/mb/xklb/xklb_dict_o\345\274\225\345\257\274.txt" +++ /dev/null @@ -1,13 +0,0 @@ -bsoaoo $[bing]$FILE(mb\xkjd6\biang.bmp) -oojp $GO([ͼ],skin\xklb_keymap.png) - -oyi -ove -osa -osi -owu -oli -oqi -oba -oji -osii diff --git "a/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" "b/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" deleted file mode 100644 index 28dbba7..0000000 --- "a/xxxk-schema-xkxb/mb/xkxb/xkxb_dict_o\345\274\225\345\257\274.txt" +++ /dev/null @@ -1,13 +0,0 @@ -bco $[bing]$FILE(mb\xkjd6\biang.bmp) -oojp $GO([ͼ],skin\xkxb_keymap.png) - -oyi -ovu -osj -osi -owu -olq -oqi -oba -ojq -osij \ No newline at end of file diff --git "a/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" "b/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" deleted file mode 100644 index 42eb909..0000000 --- "a/xxxk-schema-xkyb/mb/xkyb/xkyb_dict_o\345\274\225\345\257\274.txt" +++ /dev/null @@ -1,14 +0,0 @@ -bcoooa $[bing]$FILE(mb\xkjd6\biang.bmp) -oojp $GO([ͼ],skin\xkyb_keymap.png) -oomb $GO([],https://docs.qq.com/sheet/BkqgM135VoP52ib4661Iazqq3hik7F2ts2Au0) - -oyi -ovu -osj -osi -owu -olq -oqi -oba -ojq -osii diff --git a/xxxk-xkcommon/menu.ini b/xxxk-xkcommon/menu.ini deleted file mode 100644 index e7aeeca..0000000 --- a/xxxk-xkcommon/menu.ini +++ /dev/null @@ -1,90 +0,0 @@ -[root] -child=im config oomb ooml help ooxx - tools - output - -[im] -name=方案切换（Ctrl+Shift+H） -exec=$IMLIST - -[config] -name=图形化配置程序（ooxx） -exec=$CONFIG -#$CONFIG会自动根据当前界面程序的位数判断调用哪一个 - -[oomb] -name=在线码表（oomb） -child=jdol jdol2 ydol -[jdol] -name=在线码表简洁版（键道） -exec=$GO(https://docs.qq.com/form/fill/DRWlwcUplU3dzaEFq#/fill/resubmit) -[jdol2] -name=在线码表完整版（键道） -exec=$GO(https://docs.qq.com/sheet/BFdiXU0nyc1W1kwuZl3Gx31r2KLm2k3F8YzI4) -[ydol] -name=在线码表（一道） -exec=$GO(https://docs.qq.com/sheet/BkqgM135VoP52ib4661Iazqq3hik7F2ts2Au0) - -[ooml] -name=常用目录（ooml） -child=instdir yongdir -[instdir] -name=程序目录 -exec=$GO(".") -[yongdir] -name=配置目录 -exec=$GO(tools\\bat\\yongdir.bat) - -[help] -name=帮助 -child=gw1 gw2 gw3 - rm - about -[gw1] -name=小小星空首页和帮助（oogw） -exec=$GO(https://xkinput.github.io/xxxk-help) -[gw2] -name=小小星空网盘（oogw） -exec=$GO(http://xxxk.ysepan.com/) -[gw3] -name=星空系列方案首页（oogw） -exec=$GO(https://xkinput.github.io/) -[rm] -name=入门文档（oorm） -exec=$GO(doc) -[about] -name=关于小小星空 -exec=$MSG(小小星空\r\r版本：unknown) - -[ooxx] -name=退出程序（ooxx） -child=rerun exit -[rerun] -name=重启小小（ooxx） -exec=$GO(tools\bat\\rerun.bat) -[exit] -name=退出小小（ooxx） -exec=$EXIT - -[tools] -name=其他工具 -child=stat keymap - caution #xchr -[stat] -name=输入统计 -exec=$STAT -[keymap] -name=键盘图 -exec=$KEYMAP -[xchr] -name=符文角 -exec=$GO(tools\\xchr\\xchr.exe) - -[caution] -name=慎用 -child=reset #update -[reset] -name=重置设定（ooxx） -exec=$GO(tools\\bat\\reset.bat) -[update] -name=更新主程序（不含码表等资源） -exec=$GO(yong-config --update) - -[output] -name=TSF未生效，正以外挂模式运行： -exec=$OUTPUT diff --git a/xxxk-xkcommon/tools/bat/quit.bat b/xxxk-xkcommon/tools/bat/quit.bat deleted file mode 100644 index 0f34cd8..0000000 --- a/xxxk-xkcommon/tools/bat/quit.bat +++ /dev/null @@ -1,26 +0,0 @@ -@echo off -echo ڽԱȨ... -cd /d "%~dp0" - -pushd %cd% -cacls.exe "%SystemDrive%\System Volume Information" >nul 2>nul - -if %errorlevel%==0 goto Admin - -if exist "%temp%\getadmin.vbs" del /f /q "%temp%\getadmin.vbs" - -echo Set RequestUAC = CreateObject^("Shell.Application"^)>"%temp%\getadmin.vbs" - -echo RequestUAC.ShellExecute "%~s0","","","runas",1 >>"%temp%\getadmin.vbs" - -echo WScript.Quit >>"%temp%\getadmin.vbs" - -"%temp%\getadmin.vbs" /f -if exist "%temp%\getadmin.vbs" del /f /q "%temp%\getadmin.vbs" - - -:Admin - -taskkill /f /im yong.exe >nul 2>nul - -echo ɣ \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/rerun.bat b/xxxk-xkcommon/tools/bat/rerun.bat deleted file mode 100644 index 3478aa5..0000000 --- a/xxxk-xkcommon/tools/bat/rerun.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -cd /d "%~dp0" -call quit.bat -echo ׼뷨... -ping -n 2 127.0.0.1 >nul -call yong.bat \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/yong-config.bat b/xxxk-xkcommon/tools/bat/yong-config.bat deleted file mode 100644 index 2d7f0e6..0000000 --- a/xxxk-xkcommon/tools/bat/yong-config.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -cd /d "%~dp0" -cd /d .. -cd /d .. -if not exist yong-config.exe (cd /d ..) -echo 뷨ó... -start yong-config.exe \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/yong-config64.bat b/xxxk-xkcommon/tools/bat/yong-config64.bat deleted file mode 100644 index edad33c..0000000 --- a/xxxk-xkcommon/tools/bat/yong-config64.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -cd /d "%~dp0" -cd /d .. -cd /d .. -rem if not exist yong.exe (cd /d ..) -echo 뷨ó... -if /i "%PROCESSOR_IDENTIFIER:~0,3%"=="X86" (start yong-config.exe) else (if exist w64/yong-config.exe (start w64/yong-config.exe) else (start yong-config.exe)) \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/yong.bat b/xxxk-xkcommon/tools/bat/yong.bat deleted file mode 100644 index d2d82a7..0000000 --- a/xxxk-xkcommon/tools/bat/yong.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -cd /d "%~dp0" -cd /d .. -cd /d .. -if not exist yong.exe (cd /d ..) -echo 뷨... -start yong.exe \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/yong64.bat b/xxxk-xkcommon/tools/bat/yong64.bat deleted file mode 100644 index 176abc2..0000000 --- a/xxxk-xkcommon/tools/bat/yong64.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -cd /d "%~dp0" -cd /d .. -cd /d .. -rem if not exist yong.exe (cd /d ..) -echo 뷨... -if /i "%PROCESSOR_IDENTIFIER:~0,3%"=="X86" (start yong.exe) else (if exist w64/yong.exe (start w64/yong.exe) else (start yong.exe)) \ No newline at end of file diff --git a/xxxk-xkcommon/tools/bat/yongdir.bat b/xxxk-xkcommon/tools/bat/yongdir.bat deleted file mode 100644 index 1c46947..0000000 --- a/xxxk-xkcommon/tools/bat/yongdir.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -cd /d "%~dp0" - -cd /d .. -cd /d .. -if not exist yong.exe exit - -if exist ".yong" ( - start /max "" ".yong" >nul 2>nul -) else ( - if exist "%AppData%\yong" (start /max "" "%AppData%\yong" >nul 2>nul) -) diff --git "a/xxxk-xkcommon/tools/vbs/\346\222\244\351\224\200.vbs" "b/xxxk-xkcommon/tools/vbs/\346\222\244\351\224\200.vbs" deleted file mode 100644 index 519ec75..0000000 --- "a/xxxk-xkcommon/tools/vbs/\346\222\244\351\224\200.vbs" +++ /dev/null @@ -1,2 +0,0 @@ -set WshShell=createobject("wscript.shell") -WshShell.sendkeys "^{z}" 'Esc{ESC}CTRL+Z^{z} \ No newline at end of file