From 3e1e9840d7b4fef12281309cca3b920cc176efd5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Jul 2024 13:20:19 +0200 Subject: [PATCH] uniname/uniname: Modernize gen-uninames.lisp. Reported by Simon Josefsson in . * lib/uniname/gen-uninames.lisp: Swap second and third parameter. Look up clisp in $PATH. * lib/gen-uni-tables.c: Update invocation. --- ChangeLog | 9 +++++++++ lib/gen-uni-tables.c | 2 +- lib/uniname/gen-uninames.lisp | 9 +++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index abdba4716b..ac83778598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-07-02 Bruno Haible + + uniname/uniname: Modernize gen-uninames.lisp. + Reported by Simon Josefsson in + . + * lib/uniname/gen-uninames.lisp: Swap second and third parameter. Look + up clisp in $PATH. + * lib/gen-uni-tables.c: Update invocation. + 2024-07-01 Bruno Haible Avoid some possibly wrong configure test results. diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c index 3ebcd833ff..b4f16da560 100644 --- a/lib/gen-uni-tables.c +++ b/lib/gen-uni-tables.c @@ -12075,8 +12075,8 @@ main (int argc, char * argv[]) * && diff uniwbrk/wbrkprop_org.txt uniwbrk/wbrkprop.txt \\ * && clisp -C uniname/gen-uninames.lisp \\ * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.1.0/ucd/UnicodeData.txt \\ - * uniname/uninames.h \\ * /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.1.0/ucd/NameAliases.txt \\ + * uniname/uninames.h \\ * && { sed -e 's/^/# /' -e 's/ $//' < /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/license.txt; \\ * echo; \\ * cat /media/nas/bruno/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/15.1.0/ucd/NameAliases.txt; } \\ diff --git a/lib/uniname/gen-uninames.lisp b/lib/uniname/gen-uninames.lisp index 1b0c60cf04..30191f2e8e 100755 --- a/lib/uniname/gen-uninames.lisp +++ b/lib/uniname/gen-uninames.lisp @@ -1,6 +1,7 @@ -#!/usr/local/bin/clisp -C +#!/usr/bin/env -S clisp -C -;;; Creation of gnulib's uninames.h from the UnicodeData.txt table. +;;; Creation of gnulib's uninames.h from the UnicodeData.txt and NameAliases.txt +;;; tables. ;;; Copyright (C) 2000-2024 Free Software Foundation, Inc. ;;; Written by Bruno Haible , 2000-12-28. @@ -48,8 +49,8 @@ length ; number of words ) -(defun main (inputfile outputfile aliasfile) - (declare (type string inputfile outputfile aliasfile)) +(defun main (inputfile aliasfile outputfile) + (declare (type string inputfile aliasfile outputfile)) #+UNICODE (setq *default-file-encoding* charset:utf-8) (let ((all-chars '()) (all-chars-hashed (make-hash-table :test #'equal)) -- 2.39.5