Skip to content

Commit

Permalink
Merge CorvusSKK 2.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@deton
deton committed Jun 24, 2016
2 parents 1baf912 + 75524df commit 0013317
Show file tree
Hide file tree
Showing 128 changed files with 7,690 additions and 707 deletions.
2 changes: 1 addition & 1 deletion LICENSE.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Lua

The MIT License

Copyright (C) 1994-2015 Lua.org, PUC-Rio.
Copyright (C) 1994-2016 Lua.org, PUC-Rio.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ SKK辞書のダウンロード機能では HTTP, HTTPS が使用可能です。
| 候補一覧のフォント | 候補一覧に表示するフォントの種類、スタイル、サイズを指定します。 |
| 候補一覧の最大幅 | 候補一覧の最大幅のサイズを指定します。 |
| 候補一覧の色 | 候補一覧の色を指定します。 |
| 候補一覧の描画API | 候補一覧の描画をおこなうAPIを指定します。<br>Direct2Dと彩色の指定でカラーフォントをその色で表示します。(Windows8.1以降) |
| 候補一覧の描画API | 候補一覧の描画をおこなうAPIを指定します。<br>Direct2Dと彩色の指定でカラーフォントを表示します。(Windows8.1以降) |
| 候補一覧表示に要する変換回数(0は表示無し) | 指定した回数変換すると候補一覧が表示されます。 |
| 候補一覧が表示無しのとき候補数を表示する | (<現在の候補の番号>/<候補数>) の形式を追加して表示します。 |
| 候補一覧を縦に表示する | 候補一覧で候補を縦に並べて表示します。 |
| 注釈を表示する | <候補><セミコロン><注釈> の形式で注釈を表示します。<br>「候補一覧」の指定で候補一覧に限定されます。 |
| 入力モードを表示する | キャレットまたは辞書登録ウィンドウ付近に入力モードを表示します。<br>タイミングは、IME ON/OFF 変更、入力モード変更、IME ON/OFF キー押下、「\*無効\*」キー押下のときです。<br>「没入型」の指定でストアアプリやEdgeなどに限定されます。 |
| 入力モードを表示する | キャレットまたは辞書登録ウィンドウ付近に入力モードを表示します。<br>タイミングは、IME ON/OFF 変更、入力モード変更、IME ON/OFF キー押下、「\*無効\*」キー押下、ウィンドウフォーカスのときです。<br>表示する秒数として1〜60秒を設定してください。デフォルト値は3秒です。 |
| ▽▼\*マークを表示する | 大切なものは目に見えないようです。 |
| ローマ字を表示する | 仮名文字のローマ字プレフィックスを表示します。 |
| 入力途中のキーシーケンスを表示する | 有効にすると、一部アプリで後置型変換動作に問題が生じます。 |
Expand Down Expand Up @@ -594,7 +594,7 @@ ASCII、全英文字の組み合せを指定します。最大で128行です。

辞書管理プロセス (imtutmgr.exe) の各機能の拡張、プログラム実行変換もどき、数値変換をLuaスクリプトで実装しています。

現在使用しているLuaのバージョンは5.3.2です。
現在使用しているLuaのバージョンは5.3.3です。

詳細はこちらを参照ください。http://www.lua.org/manual/5.3/manual.html

Expand Down Expand Up @@ -822,7 +822,7 @@ Visual Studio Community 2015 Update 2

WiX Toolset v3.10.2

pandoc 1.17.0.2
pandoc 1.17.1

### ビルド手順

Expand Down
2 changes: 1 addition & 1 deletion common/configxml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ LPCWSTR ValueVerticalCand = L"verticalcand";
LPCWSTR ValueAnnotation = L"annotation";
LPCWSTR ValueAnnotatLst = L"annotatlst";
LPCWSTR ValueShowModeInl = L"showmodeinl";
LPCWSTR ValueShowModeImm = L"showmodeimm";
LPCWSTR ValueShowModeSec = L"showmodesec";
LPCWSTR ValueShowModeMark = L"showmodemark";
LPCWSTR ValueShowRoman = L"showroman";
LPCWSTR ValueShowRomanComp = L"showromancomp";
Expand Down
2 changes: 1 addition & 1 deletion common/configxml.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ extern LPCWSTR ValueVerticalCand;
extern LPCWSTR ValueAnnotation;
extern LPCWSTR ValueAnnotatLst;
extern LPCWSTR ValueShowModeInl;
extern LPCWSTR ValueShowModeImm;
extern LPCWSTR ValueShowModeSec;
extern LPCWSTR ValueShowModeMark;
extern LPCWSTR ValueShowRoman;
extern LPCWSTR ValueShowRomanComp;
Expand Down
76 changes: 57 additions & 19 deletions imcrvcnf/DlgProcDisplay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
PAINTSTRUCT ps;
WCHAR num[16];
WCHAR fontname[LF_FACESIZE];
int fontpoint, fontweight, x, y, count;
INT fontpoint, fontweight, x, y, count;
BOOL fontitalic;
CHOOSEFONTW cf;
LOGFONTW lf;
Expand All @@ -45,26 +45,27 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
case WM_INITDIALOG:
ReadValue(pathconfigxml, SectionFont, ValueFontName, strxmlval);
wcsncpy_s(fontname, strxmlval.c_str(), _TRUNCATE);

