summaryrefslogtreecommitdiff
path: root/lib/unistring
diff options
context:
space:
mode:
Diffstat (limited to 'lib/unistring')
-rw-r--r--lib/unistring/Makefile.am12
-rw-r--r--lib/unistring/m4/gnulib-cache.m43
-rw-r--r--lib/unistring/m4/gnulib-comp.m45
-rw-r--r--lib/unistring/unictype/pr_join_control.c57
-rw-r--r--lib/unistring/unictype/pr_join_control.h156
5 files changed, 231 insertions, 2 deletions
diff --git a/lib/unistring/Makefile.am b/lib/unistring/Makefile.am
index 2982acc677..537296abf1 100644
--- a/lib/unistring/Makefile.am
+++ b/lib/unistring/Makefile.am
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring unictype/category-all unictype/property-default-ignorable-code-point unictype/property-not-a-character uninorm/nfc uninorm/nfkc uninorm/u16-normalize uninorm/u32-normalize uninorm/u8-normalize unistr/u16-to-u8 unistr/u32-to-u8 unistr/u8-check unistr/u8-to-u16 unistr/u8-to-u32
+# Reproduce by: gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring unictype/category-all unictype/property-default-ignorable-code-point unictype/property-join-control unictype/property-not-a-character uninorm/nfc uninorm/nfkc uninorm/u16-normalize uninorm/u32-normalize uninorm/u8-normalize unistr/u16-to-u8 unistr/u32-to-u8 unistr/u8-check unistr/u8-to-u16 unistr/u8-to-u32
AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
@@ -730,6 +730,16 @@ EXTRA_DIST += unictype/bitmap.h unictype/pr_default_ignorable_code_point.h
## end gnulib module unictype/property-default-ignorable-code-point
+## begin gnulib module unictype/property-join-control
+
+if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_JOIN_CONTROL
+libunistring_la_SOURCES += unictype/pr_join_control.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/pr_join_control.h
+
+## end gnulib module unictype/property-join-control
+
## begin gnulib module unictype/property-not-a-character
if LIBUNISTRING_COMPILE_UNICTYPE_PROPERTY_NOT_A_CHARACTER
diff --git a/lib/unistring/m4/gnulib-cache.m4 b/lib/unistring/m4/gnulib-cache.m4
index 5e78af3cd2..871fbf8455 100644
--- a/lib/unistring/m4/gnulib-cache.m4
+++ b/lib/unistring/m4/gnulib-cache.m4
@@ -27,13 +27,14 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring unictype/category-all unictype/property-default-ignorable-code-point unictype/property-not-a-character uninorm/nfc uninorm/nfkc uninorm/u16-normalize uninorm/u32-normalize uninorm/u8-normalize unistr/u16-to-u8 unistr/u32-to-u8 unistr/u8-check unistr/u8-to-u16 unistr/u8-to-u32
+# gnulib-tool --import --local-dir=lib/unistring/override --lib=libunistring --source-base=lib/unistring --m4-base=lib/unistring/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3orGPLv2 --no-conditional-dependencies --libtool --macro-prefix=unistring unictype/category-all unictype/property-default-ignorable-code-point unictype/property-join-control unictype/property-not-a-character uninorm/nfc uninorm/nfkc uninorm/u16-normalize uninorm/u32-normalize uninorm/u8-normalize unistr/u16-to-u8 unistr/u32-to-u8 unistr/u8-check unistr/u8-to-u16 unistr/u8-to-u32
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([lib/unistring/override])
gl_MODULES([
unictype/category-all
unictype/property-default-ignorable-code-point
+ unictype/property-join-control
unictype/property-not-a-character
uninorm/nfc
uninorm/nfkc
diff --git a/lib/unistring/m4/gnulib-comp.m4 b/lib/unistring/m4/gnulib-comp.m4
index 95799a3fba..690f4bfa8b 100644
--- a/lib/unistring/m4/gnulib-comp.m4
+++ b/lib/unistring/m4/gnulib-comp.m4
@@ -106,6 +106,7 @@ AC_DEFUN([unistring_EARLY],
# Code from module unictype/category-test-withtable:
# Code from module unictype/combining-class:
# Code from module unictype/property-default-ignorable-code-point:
+ # Code from module unictype/property-join-control:
# Code from module unictype/property-not-a-character:
# Code from module uninorm/base:
# Code from module uninorm/canonical-decomposition:
@@ -217,6 +218,8 @@ AC_DEFUN([unistring_INIT],
AC_REQUIRE([AC_C_INLINE])
gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-default-ignorable-code-point])
AC_REQUIRE([AC_C_INLINE])
+ gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-join-control])
+ AC_REQUIRE([AC_C_INLINE])
gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-not-a-character])
gl_LIBUNISTRING_LIBHEADER([0.9.4], [uninorm.h])
gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/canonical-decomposition])
@@ -494,6 +497,8 @@ AC_DEFUN([unistring_FILE_LIST], [
lib/unictype/combiningclass.h
lib/unictype/pr_default_ignorable_code_point.c
lib/unictype/pr_default_ignorable_code_point.h
+ lib/unictype/pr_join_control.c
+ lib/unictype/pr_join_control.h
lib/unictype/pr_not_a_character.c
lib/unictype/pr_not_a_character.h
lib/uninorm.in.h
diff --git a/lib/unistring/unictype/pr_join_control.c b/lib/unistring/unictype/pr_join_control.c
new file mode 100644
index 0000000000..b060931ef7
--- /dev/null
+++ b/lib/unistring/unictype/pr_join_control.c
@@ -0,0 +1,57 @@
+/* Properties of Unicode characters.
+ Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of either:
+
+ * 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,
+ 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.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+/* Specification. */
+#include "unictype.h"
+
+#if 0
+
+#include "bitmap.h"
+
+/* Define u_property_join_control table. */
+#include "pr_join_control.h"
+
+bool
+uc_is_property_join_control (ucs4_t uc)
+{
+ return bitmap_lookup (&u_property_join_control, uc);
+}
+
+#else
+
+bool
+uc_is_property_join_control (ucs4_t uc)
+{
+ return (uc >= 0x200C && uc <= 0x200D);
+}
+
+#endif
+
+const uc_property_t UC_PROPERTY_JOIN_CONTROL =
+ { &uc_is_property_join_control };
diff --git a/lib/unistring/unictype/pr_join_control.h b/lib/unistring/unictype/pr_join_control.h
new file mode 100644
index 0000000000..db6c9b3305
--- /dev/null
+++ b/lib/unistring/unictype/pr_join_control.h
@@ -0,0 +1,156 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Properties of Unicode characters. */
+/* Generated automatically by gen-uni-tables.c for Unicode 8.0.0. */
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+ {
+ int header[1];
+ int level1[1];
+ short level2[1 << 7];
+ /*unsigned*/ int level3[1 << 4];
+ }
+u_property_join_control =
+{
+ { 1 },
+ { 2 * sizeof (int) / sizeof (short) + 0 },
+ {
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ 2 + 128 * sizeof (short) / sizeof (int) + 0,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1,
+ -1
+ },
+ {
+ 0x00003000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000
+ }
+};
View Lorry Controller Status