OLD | NEW |
1 --- source/data/brkitr/word.txt 2010-09-17 18:22:35.000000000 -0700 | 1 --- source/data/brkitr/word.txt 2010-09-17 18:22:35.000000000 -0700 |
2 +++ source/data/brkitr/word.txt 2011-01-25 18:14:09.445378000 -0800 | 2 +++ source/data/brkitr/word.txt 2011-01-25 18:14:09.445378000 -0800 |
3 @@ -29,29 +29,49 @@ | 3 @@ -29,29 +29,49 @@ |
4 $Newline = [\p{Word_Break = Newline}]; | 4 $Newline = [\p{Word_Break = Newline}]; |
5 $Extend = [\p{Word_Break = Extend}]; | 5 $Extend = [\p{Word_Break = Extend}]; |
6 $Format = [\p{Word_Break = Format}]; | 6 $Format = [\p{Word_Break = Format}]; |
7 +$Hiragana = [:Hiragana:]; | 7 +$Hiragana = [:Hiragana:]; |
8 $Katakana = [\p{Word_Break = Katakana}]; | 8 $Katakana = [\p{Word_Break = Katakana}]; |
9 +$Han = [:Han:]; | 9 +$Han = [:Han:]; |
10 $ALetter = [\p{Word_Break = ALetter}]; | 10 $ALetter = [\p{Word_Break = ALetter}]; |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 ($BackALetterEx | $BackNumericEx | $BackKatakanaEx) $BackExtendNumLetEx; | 158 ($BackALetterEx | $BackNumericEx | $BackKatakanaEx) $BackExtendNumLetEx; |
159 | 159 |
160 +# special handling for CJK characters: chain for later dictionary segmentation | 160 +# special handling for CJK characters: chain for later dictionary segmentation |
161 +$HangulSyllable $HangulSyllable; | 161 +$HangulSyllable $HangulSyllable; |
162 +$KanaKanji $KanaKanji; #different rule status if both kanji and kana found | 162 +$KanaKanji $KanaKanji; #different rule status if both kanji and kana found |
163 + | 163 + |
164 ## ------------------------------------------------- | 164 ## ------------------------------------------------- |
165 | 165 |
166 !!safe_reverse; | 166 !!safe_reverse; |
167 --- source/data/brkitr/line.txt 2010-09-17 18:22:35.000000000 -0700 | 167 --- source/data/brkitr/line.txt 2010-09-17 18:22:35.000000000 -0700 |
168 +++ source/data/brkitr/line.txt»2011-01-26 16:06:47.246010000 -0800 | 168 +++ source/data/brkitr/line.txt»2011-07-22 13:46:19.923562000 -0700 |
169 @@ -11,6 +11,9 @@ | 169 @@ -11,6 +11,9 @@ |
170 # TODO: Rule LB 8 remains as it was in Unicode 5.2 | 170 # TODO: Rule LB 8 remains as it was in Unicode 5.2 |
171 # This is only because of a limitation of ICU break engine implementati
on, | 171 # This is only because of a limitation of ICU break engine implementati
on, |
172 # not because the older behavior is desirable. | 172 # not because the older behavior is desirable. |
173 +# | 173 +# |
174 +# CHROME: Hebrew tailoring was incorporatd as well as some | 174 +# CHROME: Hebrew tailoring was incorporatd as well as some |
175 +# other minor changes (CL, OP, ID). | 175 +# other minor changes (CL, OP, ID). |
176 | 176 |
177 # | 177 # |
178 # Character Classes defined by TR 14. | 178 # Character Classes defined by TR 14. |
179 @@ -57,13 +60,15 @@ | 179 @@ -55,15 +58,22 @@ |
180 # | 180 # |
| 181 # See rule LB 19 for an example. |
| 182 # |
| 183 +$SmallHira = [\u3041 \u3043 \u3045 \u3047 \u3049 \u3063 \u3083 \u3085 \u3087 \u
308E \u3095 \u3096]; |
| 184 +$SmallKata = [\u30A1 \u30A3 \u30A5 \u30A7 \u30A9 \u30C3 \u30E3 \u30E5 \u30E7 \u
30EE \u30F5 \u30F6]; |
| 185 +$SmallKataExt = [\u31F0 \u31F1 \u31F2 \u31F3 \u31F4 \u31F5 \u31F6 \u31F7 \u31F8
\u31F9 \u31FA \u31FB \u31FC \u31FD \u31FE \u31FF]; |
| 186 +$SmallKanaAndProlongedMark = [[$SmallHira] [$SmallKata] [$SmallKataExt] [\u30FC
]]; |
| 187 + |
181 | 188 |
182 $AI = [:LineBreak = Ambiguous:]; | 189 $AI = [:LineBreak = Ambiguous:]; |
183 -$AL = [:LineBreak = Alphabetic:]; | 190 -$AL = [:LineBreak = Alphabetic:]; |
184 -$BA = [:LineBreak = Break_After:]; | 191 -$BA = [:LineBreak = Break_After:]; |
185 +$AL = [[:LineBreak = Alphabetic:] - [[:Hebrew:] & [:Letter:]] - [\u23B4\u23B5]
]; | 192 +$AL = [[:LineBreak = Alphabetic:] - [[:Hebrew:] & [:Letter:]] - [\u23B4\u23B5]
]; |
186 +$HL = [[:Hebrew:] & [:Letter:]]; | 193 +$HL = [[:Hebrew:] & [:Letter:]]; |
187 +$BA = [[:LineBreak = Break_After:] - [\u2010]]; | 194 +$BA = [[:LineBreak = Break_After:] - [\u2010]]; |
188 +$HH = [\u2010]; | 195 +$HH = [\u2010]; |
189 $BB = [:LineBreak = Break_Before:]; | 196 $BB = [:LineBreak = Break_Before:]; |
190 $BK = [:LineBreak = Mandatory_Break:]; | 197 $BK = [:LineBreak = Mandatory_Break:]; |
191 $B2 = [:LineBreak = Break_Both:]; | 198 $B2 = [:LineBreak = Break_Both:]; |
192 $CB = [:LineBreak = Contingent_Break:]; | 199 $CB = [:LineBreak = Contingent_Break:]; |
193 -$CL = [:LineBreak = Close_Punctuation:]; | 200 -$CL = [:LineBreak = Close_Punctuation:]; |
194 +$CL = [[:LineBreak = Close_Punctuation:] [\uFE51\uFE10\u23B5]]; | 201 +$CL = [[:LineBreak = Close_Punctuation:] [\uFE51\uFE10\u23B5]]; |
195 $CM = [:LineBreak = Combining_Mark:]; | 202 $CM = [:LineBreak = Combining_Mark:]; |
196 $CP = [:LineBreak = Close_Parenthesis:]; | 203 $CP = [:LineBreak = Close_Parenthesis:]; |
197 $CR = [:LineBreak = Carriage_Return:]; | 204 $CR = [:LineBreak = Carriage_Return:]; |
198 @@ -72,9 +77,9 @@ | 205 @@ -72,17 +82,17 @@ |
199 $HY = [:LineBreak = Hyphen:]; | 206 $HY = [:LineBreak = Hyphen:]; |
200 $H2 = [:LineBreak = H2:]; | 207 $H2 = [:LineBreak = H2:]; |
201 $H3 = [:LineBreak = H3:]; | 208 $H3 = [:LineBreak = H3:]; |
202 -$ID = [:LineBreak = Ideographic:]; | 209 -$ID = [:LineBreak = Ideographic:]; |
203 +$ID = [[:LineBreak = Ideographic:] - [\uFE51]]; | 210 +$ID = [[[:LineBreak = Ideographic:] - [\uFE51]] [$SmallKanaAndProlongedMark]]; |
204 $IN = [:LineBreak = Inseperable:]; | 211 $IN = [:LineBreak = Inseperable:]; |
205 -$IS = [:LineBreak = Infix_Numeric:]; | 212 -$IS = [:LineBreak = Infix_Numeric:]; |
206 +$IS = [[:LineBreak = Infix_Numeric:] - [\uFE10]]; | 213 +$IS = [[:LineBreak = Infix_Numeric:] - [\uFE10]]; |
207 $JL = [:LineBreak = JL:]; | 214 $JL = [:LineBreak = JL:]; |
208 $JV = [:LineBreak = JV:]; | 215 $JV = [:LineBreak = JV:]; |
209 $JT = [:LineBreak = JT:]; | 216 $JT = [:LineBreak = JT:]; |
210 @@ -82,7 +87,7 @@ | 217 $LF = [:LineBreak = Line_Feed:]; |
211 $NL = [:LineBreak = Next_Line:]; | 218 $NL = [:LineBreak = Next_Line:]; |
212 $NS = [:LineBreak = Nonstarter:]; | 219 -$NS = [:LineBreak = Nonstarter:]; |
| 220 +$NS = [[:LineBreak = Nonstarter:] - [$SmallKanaAndProlongedMark]]; |
213 $NU = [:LineBreak = Numeric:]; | 221 $NU = [:LineBreak = Numeric:]; |
214 -$OP = [:LineBreak = Open_Punctuation:]; | 222 -$OP = [:LineBreak = Open_Punctuation:]; |
215 +$OP = [[:LineBreak = Open_Punctuation:] \u23B4]; | 223 +$OP = [[:LineBreak = Open_Punctuation:] \u23B4]; |
216 $PO = [:LineBreak = Postfix_Numeric:]; | 224 $PO = [:LineBreak = Postfix_Numeric:]; |
217 $PR = [:LineBreak = Prefix_Numeric:]; | 225 $PR = [:LineBreak = Prefix_Numeric:]; |
218 $QU = [:LineBreak = Quotation:]; | 226 $QU = [:LineBreak = Quotation:]; |
219 @@ -108,13 +113,15 @@ | 227 @@ -108,13 +118,15 @@ |
220 # XX (Unknown, unassigned) | 228 # XX (Unknown, unassigned) |
221 # as $AL (Alphabetic) | 229 # as $AL (Alphabetic) |
222 # | 230 # |
223 -$ALPlus = [$AL $AI $SA $SG $XX]; | 231 -$ALPlus = [$AL $AI $SA $SG $XX]; |
224 +$ALPlus = [$AL $HL $AI $SA $SG $XX]; | 232 +$ALPlus = [$AL $HL $AI $SA $SG $XX]; |
225 | 233 |
226 # | 234 # |
227 # Combining Marks. X $CM* behaves as if it were X. Rule LB6. | 235 # Combining Marks. X $CM* behaves as if it were X. Rule LB6. |
228 # | 236 # |
229 $ALcm = $ALPlus $CM*; | 237 $ALcm = $ALPlus $CM*; |
230 +$HLcm = $HL $CM*; | 238 +$HLcm = $HL $CM*; |
231 $BAcm = $BA $CM*; | 239 $BAcm = $BA $CM*; |
232 +$HHcm = $HH $CM*; | 240 +$HHcm = $HH $CM*; |
233 $BBcm = $BB $CM*; | 241 $BBcm = $BB $CM*; |
234 $B2cm = $B2 $CM*; | 242 $B2cm = $B2 $CM*; |
235 $CLcm = $CL $CM*; | 243 $CLcm = $CL $CM*; |
236 @@ -148,6 +155,7 @@ | 244 @@ -148,6 +160,7 @@ |
237 # | 245 # |
238 $ALPlus $CM+; | 246 $ALPlus $CM+; |
239 $BA $CM+; | 247 $BA $CM+; |
240 +$HH $CM+; | 248 +$HH $CM+; |
241 $BB $CM+; | 249 $BB $CM+; |
242 $B2 $CM+; | 250 $B2 $CM+; |
243 $CL $CM+; | 251 $CL $CM+; |
244 @@ -190,7 +198,7 @@ | 252 @@ -190,7 +203,7 @@ |
245 # so for this one case we need to manually list out longer sequences
. | 253 # so for this one case we need to manually list out longer sequences
. |
246 # | 254 # |
247 $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; | 255 $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; |
248 -$AL_FOLLOW_CM = [$CL $CP $EX $IS $SY $WJ $GL $OP $QU $BA $HY $NS $IN $NU $ALP
lus]; | 256 -$AL_FOLLOW_CM = [$CL $CP $EX $IS $SY $WJ $GL $OP $QU $BA $HY $NS $IN $NU $ALP
lus]; |
249 +$AL_FOLLOW_CM = [$CL $CP $EX $IS $SY $WJ $GL $OP $QU $BA $HH $HY $NS $IN $NU
$ALPlus]; | 257 +$AL_FOLLOW_CM = [$CL $CP $EX $IS $SY $WJ $GL $OP $QU $BA $HH $HY $NS $IN $NU
$ALPlus]; |
250 $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; | 258 $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; |
251 | 259 |
252 | 260 |
253 @@ -252,7 +260,7 @@ | 261 @@ -252,7 +265,7 @@ |
254 # LB 12a Do not break before NBSP and related characters ... | 262 # LB 12a Do not break before NBSP and related characters ... |
255 # [^SP BA HY] x GL | 263 # [^SP BA HY] x GL |
256 # | 264 # |
257 -[[$LB8NonBreaks] - [$SP $BA $HY]] $CM* $GLcm; | 265 -[[$LB8NonBreaks] - [$SP $BA $HY]] $CM* $GLcm; |
258 +[[$LB8NonBreaks] - [$SP $BA $HH $HY]] $CM* $GLcm; | 266 +[[$LB8NonBreaks] - [$SP $BA $HH $HY]] $CM* $GLcm; |
259 $CM+ GLcm; | 267 $CM+ GLcm; |
260 | 268 |
261 | 269 |
262 @@ -325,7 +333,7 @@ | 270 @@ -325,7 +338,7 @@ |
263 # LB 21 x (BA | HY | NS) | 271 # LB 21 x (BA | HY | NS) |
264 # BB x | 272 # BB x |
265 # | 273 # |
266 -$LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); | 274 -$LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); |
267 +$LB20NonBreaks $CM* ($BAcm | $HHcm | $HYcm | $NScm); | 275 +$LB20NonBreaks $CM* ($BAcm | $HHcm | $HYcm | $NScm); |
268 | 276 |
269 $BBcm [^$CB]; # $BB x | 277 $BBcm [^$CB]; # $BB x |
270 $BBcm $LB20NonBreaks $CM*; | 278 $BBcm $LB20NonBreaks $CM*; |
271 @@ -381,6 +389,8 @@ | 279 @@ -381,6 +394,8 @@ |
272 $CM+ $OPcm; # The $CM+ is from rule 10, an unattached CM is treated as
AL. | 280 $CM+ $OPcm; # The $CM+ is from rule 10, an unattached CM is treated as
AL. |
273 $CPcm ($ALcm | $NUcm); | 281 $CPcm ($ALcm | $NUcm); |
274 | 282 |
275 +# (LB 31) Add new rule to prevent the break we do not want, this is the behavio
r change | 283 +# (LB 31) Add new rule to prevent the break we do not want, this is the behavio
r change |
276 +$HLcm ($HY | $HH) $ALcm; | 284 +$HLcm ($HY | $HH) $ALcm; |
277 | 285 |
278 # | 286 # |
279 # Reverse Rules. | 287 # Reverse Rules. |
280 @@ -391,6 +401,7 @@ | 288 @@ -391,6 +406,7 @@ |
281 | 289 |
282 $CM+ $ALPlus; | 290 $CM+ $ALPlus; |
283 $CM+ $BA; | 291 $CM+ $BA; |
284 +$CM+ $HH; | 292 +$CM+ $HH; |
285 $CM+ $BB; | 293 $CM+ $BB; |
286 $CM+ $B2; | 294 $CM+ $B2; |
287 $CM+ $CL; | 295 $CM+ $CL; |
288 @@ -479,7 +490,7 @@ | 296 @@ -479,7 +495,7 @@ |
289 # LB 12a | 297 # LB 12a |
290 # [^SP BA HY] x GL | 298 # [^SP BA HY] x GL |
291 # | 299 # |
292 -$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HY]]; | 300 -$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HY]]; |
293 +$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HH $HY]]; | 301 +$CM* $GL $CM* [$LB8NonBreaks-[$CM $SP $BA $HH $HY]]; |
294 | 302 |
295 # LB 12 | 303 # LB 12 |
296 # GL x | 304 # GL x |
297 @@ -549,7 +560,7 @@ | 305 @@ -549,7 +565,7 @@ |
298 # | 306 # |
299 | 307 |
300 # LB 21 | 308 # LB 21 |
301 -$CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) | 309 -$CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) |
302 +$CM* ($BA | $HH | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | N
S) | 310 +$CM* ($BA | $HH | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | N
S) |
303 | 311 |
304 $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . | 312 $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . |
305 [^$CB] $CM* $BB; # | 313 [^$CB] $CM* $BB; # |
306 @@ -597,6 +608,8 @@ | 314 @@ -597,6 +613,8 @@ |
307 $CM* $OP $CM* ($ALPlus | $NU); | 315 $CM* $OP $CM* ($ALPlus | $NU); |
308 $CM* ($ALPlus | $NU) $CM* $CP; | 316 $CM* ($ALPlus | $NU) $CM* $CP; |
309 | 317 |
310 +# (LB 31) Add new rule to prevent the break we do not want, this is the behavio
r change | 318 +# (LB 31) Add new rule to prevent the break we do not want, this is the behavio
r change |
311 +$CM* $ALPlus ($HY | $HH) $CM* $HL; | 319 +$CM* $ALPlus ($HY | $HH) $CM* $HL; |
312 | 320 |
313 ## ------------------------------------------------- | 321 ## ------------------------------------------------- |
314 | 322 |
315 --- source/data/brkitr/brklocal.mk 1969-12-31 16:00:00.000000000 -0800 | 323 --- source/data/brkitr/brklocal.mk 1969-12-31 16:00:00.000000000 -0800 |
316 +++ source/data/brkitr/brklocal.mk 2011-01-25 17:54:01.149770000 -0800 | 324 +++ source/data/brkitr/brklocal.mk 2011-01-25 17:54:01.149770000 -0800 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
356 + | 364 + |
357 +# List of break iterator files (brk). | 365 +# List of break iterator files (brk). |
358 +# Chrome change: remove word_ja.txt and line_he.txt | 366 +# Chrome change: remove word_ja.txt and line_he.txt |
359 +BRK_SOURCE = sent_el.txt word_POSIX.txt line_fi.txt char.txt word.txt line.txt
sent.txt title.txt char_th.txt | 367 +BRK_SOURCE = sent_el.txt word_POSIX.txt line_fi.txt char.txt word.txt line.txt
sent.txt title.txt char_th.txt |
360 + | 368 + |
361 + | 369 + |
362 +# Ordinary resources | 370 +# Ordinary resources |
363 +# Chrome change: remove ja.txt and he.txt | 371 +# Chrome change: remove ja.txt and he.txt |
364 +BRK_RES_SOURCE = el.txt en.txt en_US.txt en_US_POSIX.txt\ | 372 +BRK_RES_SOURCE = el.txt en.txt en_US.txt en_US_POSIX.txt\ |
365 + fi.txt th.txt | 373 + fi.txt th.txt |
OLD | NEW |