ICU 56 update step 1

source/data/brkitr/line_normal_cj.txt

-# Copyright (c) 2002-2013  International Business Machines Corporation and
+# Copyright (c) 2002-2015  International Business Machines Corporation and
 # others. All Rights Reserved.
 #
-#  file:  line_ja.txt
+#  file:  line_normal_cj.txt
 #
 #         Line Breaking Rules
 #         Implement default line breaking as defined by 
-#         Unicode Standard Annex #14 Revision 29 for Unicode 6.2
+#         Unicode Standard Annex #14 Revision 34 for Unicode 8.0
 #         http://www.unicode.org/reports/tr14/
+#         tailored as noted in 2nd paragraph below..
 #
 #         TODO:  Rule LB 8 remains as it was in Unicode 5.2
 #         This is only because of a limitation of ICU break engine implementation,
 #         not because the older behavior is desirable.
+#
+#         This tailors the line break behavior to correspond to CSS
+#         line-break=normal (BCP47 -u-lb-normal) as defined for Chinese & Japanese.
+#         It sets characters of class CJ to behave like ID.
+#         In addition, it allows breaks:
+#         * before hyphens 2010 & 2013 (both BA) and 301C, 30A0 (both NS)
 
 #
 #  Character Classes defined by TR 14.
 #
 
 !!chain;
 !!LBCMNoChain;
 
 
 !!lookAheadHardBreak;
@@ skipping 27 matching lines @@
 #           !!lookAheadHardBreak forces the run time state machine to
 #           stop immediately when a look ahead rule ( '/' operator) matches,
 #           and set the match position to that of the look-ahead operator,
 #           no matter what other rules may be in play at the time.
 #
 #           See rule LB 19 for an example.
 #
 
 $AI = [:LineBreak =  Ambiguous:];
 $AL = [:LineBreak =  Alphabetic:];
-$BA = [:LineBreak =  Break_After:];
+$BAX = [\u2010 \u2013];
+$BA = [[:LineBreak =  Break_After:] - $BAX];
 $BB = [:LineBreak =  Break_Before:];
 $BK = [:LineBreak =  Mandatory_Break:];
 $B2 = [:LineBreak =  Break_Both:];
 $CB = [:LineBreak =  Contingent_Break:];
 $CJ = [:LineBreak =  Conditional_Japanese_Starter:];
 $CL = [:LineBreak =  Close_Punctuation:];
 $CM = [:LineBreak =  Combining_Mark:];
 $CP = [:LineBreak =  Close_Parenthesis:];
 $CR = [:LineBreak =  Carriage_Return:];
 $EX = [:LineBreak =  Exclamation:];
 $GL = [:LineBreak =  Glue:];
 $HL = [:LineBreak =  Hebrew_Letter:];
 $HY = [:LineBreak =  Hyphen:];
 $H2 = [:LineBreak =  H2:];
 $H3 = [:LineBreak =  H3:];
 $ID = [[:LineBreak =  Ideographic:] $CJ];
 $IN = [:LineBreak =  Inseperable:];
 $IS = [:LineBreak =  Infix_Numeric:];
 $JL = [:LineBreak =  JL:];
 $JV = [:LineBreak =  JV:];
 $JT = [:LineBreak =  JT:];
 $LF = [:LineBreak =  Line_Feed:];
 $NL = [:LineBreak =  Next_Line:];
-$NS = [:LineBreak =  Nonstarter:];
+$NSX = [\u301C \u30A0];
+$NS = [[:LineBreak =  Nonstarter:] - $NSX];
 $NU = [:LineBreak =  Numeric:];
 $OP = [:LineBreak =  Open_Punctuation:];
 $PO = [:LineBreak =  Postfix_Numeric:];
 $PR = [:LineBreak =  Prefix_Numeric:];
 $QU = [:LineBreak =  Quotation:];
 $RI = [:LineBreak =  Regional_Indicator:];
 $SA = [:LineBreak =  Complex_Context:];
 $SG = [:LineBreak =  Surrogate:];
 $SP = [:LineBreak =  Space:];
 $SY = [:LineBreak =  Break_Symbols:];
@@ skipping 15 matching lines @@
 #                               XX  (Unknown, unassigned)
 #                         as $AL  (Alphabetic)
 #
 $ALPlus = [$AL $AI $SA $SG $XX];
 
 #
 #  Combining Marks.   X $CM*  behaves as if it were X.  Rule LB6.
 #
 $ALcm = $ALPlus $CM*;
 $BAcm = $BA $CM*;
