1diff --git a/source/data/brkitr/brklocal.mk b/source/data/brkitr/brklocal.mk 2index d9664b37..0855139b 100644 3--- a/source/data/brkitr/brklocal.mk 4+++ b/source/data/brkitr/brklocal.mk 5@@ -34,14 +34,14 @@ BRK_RES_ALIAS_SOURCE = $(BRK_RES_SYNTHETIC_ALIAS) 6 7 8 # List of dictionary files (dict). 9-BRK_DICT_SOURCE = burmesedict.txt cjdict.txt khmerdict.txt laodict.txt\ 10+BRK_DICT_SOURCE = burmesedict.txt khmerdict.txt laodict.txt\ 11 thaidict.txt 12 13 14 # List of break iterator files (brk). 15 BRK_SOURCE = char.txt line.txt line_loose.txt line_loose_cj.txt\ 16 line_normal.txt line_normal_cj.txt sent.txt sent_el.txt title.txt\ 17- word.txt 18+ word.txt word_ja.txt 19 20 21 # Ordinary resources 22diff --git a/source/data/brkitr/ja.txt b/source/data/brkitr/ja.txt 23index 0048b118..c422c425 100644 24--- a/source/data/brkitr/ja.txt 25+++ b/source/data/brkitr/ja.txt 26@@ -7,5 +7,6 @@ ja{ 27 line_loose:process(dependency){"line_loose_cj.brk"} 28 line_normal:process(dependency){"line_normal_cj.brk"} 29 line_strict:process(dependency){"line.brk"} 30+ word:process(dependency){"word_ja.brk"} 31 } 32 } 33diff --git a/source/data/brkitr/root.txt b/source/data/brkitr/root.txt 34index cb87c7ff..ef60ab6f 100644 35--- a/source/data/brkitr/root.txt 36+++ b/source/data/brkitr/root.txt 37@@ -13,9 +13,6 @@ root{ 38 word:process(dependency){"word.brk"} 39 } 40 dictionaries{ 41- Hani:process(dependency){"cjdict.dict"} 42- Hira:process(dependency){"cjdict.dict"} 43- Kana:process(dependency){"cjdict.dict"} 44 Khmr:process(dependency){"khmerdict.dict"} 45 Laoo:process(dependency){"laodict.dict"} 46 Mymr:process(dependency){"burmesedict.dict"} 47diff --git a/source/data/brkitr/rules/word.txt b/source/data/brkitr/rules/word.txt 48index 86977021..41a03ca0 100644 49--- a/source/data/brkitr/rules/word.txt 50+++ b/source/data/brkitr/rules/word.txt 51@@ -68,11 +68,9 @@ $Control = [\p{Grapheme_Cluster_Break = Control}]; 52 $HangulSyllable = [\uac00-\ud7a3]; 53 $ComplexContext = [:LineBreak = Complex_Context:]; 54 $KanaKanji = [$Han $Hiragana $Katakana]; 55-$dictionaryCJK = [$KanaKanji $HangulSyllable]; 56-$dictionary = [$ComplexContext $dictionaryCJK]; 57+$dictionary = [$ComplexContext]; 58 59-# leave CJK scripts out of ALetterPlus 60-$ALetterPlus = [$ALetter-$dictionaryCJK [$ComplexContext-$Extend-$Control]]; 61+$ALetterPlus = [$ALetter [$ComplexContext-$Extend-$Control]]; 62 63 64 # 65@@ -184,10 +182,6 @@ $ExtendNumLetEx $KatakanaEx {400}; # (13b) 66 # 67 ^$Regional_IndicatorEx $Regional_IndicatorEx; 68 69-# special handling for CJK characters: chain for later dictionary segmentation 70-$HangulSyllable $HangulSyllable {200}; 71-$KanaKanji $KanaKanji {400}; # different rule status if both kana and kanji found 72- 73 # Rule 999 74 # Match a single code point if no other rule applies. 75 .; 76