Branch
Hash :
c63a0c67
Author :
Date :
2025-09-24T23:28:18
Update to Unicode 17.0.0. * lib/gen-uni-tables.c (is_property_alphabetic): Add three YANGQIN SIGNs. (UC_JOINING_GROUP_THIN_NOON): New enum item. (fill_arabicshaping, joining_group_as_c_identifier): Handle UC_JOINING_GROUP_THIN_NOON. (LBP_*): Split LBP_SA into LBP_SA1 and LBP_SA2. (LBP_HH, LBP_SA): New enum items. (get_lbp): Use them. Update such that unilbrk/lbrkprop.txt comes out as expected. (debug_output_lbp): Handle LBP_HH. Print either LBP_SA1, LBP_SA2 as LBP_SA. (fill_org_lbp, debug_output_org_lbp): Handle LBP_HH. (lbp_value_to_string): Handle LBP_HH. Handle LBP_SA1, LBP_SA2 instead of LBP_SA. (output_lbrk_rules_as_tables): Update for LBP_HH change. Update rules LBP12a, LB21 as specified by https://www.unicode.org/reports/tr14/tr14-55.html. (get_wbp): Update such that uniwbrk/wbrkprop.txt comes out as expected. * lib/unictype.in.h (UC_JOINING_GROUP_THIN_NOON): New enum item. * lib/unictype/joininggroup_byname.gperf: Handle it. * lib/unictype/joininggroup_name.h: Likewise. * lib/unilbrk/lbrktables.h (LBP_*): Split LBP_SA into LBP_SA1 and LBP_SA2. (LBP_HH): New enum item. (unilbrk_table): Update bounds. * lib/unilbrk/u8-possible-linebreaks.c (u8_possible_linebreaks_loop): Use LBP_HL_HY instead of LBP_HL_BA. Use LBP_SA1 instead of LBP_SA. Treat LBP_SA2 like LBP_CM. Update rules LB20a and LB21a, as specified by https://www.unicode.org/reports/tr14/tr14-55.html. * lib/unilbrk/u16-possible-linebreaks.c (u16_possible_linebreaks_loop): Likewise. * lib/unilbrk/u32-possible-linebreaks.c (u32_possible_linebreaks_loop): Likewise. * tests/unigbrk/test-u8-grapheme-breaks.c (main): Use U+2B50 instead of U+2605, because U+2605 no longer is an Extended_Pictographic character. * tests/unigbrk/test-u16-grapheme-breaks.c (main): Likewise. * tests/unigbrk/test-u32-grapheme-breaks.c (main): Likewise. * tests/unigbrk/test-u8-grapheme-next.c (main): Likewise. * tests/unigbrk/test-u16-grapheme-next.c (main): Likewise. * tests/unigbrk/test-u32-grapheme-next.c (main): Likewise. * tests/unigbrk/test-u8-grapheme-prev.c (main): Likewise. * tests/unigbrk/test-u16-grapheme-prev.c (main): Likewise. * tests/unigbrk/test-u32-grapheme-prev.c (main): Likewise. * tests/uniwidth/test-uc_width2.sh: Update expected test result. * All generated files under lib/uni* and tests/uni*: Regenerate. * tests/uniname/NameAliases.txt: Update. * tests/uniname/UnicodeData.txt: Update. * tests/uninorm/NormalizationTest.txt: Update. * tests/unigbrk/GraphemeBreakTest.txt: Update. * tests/uniwbrk/WordBreakTest.txt: Update. * tests/unilbrk/LineBreakTest.txt: Update. * All the affected modules: Bump required libunistring version.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436
/* Line breaking of UTF-32 strings.
Copyright (C) 2001-2003, 2006-2025 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2001.
This file is free software.
It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
You can redistribute it and/or modify it under either
- the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3, or (at your
option) any later version, or
- the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option)
any later version, or
- the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License and the GNU General Public License
for more details.
You should have received a copy of the GNU Lesser General Public
License and of the GNU General Public License along with this
program. If not, see <https://www.gnu.org/licenses/>. */
#include <config.h>
/* Specification. */
#include "unilbrk.h"
#include "unilbrk/internal.h"
#include <stdlib.h>
#include "unilbrk/lbrktables.h"
#include "uniwidth/cjk.h"
/* This file implements
Unicode Standard Annex #14 <https://www.unicode.org/reports/tr14/>. */
void
u32_possible_linebreaks_loop (const uint32_t *s, size_t n, const char *encoding,
int cr, char *p)
{
if (n > 0)
{
int LBP_AI_REPLACEMENT = (is_cjk_encoding (encoding) ? LBP_ID : LBP_AL1);
const uint32_t *s_end = s + n;
/* We need 2 characters of lookahead:
- 1 character of lookahead for (LB15c,LB19a,LB28a),
- 2 characters of lookahead for (LB25). */
const uint32_t *lookahead1_end;
ucs4_t lookahead1_uc;
int lookahead1_prop_ea;
const uint32_t *lookahead2_end;
ucs4_t lookahead2_uc;
int lookahead2_prop_ea;
/* Get the first lookahead character. */
lookahead1_end = s;
lookahead1_uc = *lookahead1_end++;
lookahead1_prop_ea = unilbrkprop_lookup (lookahead1_uc);
/* Get the second lookahead character. */
lookahead2_end = lookahead1_end;
if (lookahead2_end < s_end)
{
lookahead2_uc = *lookahead2_end++;
lookahead2_prop_ea = unilbrkprop_lookup (lookahead2_uc);
}
else
{
lookahead2_uc = 0xFFFD;
lookahead2_prop_ea = PROP_EA (LBP_BK, 0);
}
int preceding_prop = LBP_BK; /* line break property of preceding character */
int prev_prop = LBP_BK; /* line break property of previous character
(= last character, ignoring intervening characters of class CM or ZWJ) */
int prev_ea = 0; /* EastAsian property of previous character
(= last character, ignoring intervening characters of class CM or ZWJ) */
int prev2_ea = 0; /* EastAsian property of character before the previous character */
bool prev_initial_hyphen = false; /* the previous character was a
word-initial hyphen or unambiguous hyphen */
bool prev_nus = false; /* before the previous character, there was a character
with line break property LBP_NU and since then
only characters with line break property LBP_SY
or LBP_IS */
int last_prop = LBP_BK; /* line break property of last non-space character
(= last character, ignoring intervening characters of class SP or CM or ZWJ) */
char *seen_space = NULL; /* Was a space seen after the last non-space character? */
/* Number of consecutive regional indicator (RI) characters seen
immediately before the current point. */
size_t ri_count = 0;
do
{
/* Read the next character. */
s = lookahead1_end;
ucs4_t uc = lookahead1_uc;
int prop_ea = lookahead1_prop_ea; /* = unilbrkprop_lookup (uc); */
int prop = PROP (prop_ea); /* line break property of uc */
int ea = EA (prop_ea); /* EastAsian property of uc */
/* Refill the pipeline of 2 lookahead characters. */
lookahead1_end = lookahead2_end;
lookahead1_uc = lookahead2_uc;
lookahead1_prop_ea = lookahead2_prop_ea;
if (lookahead2_end < s_end)
{
lookahead2_uc = *lookahead2_end++;
lookahead2_prop_ea = unilbrkprop_lookup (lookahead2_uc);
}
else
{
lookahead2_uc = 0xFFFD;
lookahead2_prop_ea = PROP_EA (LBP_BK, 0);
}
bool nus = /* ending at the previous character, there was a character
with line break property LBP_NU and since then only
characters with line break property LBP_SY or LBP_IS */
(prev_prop == LBP_NU
|| (prev_nus && (prev_prop == LBP_SY || prev_prop == LBP_IS)));
if (prop == LBP_BK || prop == LBP_LF || prop == LBP_CR)
{
/* (LB4,LB5,LB6) Mandatory break. */
*p = UC_BREAK_MANDATORY;
/* cr is either LBP_CR or -1. In the first case, recognize
a CR-LF sequence. */
if (prev_prop == cr && prop == LBP_LF)
p[-1] = UC_BREAK_CR_BEFORE_LF;
last_prop = LBP_BK;
seen_space = NULL;
}
else
{
/* Resolve property values whose behaviour is not fixed. */
switch (prop)
{
case LBP_AI:
/* Resolve ambiguous. */
prop = LBP_AI_REPLACEMENT;
break;
case LBP_CB:
/* This is arbitrary. */
prop = LBP_ID;
break;
case LBP_SA1:
/* We don't handle complex scripts yet.
Treat LBP_SA1 like LBP_XX. */
case LBP_XX:
/* This is arbitrary. */
prop = LBP_AL1;
break;
}
/* Deal with spaces and combining characters. */
if (prop == LBP_SP)
{
/* (LB7) Don't break just before a space. */
*p = UC_BREAK_PROHIBITED;
seen_space = p;
}
else if (prop == LBP_ZW)
{
/* (LB7) Don't break just before a zero-width space. */
*p = UC_BREAK_PROHIBITED;
last_prop = LBP_ZW;
seen_space = NULL;
}
else if (prop == LBP_CM || prop == LBP_SA2 || prop == LBP_ZWJ)
{
/* (LB9) Don't break just before a combining character or
zero-width joiner, except immediately after a mandatory
break character, space, or zero-width space. */
if (last_prop == LBP_BK)
{
/* (LB4,LB5,LB6) Don't break at the beginning of a line. */
*p = UC_BREAK_PROHIBITED;
/* (LB10) Treat CM or ZWJ as AL. */
last_prop = LBP_AL1;
seen_space = NULL;
}
else if (last_prop == LBP_ZW
|| (seen_space != NULL
/* (LB14) has higher priority than (LB18). */
&& !(last_prop == LBP_OP1 || last_prop == LBP_OP2)
/* (LB15a) has higher priority than (LB18). */
&& !(last_prop == LBP_QU2)))
{
/* (LB8) Break after zero-width space. */
/* (LB18) Break after spaces.
We do *not* implement the "legacy support for space
character as base for combining marks" because now the
NBSP CM sequence is recommended instead of SP CM. */
*p = UC_BREAK_POSSIBLE;
/* (LB10) Treat CM or ZWJ as AL. */
last_prop = LBP_AL1;
seen_space = NULL;
}
else
{
/* Treat X CM as if it were X. */
*p = UC_BREAK_PROHIBITED;
}
}
else
{
/* prop must be usable as an index for table 7.3 of UTR #14. */
if (!(prop >= 0 && prop < sizeof (unilbrk_table) / sizeof (unilbrk_table[0])))
abort ();
if (last_prop == LBP_BK)
{
/* (LB4,LB5,LB6) Don't break at the beginning of a line. */
*p = UC_BREAK_PROHIBITED;
}
else if (last_prop == LBP_ZW)
{
/* (LB8) Break after zero-width space. */
*p = UC_BREAK_POSSIBLE;
}
else if (preceding_prop == LBP_ZWJ)
{
/* (LB8a) Don't break right after a zero-width joiner. */
*p = UC_BREAK_PROHIBITED;
}
else if (prop == LBP_IS && prev_prop == LBP_SP
&& PROP (lookahead1_prop_ea) == LBP_NU)
{
/* (LB15c) Break before a decimal mark that follows a space. */
*p = UC_BREAK_POSSIBLE;
}
else if (((prop == LBP_QU1 || prop == LBP_QU2 || prop == LBP_QU3)
&& (! prev_ea || ! EA (lookahead1_prop_ea))
/* (LB18) has higher priority than (LB19a). */
&& prev_prop != LBP_SP)
|| ((prev_prop == LBP_QU1 || prev_prop == LBP_QU2 || prev_prop == LBP_QU3)
&& (! prev2_ea || ! ea)))
{
/* (LB19a) Don't break on either side of ambiguous
quotation marks, except next to an EastAsian character. */
*p = UC_BREAK_PROHIBITED;
}
else if (prev_initial_hyphen
&& (prop == LBP_AL1 || prop == LBP_AL2 || prop == LBP_HL))
{
/* (LB20a) Don't break after a word-initial hyphen. */
*p = UC_BREAK_PROHIBITED;
}
else if (prev_prop == LBP_HL_HY && prop != LBP_HL)
{
/* (LB21a) Don't break after Hebrew + Hyphen/Unambiguous hyphen,
before non-Hebrew. */
*p = UC_BREAK_PROHIBITED;
}
else if ((prev_nus
&& (prev_prop == LBP_CL
|| prev_prop == LBP_CP1 || prev_prop == LBP_CP2)
&& (prop == LBP_PO || prop == LBP_PR))
|| (nus && (prop == LBP_PO || prop == LBP_PR
|| prop == LBP_NU)))
{
/* (LB25) Don't break numbers. */
*p = UC_BREAK_PROHIBITED;
}
else if ((prev_prop == LBP_PO || prev_prop == LBP_PR)
&& (prop == LBP_OP1 || prop == LBP_OP2)
&& (PROP (lookahead1_prop_ea) == LBP_NU
|| (PROP (lookahead1_prop_ea) == LBP_IS
&& PROP (lookahead2_prop_ea) == LBP_NU)))
{
/* (LB25) Don't break numbers. */
*p = UC_BREAK_PROHIBITED;
}
else if (prev_prop == LBP_AKLS_VI
&& (prop == LBP_AK || prop == LBP_AL2))
{
/* (LB28a) Don't break inside orthographic syllables of
Brahmic scripts, line 3. */
*p = UC_BREAK_PROHIBITED;
}
else if (PROP (lookahead1_prop_ea) == LBP_VF
&& (prop == LBP_AK || prop == LBP_AL2 || prop == LBP_AS)
&& (prev_prop == LBP_AK || prev_prop == LBP_AL2 || prev_prop == LBP_AS))
{
/* (LB28a) Don't break inside orthographic syllables of
Brahmic scripts, line 4. */
*p = UC_BREAK_PROHIBITED;
}
else if (last_prop == LBP_IS && uc == 0x003C)
{
/* Partially disable (LB29) Do not break between numeric
punctuation and alphabetics ("e.g."). We find it
desirable to break before the HTML tag "</P>" in
strings like "<P>Some sentence.</P>". */
*p = UC_BREAK_POSSIBLE;
}
else if (last_prop == LBP_RI && prop == LBP_RI)
{
/* (LB30a) Break between two regional indicator symbols
if and only if there are an even number of regional
indicators preceding the position of the break. */
*p = (seen_space != NULL || (ri_count % 2) == 0
? UC_BREAK_POSSIBLE
: UC_BREAK_PROHIBITED);
}
else
{
int this_prop = prop;
if (prop == LBP_QU3)
{
/* For (LB15b): Replace LBP_QU3 with LBP_QU1 if the
next character's line break property is not one of
BK, CR, LF, SP, GL, WJ, CL, QU, CP, EX, IS, SY, ZW. */
switch (PROP (lookahead1_prop_ea))
{
case LBP_BK:
case LBP_CR:
case LBP_LF:
case LBP_SP:
case LBP_GL:
case LBP_WJ:
case LBP_CL:
case LBP_QU1: case LBP_QU2: case LBP_QU3:
case LBP_CP1: case LBP_CP2:
case LBP_EX:
case LBP_IS:
case LBP_SY:
case LBP_ZW:
break;
default:
this_prop = LBP_QU1;
break;
}
}
switch (unilbrk_table [last_prop] [this_prop])
{
case D:
*p = UC_BREAK_POSSIBLE;
break;
case I:
*p = (seen_space != NULL ? UC_BREAK_POSSIBLE : UC_BREAK_PROHIBITED);
break;
case P:
*p = UC_BREAK_PROHIBITED;
break;
default:
abort ();
}
}
if (prop == LBP_QU2)
{
/* For (LB15a): Replace LBP_QU2 with LBP_QU1 if the
previous character's line break property was not one of
BK, CR, LF, OP, QU, GL, SP, ZW. */
switch (prev_prop)
{
case LBP_BK:
case LBP_CR:
case LBP_LF:
case LBP_OP1: case LBP_OP2:
case LBP_QU1: case LBP_QU2: case LBP_QU3:
case LBP_GL:
case LBP_SP:
case LBP_ZW:
break;
default:
prop = LBP_QU1;
break;
}
}
last_prop = prop;
seen_space = NULL;
}
}
/* (LB9) Treat X (CM | ZWJ)* as if it were X, where X is any line
break class except BK, CR, LF, NL, SP, or ZW. */
if (!((prop == LBP_CM || prop == LBP_ZWJ)
&& !(prev_prop == LBP_BK || prev_prop == LBP_LF || prev_prop == LBP_CR
|| prev_prop == LBP_SP || prev_prop == LBP_ZW)))
{
prev_initial_hyphen =
(prop == LBP_HY || prop == LBP_HH)
&& (prev_prop == LBP_BK || prev_prop == LBP_CR || prev_prop == LBP_LF
|| prev_prop == LBP_SP || prev_prop == LBP_ZW
|| prev_prop == LBP_CB || prev_prop == LBP_GL);
prev_prop = (prop == LBP_VI && (prev_prop == LBP_AK
|| prev_prop == LBP_AL2
|| prev_prop == LBP_AS)
? LBP_AKLS_VI :
prev_prop == LBP_HL && (prop == LBP_HY || prop == LBP_HH)
? LBP_HL_HY :
prop);
prev2_ea = prev_ea;
prev_ea = ea;
prev_nus = nus;
}
preceding_prop = prop;
if (prop == LBP_RI)
ri_count++;
else
ri_count = 0;
p++;
}
while (s < s_end);
}
}
#if defined IN_LIBUNISTRING
/* For backward compatibility with older versions of libunistring. */
# undef u32_possible_linebreaks
void
u32_possible_linebreaks (const uint32_t *s, size_t n, const char *encoding,
char *p)
{
u32_possible_linebreaks_loop (s, n, encoding, -1, p);
}
#endif
void
u32_possible_linebreaks_v2 (const uint32_t *s, size_t n, const char *encoding,
char *p)
{
u32_possible_linebreaks_loop (s, n, encoding, LBP_CR, p);
}