Skip to content

Commit e92a444

Browse files
committed
NamesList.txt 17.0_Beta for anyone interested in debugging.
17.0 is due to be released approx September 2025 so this is released as 16.9b to avoid sorting problems with 17.0 later libuninames-fr has also been updated to ListeDesNomes 16.0. configure has been updated to run 'make clean' anytime when you run ./configure to allow for fresh builds since library builds can be made to include or exclude optional French or (other (future?) language?) libuninameslist-* sub-libraries resolving Gentoo libuninameslist-20200413-makefile.patch or Debian bug #989173
1 parent 7ce440a commit e92a444

File tree

12 files changed

+8574
-2256
lines changed

12 files changed

+8574
-2256
lines changed

.appveyor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ matrix:
1616

1717
install:
1818
- call %MBASH% "pacman --noconfirm -S --needed base-devel"
19-
- call %MBASH% "pacman --noconfirm -S autoconf automake libtool"
19+
- call %MBASH% "pacman --noconfirm -S autoconf automake libtool python-setuptools"
20+
- call %MBASH% "python --version"
21+
- call %MBASH% "python -m ensurepip --default-pip"
22+
- call %MBASH% "pip --version"
2023
- call %MBASH% "python -m pip install ."
2124
build_script:
2225
- call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; autoreconf -fiv && mkdir build && cd build && ../configure --enable-pylib && make check -j4 && make install"

.github/workflows/main.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
strategy:
5252
matrix:
5353
include: [
54-
{ msystem: MINGW64, toolchain: mingw-w64-x86_64-toolchain },
55-
{ msystem: MINGW32, toolchain: mingw-w64-i686-toolchain },
56-
{ msystem: UCRT64, toolchain: mingw-w64-ucrt-x86_64-toolchain },
57-
{ msystem: CLANG64, toolchain: mingw-w64-clang-x86_64-toolchain },
54+
{ msystem: MINGW64, tools: mingw-w64-x86_64 },
55+
{ msystem: MINGW32, tools: mingw-w64-i686 },
56+
{ msystem: UCRT64, tools: mingw-w64-ucrt-x86_64 },
57+
{ msystem: CLANG64, tools: mingw-w64-clang-x86_64 },
5858
]
5959
name: ${{ matrix.msystem }}
6060
defaults:
@@ -66,13 +66,17 @@ jobs:
6666
with:
6767
msystem: ${{ matrix.msystem }}
6868
update: true
69-
install: autotools base-devel git ${{ matrix.toolchain }}
69+
install: autotools base-devel git ${{matrix.tools}}-toolchain ${{matrix.tools}}-python-setuptools
7070
- name: Create configure
7171
run: |
72+
python --version
73+
python -m ensurepip --default-pip
74+
pip --version
75+
pip install setuptools wheel build
7276
autoreconf -i
7377
automake
7478
- name: Choose configure
75-
run: ./configure
79+
run: ./configure --enable-pylib
7680
- name: Make library
7781
run: make
7882
- name: Test library

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
- 2025-Jul-14
2+
* Unicode 17.0_Beta, this is a preview Beta version for anybody who
3+
is interested in trying it before an official 17.0 is available.
4+
NOTE: This version shows as 16.9b to maintain versions sorting.
5+
* Updated French Unicode to 16.0 (libuninameslist-fr = version1.8).
6+
17
- 2024-Sep-10
28
* Introducing Unicode 16.0 (libuninameslist=version1.15) and French
39
Unicode 15.1 translation (libuninameslist-fr=version1.7).

Makefile.am

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ buildnameslist_SOURCES = buildnameslist.c buildnameslist.h
3232

3333
nodist_EXTRA_DATA = NamesList.txt ListeDesNoms.txt buildnameslist.h .git .github .appveyor.yml .travis.yml
3434

35-
DISTCLEANFILES = libuninameslist.pc
35+
DISTCLEANFILES = libuninameslist.pc install-sh ltmain.sh config.sub \
36+
missing config.guess ar-lib compile test-driver depcomp
3637
DISTCHECK_CONFIGURE_FLAGS = --enable-frenchlib --enable-pylib --disable-silent-rules
3738