ReadValue(pathconfigxml, SectionFont, ValueFontSize, strxmlval);
fontpoint = _wtoi(strxmlval.c_str());
ReadValue(pathconfigxml, SectionFont, ValueFontWeight, strxmlval);
fontweight = _wtoi(strxmlval.c_str());
ReadValue(pathconfigxml, SectionFont, ValueFontItalic, strxmlval);
fontitalic = _wtoi(strxmlval.c_str());

if(fontname[0] == L'\0')
{
wcsncpy_s(fontname, L"メイリオ", _TRUNCATE);
}

ReadValue(pathconfigxml, SectionFont, ValueFontSize, strxmlval);
fontpoint = _wtoi(strxmlval.c_str());
if(fontpoint < 8 || fontpoint > 72)
{
fontpoint = 12;
}

ReadValue(pathconfigxml, SectionFont, ValueFontWeight, strxmlval);
fontweight = _wtoi(strxmlval.c_str());
if(fontweight <= 0 || fontweight > 1000)
{
fontweight = FW_NORMAL;
}

ReadValue(pathconfigxml, SectionFont, ValueFontItalic, strxmlval);
fontitalic = _wtoi(strxmlval.c_str());
if(fontitalic != FALSE)
{
fontitalic = TRUE;
Expand Down Expand Up @@ -104,11 +105,13 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
}

LoadCheckButton(hDlg, IDC_RADIO_API_D2D, SectionDisplay, ValueDrawAPI);
EnableWindow(GetDlgItem(hDlg, IDC_CHECKBOX_COLOR_FONT), TRUE);
if(!IsDlgButtonChecked(hDlg, IDC_RADIO_API_D2D))
{
CheckDlgButton(hDlg, IDC_RADIO_API_GDI, BST_CHECKED);
EnableWindow(GetDlgItem(hDlg, IDC_CHECKBOX_COLOR_FONT), FALSE);
}
LoadCheckButton(hDlg, IDC_CHECKBOX_COLOR_FONT, SectionDisplay, ValueColorFont);
LoadCheckButton(hDlg, IDC_CHECKBOX_COLOR_FONT, SectionDisplay, ValueColorFont, L"1");

hwnd = GetDlgItem(hDlg, IDC_COMBO_UNTILCANDLIST);
num[1] = L'\0';
Expand All @@ -119,7 +122,7 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
}
ReadValue(pathconfigxml, SectionDisplay, ValueUntilCandList, strxmlval);
count = strxmlval.empty() ? 5 : _wtoi(strxmlval.c_str());
if(count > 9)
if(count > 9 || count < 0)
{
count = 5;
}
Expand All @@ -135,12 +138,15 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
CheckDlgButton(hDlg, IDC_RADIO_ANNOTATALL, BST_CHECKED);
}

LoadCheckButton(hDlg, IDC_CHECKBOX_SHOWMODEINL, SectionDisplay, ValueShowModeInl);
LoadCheckButton(hDlg, IDC_RADIO_SHOWMODEIMM, SectionDisplay, ValueShowModeImm, L"1");
if(!IsDlgButtonChecked(hDlg, IDC_RADIO_SHOWMODEIMM))
LoadCheckButton(hDlg, IDC_CHECKBOX_SHOWMODEINL, SectionDisplay, ValueShowModeInl, L"1");
ReadValue(pathconfigxml, SectionDisplay, ValueShowModeSec, strxmlval);
count = strxmlval.empty() ? -1 : _wtoi(strxmlval.c_str());
if(count > 60 || count <= 0)
{
CheckDlgButton(hDlg, IDC_RADIO_SHOWMODEALL, BST_CHECKED);
count = 3;
}
_snwprintf_s(num, _TRUNCATE, L"%d", count);
SetDlgItemTextW(hDlg, IDC_EDIT_SHOWMODESEC, num);

LoadCheckButton(hDlg, IDC_CHECKBOX_SHOWMODEMARK, SectionDisplay, ValueShowModeMark, L"1");
LoadCheckButton(hDlg, IDC_CHECKBOX_SHOWROMAN, SectionDisplay, ValueShowRoman, L"1");
Expand All @@ -149,6 +155,24 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
return TRUE;

case WM_COMMAND:
switch(LOWORD(wParam))
{
case IDC_RADIO_API_GDI:
case IDC_RADIO_API_D2D:
hwnd = GetDlgItem(hDlg, IDC_CHECKBOX_COLOR_FONT);
if(IsDlgButtonChecked(hDlg, IDC_RADIO_API_D2D))
{
EnableWindow(hwnd, TRUE);
}
else
{
EnableWindow(hwnd, FALSE);
}
break;
default:
break;
}

