Skip to content

Commit

Permalink
2.7.10
Browse files Browse the repository at this point in the history
・かな入力、月配列などで、それ以上濁点・半濁点を取らないエントリで、ローマ字仮名変換の「待機」を OFF に設定可能としました。
 OFF にした場合は、その仮名を入力した時点で確定または辞書検索開始されます。

・x64 の vcruntime140_1.dll をインストーラに同梱しました。
 Visual Studio 2019 のバージョンアップにより新たにリンクされるようになったため。
  • Loading branch information
nathancorvussolis committed Nov 21, 2019
1 parent 0cee8b8 commit 29eea0b
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 45 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# CorvusSKK ver. 2.7.9
# CorvusSKK ver. 2.7.10

Windowsで動作するSKK風のIMEです。

Expand Down Expand Up @@ -485,6 +485,13 @@ Visual C++ 2019 の 正規表現で、文法は ECMAScript を使用していま
| ng |||| **ON** | OFF |
| go ||| ゴ | OFF | OFF |

* 例3) 以下のように設定したとき「w」の連続入力により草を生やすことができます。

| ローマ字 | かな | カナ | カナ | 促/ん | 待機 | 説明 |
|---|---|---|---|---|---|---|
| ww |||| **ON** | OFF | Latin Small Letter W → Fullwidth Latin Small Letter W |
| w |||| OFF | OFF | Latin Small Letter W → Fullwidth Latin Small Letter W |

* 「待機」
* 「待機」がONのとき、入力した文字をローマ字仮名変換した結果 (変換出来ないときは入力した文字そのまま) がローマ字として扱われ、辞書検索開始、確定、補完開始、ローマ字に設定されていない組み合わせ、のいずれかになるまで仮名の最終的な決定が遅延されます。
* 「待機」機能サンプルを参照してください。[https://github.com/nathancorvussolis/corvusskk/blob/master/installer/config-sample/config - wait-sample.xml](https://github.com/nathancorvussolis/corvusskk/blob/master/installer/config-sample/config%20-%20wait-sample.xml)
Expand All @@ -494,7 +501,7 @@ Visual C++ 2019 の 正規表現で、文法は ECMAScript を使用していま
|---|---|---|---|---|---|---|
||||| OFF | **ON** | JIS X 0201 仮名 → JIS X 0208 仮名 |
||||| OFF | **ON** | JIS X 0201 濁点 → JIS X 0208 濁点 |
| か゛ ||| ガ | OFF | **ON** | 仮名と濁点の合成 |
| か゛ ||| ガ | OFF | ON または OFF | 仮名と濁点の合成<br>待機OFFのとき直ちに確定または辞書検索開始します |

* 例2) 以下のように設定したとき「zsssss …」と入力することで「☆」と「★」が繰り返され任意のタイミングで確定することができます。

Expand Down Expand Up @@ -735,7 +742,7 @@ Windows 10 (Ver.1709 から) の場合

### 開発環境

Visual Studio Community 2019 16.3.9
Visual Studio Community 2019 16.3.10

* Desktop development with C++
* MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.23)
Expand Down
6 changes: 3 additions & 3 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#define TEXTSERVICE_DESC TEXTSERVICE_NAME L"_DEBUG"
#endif
#define TEXTSERVICE_DIR L"IMCRVSKK"
#define TEXTSERVICE_VER L"2.7.9"
#define TEXTSERVICE_VER L"2.7.10"

//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "2.7.9"
#define RC_VERSION_D 2,7,9,0
#define RC_VERSION "2.7.10"
#define RC_VERSION_D 2,7,10,0
2 changes: 1 addition & 1 deletion installer/_version.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

set VERSION=2.7.9
set VERSION=2.7.10

set TARGETDIR=build

Expand Down
22 changes: 11 additions & 11 deletions installer/config-sample/config - tsuki-2-263-jpkbd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@
<row ro="b" hi="" ka="" an="" so="2" />
<row ro="n" hi="" ka="" an="" so="2" />
<row ro="m" hi="" ka="" an="" so="2" />
<row ro="," hi="" ka="" an="" so="2" />
<row ro="." hi="" ka="" an="" so="2" />
<row ro="," hi="" ka="" an="" so="0" />
<row ro="." hi="" ka="" an="" so="0" />
<row ro="/" hi="" ka="" an="" so="2" />
<row ro="\" hi="" ka="" an="" so="2" />
<row ro="\" hi="" ka="" an="" so="0" />

<row ro="?" hi="" ka="" an="" so="2" /> <!-- シフトキー押したまま半濁点 -->