+$BAXcm = $BAX $CM*;
 $BBcm = $BB $CM*;
 $B2cm = $B2 $CM*;
 $CLcm = $CL $CM*;
 $CPcm = $CP $CM*;
 $EXcm = $EX $CM*;
 $GLcm = $GL $CM*;
 $HLcm = $HL $CM*;
 $HYcm = $HY $CM*;
 $H2cm = $H2 $CM*;
 $H3cm = $H3 $CM*;
 $IDcm = $ID $CM*;
 $INcm = $IN $CM*;
 $IScm = $IS $CM*;
 $JLcm = $JL $CM*;
 $JVcm = $JV $CM*;
 $JTcm = $JT $CM*;
 $NScm = $NS $CM*;
+$NSXcm = $NSX $CM*;
 $NUcm = $NU $CM*;
 $OPcm = $OP $CM*;
 $POcm = $PO $CM*;
 $PRcm = $PR $CM*;
 $QUcm = $QU $CM*;
 $RIcm = $RI $CM*;
 $SYcm = $SY $CM*;
 $WJcm = $WJ $CM*;
 
 ## -------------------------------------------------
 
 !!forward;
 
 #
 #  Each class of character can stand by itself as an unbroken token, with trailing combining stuff
 #
 $ALPlus $CM+;
 $BA $CM+;
+$BAX $CM+;
 $BB $CM+;
 $B2 $CM+;
 $CL $CM+;
 $CP $CM+;
 $EX $CM+;
 $GL $CM+;
 $HL $CM+;
 $HY $CM+;
 $H2 $CM+;
 $H3 $CM+;
 $ID $CM+;
 $IN $CM+;
 $IS $CM+;
 $JL $CM+;
 $JV $CM+;
 $JT $CM+;
 $NS $CM+;
+$NSX $CM+;
 $NU $CM+;
 $OP $CM+;
 $PO $CM+;
 $PR $CM+;
 $QU $CM+;
 $RI $CM+;
 $SY $CM+;
 $WJ $CM+;
 
 #
@@ skipping 69 matching lines @@
 # LB 12  Do not break after NBSP and related characters.
 #         GL  x
 #
 $GLcm $CAN_CM $CM*;
 $GLcm $CANT_CM;
  
 #
 # LB 12a  Do not break before NBSP and related characters ...
 #            [^SP BA HY] x GL
 #
-[[$LB8NonBreaks] - [$SP $BA $HY]] $CM* $GLcm;
+[[$LB8NonBreaks] - [$SP $BA $BAX $HY]] $CM* $GLcm;
 $CM+ GLcm;
 
 
 
 #
 # LB 13   Don't break before ']' or '!' or ';' or '/', even after spaces.
 #
 $LB8NonBreaks $CL;
 $CAN_CM $CM*  $CL;
 $CM+          $CL;              # by rule 10, stand-alone CM behaves as AL
@@ skipping 20 matching lines @@
 #
 $OPcm $SP* $CAN_CM $CM*;
 $OPcm $SP* $CANT_CM;
 
 $OPcm $SP+ $CM+ $AL_FOLLOW?;    # by rule 10, stand-alone CM behaves as AL
 
 # LB 15
 $QUcm $SP* $OPcm;
 
 # LB 16
+# Do not break between closing punctuation and $NS, even with intervening spaces
+# But DO allow a break between closing punctuation and $NSX, don't include it here
 ($CLcm | $CPcm) $SP* $NScm;
 
 # LB 17
 $B2cm $SP* $B2cm;
 
 #
 # LB 18  Break after spaces.
 #
 $LB18NonBreaks = [$LB8NonBreaks - [$SP]];
 $LB18Breaks    = [$LB8Breaks $SP];
@@ skipping 12 matching lines @@
 
 # LB 20
 #        <break>  $CB
 #        $CB   <break>
 
 $LB20NonBreaks = [$LB18NonBreaks - $CB];
 
 # LB 21        x   (BA | HY | NS)
 #           BB x
 #
+# DO allow breaks here before $BAXcm and $NSXcm, so don't include them
 $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); 
 
 $BBcm [^$CB];                                  #  $BB  x
 $BBcm $LB20NonBreaks $CM*;
 
 # LB 21a Don't break after Hebrew + Hyphen
 #   HL (HY | BA) x
 #  
-$HLcm ($HYcm | $BAcm) [^$CB]?;
+$HLcm ($HYcm | $BAcm | $BAXcm) [^$CB]?;
 
 # LB 21b (forward) Don't break between SY and HL
 # (break between HL and SY already disallowed by LB 13 above)
 $SYcm $HLcm;
 
 # LB 22
 ($ALcm | $HLcm) $INcm;
 $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
+$EXcm    $INcm;
 $IDcm    $INcm;
 $INcm    $INcm;
 $NUcm    $INcm;
 
 
 # $LB 23
 $IDcm  $POcm;
 $ALcm  $NUcm;       # includes $LB19
 $HLcm  $NUcm;
 $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