3839
lib_LTLIBRARIES =
@@ -72,10 +73,10 @@ libtool: $(LIBTOOL_DEPS)
7273
$(SHELL) ./config.status libtool
7374

7475
NamesList.txt:
75-
$(WGET) "https://www.unicode.org/Public/UCD/latest/ucd/NamesList.txt" -O NamesList.txt
76+
$(WGET) "https://www.unicode.org/Public/draft/ucd/NamesList.txt" -O NamesList.txt
7677

7778
ListeDesNoms.txt:
78-
$(WGET) "http://hapax.qc.ca/ListeNoms-15.1.0.txt" -O ListeDesNoms.txt
79+
$(WGET) "https://hapax.qc.ca/ListeNoms-16.0.0.txt" -O ListeDesNoms.txt
7980

8081
# test: run all tests in cwd and subdirs
8182
test: $(TEST_PROGS)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ libuninameslist – A Library of Unicode names and annotation data
1212
Description
1313
-----------
1414

15-
This library is updated for Nameslist.txt ver15.1 and ListeDesNoms.txt ver15.0
15+
This library is updated for Nameslist.txt ver17.0_Beta and ListeDesNoms.txt ver16.0
1616
and includes python wrapper 'uninameslist.py'
1717

1818
For latest release, see: https://github.com/fontforge/libuninameslist/releases

buildnameslist.c

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,22 @@ static const char *lgb[2] = { "UNICODE_EN_BLOCK_MAX", "UNICODE_FR_BLOCK_MAX" };
4141
static const char *lgv[2] = { NL_VERSION, NFR_VERSION };
4242