Expand All @@ -432,8 +432,8 @@
<row ro="di" hi="" ka="" an="" so="2" />
<row ro="do" hi="" ka="" an="" so="2" />
<row ro="dp" hi="" ka="" an="" so="2" />
<row ro="d@" hi="" ka="" an="" so="2" /> <!-- JP Keyboard -->
<!-- <row ro="d[" hi="「" ka="「" an="「" so="2" /> --> <!-- US Keyboard -->
<row ro="d@" hi="" ka="" an="" so="0" /> <!-- JP Keyboard -->
<!-- <row ro="d[" hi="「" ka="「" an="「" so="0" /> --> <!-- US Keyboard -->

<row ro="ka" hi="" ka="" an="" so="2" />
<row ro="ks" hi="" ka="" an="" so="2" />
Expand All @@ -445,8 +445,8 @@
<row ro="dk" hi="" ka="" an="" so="2" />
<row ro="dl" hi="" ka="" an="" so="2" />
<row ro="d;" hi="" ka="" an="" so="2" />
<row ro="d:" hi="" ka="" an="" so="2" /> <!-- JP Keyboard -->
<!-- <row ro="d'" hi="」" ka="」" an="」" so="2" /> --> <!-- US Keyboard -->
<row ro="d:" hi="" ka="" an="" so="0" /> <!-- JP Keyboard -->
<!-- <row ro="d'" hi="」" ka="」" an="」" so="0" /> --> <!-- US Keyboard -->

<row ro="kz" hi="" ka="" an="" so="2" />
<row ro="kx" hi="" ka="" an="" so="2" />
Expand Down Expand Up @@ -491,10 +491,10 @@
<row ro="dd~" hi="" ka="" an="" so="0" /> <!-- 波ダッシュ -->
<row ro="dd." hi="" ka="" an="" so="0" />

<row ro="dd@" hi="" ka="" an="" so="2" /> <!-- JP Keyboard -->
<!-- <row ro="dd[" hi="『" ka="『" an="『" so="2" /> --> <!-- US Keyboard -->
<row ro="dd:" hi="" ka="" an="" so="2" /> <!-- JP Keyboard -->
<!-- <row ro="dd'" hi="』" ka="』" an="』" so="2" /> --> <!-- US Keyboard -->
<row ro="dd@" hi="" ka="" an="" so="0" /> <!-- JP Keyboard -->
<!-- <row ro="dd[" hi="『" ka="『" an="『" so="0" /> --> <!-- US Keyboard -->
<row ro="dd:" hi="" ka="" an="" so="0" /> <!-- JP Keyboard -->
<!-- <row ro="dd'" hi="』" ka="』" an="』" so="0" /> --> <!-- US Keyboard -->

<!-- 濁点・半濁点 合成 -->

Expand Down
22 changes: 11 additions & 11 deletions installer/config-sample/config - tsuki-2-263-uskbd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@
<row ro="b" hi="" ka="" an="" so="2" />
<row ro="n" hi="" ka="" an="" so="2" />
<row ro="m" hi="" ka="" an="" so="2" />
<row ro="," hi="" ka="" an="" so="2" />
<row ro="." hi="" ka="" an="" so="2" />
<row ro="," hi="" ka="" an="" so="0" />
<row ro="." hi="" ka="" an="" so="0" />
<row ro="/" hi="" ka="" an="" so="2" />
<row ro="\" hi="" ka="" an="" so="2" />
<row ro="\" hi="" ka="" an="" so="0" />

<row ro="?" hi="" ka="" an="" so="2" /> <!-- シフトキー押したまま半濁点 -->

Expand All @@ -432,8 +432,8 @@
<row ro="di" hi="" ka="" an="" so="2" />
<row ro="do" hi="" ka="" an="" so="2" />
<row ro="dp" hi="" ka="" an="" so="2" />
<!-- <row ro="d@" hi="「" ka="「" an="「" so="2" /> --> <!-- JP Keyboard -->
<row ro="d[" hi="" ka="" an="" so="2" /> <!-- US Keyboard -->
<!-- <row ro="d@" hi="「" ka="「" an="「" so="0" /> --> <!-- JP Keyboard -->
<row ro="d[" hi="" ka="" an="" so="0" /> <!-- US Keyboard -->

<row ro="ka" hi="" ka="" an="" so="2" />
<row ro="ks" hi="" ka="" an="" so="2" />
Expand All @@ -445,8 +445,8 @@
<row ro="dk" hi="" ka="" an="" so="2" />
<row ro="dl" hi="" ka="" an="" so="2" />
<row ro="d;" hi="" ka="" an="" so="2" />
<!-- <row ro="d:" hi="」" ka="」" an="」" so="2" /> --> <!-- JP Keyboard -->
<row ro="d'" hi="" ka="" an="" so="2" /> <!-- US Keyboard -->
<!-- <row ro="d:" hi="」" ka="」" an="」" so="0" /> --> <!-- JP Keyboard -->
<row ro="d'" hi="" ka="" an="" so="0" /> <!-- US Keyboard -->