@@ skipping 42 matching lines @@
 
 #
 #  Reverse Rules.
 #
 ## -------------------------------------------------
 
 !!reverse;
 
 $CM+ $ALPlus;
 $CM+ $BA;
+$CM+ $BAX;
 $CM+ $BB;
 $CM+ $B2;
 $CM+ $CL;
 $CM+ $CP;
 $CM+ $EX;
 $CM+ $GL;
 $CM+ $HL;
 $CM+ $HY;
 $CM+ $H2;
 $CM+ $H3;
 $CM+ $ID;
 $CM+ $IN;
 $CM+ $IS;
 $CM+ $JL;
 $CM+ $JV;
 $CM+ $JT;
 $CM+ $NS;
+$CM+ $NSX;
 $CM+ $NU;
 $CM+ $OP;
 $CM+ $PO;
 $CM+ $PR;
 $CM+ $QU;
 $CM+ $RI;
 $CM+ $SY;
 $CM+ $WJ;
 $CM+;
 
@@ skipping 53 matching lines @@
 # LB 11
 $CM* $WJ $CM* $CAN_CM;
 $CM* $WJ      [$LB8NonBreaks-$CM];
 
      $CANT_CM $CM* $WJ;
 $CM* $CAN_CM  $CM* $WJ;
 
 # LB 12a
 #      [^SP BA HY] x GL
 #
-$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HY]];
+$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $BAX $HY]];
 
 # LB 12
 #     GL  x
 #
 $CANT_CM $CM* $GL;
 $CM* $CAN_CM $CM* $GL;
 
 
 # LB 13
 $CL $CM+ $CAN_CM;
@@ skipping 24 matching lines @@
      $AL_FOLLOW_NOCM $CM+ $SP+ $CM* $OP;
 $CM* $AL_FOLLOW_CM   $CM+ $SP+ $CM* $OP;
 $SY $CM $SP+ $OP;   # TODO:  Experiment.  Remove.
 
 
 
 # LB 15
 $CM* $OP $SP* $CM* $QU;
 
 # LB 16
+# Don't include $NSX here
 $CM* $NS $SP* $CM* ($CL | $CP);
 
 # LB 17
 $CM* $B2 $SP* $CM* $B2;
 
 # LB 18  break after spaces
 #        Nothing explicit needed here.
 
 
 #
 # LB 19
 #
 $CM* $QU $CM* $CAN_CM;                                #   . x QU
 $CM* $QU      $LB18NonBreaks;
 
 
 $CM* $CAN_CM  $CM* $QU;                               #   QU x .
      $CANT_CM $CM* $QU;
      
 #
 #  LB 20  Break before and after CB.
 #         nothing needed here.
 #
 
 # LB 21
+# Don't include $BAX or $NSX here
 $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
 
 $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
 [^$CB] $CM* $BB;                                      # 
 
 # LB21a
-[^$CB] $CM* ($HY | $BA) $CM* $HL;
+[^$CB]? $CM* ($HY | $BA | $BAX) $CM* $HL;
 
 # LB21b (reverse)
 $CM* $HL $CM* $SY;
 
 # LB 22
 $CM* $IN $CM* ($ALPlus | $HL);
+$CM* $IN $CM* $EX;
 $CM* $IN $CM* $ID;
 $CM* $IN $CM* $IN;
 $CM* $IN $CM* $NU;
 
 # LB 23
 $CM* $PO $CM* $ID;
 $CM* $NU $CM* ($ALPlus | $HL);
 $CM* ($ALPlus | $HL) $CM* $NU;
 
 # LB 24
@@ skipping 43 matching lines @@
 # LB 15
 $SP+ $CM* $QU;
 
 # LB 16
 $SP+ $CM* ($CL | $CP);
 
 # LB 17
 $SP+ $CM* $B2;
 
 # LB 21
-$CM* ($HY | $BA) $CM* $HL;
+$CM* ($HY | $BA | $BAX) $CM* $HL;
 
 # LB 25
 ($CM* ($IS | $SY))+ $CM* $NU;
 ($CL | $CP) $CM* ($NU | $IS | $SY);
 
 # For dictionary-based break
 $dictionary $dictionary;
 
 ## -------------------------------------------------
 
 !!safe_forward;
 
 # Skip forward over all character classes that are involved in
 #   rules containing patterns with possibly more than one char
 #   of context.
 #
 #  It might be slightly more efficient to have specific rules
 #  instead of one generic one, but only if we could
 #  turn off rule chaining.  We don't want to move more
 #  than necessary.
 #
-[$CM $OP $QU $CL $CP $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $CP $B2 $PR $HY $BA $dictionary];
+[$CM $OP $QU $CL $CP $B2 $PR $HY $BA $BAX $SP $dictionary]+ [^$CM $OP $QU $CL $CP $B2 $PR $HY $BA $BAX $dictionary];
 $dictionary $dictionary;