• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git a/source/data/brkitr/ja.txt b/source/data/brkitr/ja.txt
2index dba2fdcf..71f090da 100644
3--- a/source/data/brkitr/ja.txt
4+++ b/source/data/brkitr/ja.txt
5@@ -1,4 +1,4 @@
6-// © 2016 and later: Unicode, Inc. and others.
7+// © 2016 and later: Unicode, Inc. and others.
8 // License & terms of use: http://www.unicode.org/copyright.html#License
9 ja{
10     Version{"2.1.44.56"}
11@@ -7,5 +7,6 @@ ja{
12         line_loose:process(dependency){"line_loose_cj.brk"}
13         line_normal:process(dependency){"line_normal_cj.brk"}
14         line_strict:process(dependency){"line.brk"}
15+	word:process(dependency){"word_ja.brk"}
16     }
17 }
18diff --git a/source/data/brkitr/root.txt b/source/data/brkitr/root.txt
19index cb87c7ff..ef60ab6f 100644
20--- a/source/data/brkitr/root.txt
21+++ b/source/data/brkitr/root.txt
22@@ -13,9 +13,6 @@ root{
23         word:process(dependency){"word.brk"}
24     }
25     dictionaries{
26-        Hani:process(dependency){"cjdict.dict"}
27-        Hira:process(dependency){"cjdict.dict"}
28-        Kana:process(dependency){"cjdict.dict"}
29         Khmr:process(dependency){"khmerdict.dict"}
30         Laoo:process(dependency){"laodict.dict"}
31         Mymr:process(dependency){"burmesedict.dict"}
32diff --git a/source/data/brkitr/rules/word.txt b/source/data/brkitr/rules/word.txt
33index 5bffd5d7..7ce80da2 100644
34--- a/source/data/brkitr/rules/word.txt
35+++ b/source/data/brkitr/rules/word.txt
36@@ -67,13 +67,11 @@ $Control        = [\p{Grapheme_Cluster_Break = Control}];
37 $HangulSyllable = [\uac00-\ud7a3];
38 $ComplexContext = [:LineBreak = Complex_Context:];
39 $KanaKanji      = [$Han $Hiragana $Katakana];
40-$dictionaryCJK  = [$KanaKanji $HangulSyllable];
41-$dictionary     = [$ComplexContext $dictionaryCJK];
42+$dictionary     = [$ComplexContext];
43
44 # TODO: check if handling of katakana in dictionary makes rules incorrect/void
45
46-# leave CJK scripts out of ALetterPlus
47-$ALetterPlus  = [$ALetter-$dictionaryCJK [$ComplexContext-$Extend-$Control]];
48+$ALetterPlus  = [$ALetter [$ComplexContext-$Extend-$Control]];
49
50
51 ## -------------------------------------------------
52@@ -168,10 +166,6 @@ $ExtendNumLet  $ExFm* $Katakana     {400};    #  (13b)
53 #
54 ^$Regional_Indicator $ExFm* $Regional_Indicator;
55
56-# special handling for CJK characters: chain for later dictionary segmentation
57-$HangulSyllable $HangulSyllable {200};
58-$KanaKanji $KanaKanji {400}; # different rule status if both kana and kanji found
59-
60 # Rule 999
61 #     Match a single code point if no other rule applies.
62 .;
63