<row ro="kz" hi="" ka="" an="" so="2" />
<row ro="kx" hi="" ka="" an="" so="2" />
Expand Down Expand Up @@ -491,10 +491,10 @@
<row ro="dd~" hi="" ka="" an="" so="0" /> <!-- 波ダッシュ -->
<row ro="dd." hi="" ka="" an="" so="0" />

<!-- <row ro="dd@" hi="『" ka="『" an="『" so="2" /> --> <!-- JP Keyboard -->
<row ro="dd[" hi="" ka="" an="" so="2" /> <!-- US Keyboard -->
<!-- <row ro="dd:" hi="』" ka="』" an="』" so="2" /> --> <!-- JP Keyboard -->
<row ro="dd'" hi="" ka="" an="" so="2" /> <!-- US Keyboard -->
<!-- <row ro="dd@" hi="『" ka="『" an="『" so="0" /> --> <!-- JP Keyboard -->
<row ro="dd[" hi="" ka="" an="" so="0" /> <!-- US Keyboard -->
<!-- <row ro="dd:" hi="』" ka="』" an="』" so="0" /> --> <!-- JP Keyboard -->
<row ro="dd'" hi="" ka="" an="" so="0" /> <!-- US Keyboard -->

<!-- 濁点・半濁点 合成 -->

Expand Down
31 changes: 16 additions & 15 deletions installer/config-sample/config - wait-sample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,21 +211,18 @@

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

<!-- (2) 「zccccc …」と入力することで「○」と「●」が繰り返し -->

<row ro="zc" hi="" ka="" an="" so="2" />
<row ro="○c" hi="" ka="" an="" so="2" />
<row ro="●c" hi="" ka="" an="" so="2" />

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

<!-- (3) 草 -->
<!-- (2) 草 -->

<row ro="w" hi="" ka="" an="" so="2" />

<!-- このほうが使い勝手が良いかも…
<row ro="ww" hi="w" ka="w" an="w" so="1" />
<row ro="w" hi="w" ka="w" an="w" so="0" />
-->

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

<!-- (4) 月配列
<!-- (3) 月配列
シフトあり/なし、濁音あり/なし の組み合わせ
「HM」 → 「▽く*る」
Expand Down Expand Up @@ -280,14 +277,18 @@

<row ro="kr" hi="" ka="" an="" so="2" />

<row ro="dn" hi="" ka="" an="" so="2" />
<row ro="dn" hi="" ka="" an="" so="0" /> <!-- 待機なし -->

<!--
濁点、半濁点は、ローマ字仮名変換した結果が付加されたものがあれば、それを変換する。
仕組み自体は、かな入力と同じ。
濁点、半濁点のローマ字部分は、現状1文字のみ対応している。
1) 「h」を入力 → 変換した「く」が表示
2) 「l」(エル)を入力 → 「゛」に変換 → 「く゛」のエントリを検索 → 変換した「ぐ」が表示
上記の「dn → む」、下記の「(片仮名)+(濁点、半濁点) → (濁音、半濁音)」のように待機なしにすると、
その仮名を入力した時点で確定または辞書検索開始される。
-->
<row ro="l" hi="" ka="" an="" so="2" /> <!-- l → 濁点 -->
<row ro="L" hi="" ka="" an="" so="2" /> <!-- L → 濁点 -->
Expand All @@ -297,15 +298,15 @@
<!-- 濁点・半濁点 合成 -->

<row ro="く゛" hi="" ka="" an="グ" so="2" />
<row ro="ク゛" hi="" ka="" an="グ" so="2" />
<row ro="ク゛" hi="" ka="" an="グ" so="0" /> <!-- 待機なし -->
<row ro="ふ゛" hi="" ka="" an="ブ" so="2" />
<row ro="ふ゜" hi="" ka="" an="プ" so="2" />
<row ro="フ゛" hi="" ka="" an="ブ" so="2" />
<row ro="フ゜" hi="" ka="" an="プ" so="2" />
<row ro="フ゛" hi="" ka="" an="ブ" so="0" /> <!-- 待機なし -->
<row ro="フ゜" hi="" ka="" an="プ" so="0" /> <!-- 待機なし -->

<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->

<!-- (5) かな入力
<!-- (4) かな入力
かなキーロックして入力
変換位置指定 [F1], [変換], [無変換]
-->
Expand Down
2 changes: 1 addition & 1 deletion installer/installer-version.wxi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define version="2.7.9" ?>
<?define version="2.7.10" ?>
</Include>
Binary file modified installer/resource-md/01_dictionary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/02_behavior_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/03_behavior_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/04_display1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/05_display2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/06_display_attribute_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/07_display_attribute_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/08_select_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/09_on_off_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/10_key1_character.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/11_key2_virtual_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/12_conversion_point.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/13_kana.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/14_full_width_latin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/21_convert_program.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 29eea0b

Please sign in to comment.