lbrktables.h

Branch

Show log
Commit

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.

Download

lib/unilbrk/lbrktables.h

/* Line breaking auxiliary tables.
   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 "unitypes.h"

#ifdef __cplusplus
extern "C" {
#endif


/* Line breaking classification.  */

enum
{
  /* Values >= 43 are resolved at run time. */
  LBP_BK  = 43, /* mandatory break */
  LBP_CR  = 44, /* carriage return */
  LBP_LF  = 45, /* line feed */
  LBP_CM  = 46, /* attached characters and combining marks */
/*LBP_NL,          next line - not used here because it's equivalent to LBP_BK */
/*LBP_SG,          surrogates - not used here because they are not characters */
  LBP_WJ  =  0, /* word joiner */
  LBP_ZW  = 47, /* zero width space */
  LBP_GL  =  1, /* non-breaking (glue) */
  LBP_SP  = 48, /* space */
  LBP_B2  =  2, /* break opportunity before and after */
  LBP_BA  =  3, /* break opportunity after */
  LBP_BB  =  4, /* break opportunity before */
  LBP_HH  =  5, /* unambiguous hyphen */
  LBP_HY  =  6, /* hyphen */
  LBP_CB  = 49, /* contingent break opportunity */
  LBP_CL  =  7, /* closing punctuation */
  LBP_CP1 =  8, /* closing parenthesis, non-EastAsian character */
  LBP_CP2 =  9, /* closing parenthesis, EastAsian character */
  LBP_EX  = 10, /* exclamation/interrogation */
  LBP_IN  = 11, /* inseparable */
  LBP_NS  = 12, /* non starter */
  LBP_OP1 = 13, /* opening punctuation, non-EastAsian character */
  LBP_OP2 = 14, /* opening punctuation, EastAsian character */
  LBP_QU1 = 15, /* ambiguous quotation, neither initial nor final punctuation */
  LBP_QU2 = 16, /* ambiguous quotation, initial punctuation */
  LBP_QU3 = 17, /* ambiguous quotation, final punctuation */
  LBP_IS  = 18, /* infix separator (numeric) */
  LBP_NU  = 19, /* numeric */
  LBP_PO  = 20, /* postfix (numeric) */
  LBP_PR  = 21, /* prefix (numeric) */
  LBP_SY  = 22, /* symbols allowing breaks */
  LBP_AI  = 50, /* ambiguous (alphabetic or ideograph) */
  LBP_AL1 = 23, /* ordinary alphabetic and symbol characters, != U+25CC */
  LBP_AL2 = 24, /* ordinary alphabetic and symbol characters, == U+25CC */
/*LBP_CJ,          conditional Japanese starter, resolved to NS */
  LBP_H2  = 25, /* Hangul LV syllable */
  LBP_H3  = 26, /* Hangul LVT syllable */
  LBP_HL  = 32, /* Hebrew letter */
  LBP_ID  = 27, /* ideographic */
  LBP_EBF = 28, /* future emoji base */
  LBP_JL  = 29, /* Hangul L Jamo */
  LBP_JV  = 30, /* Hangul V Jamo */
  LBP_JT  = 31, /* Hangul T Jamo */
  LBP_AP  = 33, /* Brahmic scripts: pre-base repha */
  LBP_AK  = 34, /* Brahmic scripts: consonants */
  LBP_AS  = 35, /* Brahmic scripts: independent vowels */
  LBP_VI  = 36, /* Brahmic scripts: conjoining viramas */
  LBP_VF  = 37, /* Brahmic scripts: viramas for final consonants */
  LBP_RI  = 38, /* regional indicator */
  LBP_SA1 = 51, /* complex context (South East Asian), not combining mark */
  LBP_SA2 = 39, /* complex context (South East Asian), combining mark */
  LBP_ZWJ = 40, /* zero width joiner */
  LBP_EB  = 41, /* emoji base */
  LBP_EM  = 42, /* emoji modifier */
  LBP_XX  = 52, /* unknown */
  /* Artificial values that exist only at runtime, not in the tables. */
  LBP_AKLS_VI = 100,
  LBP_HL_HY = 101
};

#include "lbrkprop1.h"

/* Combining prop and ea to a table entry.  */
#define PROP_EA(prop,ea) (((prop) << 1) | (ea))

/* Splitting a table entry into prop and ea.  */
#define PROP(entry) ((entry) >> 1)
#define EA(entry) ((entry) & 1)

/* Returns (prop << 1) | ea, where
     - prop is the line breaking property,
     - ea is the EastAsian property (1 bit)
   of UC.  */
static inline unsigned char
unilbrkprop_lookup (ucs4_t uc)
{
  unsigned int index1 = uc >> lbrkprop_header_0;
  if (index1 < lbrkprop_header_1)
    {
      int lookup1 = unilbrkprop.level1[index1];
      if (lookup1 >= 0)
        {
          unsigned int index2 = (uc >> lbrkprop_header_2) & lbrkprop_header_3;
          int lookup2 = unilbrkprop.level2[lookup1 + index2];
          if (lookup2 >= 0)
            {
              unsigned int index3 = uc & lbrkprop_header_4;
              return unilbrkprop.level3[lookup2 + index3];
            }
        }
    }
  return PROP_EA (LBP_XX, 0);
}


/* Table indexed by two line breaking classifications.  */
#define D 1  /* direct break opportunity, empty in table 7.3 of UTR #14 */
#define I 2  /* indirect break opportunity, '%' in table 7.3 of UTR #14 */
#define P 3  /* prohibited break,           '^' in table 7.3 of UTR #14 */

extern const unsigned char unilbrk_table[43][43];

/* We don't support line breaking of complex-context dependent characters
   (Thai, Lao, Myanmar, Khmer) yet, because it requires dictionary lookup. */


#ifdef __cplusplus
}
#endif

Download

kc3-lang/gnulib/lib/unilbrk/lbrktables.h

Commit

lib/unilbrk/lbrktables.h