summaryrefslogtreecommitdiff
path: root/lib/uniwbrk/wbrktable.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
commitfa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch)
tree7d0ae09775ea950056193eaa2ca93844299d46f1 /lib/uniwbrk/wbrktable.c
parentc78359d9542c86b972aac373efcf7bc7a8a560e5 (diff)
parent2959e59fab3bab834368adefd90bd4b1b094366b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/uniwbrk/wbrktable.c')
-rw-r--r--lib/uniwbrk/wbrktable.c135
1 files changed, 66 insertions, 69 deletions
diff --git a/lib/uniwbrk/wbrktable.c b/lib/uniwbrk/wbrktable.c
index 4b4e510..ec31ca5 100644
--- a/lib/uniwbrk/wbrktable.c
+++ b/lib/uniwbrk/wbrktable.c
@@ -1,97 +1,94 @@
/* Word break auxiliary table. -*- coding: utf-8 -*-
- Copyright (C) 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2009-2022 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2009.
- This program is free software: you can redistribute it and/or
- modify it under the terms of either:
+ 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+".
- * the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at your
- option) any later version.
-
- or
-
- * the GNU General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- or both in parallel, as here.
- This program is distributed in the hope that it will be useful,
+ 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 for more details.
+ 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
- along with this program. If not, see <https://www.gnu.org/licenses/>. */
+ 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 "wbrktable.h"
-const int uniwbrk_prop_index[22] =
+const int uniwbrk_prop_index[23] =
{
- 0, /* WBP_OTHER */
- 1, /* WBP_KATAKANA */
- 2, /* WBP_ALETTER */
- 3, /* WBP_MIDNUMLET */
- 4, /* WBP_MIDLETTER */
- 5, /* WBP_MIDNUM */
- 6, /* WBP_NUMERIC */
- 7, /* WBP_EXTENDNUMLET */
- -1, /* WBP_EXTEND */
- -1, /* WBP_FORMAT */
- -1, /* WBP_NEWLINE */
- -1, /* WBP_CR */
- -1, /* WBP_LF */
- -1, /* WBP_RI */
- 8, /* WBP_DQ */
- 9, /* WBP_SQ */
- 10, /* WBP_HL */
- -1, /* WBP_ZWJ */
- 11, /* WBP_EB */
- 12, /* WBP_EM */
- -1, /* WBP_GAZ */
- 13 /* WBP_EBG */
+ /* WBP_OTHER */ 0,
+ /* WBP_KATAKANA */ 1,
+ /* WBP_ALETTER */ 2,
+ /* WBP_MIDNUMLET */ 3,
+ /* WBP_MIDLETTER */ 4,
+ /* WBP_MIDNUM */ 5,
+ /* WBP_NUMERIC */ 6,
+ /* WBP_EXTENDNUMLET */ 7,
+ /* WBP_EXTEND */ -1,
+ /* WBP_FORMAT */ -1,
+ /* WBP_NEWLINE */ -1,
+ /* WBP_CR */ -1,
+ /* WBP_LF */ -1,
+ /* WBP_RI */ -1,
+ /* WBP_DQ */ 8,
+ /* WBP_SQ */ 9,
+ /* WBP_HL */ 10,
+ /* WBP_ZWJ */ -1,
+ /* WBP_EB */ -1,
+ /* WBP_EM */ -1,
+ /* WBP_GAZ */ -1,
+ /* WBP_EBG */ -1,
+ /* WBP_WSS */ 11
};
/* This table contains the following rules (see UAX #29):
last current
- (ALetter | HL) × (ALetter | HL) (WB5)
- (ALetter | HL) × Numeric (WB9)
- HL × SQ (WB7a)
- Numeric × (ALetter | HL) (WB10)
- Numeric × Numeric (WB8)
- Katakana × Katakana (WB13)
-(ALetter | HL | Numeric | Katakana) × ExtendNumLet (WB13a)
- ExtendNumLet × ExtendNumLet (WB13a)
- ExtendNumLet × (ALetter | HL | Numeric | Katakana) (WB13b)
- (E_Base | EBG) × E_Modifier (WB14)
+ (ALetter | HL) × (ALetter | HL) (WB5)
+ (ALetter | HL) × Numeric (WB9)
+ HL × SQ (WB7a)
+ Numeric × (ALetter | HL) (WB10)
+ Numeric × Numeric (WB8)
+ Katakana × Katakana (WB13)
+(ALetter | HL | Numeric | Katakana) × ExtendNumLet (WB13a)
+ ExtendNumLet × ExtendNumLet (WB13a)
+ ExtendNumLet × (ALetter | HL | Numeric | Katakana) (WB13b)
Note that the following rules are not handled here but in the loop in u-wordbreaks.h:
- The rules need to look back or look ahead the second character (WB6, WB7, WB7b, WB7c, WB11, WB12)
- The rules with a higher precedence over the "ignore" rule (WB4), such as WB3c
*/
-const unsigned char uniwbrk_table[14][14] =
-{ /* current: OTHER MIDNUMLET NUMERIC SQ EM */
- /* KATAKANA MIDLETTER EXNUMLET HL EBG */
- /* ALETTER MIDNUM DQ EB */
+const unsigned char uniwbrk_table[12][12] =
+{ /* current: OTHER MIDNUMLET NUMERIC SQ */
+ /* KATAKANA MIDLETTER EXNUMLET HL */
+ /* ALETTER MIDNUM DQ WSS */
/* last */
- /* WBP_OTHER */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_KATAKANA */ { 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 },
- /* WBP_ALETTER */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1 },
- /* WBP_MIDNUMLET */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_MIDLETTER */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_MIDNUM */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_NUMERIC */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1 },
- /* WBP_EXTENDNUMLET */ { 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1 },
- /* WBP_DQ */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_SQ */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_HL */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1 },
- /* WBP_EB */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1 },
- /* WBP_EM */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
- /* WBP_EBG */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1 }
+ /* WBP_OTHER */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_KATAKANA */ { 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1 },
+ /* WBP_ALETTER */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1 },
+ /* WBP_MIDNUMLET */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_MIDLETTER */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_MIDNUM */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_NUMERIC */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1 },
+ /* WBP_EXTENDNUMLET */ { 1, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1 },
+ /* WBP_DQ */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_SQ */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
+ /* WBP_HL */ { 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1 },
+ /* WBP_WSS */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }
};