diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccbac49..dae426d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,6 +37,12 @@ jobs: - uses: actions/checkout@v2 - name: Create configure run: | + python --version + pip --version + easy_install --version + pip install setuptools + python -m pip install setuptools + python3 -m pip install -U wheel setuptools brew install autoconf automake libtool gcc autoreconf -i automake diff --git a/ChangeLog b/ChangeLog index 48ed1df..64aa1ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +- 2023-Sep-16 + * Version 1.14, Unicode 15.1 and French version 1.6 now is at 15.0. + - 2023-May-23 * Unicode 15.1_Beta (Nameslist.txt 15.1Beta for review upto Jul04). NOTE: This version shows as 15.0b (to maintain versions sorting). diff --git a/Makefile.am b/Makefile.am index 593b220..41071bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,7 +72,7 @@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status libtool NamesList.txt: - $(WGET) "https://www.unicode.org/Public/draft/UCD/ucd/NamesList.txt" -O NamesList.txt + $(WGET) "https://www.unicode.org/Public/UCD/latest/ucd/NamesList.txt" -O NamesList.txt ListeDesNoms.txt: $(WGET) "http://hapax.qc.ca/ListeNoms-15.0.0.txt" -O ListeDesNoms.txt diff --git a/README.md b/README.md index 166da5f..2157861 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ libuninameslist – A Library of Unicode names and annotation data Description ----------- -This library is updated for Nameslist.txt ver15.1beta and ListeDesNoms.txt ver15.0 +This library is updated for Nameslist.txt ver15.1 and ListeDesNoms.txt ver15.0 and includes python wrapper 'uninameslist.py' For latest release, see: https://github.com/fontforge/libuninameslist/releases diff --git a/buildnameslist.c b/buildnameslist.c index a3567f2..fcf71fb 100644 --- a/buildnameslist.c +++ b/buildnameslist.c @@ -178,8 +178,8 @@ static int ReadNamesList(void) { int i, j; static char *nameslistfiles[] = { "NamesList.txt", "ListeDesNoms.txt", NULL }; static char *nameslistlocs[] = { - "http://www.unicode.org/Public/15.0.0/ucd/NamesList-15.0.0d5.txt", - "http://hapax.qc.ca/ListeNoms-14.0.0.txt (charset=UTF-8)" + "https://www.unicode.org/Public/UCD/latest/ucd/NamesList.txt", + "http://hapax.qc.ca/ListeNoms-15.0.0.txt (charset=UTF-8)" }; buffer[sizeof(buffer)-1]=0; diff --git a/configure.ac b/configure.ac index b284e45..111f94a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,13 +4,13 @@ AC_PREREQ([2.64]) #------------------------------------------- # PackageTimestamp, major version, minor version, and Nameslist.txt version # Libraries have a "package" version of the form major.minor.micro. -m4_define([uninameslist_package_stamp], [20230523]) dnl yyyymmdd +m4_define([uninameslist_package_stamp], [20230916]) dnl yyyymmdd m4_define([uninameslist_major_version], [15]) dnl Nameslist.txt -m4_define([uninameslist_minor_version], [0b]) +m4_define([uninameslist_minor_version], [1]) m4_define([uninameslist_nameslist_ver], [uninameslist_major_version.uninameslist_minor_version]) # Libraries have a "libtool" version of the form current:revision:age. m4_define([uninameslist_current], [1]) -m4_define([uninameslist_revision],[13]) +m4_define([uninameslist_revision],[14]) m4_define([uninameslist_age], [0]) m4_define([uninameslist_libver], [uninameslist_current:uninameslist_revision:uninameslist_age]) @@ -229,8 +229,8 @@ AC_SUBST([WUNLIB]) #------------------------------------------- # Ensure fresh timestamps if run ./configure -echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' > buildnameslist.h -echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> buildnameslist.h +echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' > ${builddir}buildnameslist.h +echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> ${builddir}buildnameslist.h rm -f ${top_builddir}tests/call-test.h echo 'const char NL_VERSION[[]] = "Nameslist-Version: uninameslist_nameslist_ver";' > ${top_builddir}tests/call-test.h echo 'const char NFR_VERSION[[]] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> ${top_builddir}tests/call-test.h diff --git a/nameslist.c b/nameslist.c index 994ca5e..2919a0d 100644 --- a/nameslist.c +++ b/nameslist.c @@ -67,7 +67,7 @@ const char *uniNamesList_annot(unsigned long uni) { /* Retrieve Nameslist.txt version number. */ UN_DLL_EXPORT const char *uniNamesList_NamesListVersion(void) { - return( "Nameslist-Version: 15.0b" ); + return( "Nameslist-Version: 15.1" ); } @@ -855,7 +855,7 @@ const struct unicode_block UnicodeBlock[] = { { 0x2b740, 0x2b81d, "CJK Unified Ideographs Extension D" }, { 0x2b820, 0x2cea1, "CJK Unified Ideographs Extension E" }, { 0x2ceb0, 0x2ebe0, "CJK Unified Ideographs Extension F" }, - { 0x2ebf0, 0x2ee4a, "CJK Unified Ideographs Extension I" }, + { 0x2ebf0, 0x2ee5d, "CJK Unified Ideographs Extension I" }, { 0x2f800, 0x2fa1f, "CJK Compatibility Ideographs Supplement" }, { 0x2ff80, 0x2ffff, "Unassigned" }, { 0x30000, 0x3134a, "CJK Unified Ideographs Extension G" }, @@ -2577,7 +2577,8 @@ static const struct unicode_nameannot una_00_02[] = { /* 02BC */ { "MODIFIER LETTER APOSTROPHE"," = apostrophe\n" " * glottal stop, glottalization, ejective\n" " * many languages use this as a letter of their alphabets\n" - " * used as a tone marker in Bodo, Dogri, and Maithili\n" + " * used as a tone marker in Bodo and Dogri\n" + " * indicates vowel elongation, or various truncations and ellipsis in Maithili\n" " * used as a modifier letter in the Lisu script\n" " * 2019 is the preferred character for a punctuation apostrophe\n" " x (apostrophe - 0027)\n" @@ -4014,7 +4015,8 @@ static const struct unicode_nameannot una_00_06[] = { /* 06CA */ { "ARABIC LETTER WAW WITH TWO DOTS ABOVE"," * Kurdish"}, /* 06CB */ { "ARABIC LETTER VE"," * Uyghur, Kazakh"}, /* 06CC */ { "ARABIC LETTER FARSI YEH"," * Arabic, Persian, Urdu, Kashmiri, ...\n" - " * initial and medial forms of this letter have dots\n" + " * initial and medial forms of this letter have two horizontal dots below\n" + " * retains its dots in initial and medial forms when used in combination with 0654\n" " x (arabic letter alef maksura - 0649)\n" " x (arabic letter yeh - 064A)"}, /* 06CD */ { "ARABIC LETTER YEH WITH TAIL"," * Pashto, Sindhi"}, @@ -15612,6 +15614,7 @@ static const struct unicode_nameannot una_00_2E[] = { /* 2E39 */ { "TOP HALF SECTION SIGN"," * indicates pronunciation on one side of the mouth only\n" " x (section sign - 00A7)"}, /* 2E3A */ { "TWO-EM DASH"," = omission dash\n" + " * may be used in Chinese for abrupt change of thought, inserting new content, or continuation of tone or sound\n" " x (em dash - 2014)"}, /* 2E3B */ { "THREE-EM DASH",NULL}, /* 2E3C */ { "STENOGRAPHIC FULL STOP"," * used in shorthands and stenographies\n" diff --git a/uninameslist.h b/uninameslist.h index 2978c09..f8dfeae 100644 --- a/uninameslist.h +++ b/uninameslist.h @@ -58,9 +58,9 @@ const char *uniNamesList_NamesListVersion(void); /* Version information for this include file */ #define LIBUNINAMESLIST_MAJOR 1 -#define LIBUNINAMESLIST_MINOR 13 +#define LIBUNINAMESLIST_MINOR 14 -/* Return number of blocks in this NamesList (Version 15.0b). */ +/* Return number of blocks in this NamesList (Version 15.1). */ int uniNamesList_blockCount(void); /* Return block number for this unicode value (-1 if bad unicode value) */