[liblangtag] 02/07: New upstream version 0.5.8
Rene Engelhard
rene at moszumanska.debian.org
Tue Sep 13 02:53:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository liblangtag.
commit e4beee6823ab74282e33f3a80da661b93fd14c2a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Tue Sep 6 20:53:52 2016 +0200
New upstream version 0.5.8
---
Makefile.in | 2 +-
NEWS | 10 +++++
aclocal.m4 | 37 ++++++-----------
config.h.in | 3 ++
configure | 44 +++++++++------------
configure.ac | 19 ++++-----
data/Makefile.am | 1 +
data/Makefile.in | 2 +-
data/common/bcp47/calendar.xml | 20 ++++++++--
data/common/bcp47/collation.xml | 3 +-
data/common/bcp47/currency.xml | 7 +++-
data/common/bcp47/number.xml | 18 ++++++++-
data/common/bcp47/timezone.xml | 3 +-
data/common/bcp47/transform.xml | 5 +--
data/common/bcp47/transform_ime.xml | 3 +-
data/common/bcp47/transform_keyboard.xml | 3 +-
data/common/bcp47/transform_mt.xml | 3 +-
data/common/bcp47/transform_private_use.xml | 5 +--
data/common/bcp47/variant.xml | 24 ++++++------
data/common/supplemental/likelySubtags.xml | 61 +++++++++++++++++++++++------
data/language-subtag-registry | 12 +++++-
data/language-subtag-registry.xml | 12 +++++-
docs/Makefile.in | 1 -
docs/html/index.html | 2 +-
docs/version.xml | 2 +-
extensions/Makefile.in | 1 -
liblangtag-gobject-uninstalled.pc | 2 +-
liblangtag-gobject.pc | 2 +-
liblangtag-gobject/Makefile.in | 1 -
liblangtag-uninstalled.pc | 2 +-
liblangtag.pc | 4 +-
liblangtag.pc.in | 2 +-
liblangtag/Makefile.am | 7 ++--
liblangtag/Makefile.in | 8 ++--
liblangtag/lt-atomic.h | 5 ++-
liblangtag/lt-ext-module-private.h | 6 ++-
liblangtag/lt-ext-module.c | 36 +++++++++++------
liblangtag/lt-extension-private.h | 6 ++-
liblangtag/lt-extlang-db.c | 3 +-
liblangtag/lt-extlang-private.h | 6 ++-
liblangtag/lt-grandfathered-db.c | 3 +-
liblangtag/lt-grandfathered-private.h | 6 ++-
liblangtag/lt-iter-private.h | 6 ++-
liblangtag/lt-lang-private.h | 6 ++-
liblangtag/lt-localealias.h | 2 -
liblangtag/lt-lock.h | 6 ++-
liblangtag/lt-mem.h | 6 ++-
liblangtag/lt-messages.h | 4 +-
liblangtag/lt-redundant-private.h | 6 ++-
liblangtag/lt-region-private.h | 6 ++-
liblangtag/lt-script-private.h | 6 ++-
liblangtag/lt-stdint.h | 2 +-
liblangtag/lt-tag-private.h | 6 ++-
liblangtag/lt-trie.h | 6 ++-
liblangtag/lt-utils.h | 8 +---
liblangtag/lt-variant-private.h | 6 ++-
liblangtag/lt-xml.c | 12 +++---
tests/Makefile.am | 1 +
tests/Makefile.in | 2 +-
59 files changed, 317 insertions(+), 176 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 911108a..cd78394 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -249,7 +249,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4macros
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
@@ -411,6 +410,7 @@ NULL =
AUTOMAKE_OPTIONS = dist-bzip2
#SUBDIRS += docs tests
SUBDIRS = liblangtag extensions data docs $(am__append_1) tests
+ACLOCAL_AMFLAGS = -I m4macros
CONFIGURE_DEPENDENCIES = \
requires \
$(NULL)
diff --git a/NEWS b/NEWS
index 29b0376..620ac38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+0.5.7 -> 0.5.8
+=================
+Akira TAGOH (6):
+ Fix the build fail on MSVC 14 (fixes issue#13)
+ Drop the word of GNOME from the ifdef'd variable for debugging
+ Fix the build requirement in pkgconfig file
+ Make some header files public (fixes: issue#14)
+ Fix test fail on SunOS
+ Fix unknown node issue
+
0.5.6 -> 0.5.7
=================
Akira TAGOH (3):
diff --git a/aclocal.m4 b/aclocal.m4
index 1185ed3..1056820 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -150,26 +150,6 @@ AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
# serial 3
#
-dnl GNOME_COMMON_INIT
-
-AU_DEFUN([GNOME_COMMON_INIT],
-[
- dnl this macro should come after AC_CONFIG_MACRO_DIR
- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
- dnl ensure that when the Automake generated makefile calls aclocal,
- dnl it honours the $ACLOCAL_FLAGS environment variable
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
- if test -n "$ac_macro_dir"; then
- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
-
- AC_SUBST([ACLOCAL_AMFLAGS])
-],
-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
-in your top-level Makefile.am, instead, where "m4" is the macro directory set
-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-
AU_DEFUN([GNOME_DEBUG_CHECK],
[
AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
@@ -200,7 +180,7 @@ are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]])
# gnome-compiler-flags.m4
#
-# serial 2
+# serial 4
#
dnl GNOME_COMPILE_WARNINGS
@@ -212,7 +192,7 @@ dnl the first argument to the macro, defaulting to 'yes'.
dnl Additional warning/error flags can be passed as an optional second argument.
dnl
dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar])
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+AU_DEFUN([GNOME_COMPILE_WARNINGS],[
dnl ******************************
dnl More compiler warnings
dnl ******************************
@@ -249,6 +229,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-Werror=format-security \
-Werror=format=2 \
-Werror=missing-include-dirs \
+ -Werror=return-type \
"
dnl Additional warning or error flags provided by the module author to
@@ -319,11 +300,14 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
WARN_CFLAGS="$tested_warning_flags $complCFLAGS"
AC_SUBST(WARN_CFLAGS)
-])
+],
+[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and
+eliminate use of --enable-iso-c.
+See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]])
dnl For C++, do basically the same thing.
-AC_DEFUN([GNOME_CXX_WARNINGS],[
+AU_DEFUN([GNOME_CXX_WARNINGS],[
AC_ARG_ENABLE(cxx-warnings,
AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
[Turn on compiler warnings.]),,
@@ -374,7 +358,10 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
AC_SUBST(WARN_CXXFLAGS)
-])
+],
+[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and
+eliminate use of --enable-iso-cxx.
+See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]])
dnl -*- mode: autoconf -*-
dnl Copyright 2009 Johan Dahlin
diff --git a/config.h.in b/config.h.in
index 855db83..a77352a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -18,6 +18,9 @@
/* Predefined possible va_copy() implementation (id: CPS) */
#define __VA_COPY_USE_CPS(d, s) memcpy((void *)&(d), (void *)&(s), sizeof((s)))
+/* Define if debugging is enabled */
+#undef ENABLE_DEBUG
+
/* Use modules */
#undef ENABLE_MODULE
diff --git a/configure b/configure
index 6c23484..b9c2b5f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for liblangtag 0.5.7.
+# Generated by GNU Autoconf 2.69 for liblangtag 0.5.8.
#
# Report bugs to <http://github.com/tagoh/liblangtag/issues>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='liblangtag'
PACKAGE_TARNAME='liblangtag'
-PACKAGE_VERSION='0.5.7'
-PACKAGE_STRING='liblangtag 0.5.7'
+PACKAGE_VERSION='0.5.8'
+PACKAGE_STRING='liblangtag 0.5.8'
PACKAGE_BUGREPORT='http://github.com/tagoh/liblangtag/issues'
PACKAGE_URL=''
@@ -726,7 +726,6 @@ OBJDUMP
DLLTOOL
AS
DISABLE_DEPRECATED
-ACLOCAL_AMFLAGS
WARN_CFLAGS
ac_ct_AR
AR
@@ -1405,7 +1404,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures liblangtag 0.5.7 to adapt to many kinds of systems.
+\`configure' configures liblangtag 0.5.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1474,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of liblangtag 0.5.7:";;
+ short | recursive ) echo "Configuration of liblangtag 0.5.8:";;
esac
cat <<\_ACEOF
@@ -1620,7 +1619,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-liblangtag configure 0.5.7
+liblangtag configure 0.5.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2226,7 +2225,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by liblangtag $as_me 0.5.7, which was
+It was created by liblangtag $as_me 0.5.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3092,7 +3091,7 @@ fi
# Define the identity of the package.
PACKAGE='liblangtag'
- VERSION='0.5.7'
+ VERSION='0.5.8'
cat >>confdefs.h <<_ACEOF
@@ -3342,6 +3341,8 @@ esac
if test "x$enable_debug" = "xyes"; then :
+$as_echo "#define ENABLE_DEBUG /**/" >>confdefs.h
+
else
$as_echo "#define NDEBUG /**/" >>confdefs.h
@@ -5777,6 +5778,7 @@ fi
-Werror=format-security \
-Werror=format=2 \
-Werror=missing-include-dirs \
+ -Werror=return-type \
"
additional_flags=""
@@ -5868,16 +5870,7 @@ $as_echo "$complCFLAGS" >&6; }
-
-
-
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
- if test -n "$ac_macro_dir"; then
- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
-
-
-
+GNOME_COMMON_INIT
@@ -14786,8 +14779,7 @@ $as_echo "no (using fallback implementation)" >&6; }
fi
-if test "x$ac_cv_func_vsnprintf" = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is C99-compliant" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is C99-compliant" >&5
$as_echo_n "checking Whether vsnprintf is C99-compliant... " >&6; }
if ${lt_cv_c99_vsnprintf+:} false; then :
$as_echo_n "(cached) " >&6
@@ -14798,7 +14790,10 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <sys/types.h>
+#include <stdio.h>
#include <stdarg.h>
+#include <stdlib.h>
int
foo(char *format, ...)
{
@@ -14834,11 +14829,10 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_c99_vsnprintf" >&5
$as_echo "$lt_cv_c99_vsnprintf" >&6; }
- if test "x$lt_cv_c99_vsnprintf" = xyes; then
+if test "x$lt_cv_c99_vsnprintf" = xyes; then
$as_echo "#define LT_HAVE_C99_VSNPRINTF 1" >>confdefs.h
- fi
fi
@@ -16880,7 +16874,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by liblangtag $as_me 0.5.7, which was
+This file was extended by liblangtag $as_me 0.5.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16946,7 +16940,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-liblangtag config.status 0.5.7
+liblangtag config.status 0.5.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index dd72c0d..9773fa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.62)
-AC_INIT([liblangtag], 0.5.7, [http://github.com/tagoh/liblangtag/issues])
+AC_INIT([liblangtag], 0.5.8, [http://github.com/tagoh/liblangtag/issues])
. `dirname $0`/requires
@@ -18,7 +18,7 @@ AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4macros])
-AX_CHECK_ENABLE_DEBUG
+AX_CHECK_ENABLE_DEBUG([no], [ENABLE_DEBUG])
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC
@@ -221,10 +221,12 @@ AC_CHECK_HEADERS([dirent.h execinfo.h libgen.h sys/param.h])
AC_CHECK_FUNCS([backtrace getegid geteuid getgid getuid __secure_getenv secure_getenv strndup vasprintf vsnprintf])
AC_CHECK_VA_COPY
-if test "x$ac_cv_func_vsnprintf" = xyes; then
- AC_CACHE_CHECK([Whether vsnprintf is C99-compliant], [lt_cv_c99_vsnprintf],
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_CACHE_CHECK([Whether vsnprintf is C99-compliant], [lt_cv_c99_vsnprintf],
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <sys/types.h>
+#include <stdio.h>
#include <stdarg.h>
+#include <stdlib.h>
int
foo(char *format, ...)
{
@@ -247,10 +249,9 @@ main(void)
return foo("foo: %s", "bar");
}]])],
- [lt_cv_c99_vsnprintf=yes],[lt_cv_c99_vsnprintf=no],[lt_cv_c99_vsnprintf=no])])
- if test "x$lt_cv_c99_vsnprintf" = xyes; then
- AC_DEFINE(LT_HAVE_C99_VSNPRINTF, 1, [Have C99-compliant vsnprintf])
- fi
+ [lt_cv_c99_vsnprintf=yes],[lt_cv_c99_vsnprintf=no],[lt_cv_c99_vsnprintf=no])])
+if test "x$lt_cv_c99_vsnprintf" = xyes; then
+ AC_DEFINE(LT_HAVE_C99_VSNPRINTF, 1, [Have C99-compliant vsnprintf])
fi
dnl ======================================================================
diff --git a/data/Makefile.am b/data/Makefile.am
index 85c413d..84b9c5b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -112,6 +112,7 @@ reg2xml_SOURCES = \
$(NULL)
reg2xml_CFLAGS = \
$(LIBXML2_CFLAGS) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/liblangtag \
-D__LANGTAG_COMPILATION \
$(NULL)
diff --git a/data/Makefile.in b/data/Makefile.in
index 7318506..29b38c8 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -218,7 +218,6 @@ CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
@@ -461,6 +460,7 @@ reg2xml_SOURCES = \
reg2xml_CFLAGS = \
$(LIBXML2_CFLAGS) \
+ -I$(top_srcdir) \
-I$(top_srcdir)/liblangtag \
-D__LANGTAG_COMPILATION \
$(NULL)
diff --git a/data/common/bcp47/calendar.xml b/data/common/bcp47/calendar.xml
index 7767df5..7453b04 100644
--- a/data/common/bcp47/calendar.xml
+++ b/data/common/bcp47/calendar.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldmlBCP47 SYSTEM "../../common/dtd/ldmlBCP47.dtd">
<!--
-Copyright © 1991-2013 Unicode, Inc.
+Copyright © 1991-2015 Unicode, Inc.
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 9198 $"/>
- <generation date="$Date: 2013-08-12 16:14:45 -0500 (Mon, 12 Aug 2013) $"/>
+ <version number="$Revision: 11914 $"/>
<keyword>
<key name="ca" description="Calendar algorithm key" alias="calendar">
<type name="buddhist" description="Thai Buddhist calendar"/>
@@ -32,5 +31,20 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="islamicc" description="Civil (algorithmic) Arabic calendar" deprecated="true" preferred="islamic-civil" alias="islamic-civil"/>
</key>
+ <key name="fw" description="First day of week" since="28">
+ <type name="sun" description="Sunday" since="28" />
+ <type name="mon" description="Monday" since="28" />
+ <type name="tue" description="Tuesday" since="28" />
+ <type name="wed" description="Wednesday" since="28" />
+ <type name="thu" description="Thursday" since="28" />
+ <type name="fri" description="Friday" since="28" />
+ <type name="sat" description="Saturday" since="28" />
+ </key>
+ <key name="hc" description="Hour cycle (12 vs 24)" alias="hours" since="28">
+ <type name="h12" description="Hour system using 1–12; 'h' in patterns" since="28" />
+ <type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
+ <type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
+ <type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
+ </key>
</keyword>
</ldmlBCP47>
diff --git a/data/common/bcp47/collation.xml b/data/common/bcp47/collation.xml
index 5b7c561..00ae97d 100644
--- a/data/common/bcp47/collation.xml
+++ b/data/common/bcp47/collation.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 11305 $"/>
- <generation date="$Date: 2015-02-24 12:19:50 -0600 (Tue, 24 Feb 2015) $"/>
+ <version number="$Revision: 11914 $"/>
<keyword>
<key name="co" description="Collation type key" alias="collation">
<type name="big5han" description="Pinyin ordering for Latin, big5 charset ordering for CJK characters (used in Chinese)"/>
diff --git a/data/common/bcp47/currency.xml b/data/common/bcp47/currency.xml
index 22adbd9..33648b2 100644
--- a/data/common/bcp47/currency.xml
+++ b/data/common/bcp47/currency.xml
@@ -7,9 +7,12 @@ For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 9198 $"/>
- <generation date="$Date: 2013-08-12 16:14:45 -0500 (Mon, 12 Aug 2013) $"/>
+ <version number="$Revision: 11914 $"/>
<keyword>
+ <key name="cf" description="Currency format key" since="28">
+ <type name="standard" description="Standard currency format" since="28"/>
+ <type name="account" description="Accounting currency format" since="28"/>
+ </key>
<key name="cu" description="Currency type key" alias="currency">
<type name="adp" description="Andorran Peseta" since="1.9"/>
<type name="aed" description="United Arab Emirates Dirham" since="1.9"/>
diff --git a/data/common/bcp47/number.xml b/data/common/bcp47/number.xml
index 461f6aa..8c56f9a 100644
--- a/data/common/bcp47/number.xml
+++ b/data/common/bcp47/number.xml
@@ -7,10 +7,10 @@ For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 9732 $"/>
- <generation date="$Date: 2014-02-13 11:57:02 -0600 (Thu, 13 Feb 2014) $"/>
+ <version number="$Revision: 11966 $"/>
<keyword>
<key name="nu" description="Numbering system type key" alias="numbers">
+ <type name="ahom" description="Ahom digits" since="28"/>
<type name="arab" description="Arabic-Indic digits"/>
<type name="arabext" description="Extended Arabic-Indic digits"/>
<type name="armn" description="Armenian upper case numerals — algorithmic"/>
@@ -20,6 +20,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="brah" description="Brahmi digits" since="21"/>
<type name="cakm" description="Chakma digits" since="21"/>
<type name="cham" description="Cham digits" since="21"/>
+ <type name="cyrl" description="Cyrillic numerals — algorithmic" since="28"/>
<type name="deva" description="Devanagari digits"/>
<type name="ethi" description="Ethiopic numerals — algorithmic"/>
<type name="finance" description="Financial numerals — may be algorithmic" since="21"/>
@@ -36,6 +37,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="hant" description="Traditional Chinese numerals — algorithmic"/>
<type name="hantfin" description="Traditional Chinese financial numerals — algorithmic"/>
<type name="hebr" description="Hebrew numerals — algorithmic"/>
+ <type name="hmng" description="Pahawh Hmong digits" since="28"/>
<type name="java" description="Javanese digits" since="21"/>
<type name="jpan" description="Japanese numerals — algorithmic"/>
<type name="jpanfin" description="Japanese financial numerals — algorithmic"/>
@@ -48,11 +50,19 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="latn" description="Latin digits"/>
<type name="lepc" description="Lepcha digits" since="21"/>
<type name="limb" description="Limbu digits" since="21"/>
+ <type name="mathbold" description="Mathematical bold digits" since="28"/>
+ <type name="mathdbl" description="Mathematical double-struck digits" since="28"/>
+ <type name="mathmono" description="Mathematical monospace digits" since="28"/>
+ <type name="mathsanb" description="Mathematical sans-serif bold digits" since="28"/>
+ <type name="mathsans" description="Mathematical sans-serif digits" since="28"/>
<type name="mlym" description="Malayalam digits"/>
+ <type name="modi" description="Modi digits" since="28"/>
<type name="mong" description="Mongolian digits"/>
+ <type name="mroo" description="Mro digits" since="28"/>
<type name="mtei" description="Meetei Mayek digits" since="21"/>
<type name="mymr" description="Myanmar digits"/>
<type name="mymrshan" description="Myanmar Shan digits" since="21"/>
+ <type name="mymrtlng" description="Myanmar Tai Laing digits" since="28"/>
<type name="native" description="Native digits" since="21"/>
<type name="nkoo" description="N'Ko digits" since="21"/>
<type name="olck" description="Ol Chiki digits" since="21"/>
@@ -62,6 +72,8 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="romanlow" description="Roman lowercase numerals — algorithmic"/>
<type name="saur" description="Saurashtra digits" since="21"/>
<type name="shrd" description="Sharada digits" since="21"/>
+ <type name="sind" description="Khudawadi digits" since="28"/>
+ <type name="sinh" description="Sinhala Lith digits" since="28"/>
<type name="sora" description="Sora_Sompeng digits" since="21"/>
<type name="sund" description="Sundanese digits" since="21"/>
<type name="takr" description="Takri digits" since="21"/>
@@ -70,9 +82,11 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="tamldec" description="Modern Tamil decimal digits" since="2.0.1"/>
<type name="telu" description="Telugu digits"/>
<type name="thai" description="Thai digits"/>
+ <type name="tirh" description="Tirhuta digits" since="28"/>
<type name="tibt" description="Tibetan digits"/>
<type name="traditio" description="Traditional numerals — may be algorithmic" alias="traditional" since="21"/>
<type name="vaii" description="Vai digits" since="21"/>
+ <type name="wara" description="Warang Citi digits" since="28"/>
</key>
</keyword>
</ldmlBCP47>
diff --git a/data/common/bcp47/timezone.xml b/data/common/bcp47/timezone.xml
index a101b47..fea8894 100644
--- a/data/common/bcp47/timezone.xml
+++ b/data/common/bcp47/timezone.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 11036 $"/>
- <generation date="$Date: 2014-10-24 00:13:30 -0500 (Fri, 24 Oct 2014) $"/>
+ <version number="$Revision: 11914 $"/>
<keyword>
<key name="tz" description="Time zone key" alias="timezone">
<type name="adalv" description="Andorra" alias="Europe/Andorra"/>
diff --git a/data/common/bcp47/transform.xml b/data/common/bcp47/transform.xml
index 8e645d2..562fd26 100644
--- a/data/common/bcp47/transform.xml
+++ b/data/common/bcp47/transform.xml
@@ -7,8 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 8268 $" />
- <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $" />
+ <version number="$Revision: 11914 $" />
<keyword>
<key extension="t" name="m0" description="Transform extension mechanism" since="21">
<type name="alaloc" description="American Library Association-Library of Congress" since="21"/>
@@ -22,4 +21,4 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="ungegn" description="United Nations Group of Experts on Geographical Names" since="21"/>
</key>
</keyword>
-</ldmlBCP47>
\ No newline at end of file
+</ldmlBCP47>
diff --git a/data/common/bcp47/transform_ime.xml b/data/common/bcp47/transform_ime.xml
index f60b6d0..19b317d 100644
--- a/data/common/bcp47/transform_ime.xml
+++ b/data/common/bcp47/transform_ime.xml
@@ -6,8 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 8268 $" />
- <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $" />
+ <version number="$Revision: 11914 $" />
<keyword>
<key extension="t" name="i0" description="Input Method Engine transform:
Used to indicate an input method transformation, such as one used by
diff --git a/data/common/bcp47/transform_keyboard.xml b/data/common/bcp47/transform_keyboard.xml
index 2228acf..995e813 100644
--- a/data/common/bcp47/transform_keyboard.xml
+++ b/data/common/bcp47/transform_keyboard.xml
@@ -6,8 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 8268 $" />
- <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $" />
+ <version number="$Revision: 11914 $" />
<keyword>
<key extension="t" name="k0" description="Keyboard transform:
Used to indicate a keyboard transformation, such as one used by a client-side virtual keyboard.
diff --git a/data/common/bcp47/transform_mt.xml b/data/common/bcp47/transform_mt.xml
index dc9f106..6836c8a 100644
--- a/data/common/bcp47/transform_mt.xml
+++ b/data/common/bcp47/transform_mt.xml
@@ -6,8 +6,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 8268 $" />
- <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $" />
+ <version number="$Revision: 11914 $" />
<keyword>
<key extension="t" name="t0" description="Machine Translation:
Used to indicate content that has been machine translated, or a request for a particular type of machine translation of content.
diff --git a/data/common/bcp47/transform_private_use.xml b/data/common/bcp47/transform_private_use.xml
index 15b45c7..616b57d 100644
--- a/data/common/bcp47/transform_private_use.xml
+++ b/data/common/bcp47/transform_private_use.xml
@@ -6,12 +6,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
For terms of use, see http://www.unicode.org/copyright.html
-->
<ldmlBCP47>
- <version number="$Revision: 8268 $" />
- <generation date="$Date: 2013-03-01 08:26:02 -0600 (Fri, 01 Mar 2013) $" />
+ <version number="$Revision: 11914 $" />
<keyword>
<key extension="t" name="x0" description="Private Use:
Used for implementation-specific transforms.
All subfields consistent with rfc6497 (that is, subtags of 3-8 alphanum characters) are valid, and do not require registration." since="21.0.2">
</key>
</keyword>
-</ldmlBCP47>
\ No newline at end of file
+</ldmlBCP47>
diff --git a/data/common/bcp47/variant.xml b/data/common/bcp47/variant.xml
index b0232df..4ebea47 100644
--- a/data/common/bcp47/variant.xml
+++ b/data/common/bcp47/variant.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE ldmlBCP47 SYSTEM "../../common/dtd/ldmlBCP47.dtd">
-<!--
-Copyright © 1991-2013 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
+<!-- Copyright © 1991-2013 Unicode, Inc. CLDR data files are interpreted according to the LDML specification
+ (http://unicode.org/reports/tr35/) For terms of use, see http://www.unicode.org/copyright.html -->
<ldmlBCP47>
- <version number="$Revision: 8242 $"/>
- <generation date="$Date: 2013-02-24 21:06:02 -0600 (Sun, 24 Feb 2013) $"/>
- <keyword>
- <key name="va" description="Common locale variant type key">
- <type name="posix" description="POSIX style locale variant"/>
- </key>
- </keyword>
+ <version number="$Revision: 12088 $" />
+ <keyword>
+ <key name="va" description="Common locale variant type key">
+ <type name="posix" description="POSIX style locale variant" />
+ </key>
+ <key name="sd" description="Region subdivision">
+ <type name="SUBDIVISION_CODE"
+ description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" />
+ </key>
+ </keyword>
</ldmlBCP47>
diff --git a/data/common/supplemental/likelySubtags.xml b/data/common/supplemental/likelySubtags.xml
index 304d688..42fd6aa 100644
--- a/data/common/supplemental/likelySubtags.xml
+++ b/data/common/supplemental/likelySubtags.xml
@@ -11,8 +11,7 @@ data using the GenerateMaximalLocales tool. Under normal circumstances, this fil
not be patched by hand, as any changes made in that fashion may be lost.
-->
<supplementalData>
- <version number="$Revision: 11318 $"/>
- <generation date="$Date: 2015-02-25 23:47:56 -0600 (Wed, 25 Feb 2015) $"/>
+ <version number="$Revision: 11965 $"/>
<likelySubtags>
<likelySubtag from="aa" to="aa_Latn_ET"/>
<!--{ Afar; ?; ? } => { Afar; Latin; Ethiopia }-->
@@ -36,6 +35,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Afrikaans; ?; ? } => { Afrikaans; Latin; South Africa }-->
<likelySubtag from="agq" to="agq_Latn_CM"/>
<!--{ Aghem; ?; ? } => { Aghem; Latin; Cameroon }-->
+ <likelySubtag from="aho" to="aho_Ahom_IN"/>
+ <!--{ Ahom; ?; ? } => { Ahom; Ahom; India }-->
<likelySubtag from="ak" to="ak_Latn_GH"/>
<!--{ Akan; ?; ? } => { Akan; Latin; Ghana }-->
<likelySubtag from="akk" to="akk_Xsux_IQ"/>
@@ -72,6 +73,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Assamese; ?; ? } => { Assamese; Bengali; India }-->
<likelySubtag from="asa" to="asa_Latn_TZ"/>
<!--{ Asu; ?; ? } => { Asu; Latin; Tanzania }-->
+ <likelySubtag from="ase" to="ase_Sgnw_US"/>
+ <!--{ American Sign Language; ?; ? } => { American Sign Language; SignWriting; United States }-->
<likelySubtag from="ast" to="ast_Latn_ES"/>
<!--{ Asturian; ?; ? } => { Asturian; Latin; Spain }-->
<likelySubtag from="atj" to="atj_Latn_CA"/>
@@ -84,14 +87,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Aymara; ?; ? } => { Aymara; Latin; Bolivia }-->
<likelySubtag from="az" to="az_Latn_AZ"/>
<!--{ Azerbaijani; ?; ? } => { Azerbaijani; Latin; Azerbaijan }-->
+ <likelySubtag from="az_IQ" to="az_Arab_IQ"/>
+ <!--{ Azerbaijani; ?; Iraq } => { Azerbaijani; Arabic; Iraq }-->
<likelySubtag from="az_IR" to="az_Arab_IR"/>
<!--{ Azerbaijani; ?; Iran } => { Azerbaijani; Arabic; Iran }-->
<likelySubtag from="az_RU" to="az_Cyrl_RU"/>
<!--{ Azerbaijani; ?; Russia } => { Azerbaijani; Cyrillic; Russia }-->
<likelySubtag from="az_Arab" to="az_Arab_IR"/>
<!--{ Azerbaijani; Arabic; ? } => { Azerbaijani; Arabic; Iran }-->
- <likelySubtag from="azb" to="azb_Arab_IR"/>
- <!--{ South Azerbaijani; ?; ? } => { South Azerbaijani; Arabic; Iran }-->
<likelySubtag from="ba" to="ba_Cyrl_RU"/>
<!--{ Bashkir; ?; ? } => { Bashkir; Cyrillic; Russia }-->
<likelySubtag from="bal" to="bal_Arab_PK"/>
@@ -114,6 +117,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Baoulé; ?; ? } => { Baoulé; Latin; Côte d’Ivoire }-->
<likelySubtag from="be" to="be_Cyrl_BY"/>
<!--{ Belarusian; ?; ? } => { Belarusian; Cyrillic; Belarus }-->
+ <likelySubtag from="bej" to="bej_Arab_SD"/>
+ <!--{ Beja; ?; ? } => { Beja; Arabic; Sudan }-->
<likelySubtag from="bem" to="bem_Latn_ZM"/>
<!--{ Bemba; ?; ? } => { Bemba; Latin; Zambia }-->
<likelySubtag from="bew" to="bew_Latn_ID"/>
@@ -132,6 +137,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Bulgarian; ?; ? } => { Bulgarian; Cyrillic; Bulgaria }-->
<likelySubtag from="bgc" to="bgc_Deva_IN"/>
<!--{ Haryanvi; ?; ? } => { Haryanvi; Devanagari; India }-->
+ <likelySubtag from="bgn" to="bgn_Arab_PK"/>
+ <!--{ Western Balochi; ?; ? } => { Western Balochi; Arabic; Pakistan }-->
<likelySubtag from="bgx" to="bgx_Grek_TR"/>
<!--{ Balkan Gagauz Turkish; ?; ? } => { Balkan Gagauz Turkish; Greek; Turkey }-->
<likelySubtag from="bh" to="bh_Kthi_IN"/>
@@ -356,6 +363,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Maasina Fulfulde; ?; ? } => { Maasina Fulfulde; Latin; Mali }-->
<likelySubtag from="fi" to="fi_Latn_FI"/>
<!--{ Finnish; ?; ? } => { Finnish; Latin; Finland }-->
+ <likelySubtag from="fia" to="fia_Arab_SD"/>
+ <!--{ Nobiin; ?; ? } => { Nobiin; Arabic; Sudan }-->
<likelySubtag from="fil" to="fil_Latn_PH"/>
<!--{ Filipino; ?; ? } => { Filipino; Latin; Philippines }-->
<likelySubtag from="fit" to="fit_Latn_SE"/>
@@ -384,6 +393,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Friulian; ?; ? } => { Friulian; Latin; Italy }-->
<likelySubtag from="fuv" to="fuv_Latn_NG"/>
<!--{ Nigerian Fulfulde; ?; ? } => { Nigerian Fulfulde; Latin; Nigeria }-->
+ <likelySubtag from="fvr" to="fvr_Latn_SD"/>
+ <!--{ Fur; ?; ? } => { Fur; Latin; Sudan }-->
<likelySubtag from="fy" to="fy_Latn_NL"/>
<!--{ Western Frisian; ?; ? } => { Western Frisian; Latin; Netherlands }-->
<likelySubtag from="ga" to="ga_Latn_IE"/>
@@ -470,10 +481,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Hebrew; ?; ? } => { Hebrew; Hebrew; Israel }-->
<likelySubtag from="hi" to="hi_Deva_IN"/>
<!--{ Hindi; ?; ? } => { Hindi; Devanagari; India }-->
- <likelySubtag from="hif" to="hif_Deva_FJ"/>
- <!--{ Fiji Hindi; ?; ? } => { Fiji Hindi; Devanagari; Fiji }-->
+ <likelySubtag from="hif" to="hif_Latn_FJ"/>
+ <!--{ Fiji Hindi; ?; ? } => { Fiji Hindi; Latin; Fiji }-->
<likelySubtag from="hil" to="hil_Latn_PH"/>
<!--{ Hiligaynon; ?; ? } => { Hiligaynon; Latin; Philippines }-->
+ <likelySubtag from="hlu" to="hlu_Hluw_TR"/>
+ <!--{ Hieroglyphic Luwian; ?; ? } => { Hieroglyphic Luwian; Anatolian Hieroglyphs; Turkey }-->
<likelySubtag from="hmd" to="hmd_Plrd_CN"/>
<!--{ Large Flowery Miao; ?; ? } => { Large Flowery Miao; Pollard Phonetic; China }-->
<likelySubtag from="hnd" to="hnd_Arab_PK"/>
@@ -826,10 +839,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Maori; ?; ? } => { Maori; Latin; New Zealand }-->
<likelySubtag from="min" to="min_Latn_ID"/>
<!--{ Minangkabau; ?; ? } => { Minangkabau; Latin; Indonesia }-->
+ <likelySubtag from="mis" to="mis_Hatr_IQ"/>
+ <!--{ Uncoded languages; ?; ? } => { Uncoded languages; Hatran; Iraq }-->
<likelySubtag from="mk" to="mk_Cyrl_MK"/>
<!--{ Macedonian; ?; ? } => { Macedonian; Cyrillic; Macedonia }-->
<likelySubtag from="ml" to="ml_Mlym_IN"/>
<!--{ Malayalam; ?; ? } => { Malayalam; Malayalam; India }-->
+ <likelySubtag from="mls" to="mls_Latn_SD"/>
+ <!--{ Masalit; ?; ? } => { Masalit; Latin; Sudan }-->
<likelySubtag from="mn" to="mn_Cyrl_MN"/>
<!--{ Mongolian; ?; ? } => { Mongolian; Cyrillic; Mongolia }-->
<likelySubtag from="mn_CN" to="mn_Mong_CN"/>
@@ -941,15 +958,15 @@ not be patched by hand, as any changes made in that fashion may be lost.
<likelySubtag from="non" to="non_Runr_SE"/>
<!--{ Old Norse; ?; ? } => { Old Norse; Runic; Sweden }-->
<likelySubtag from="nqo" to="nqo_Nkoo_GN"/>
- <!--{ NʼKo; ?; ? } => { NʼKo; N’Ko; Guinea }-->
+ <!--{ N’Ko; ?; ? } => { N’Ko; N’Ko; Guinea }-->
<likelySubtag from="nr" to="nr_Latn_ZA"/>
<!--{ South Ndebele; ?; ? } => { South Ndebele; Latin; South Africa }-->
<likelySubtag from="nsk" to="nsk_Cans_CA"/>
<!--{ Naskapi; ?; ? } => { Naskapi; Unified Canadian Aboriginal Syllabics; Canada }-->
<likelySubtag from="nso" to="nso_Latn_ZA"/>
<!--{ Northern Sotho; ?; ? } => { Northern Sotho; Latin; South Africa }-->
- <likelySubtag from="nus" to="nus_Latn_SD"/>
- <!--{ Nuer; ?; ? } => { Nuer; Latin; Sudan }-->
+ <likelySubtag from="nus" to="nus_Latn_SS"/>
+ <!--{ Nuer; ?; ? } => { Nuer; Latin; South Sudan }-->
<likelySubtag from="nv" to="nv_Latn_US"/>
<!--{ Navajo; ?; ? } => { Navajo; Latin; United States }-->
<likelySubtag from="nxq" to="nxq_Latn_CN"/>
@@ -1034,8 +1051,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Kʼicheʼ; ?; ? } => { Kʼicheʼ; Latin; Guatemala }-->
<likelySubtag from="qug" to="qug_Latn_EC"/>
<!--{ Chimborazo Highland Quichua; ?; ? } => { Chimborazo Highland Quichua; Latin; Ecuador }-->
- <likelySubtag from="raj" to="raj_Latn_IN"/>
- <!--{ Rajasthani; ?; ? } => { Rajasthani; Latin; India }-->
+ <likelySubtag from="raj" to="raj_Deva_IN"/>
+ <!--{ Rajasthani; ?; ? } => { Rajasthani; Devanagari; India }-->
<likelySubtag from="rcf" to="rcf_Latn_RE"/>
<!--{ Réunion Creole French; ?; ? } => { Réunion Creole French; Latin; Réunion }-->
<likelySubtag from="rej" to="rej_Latn_ID"/>
@@ -1122,6 +1139,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Sindhi; Khudawadi; ? } => { Sindhi; Khudawadi; India }-->
<likelySubtag from="sdc" to="sdc_Latn_IT"/>
<!--{ Sassarese Sardinian; ?; ? } => { Sassarese Sardinian; Latin; Italy }-->
+ <likelySubtag from="sdh" to="sdh_Arab_IR"/>
+ <!--{ Southern Kurdish; ?; ? } => { Southern Kurdish; Arabic; Iran }-->
<likelySubtag from="se" to="se_Latn_NO"/>
<!--{ Northern Sami; ?; ? } => { Northern Sami; Latin; Norway }-->
<likelySubtag from="sef" to="sef_Latn_CI"/>
@@ -1218,6 +1237,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Comorian; ?; ? } => { Comorian; Arabic; Mayotte }-->
<likelySubtag from="swc" to="swc_Latn_CD"/>
<!--{ Congo Swahili; ?; ? } => { Congo Swahili; Latin; Congo - Kinshasa }-->
+ <likelySubtag from="swg" to="swg_Latn_DE"/>
+ <!--{ Swabian; ?; ? } => { Swabian; Latin; Germany }-->
<likelySubtag from="swv" to="swv_Deva_IN"/>
<!--{ Shekhawati; ?; ? } => { Shekhawati; Devanagari; India }-->
<likelySubtag from="sxn" to="sxn_Latn_ID"/>
@@ -1406,6 +1427,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Wagdi; ?; ? } => { Wagdi; Devanagari; India }-->
<likelySubtag from="wls" to="wls_Latn_WF"/>
<!--{ Wallisian; ?; ? } => { Wallisian; Latin; Wallis & Futuna }-->
+ <likelySubtag from="wni" to="wni_Arab_KM"/>
+ <!--{ Ndzwani Comorian; ?; ? } => { Ndzwani Comorian; Arabic; Comoros }-->
<likelySubtag from="wo" to="wo_Latn_SN"/>
<!--{ Wolof; ?; ? } => { Wolof; Latin; Senegal }-->
<likelySubtag from="wtm" to="wtm_Deva_IN"/>
@@ -1458,6 +1481,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ Yucateco; ?; ? } => { Yucateco; Latin; Mexico }-->
<likelySubtag from="za" to="za_Latn_CN"/>
<!--{ Zhuang; ?; ? } => { Zhuang; Latin; China }-->
+ <likelySubtag from="zag" to="zag_Latn_SD"/>
+ <!--{ Zaghawa; ?; ? } => { Zaghawa; Latin; Sudan }-->
<likelySubtag from="zdj" to="zdj_Arab_KM"/>
<!--{ Ngazidja Comorian; ?; ? } => { Ngazidja Comorian; Arabic; Comoros }-->
<likelySubtag from="zea" to="zea_Latn_NL"/>
@@ -1962,6 +1987,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; ?; Zimbabwe } => { Shona; Latin; Zimbabwe }-->
<likelySubtag from="und_Aghb" to="lez_Aghb_RU"/>
<!--{ ?; Caucasian Albanian; ? } => { Lezghian; Caucasian Albanian; Russia }-->
+ <likelySubtag from="und_Ahom" to="aho_Ahom_IN"/>
+ <!--{ ?; Ahom; ? } => { Ahom; Ahom; India }-->
<likelySubtag from="und_Arab" to="ar_Arab_EG"/>
<!--{ ?; Arabic; ? } => { Arabic; Arabic; Egypt }-->
<likelySubtag from="und_Arab_CC" to="ms_Arab_CC"/>
@@ -1988,6 +2015,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; Arabic; Thailand } => { Pattani Malay; Arabic; Thailand }-->
<likelySubtag from="und_Arab_TJ" to="fa_Arab_TJ"/>
<!--{ ?; Arabic; Tajikistan } => { Persian; Arabic; Tajikistan }-->
+ <likelySubtag from="und_Arab_TR" to="az_Arab_TR"/>
+ <!--{ ?; Arabic; Turkey } => { Azerbaijani; Arabic; Turkey }-->
<likelySubtag from="und_Arab_YT" to="swb_Arab_YT"/>
<!--{ ?; Arabic; Mayotte } => { Comorian; Arabic; Mayotte }-->
<likelySubtag from="und_Armi" to="arc_Armi_IR"/>
@@ -2096,6 +2125,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; Simplified; ? } => { Chinese; Simplified; China }-->
<likelySubtag from="und_Hant" to="zh_Hant_TW"/>
<!--{ ?; Traditional; ? } => { Chinese; Traditional; Taiwan }-->
+ <likelySubtag from="und_Hatr" to="mis_Hatr_IQ"/>
+ <!--{ ?; Hatran; ? } => { Uncoded languages; Hatran; Iraq }-->
<likelySubtag from="und_Hebr" to="he_Hebr_IL"/>
<!--{ ?; Hebrew; ? } => { Hebrew; Hebrew; Israel }-->
<likelySubtag from="und_Hebr_CA" to="yi_Hebr_CA"/>
@@ -2110,8 +2141,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; Hebrew; United States } => { Yiddish; Hebrew; United States }-->
<likelySubtag from="und_Hira" to="ja_Hira_JP"/>
<!--{ ?; Hiragana; ? } => { Japanese; Hiragana; Japan }-->
+ <likelySubtag from="und_Hluw" to="hlu_Hluw_TR"/>
+ <!--{ ?; Anatolian Hieroglyphs; ? } => { Hieroglyphic Luwian; Anatolian Hieroglyphs; Turkey }-->
<likelySubtag from="und_Hmng" to="hnj_Hmng_LA"/>
<!--{ ?; Pahawh Hmong; ? } => { Hmong Njua; Pahawh Hmong; Laos }-->
+ <likelySubtag from="und_Hung" to="hu_Hung_HU"/>
+ <!--{ ?; Old Hungarian; ? } => { Hungarian; Old Hungarian; Hungary }-->
<likelySubtag from="und_Ital" to="ett_Ital_IT"/>
<!--{ ?; Old Italic; ? } => { Etruscan; Old Italic; Italy }-->
<likelySubtag from="und_Java" to="jv_Java_ID"/>
@@ -2212,6 +2247,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; Mro; ? } => { Mono (Cameroon); Mro; Bangladesh }-->
<likelySubtag from="und_Mtei" to="mni_Mtei_IN"/>
<!--{ ?; Meitei Mayek; ? } => { Manipuri; Meitei Mayek; India }-->
+ <likelySubtag from="und_Mult" to="skr_Mult_PK"/>
+ <!--{ ?; Multani; ? } => { Saraiki; Multani; Pakistan }-->
<likelySubtag from="und_Mymr" to="my_Mymr_MM"/>
<!--{ ?; Myanmar; ? } => { Burmese; Myanmar; Myanmar (Burma) }-->
<likelySubtag from="und_Mymr_IN" to="kht_Mymr_IN"/>
@@ -2262,6 +2299,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
<!--{ ?; Old South Arabian; ? } => { Sabaean; Old South Arabian; Yemen }-->
<likelySubtag from="und_Saur" to="saz_Saur_IN"/>
<!--{ ?; Saurashtra; ? } => { Saurashtra; Saurashtra; India }-->
+ <likelySubtag from="und_Sgnw" to="ase_Sgnw_US"/>
+ <!--{ ?; SignWriting; ? } => { American Sign Language; SignWriting; United States }-->
<likelySubtag from="und_Shaw" to="en_Shaw_GB"/>
<!--{ ?; Shavian; ? } => { English; Shavian; United Kingdom }-->
<likelySubtag from="und_Shrd" to="sa_Shrd_IN"/>
diff --git a/data/language-subtag-registry b/data/language-subtag-registry
index 1c0978d..78b381c 100644
--- a/data/language-subtag-registry
+++ b/data/language-subtag-registry
@@ -1,4 +1,4 @@
-File-Date: 2015-06-08
+File-Date: 2015-08-04
%%
Type: language
Subtag: aa
@@ -43525,6 +43525,11 @@ Description: Bengali
Added: 2005-10-16
%%
Type: script
+Subtag: Bhks
+Description: Bhaiksuki
+Added: 2015-07-24
+%%
+Type: script
Subtag: Blis
Description: Blissymbols
Added: 2005-10-16
@@ -43866,6 +43871,11 @@ Description: Latin
Added: 2005-10-16
%%
Type: script
+Subtag: Leke
+Description: Leke
+Added: 2015-07-24
+%%
+Type: script
Subtag: Lepc
Description: Lepcha
Description: Róng
diff --git a/data/language-subtag-registry.xml b/data/language-subtag-registry.xml
index abd3a7f..95f42a1 100644
--- a/data/language-subtag-registry.xml
+++ b/data/language-subtag-registry.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<registry date="2015-06-08">
+<registry date="2015-08-04">
<language>
<subtag>aa</subtag>
<description>Afar</description>
@@ -46636,6 +46636,11 @@
<added>2005-10-16</added>
</script>
<script>
+ <subtag>Bhks</subtag>
+ <description>Bhaiksuki</description>
+ <added>2015-07-24</added>
+ </script>
+ <script>
<subtag>Blis</subtag>
<description>Blissymbols</description>
<added>2005-10-16</added>
@@ -46977,6 +46982,11 @@
<added>2005-10-16</added>
</script>
<script>
+ <subtag>Leke</subtag>
+ <description>Leke</description>
+ <added>2015-07-24</added>
+ </script>
+ <script>
<subtag>Lepc</subtag>
<description>Lepcha</description>
<description>Róng</description>
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 4c04cf9..96e5abf 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -135,7 +135,6 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \
$(top_srcdir)/gtk-doc.make
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
diff --git a/docs/html/index.html b/docs/html/index.html
index 9d8b4d1..aafa08a 100644
--- a/docs/html/index.html
+++ b/docs/html/index.html
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">liblangtag Documentation</p></th></tr></table></div>
<div><p class="releaseinfo">
- for liblangtag 0.5.7
+ for liblangtag 0.5.8
.
</p></div>
diff --git a/docs/version.xml b/docs/version.xml
index d3532a1..659914a 100644
--- a/docs/version.xml
+++ b/docs/version.xml
@@ -1 +1 @@
-0.5.7
+0.5.8
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index cd1117a..6abd27e 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -233,7 +233,6 @@ CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
diff --git a/liblangtag-gobject-uninstalled.pc b/liblangtag-gobject-uninstalled.pc
index 8ba0163..e1bc5ce 100644
--- a/liblangtag-gobject-uninstalled.pc
+++ b/liblangtag-gobject-uninstalled.pc
@@ -1,6 +1,6 @@
Name: liblangtag-gobject Uninstalled
Description: GObject based interface to access tags for identifying languages
-Version: 0.5.7
+Version: 0.5.8
Requires: gobject-2.0 liblangtag
Libs: ${pcfiledir}/liblangtag-gobject/liblangtag-gobject.la
Cflags: -I${pcfiledir} -I${pcfiledir}/..
diff --git a/liblangtag-gobject.pc b/liblangtag-gobject.pc
index b81938f..4c84663 100644
--- a/liblangtag-gobject.pc
+++ b/liblangtag-gobject.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: liblangtag-gobject
Description: GObject based interface to access tags for identifying languages
-Version: 0.5.7
+Version: 0.5.8
Requires: gobject-2.0 liblangtag
Libs: -L${libdir} -llangtag-gobject
diff --git a/liblangtag-gobject/Makefile.in b/liblangtag-gobject/Makefile.in
index 0318db8..0a5bd2a 100644
--- a/liblangtag-gobject/Makefile.in
+++ b/liblangtag-gobject/Makefile.in
@@ -219,7 +219,6 @@ CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
diff --git a/liblangtag-uninstalled.pc b/liblangtag-uninstalled.pc
index 0692b20..c6a9ad6 100644
--- a/liblangtag-uninstalled.pc
+++ b/liblangtag-uninstalled.pc
@@ -1,6 +1,6 @@
Name: liblangtag Uninstalled
Description: Interface to access tags for identifying languages
-Version: 0.5.7
+Version: 0.5.8
Requires: glib-2.0
Libs: ${pcfiledir}/liblangtag/liblangtag.la
Cflags: -I${pcfiledir} -I${pcfiledir}/..
diff --git a/liblangtag.pc b/liblangtag.pc
index c475fcb..398ffa8 100644
--- a/liblangtag.pc
+++ b/liblangtag.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: liblangtag
Description: Interface to access tags for identifying languages
-Version: 0.5.7
-Requires: glib-2.0
+Version: 0.5.8
+Requires: libxml-2.0
Libs: -L${libdir} -llangtag
diff --git a/liblangtag.pc.in b/liblangtag.pc.in
index b39b6aa..9b5fcc6 100644
--- a/liblangtag.pc.in
+++ b/liblangtag.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: liblangtag
Description: Interface to access tags for identifying languages
Version: @VERSION@
-Requires: glib-2.0
+Requires: libxml-2.0
Libs: -L${libdir} -llangtag
diff --git a/liblangtag/Makefile.am b/liblangtag/Makefile.am
index 4b09abb..8bc788b 100644
--- a/liblangtag/Makefile.am
+++ b/liblangtag/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/liblangtag/ \
-I$(top_builddir) \
-D__LANGTAG_COMPILATION \
+ -D__LANGTAG_PRIVATE \
-DBUILDDIR="\"$(abs_top_builddir)\"" \
-DSRCDIR="\"$(abs_top_srcdir)\"" \
-DREGDATADIR="\"$(datadir)/liblangtag\"" \
@@ -64,6 +65,7 @@ liblangtag_public_headers = \
lt-lang-db.h \
lt-list.h \
lt-macros.h \
+ lt-messages.h \
lt-redundant.h \
lt-redundant-db.h \
lt-region.h \
@@ -72,8 +74,10 @@ liblangtag_public_headers = \
lt-script-db.h \
lt-string.h \
lt-tag.h \
+ lt-utils.h \
lt-variant.h \
lt-variant-db.h \
+ lt-xml.h \
$(NULL)
liblangtag_private_headers = \
lt-atomic.h \
@@ -85,16 +89,13 @@ liblangtag_private_headers = \
lt-lang-private.h \
lt-lock.h \
lt-mem.h \
- lt-messages.h \
lt-redundant-private.h \
lt-region-private.h \
lt-script-private.h \
lt-stdint.h \
lt-tag-private.h \
lt-trie.h \
- lt-utils.h \
lt-variant-private.h \
- lt-xml.h \
$(NULL)
liblangtag_built_public_headers = \
lt-config.h \
diff --git a/liblangtag/Makefile.in b/liblangtag/Makefile.in
index 38d5ad7..d4c0f1f 100644
--- a/liblangtag/Makefile.in
+++ b/liblangtag/Makefile.in
@@ -284,7 +284,6 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
@@ -457,6 +456,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/liblangtag/ \
-I$(top_builddir) \
-D__LANGTAG_COMPILATION \
+ -D__LANGTAG_PRIVATE \
-DBUILDDIR="\"$(abs_top_builddir)\"" \
-DSRCDIR="\"$(abs_top_srcdir)\"" \
-DREGDATADIR="\"$(datadir)/liblangtag\"" \
@@ -513,6 +513,7 @@ liblangtag_public_headers = \
lt-lang-db.h \
lt-list.h \
lt-macros.h \
+ lt-messages.h \
lt-redundant.h \
lt-redundant-db.h \
lt-region.h \
@@ -521,8 +522,10 @@ liblangtag_public_headers = \
lt-script-db.h \
lt-string.h \
lt-tag.h \
+ lt-utils.h \
lt-variant.h \
lt-variant-db.h \
+ lt-xml.h \
$(NULL)
liblangtag_private_headers = \
@@ -535,16 +538,13 @@ liblangtag_private_headers = \
lt-lang-private.h \
lt-lock.h \
lt-mem.h \
- lt-messages.h \
lt-redundant-private.h \
lt-region-private.h \
lt-script-private.h \
lt-stdint.h \
lt-tag-private.h \
lt-trie.h \
- lt-utils.h \
lt-variant-private.h \
- lt-xml.h \
$(NULL)
liblangtag_built_public_headers = \
diff --git a/liblangtag/lt-atomic.h b/liblangtag/lt-atomic.h
index 236ae30..79bffa8 100644
--- a/liblangtag/lt-atomic.h
+++ b/liblangtag/lt-atomic.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-atomic.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,9 @@
#ifndef __LT_ATOMIC_H__
#define __LT_ATOMIC_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/liblangtag/lt-ext-module-private.h b/liblangtag/lt-ext-module-private.h
index c95a0fd..6c9ec11 100644
--- a/liblangtag/lt-ext-module-private.h
+++ b/liblangtag/lt-ext-module-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-ext-mdule-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_EXT_MODULE_PRIVATE_H__
#define __LT_EXT_MODULE_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include <liblangtag/lt-macros.h>
#include <liblangtag/lt-error.h>
#include <liblangtag/lt-ext-module-data.h>
diff --git a/liblangtag/lt-ext-module.c b/liblangtag/lt-ext-module.c
index 6a44440..f77d565 100644
--- a/liblangtag/lt-ext-module.c
+++ b/liblangtag/lt-ext-module.c
@@ -24,6 +24,7 @@
#if HAVE_LIBGEN_H
#include <libgen.h>
#endif
+#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -32,6 +33,7 @@
#include "lt-ext-module-data.h"
#include "lt-ext-module.h"
#include "lt-ext-module-private.h"
+#include "lt-lock.h"
#include "lt-utils.h"
@@ -98,6 +100,7 @@ static const lt_ext_module_funcs_t __empty_and_wildcard_funcs = {
_lt_ext_eaw_get_tag,
_lt_ext_eaw_validate_tag,
};
+LT_LOCK_DEFINE_STATIC (extmod);
/*< private >*/
static void
@@ -220,7 +223,7 @@ lt_ext_module_load(lt_ext_module_t *module)
if (!env) {
path_list = strdup(
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
BUILDDIR LT_DIR_SEPARATOR_S "extensions" LT_SEARCHPATH_SEPARATOR_S
BUILDDIR LT_DIR_SEPARATOR_S "extensions" LT_DIR_SEPARATOR_S ".libs" LT_SEARCHPATH_SEPARATOR_S
#endif
@@ -576,7 +579,7 @@ lt_ext_modules_load(void)
return;
if (!env) {
path_list = strdup(
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
BUILDDIR LT_DIR_SEPARATOR_S "extensions" LT_SEARCHPATH_SEPARATOR_S
BUILDDIR LT_DIR_SEPARATOR_S "extensions" LT_DIR_SEPARATOR_S ".libs" LT_SEARCHPATH_SEPARATOR_S
#endif
@@ -604,20 +607,29 @@ lt_ext_modules_load(void)
dir = opendir(path);
if (dir) {
- struct dirent dent, *dresult;
- size_t len;
-
- while (1) {
- if (readdir_r(dir, &dent, &dresult) || dresult == NULL)
- break;
-
- len = strlen(dent.d_name);
+ struct dirent *dent, *p;
+
+ LT_LOCK (extmod);
+ while ((dent = readdir (dir))) {
+ size_t len = strlen (dent->d_name);
+ size_t dentlen = offsetof (struct dirent, d_name) + len + 1;
+
+ dentlen = ((dentlen + ALIGNOF_VOID_P - 1) & ~(ALIGNOF_VOID_P - 1));
+ p = (struct dirent *)malloc(dentlen);
+ if (!p) {
+ perror (__FUNCTION__);
+ LT_UNLOCK (extmod);
+ return;
+ }
+ memcpy(p, dent, dentlen);
if (len > suffix_len &&
- lt_strcmp0(&dent.d_name[len - suffix_len],
+ lt_strcmp0(&(p->d_name[len - suffix_len]),
"." LT_MODULE_SUFFIX) == 0) {
- lt_ext_module_new(dent.d_name);
+ lt_ext_module_new(p->d_name);
}
+ free(p);
}
+ LT_UNLOCK (extmod);
closedir(dir);
}
} while (1);
diff --git a/liblangtag/lt-extension-private.h b/liblangtag/lt-extension-private.h
index 800737d..0efe4cf 100644
--- a/liblangtag/lt-extension-private.h
+++ b/liblangtag/lt-extension-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-extension-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_EXTENSION_PRIVATE_H__
#define __LT_EXTENSION_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-ext-module.h"
#include "lt-extension.h"
diff --git a/liblangtag/lt-extlang-db.c b/liblangtag/lt-extlang-db.c
index a99592e..ce8acda 100644
--- a/liblangtag/lt-extlang-db.c
+++ b/liblangtag/lt-extlang-db.c
@@ -98,7 +98,8 @@ lt_extlang_db_parse(lt_extlang_db_t *extlangdb,
subtag = xmlNodeGetContent(cnode);
}
} else if (xmlStrcmp(cnode->name, (const xmlChar *)"added") == 0 ||
- xmlStrcmp(cnode->name, (const xmlChar *)"text") == 0) {
+ xmlStrcmp(cnode->name, (const xmlChar *)"text") == 0 ||
+ xmlStrcmp(cnode->name, (const xmlChar *)"deprecated") == 0) {
/* ignore it */
} else if (xmlStrcmp(cnode->name, (const xmlChar *)"description") == 0) {
/* wonder if many descriptions helps something. or is it a bug? */
diff --git a/liblangtag/lt-extlang-private.h b/liblangtag/lt-extlang-private.h
index caceb48..0ce3b7f 100644
--- a/liblangtag/lt-extlang-private.h
+++ b/liblangtag/lt-extlang-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-extlang-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_EXTLANG_PRIVATE_H__
#define __LT_EXTLANG_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-extlang.h"
diff --git a/liblangtag/lt-grandfathered-db.c b/liblangtag/lt-grandfathered-db.c
index 704ec46..ffc2ca1 100644
--- a/liblangtag/lt-grandfathered-db.c
+++ b/liblangtag/lt-grandfathered-db.c
@@ -99,7 +99,8 @@ lt_grandfathered_db_parse(lt_grandfathered_db_t *grandfathereddb,
}
} else if (xmlStrcmp(cnode->name, (const xmlChar *)"added") == 0 ||
xmlStrcmp(cnode->name, (const xmlChar *)"text") == 0 ||
- xmlStrcmp(cnode->name, (const xmlChar *)"deprecated") == 0) {
+ xmlStrcmp(cnode->name, (const xmlChar *)"deprecated") == 0 ||
+ xmlStrcmp(cnode->name, (const xmlChar *)"comments") == 0) {
/* ignore it */
} else if (xmlStrcmp(cnode->name, (const xmlChar *)"description") == 0) {
/* wonder if many descriptions helps something. or is it a bug? */
diff --git a/liblangtag/lt-grandfathered-private.h b/liblangtag/lt-grandfathered-private.h
index 7cb8a23..925355f 100644
--- a/liblangtag/lt-grandfathered-private.h
+++ b/liblangtag/lt-grandfathered-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-grandfathered-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_GRANDFATHERED_PRIVATE_H__
#define __LT_GRANDFATHERED_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-grandfathered.h"
diff --git a/liblangtag/lt-iter-private.h b/liblangtag/lt-iter-private.h
index ab0985a..363163c 100644
--- a/liblangtag/lt-iter-private.h
+++ b/liblangtag/lt-iter-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-iter-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_ITER_PRIVATE_H__
#define __LT_ITER_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-mem.h"
#include "lt-iter.h"
diff --git a/liblangtag/lt-lang-private.h b/liblangtag/lt-lang-private.h
index 5521dcd..ba764f5 100644
--- a/liblangtag/lt-lang-private.h
+++ b/liblangtag/lt-lang-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-lang-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_LANG_PRIVATE_H__
#define __LT_LANG_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-lang.h"
diff --git a/liblangtag/lt-localealias.h b/liblangtag/lt-localealias.h
index 8de05c0..8fefe5a 100644
--- a/liblangtag/lt-localealias.h
+++ b/liblangtag/lt-localealias.h
@@ -29,7 +29,6 @@ struct _lt_localealias_t {
static lt_localealias_t __lt_localealias_tables[] = {
{"bokmal", "nb_NO.ISO-8859-1"},
- {"bokmål", "nb_NO.ISO-8859-1"},
{"catalan", "ca_ES.ISO-8859-1"},
{"croatian", "hr_HR.ISO-8859-2"},
{"czech", "cs_CZ.ISO-8859-2"},
@@ -40,7 +39,6 @@ static lt_localealias_t __lt_localealias_tables[] = {
{"eesti", "et_EE.ISO-8859-1"},
{"estonian", "et_EE.ISO-8859-1"},
{"finnish", "fi_FI.ISO-8859-1"},
- {"français", "fr_FR.ISO-8859-1"},
{"french", "fr_FR.ISO-8859-1"},
{"galego", "gl_ES.ISO-8859-1"},
{"galician", "gl_ES.ISO-8859-1"},
diff --git a/liblangtag/lt-lock.h b/liblangtag/lt-lock.h
index bb14cff..0194e1d 100644
--- a/liblangtag/lt-lock.h
+++ b/liblangtag/lt-lock.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-lock.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_LOCK_H__
#define __LT_LOCK_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff --git a/liblangtag/lt-mem.h b/liblangtag/lt-mem.h
index 2f1296b..f2d33cc 100644
--- a/liblangtag/lt-mem.h
+++ b/liblangtag/lt-mem.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-mem.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_MEM_H__
#define __LT_MEM_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
LT_BEGIN_DECLS
diff --git a/liblangtag/lt-messages.h b/liblangtag/lt-messages.h
index d20d4d6..8fc2e9c 100644
--- a/liblangtag/lt-messages.h
+++ b/liblangtag/lt-messages.h
@@ -16,10 +16,8 @@
#ifndef __LT_MESSAGES_H__
#define __LT_MESSAGES_H__
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
#include <stdarg.h>
+#include "lt-config.h"
#include "lt-macros.h"
LT_BEGIN_DECLS
diff --git a/liblangtag/lt-redundant-private.h b/liblangtag/lt-redundant-private.h
index e54e1fe..9af4685 100644
--- a/liblangtag/lt-redundant-private.h
+++ b/liblangtag/lt-redundant-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-redundant-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_REDUNDANT_PRIVATE_H__
#define __LT_REDUNDANT_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-redundant.h"
diff --git a/liblangtag/lt-region-private.h b/liblangtag/lt-region-private.h
index 7cc739e..cbd684c 100644
--- a/liblangtag/lt-region-private.h
+++ b/liblangtag/lt-region-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-region-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_REGION_PRIVATE_H__
#define __LT_REGION_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-region.h"
diff --git a/liblangtag/lt-script-private.h b/liblangtag/lt-script-private.h
index 4954a7a..e0e2bcb 100644
--- a/liblangtag/lt-script-private.h
+++ b/liblangtag/lt-script-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-script-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_SCRIPT_PRIVATE_H__
#define __LT_SCRIPT_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-script.h"
diff --git a/liblangtag/lt-stdint.h b/liblangtag/lt-stdint.h
index fa6b5b9..385300c 100644
--- a/liblangtag/lt-stdint.h
+++ b/liblangtag/lt-stdint.h
@@ -1,7 +1,7 @@
#ifndef _LIBLANGTAG_LIBLANGTAG_LT_STDINT_H
#define _LIBLANGTAG_LIBLANGTAG_LT_STDINT_H 1
#ifndef _GENERATED_STDINT_H
-#define _GENERATED_STDINT_H "liblangtag 0.5.7"
+#define _GENERATED_STDINT_H "liblangtag 0.5.8"
/* generated using gnu compiler gcc (GCC) 5.1.1 20150618 (Red Hat 5.1.1-4) */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
diff --git a/liblangtag/lt-tag-private.h b/liblangtag/lt-tag-private.h
index 58ed4e7..d99bf5b 100644
--- a/liblangtag/lt-tag-private.h
+++ b/liblangtag/lt-tag-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-tag-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_TAG_PRIVATE_H__
#define __LT_TAG_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-tag.h"
diff --git a/liblangtag/lt-trie.h b/liblangtag/lt-trie.h
index 9534cc8..133a810 100644
--- a/liblangtag/lt-trie.h
+++ b/liblangtag/lt-trie.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-trie.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_TRIE_H__
#define __LT_TRIE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include <liblangtag/lt-macros.h>
#include <liblangtag/lt-iter.h>
#include <liblangtag/lt-list.h>
diff --git a/liblangtag/lt-utils.h b/liblangtag/lt-utils.h
index b44d534..446c1f5 100644
--- a/liblangtag/lt-utils.h
+++ b/liblangtag/lt-utils.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-utils.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -14,12 +14,6 @@
#define __LT_UTILS_H__
#include <stdarg.h>
-#if HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
#include "lt-macros.h"
LT_BEGIN_DECLS
diff --git a/liblangtag/lt-variant-private.h b/liblangtag/lt-variant-private.h
index 30e6121..de1dc32 100644
--- a/liblangtag/lt-variant-private.h
+++ b/liblangtag/lt-variant-private.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* lt-variant-private.h
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2015 Akira TAGOH
*
* Authors:
* Akira TAGOH <akira at tagoh.org>
@@ -13,6 +13,10 @@
#ifndef __LT_VARIANT_PRIVATE_H__
#define __LT_VARIANT_PRIVATE_H__
+#if !defined (__LANGTAG_PRIVATE)
+#error "Unable to use the private header publicly"
+#endif
+
#include "lt-macros.h"
#include "lt-variant.h"
diff --git a/liblangtag/lt-xml.c b/liblangtag/lt-xml.c
index 338a556..d337204 100644
--- a/liblangtag/lt-xml.c
+++ b/liblangtag/lt-xml.c
@@ -55,7 +55,7 @@ lt_xml_read_subtag_registry(lt_xml_t *xml,
lt_return_val_if_fail (xml != NULL, FALSE);
regfile = lt_string_new(NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
LT_STMT_START {
struct stat st;
@@ -68,7 +68,7 @@ lt_xml_read_subtag_registry(lt_xml_t *xml,
lt_string_append_filename(regfile,
lt_db_get_datadir(),
"language-subtag-registry.xml", NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
}
} LT_STMT_END;
#endif
@@ -120,7 +120,7 @@ lt_xml_read_cldr_bcp47(lt_xml_t *xml,
lt_return_val_if_fail (xml != NULL, FALSE);
regfile = lt_string_new(NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
LT_STMT_START {
struct stat st;
@@ -138,7 +138,7 @@ lt_xml_read_cldr_bcp47(lt_xml_t *xml,
lt_string_append_filename(regfile,
lt_db_get_datadir(),
"common", "bcp47", filename, NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
}
}
} LT_STMT_END;
@@ -190,7 +190,7 @@ lt_xml_read_cldr_supplemental(lt_xml_t *xml,
lt_return_val_if_fail (xml != NULL, FALSE);
regfile = lt_string_new(NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
LT_STMT_START {
struct stat st;
@@ -209,7 +209,7 @@ lt_xml_read_cldr_supplemental(lt_xml_t *xml,
lt_string_append_filename(regfile,
lt_db_get_datadir(),
"common", "supplemental", filename, NULL);
-#ifdef GNOME_ENABLE_DEBUG
+#ifdef ENABLE_DEBUG
}
}
} LT_STMT_END;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 41cd6e4..049ebf1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,7 @@ AM_CPPFLAGS = \
-DTEST_DATADIR=$(TEST_DATADIR) \
-DTEST_MODDIR="\"$(abs_top_builddir)/extensions/.libs\"" \
-D__LANGTAG_COMPILATION \
+ -D__LANGTAG_PRIVATE \
$(CHECK_CFLAGS) \
$(NULL)
DEPS = \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 95913da..5d21897 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -541,7 +541,6 @@ am__relativize = \
done; \
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
@@ -714,6 +713,7 @@ AM_CPPFLAGS = \
-DTEST_DATADIR=$(TEST_DATADIR) \
-DTEST_MODDIR="\"$(abs_top_builddir)/extensions/.libs\"" \
-D__LANGTAG_COMPILATION \
+ -D__LANGTAG_PRIVATE \
$(CHECK_CFLAGS) \
$(NULL)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/liblangtag.git
More information about the Pkg-openoffice-commits
mailing list