switch(LOWORD(wParam))
{
case IDC_BUTTON_CHOOSEFONT:
Expand Down Expand Up @@ -180,6 +204,7 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
return TRUE;

case IDC_EDIT_MAXWIDTH:
case IDC_EDIT_SHOWMODESEC:
switch(HIWORD(wParam))
{
case EN_CHANGE:
Expand Down Expand Up @@ -210,8 +235,6 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
case IDC_RADIO_ANNOTATALL:
case IDC_RADIO_ANNOTATLST:
case IDC_CHECKBOX_SHOWMODEINL:
case IDC_RADIO_SHOWMODEALL:
case IDC_RADIO_SHOWMODEIMM:
case IDC_CHECKBOX_SHOWMODEMARK:
case IDC_CHECKBOX_SHOWROMAN:
case IDC_CHECKBOX_SHOWROMANCOMP:
Expand Down Expand Up @@ -308,16 +331,31 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
SaveCheckButton(hDlg, IDC_CHECKBOX_COLOR_FONT, ValueColorFont);

hwnd = GetDlgItem(hDlg, IDC_COMBO_UNTILCANDLIST);
num[0] = L'0' + (WCHAR)SendMessageW(hwnd, CB_GETCURSEL, 0, 0);
count = (INT)SendMessageW(hwnd, CB_GETCURSEL, 0, 0);
if(count > 9 || count < 0)
{
count = 5;
}
num[0] = L'0' + count;
num[1] = L'\0';
WriterKey(pXmlWriter, ValueUntilCandList, num);

SaveCheckButton(hDlg, IDC_CHECKBOX_DISPCANDNO, ValueDispCandNo);
SaveCheckButton(hDlg, IDC_CHECKBOX_VERTICALCAND, ValueVerticalCand);
SaveCheckButton(hDlg, IDC_CHECKBOX_ANNOTATION, ValueAnnotation);
SaveCheckButton(hDlg, IDC_RADIO_ANNOTATLST, ValueAnnotatLst);

SaveCheckButton(hDlg, IDC_CHECKBOX_SHOWMODEINL, ValueShowModeInl);
SaveCheckButton(hDlg, IDC_RADIO_SHOWMODEIMM, ValueShowModeImm);
GetDlgItemTextW(hDlg, IDC_EDIT_SHOWMODESEC, num, _countof(num));
count = _wtoi(num);
if(count <= 0 || count > 60)
{
count = 3;
}
_snwprintf_s(num, _TRUNCATE, L"%d", count);
SetDlgItemTextW(hDlg, IDC_EDIT_SHOWMODESEC, num);
WriterKey(pXmlWriter, ValueShowModeSec, num);

SaveCheckButton(hDlg, IDC_CHECKBOX_SHOWMODEMARK, ValueShowModeMark);
SaveCheckButton(hDlg, IDC_CHECKBOX_SHOWROMAN, ValueShowRoman);
SaveCheckButton(hDlg, IDC_CHECKBOX_SHOWROMANCOMP, ValueShowRomanComp);
Expand Down
Binary file modified imcrvcnf/imcrvcnf.rc
View file
Binary file not shown.
24 changes: 12 additions & 12 deletions imcrvcnf/imcrvcnf.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;comctl32.lib;comdlg32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Culture>0x0411</Culture>
<AdditionalOptions>/c 65001</AdditionalOptions>
</ResourceCompile>
Expand All @@ -123,16 +123,16 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>common.lib;comctl32.lib;comdlg32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Culture>0x0411</Culture>
<AdditionalOptions>/c 65001</AdditionalOptions>
</ResourceCompile>
Expand All @@ -150,19 +150,19 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>common.lib;comctl32.lib;comdlg32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Culture>0x0411</Culture>
<AdditionalOptions>/c 65001</AdditionalOptions>
</ResourceCompile>
Expand All @@ -180,19 +180,19 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>common.lib;comctl32.lib;comdlg32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>No</GenerateDebugInformation>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(SolutionDir)common</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Culture>0x0411</Culture>
<AdditionalOptions>/c 65001</AdditionalOptions>
</ResourceCompile>
Expand Down
9 changes: 4 additions & 5 deletions imcrvcnf/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@
#define IDC_RADIO_ANNOTATALL 2035
#define IDC_RADIO_ANNOTATLST 2036
#define IDC_CHECKBOX_SHOWMODEINL 2037
#define IDC_RADIO_SHOWMODEALL 2038
#define IDC_RADIO_SHOWMODEIMM 2039
#define IDC_CHECKBOX_SHOWMODEMARK 2040
#define IDC_CHECKBOX_SHOWROMAN 2041
#define IDC_CHECKBOX_SHOWROMANCOMP 2042
#define IDC_EDIT_SHOWMODESEC 2038
#define IDC_CHECKBOX_SHOWMODEMARK 2039
#define IDC_CHECKBOX_SHOWROMAN 2040
#define IDC_CHECKBOX_SHOWROMANCOMP 2041

#define IDC_CHECKBOX_SERIES_MARK 2101
#define IDC_CHECKBOX_SERIES_TEXT 2102
Expand Down
Loading

0 comments on commit 0013317

Please sign in to comment.