4343
static int printcopyright2credits(FILE *out) {
44-
fprintf( out, "; Liste des noms des caractères (version en langue française)\n\n");
44+
fprintf( out, "; Date : 2025-01-24, 15:49:39 TUC\n;\n");
45+
fprintf( out, "; Standard Unicode 16.0.0\n");
46+
fprintf( out, "; Liste des noms des caractères (version en langue française)\n;\n");
4547
fprintf( out, "; Le Consortium Unicode entretient une collaboration étroite\n");
4648
fprintf( out, ";\tet une liaison officielle avec le groupe de travail qui élabore\n");
47-
fprintf( out, ";\tla norme internationale ISO/CEI 10646. La version %s du standard Unicode\n", NFR_VERSION);
48-
fprintf( out, ";\tintègre 627 nouveaux caractères (dont 622 idéogrammes unifiés CJC),\n");
49-
fprintf( out, ";\tportant le total à 149.813 caractères.\n\n");
50-
fprintf( out, "; LLe présent fichier peut être utilisé librement. Toutefois, aucune\n");
49+
fprintf( out, ";\tla norme internationale ISO/CEI 10646. La version 16.0 du standard Unicode\n");
50+
fprintf( out, ";\tintègre 5.185 nouveaux caractères (dont 3.995 hiéroglyphes égyptiens),\n");
51+
fprintf( out, ";\tportant le total à 154.998 caractères.\n;\n");
52+
fprintf( out, "; Le présent fichier peut être utilisé librement. Toutefois, aucune\n");
5153
fprintf( out, ";\tmodification n’y est autorisée ; toutes les copies doivent être\n");
52-
fprintf( out, ";\trigoureusement identiques au fichier original.\n\n");
54+
fprintf( out, ";\trigoureusement identiques au fichier original.\n;\n");
5355
fprintf( out, "; Le Consortium Unicode n’est pas responsable des erreurs ou omissions\n");
54-
fprintf( out, ";\tdans ce fichier.\n\n");
55-
fprintf( out, "; Les noms en langue française des caractères codés sont utilisés, notamment,\n");
56-
fprintf( out, ";\tpour produire les commentaires documentant chacun des caractères\n");
57-
fprintf( out, ";\tdont les poids de tri sont déterminés dans la table commune\n");
58-
fprintf( out, ";\tde la norme internationale ISO/CEI 14651. Ladite table est normative ;\n");
59-
fprintf( out, ";\tla présente liste est informative, jusqu’à ce que la norme\n");
60-
fprintf( out, ";\tISO/CEI 10646 ait été remise à niveau en français.\n\n");
56+
fprintf( out, ";\tdans ce fichier.\n;\n");
6157
fprintf( out, "; Version originale (en anglais) de la liste des noms des caractères :\n");
62-
fprintf( out, ";\thttps://www.unicode.org/Public/15.1.0/ucd/NamesList.txt\n\n");
63-
fprintf( out, "; Contributions à la version en langue française :\n");
58+
fprintf( out, ";\thttps://www.unicode.org/Public/16.0.0/ucd/NamesList.txt\n;\n");
59+
fprintf( out, "; Contributions à la version en langue française :\n;\n");
6460
fprintf( out, ";\tJacques André, France\n");
6561
fprintf( out, ";\tPatrick Andries, Canada (Québec)\n");
6662
fprintf( out, ";\tBernard Chauvois, France\n");
@@ -74,8 +70,6 @@ static int printcopyright2credits(FILE *out) {
7470

7571
static int printcopyright2(FILE *out) {
7672
fprintf( out, "\n/*\n");
77-
fprintf( out, "; Standard Unicode %s ou\n", NFR_VERSION);
78-
fprintf( out, "; Norme internationale ISO/CEI 10646\n;\n");
7973
printcopyright2credits(out);
8074
fprintf( out, "*/\n\n");
8175
return( 1 );
@@ -181,8 +175,8 @@ static int ReadNamesList(void) {
181175
int i, j;
182176
static char *nameslistfiles[] = { "NamesList.txt", "ListeDesNoms.txt", NULL };
183177
static char *nameslistlocs[] = {
184-
"https://www.unicode.org/Public/UCD/latest/ucd/NamesList.txt",
185-
"http://hapax.qc.ca/ListeNoms-15.0.0.txt (charset=UTF-8)"
178+
"https://www.unicode.org/Public/draft/ucd/NamesList.txt",
179+
"https://hapax.qc.ca/ListeNoms-16.0.0.txt (charset=UTF-8)"
186180
};
187181

188182
buffer[sizeof(buffer)-1]=0;

configure.ac

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ AC_PREREQ([2.69])
44
#-------------------------------------------
55
# PackageTimestamp, major version, minor version, and Nameslist.txt version
66
# Libraries have a "package" version of the form major.minor.micro.
7-
m4_define([uninameslist_package_stamp], [20240910]) dnl yyyymmdd
7+
m4_define([uninameslist_package_stamp], [20250714]) dnl yyyymmdd
88
m4_define([uninameslist_major_version], [16]) dnl Nameslist.txt
9-
m4_define([uninameslist_minor_version], [0])
9+
m4_define([uninameslist_minor_version], [9])
1010
m4_define([uninameslist_nameslist_ver], [uninameslist_major_version.uninameslist_minor_version])
1111
# Libraries have a "libtool" version of the form current:revision:age.
1212
m4_define([uninameslist_current], [1])
@@ -17,11 +17,11 @@ m4_define([uninameslist_libver],
1717

1818
# These values below are kept for backwards compatibility with older programs
1919
# that are using the French namesList. This increments with ListeDesNoms.txt.
20-
m4_define([fr_major_version], [15]) dnl latest ListeDesNoms.txt = ver15.0
21-
m4_define([fr_minor_version], [1])
20+
m4_define([fr_major_version], [16]) dnl latest ListeDesNoms.txt = ver16.0
21+
m4_define([fr_minor_version], [0])
2222
m4_define([uninameslist_fr_nameslist_ver], [fr_major_version.fr_minor_version])
2323
m4_define([uninameslist_fr_current], [1])
24-
m4_define([uninameslist_fr_revision],[7])
24+
m4_define([uninameslist_fr_revision],[8])
2525
m4_define([uninameslist_fr_age], [0])
2626
m4_define([uninameslist_fr_libver],
2727
[uninameslist_fr_current:uninameslist_fr_revision:uninameslist_fr_age])
@@ -57,6 +57,7 @@ AC_INIT([uninameslist],[uninameslist_package_stamp],[[email protected]
5757
AC_CONFIG_SRCDIR([buildnameslist.c])
5858
#-------------------------------------------
5959
AC_CONFIG_MACRO_DIR([m4])
60+
AC_CANONICAL_TARGET
6061
AC_CANONICAL_HOST
6162
AC_CANONICAL_BUILD
6263
AM_INIT_AUTOMAKE([foreign -Wall])
@@ -71,6 +72,7 @@ AC_SUBST([LIBTOOL_DEPS])
7172

7273
# Check building environment
7374
AC_PROG_CC
75+
AC_ENABLE_SHARED
7476
AC_PROG_LN_S
7577
AC_PROG_MKDIR_P
7678
AC_PROG_MAKE_SET
@@ -79,16 +81,6 @@ AC_CHECK_TOOL([WGET],[wget],[:])
7981
AC_CHECK_TOOL([STRIP],[strip],[:])
8082
AC_CHECK_TOOL([TOUCH],[touch],[:])
8183
AC_PROG_INSTALL
82-
case "$host" in
83-
*-pc-cygwin*)
84-
AC_DEFINE(__CygWin,1)
85-
LT_INIT([win32-dll])
86-
;;
87-
*)
88-
LT_INIT()
89-
;;
90-
esac
91-
AC_ENABLE_SHARED
9284

9385
#-------------------------------------------
9486
# Indicate this is a release build and that
@@ -132,7 +124,7 @@ AC_ARG_ENABLE([pylib],
132124
if test x$enable_pylib = xyes ; then
133125
AC_ARG_VAR([PYTHON],[Python to use to build the python wheel.])
134126
if test x"${PYTHON}" = x; then
135-
PYTHON=python
127+
PYTHON=python3
136128
fi
137129
AC_CHECK_PROG([PYTHONFOUND],[${PYTHON}],[yes])
138130
if test x"${PYTHONFOUND}" != xyes; then
@@ -226,14 +218,6 @@ AC_SUBST([UN_LIB])
226218
AC_SUBST([WCFLAGS])
227219
AC_SUBST([WUNLIB])
228220

229-
#-------------------------------------------
230-
# Ensure fresh timestamps if run ./configure
231-
echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' > ${builddir}buildnameslist.h
232-
echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> ${builddir}buildnameslist.h
233-
rm -f ${top_builddir}tests/call-test.h
234-
echo 'const char NL_VERSION[[]] = "Nameslist-Version: uninameslist_nameslist_ver";' > ${top_builddir}tests/call-test.h
235-
echo 'const char NFR_VERSION[[]] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> ${top_builddir}tests/call-test.h
236-
237221
#-------------------------------------------
238222
AC_CONFIG_FILES([
239223
Makefile
@@ -242,6 +226,17 @@ tests/Makefile
242226
libuninameslist.pc
243227
])
244228

229+
#-------------------------------------------
230+
# Ensure fresh timestamps if run ./configure
231+
make clean
232+
echo '/* This file was generated by 'configure' */' > ${builddir}buildnameslist.h
233+
echo 'const char NL_VERSION[[]] = "uninameslist_nameslist_ver";' >> ${builddir}buildnameslist.h
234+
echo 'const char NFR_VERSION[[]] = "uninameslist_fr_nameslist_ver";' >> ${builddir}buildnameslist.h
235+
rm -f ${top_builddir}tests/call-test.h
236+
echo '/* This file was generated by 'configure' */' > ${top_builddir}tests/call-test.h
237+
echo 'const char NL_VERSION[[]] = "Nameslist-Version: uninameslist_nameslist_ver";' >> ${top_builddir}tests/call-test.h
238+
echo 'const char NFR_VERSION[[]] = "Nameslist-Version: uninameslist_fr_nameslist_ver";' >> ${top_builddir}tests/call-test.h
239+
245240
AC_OUTPUT
246241

247242
AC_MSG_NOTICE([

0 commit comments

Comments
 (0)