Skip to content

Commit

Permalink
Libuninameslist version 20211114
Browse files Browse the repository at this point in the history
Has NamesList.txt 14.0, ListeDesNoms 14.0, and uninameslist.py ver0.2
  • Loading branch information
JoesCat committed Nov 14, 2021
1 parent e4b2fc9 commit 6cba8fd
Show file tree
Hide file tree
Showing 9 changed files with 3,320 additions and 1,701 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Jeremy Tan <jtanx>
David Corbett <dscorbett>
genisysram <genisysram>
orbea <orbea>
Naohiro Aota gentoo.org

French Nameslist:
Jacques André, France
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- 2021-Nov-14
* Version 1.10, Unicode 14.0 and French version 1.5 now is at 14.0.
* Gentoo Bug 781716 & Debian Bug 989173, -O0 patch by Naohiro Aota.

- 2021-Sep-17
* Version 1.9, Unicode 14.0. French version 1.4 is at Unicode 13.1.
Unicode has changed cadence to release later for this year. This
Expand Down
6 changes: 5 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ endif
lib_LTLIBRARIES += libuninameslist.la

include_HEADERS = uninameslist.h
libuninameslist_la_LIBADD =
EXTRA_libuninameslist_la_DEPENDENCIES =
man_MANS = libuninameslist.3
noinst_HEADERS = nameslist-dll.h
LIBADD =
Expand All @@ -52,6 +54,8 @@ include_HEADERS += uninameslist-fr.h
libuninameslist_fr_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(FR_VERSION)
libuninameslist_fr_la_SOURCES = nameslist-fr.c
libuninameslist_fr_la.$(OBJEXT): uninameslist-fr.h nameslist-dll.h buildnameslist.h
libuninameslist_la_LIBADD += -luninameslist-fr
EXTRA_libuninameslist_la_DEPENDENCIES += libuninameslist-fr.la
man_MANS += libuninameslist-fr.3
LIBADD += -luninameslist-fr
else
Expand All @@ -76,7 +80,7 @@ NamesList.txt:
$(WGET) "http://www.unicode.org/Public/UNIDATA/NamesList.txt" -O NamesList.txt

ListeDesNoms.txt:
$(WGET) "http://hapax.qc.ca/ListeNoms-13.0.0.txt" -O ListeDesNoms.txt
$(WGET) "http://hapax.qc.ca/ListeNoms-14.0.0.txt" -O ListeDesNoms.txt

# test: run all tests in cwd and subdirs
test: $(TEST_PROGS)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libuninameslist – A Library of Unicode names and annotation data
================================================================
[![Build Status](https://travis-ci.org/fontforge/libuninameslist.svg?branch=master)](https://travis-ci.org/fontforge/libuninameslist) [![Build status](https://ci.appveyor.com/api/projects/status/qseac73evm9leu0g?svg=true)](https://ci.appveyor.com/project/fontforge/libuninameslist) [![Coverity Scan Build Status](https://scan.coverity.com/projects/793/badge.svg?flat=1)](https://scan.coverity.com/projects/793)
[![Build status](https://ci.appveyor.com/api/projects/status/qseac73evm9leu0g?svg=true)](https://ci.appveyor.com/project/fontforge/libuninameslist) [![Coverity Scan Build Status](https://scan.coverity.com/projects/793/badge.svg?flat=1)](https://scan.coverity.com/projects/793)

- [Description](#description)
- [Installation and Build Instructions](#installation-and-build-instructions)
Expand All @@ -12,7 +12,7 @@ libuninameslist – A Library of Unicode names and annotation data
Description
-----------

This library is updated for Nameslist.txt ver14.0_beta and ListeDesNoms.txt ver13.0
This library is updated for Nameslist.txt ver14.0 and ListeDesNoms.txt ver14.0
and includes python wrapper 'uninameslist.py'

For latest release, see: https://github.com/fontforge/libuninameslist/releases
Expand All @@ -30,7 +30,7 @@ quickly and easily.
ListeDesNoms.txt
Is a seperate file which is translated from Nameslist.txt and was outdated for
a period of time but was recently updated by a group of developers who have
updated it up to version 13. Contributors to that file are listed in that file.
updated it up to version 14. Contributors to that file are listed in that file.

These libraries contain very large (sparse) arrays with one entry for each
unicode code point (U+0000–U+10FFFF). Each entry contains two strings, a name
Expand Down
4 changes: 2 additions & 2 deletions buildnameslist.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static int printcopyright2credits(FILE *out) {
static int printcopyright2(FILE *out) {
fprintf( out, "\n/*\n");
fprintf( out, "; Standard Unicode %s ou\n", NFR_VERSION);
fprintf( out, "; Norme internationale ISO/CEI 10646:2017\n;\n");
fprintf( out, "; Norme internationale ISO/CEI 10646\n;\n");
printcopyright2credits(out);
fprintf( out, "*/\n\n");
return( 1 );
Expand Down Expand Up @@ -166,7 +166,7 @@ static int ReadNamesList(void) {
static char *nameslistfiles[] = { "NamesList.txt", "ListeDesNoms.txt", NULL };
static char *nameslistlocs[] = {
"http://www.unicode.org/Public/UNIDATA/NamesList.txt",
"http://hapax.qc.ca/ListeNoms-13.0.0.txt (latin base char set)"
"http://hapax.qc.ca/ListeNoms-14.0.0.txt (latin base char set)"
};

buffer[sizeof(buffer)-1]=0;
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ 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], [20210917]) dnl yyyymmdd
m4_define([uninameslist_package_stamp], [20211114]) dnl yyyymmdd
m4_define([uninameslist_major_version], [14]) dnl Nameslist.txt
m4_define([uninameslist_minor_version], [0])
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],[9])
m4_define([uninameslist_revision],[10])
m4_define([uninameslist_age], [0])
m4_define([uninameslist_libver],
[uninameslist_current:uninameslist_revision:uninameslist_age])

# These values below are kept for backwards compatibility with older programs
# that are using the French namesList. This increments with ListeDesNoms.txt.
m4_define([fr_major_version], [13]) dnl latest ListeDesNoms.txt = ver13.0
m4_define([fr_minor_version], [1])
m4_define([fr_major_version], [14]) dnl latest ListeDesNoms.txt = ver14.0
m4_define([fr_minor_version], [0])
m4_define([uninameslist_fr_nameslist_ver], [fr_major_version.fr_minor_version])
m4_define([uninameslist_fr_current], [1])
m4_define([uninameslist_fr_revision],[4])
m4_define([uninameslist_fr_revision],[5])
m4_define([uninameslist_fr_age], [0])
m4_define([uninameslist_fr_libver],
[uninameslist_fr_current:uninameslist_fr_revision:uninameslist_fr_age])
Expand Down
Loading

0 comments on commit 6cba8fd

Please sign in to comment.