diff options
| author | Hironobu Yamashita <h.y.acetaminophen@gmail.com> | 2022-01-22 19:07:04 +0000 |
|---|---|---|
| committer | Hironobu Yamashita <h.y.acetaminophen@gmail.com> | 2022-01-22 19:07:04 +0000 |
| commit | 3917a9922ed32d5bc204c8dddca871939926e65a (patch) | |
| tree | f0dfc4d24c20b813367a26bbcce459822f31b612 | |
| parent | 91c065c4a96fe7b2b25ee1cf4a095e4c5e60e19a (diff) | |
cjkutils-4.8.5 (no changes though)
git-svn-id: svn://tug.org/texlive/trunk@61694 c570f23f-e606-0410-a88d-b1316a301751
67 files changed, 389 insertions, 261 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README index 344fbe04186..4c51b84ee3e 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -31,7 +31,7 @@ chktex 1.7.6 - checked 15mar20 http://mirror.ctan.org/support/chktex/ http://download.savannah.gnu.org/releases/chktex/ -cjkutils 4.8.4 - checked 18jul21 +cjkutils 4.8.5 - checked 22jan22 http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary http://www.nongnu.org/cjk/ @@ -69,8 +69,8 @@ dvisvgm 2.13 - checked 21jan22 https://github.com/mgieseki/dvisvgm https://ctan.org/pkg/dvisvgm -gregorio 5.2.1 - checked 19dec19 - CTAN/support/gregoriotex/gregorio-5.2.1.zip +gregorio 6.0.0 - checked 14mar21 + CTAN/support/gregoriotex/gregorio-6.0.0.zip gsftopk - from Paul Vojta's xdvi. diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 8ce1d9d3258..dc2cfbd9c3d 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,8 @@ +2022-01-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + Import cjk-4.8.5/utils as cjkutils-4.8.5. + * version.ac, tests/*.cjk: Adapted. + 2021-07-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * Regenerate C sources after patch. diff --git a/Build/source/texk/cjkutils/TLpatches/ChangeLog b/Build/source/texk/cjkutils/TLpatches/ChangeLog index 6b9bda65f5f..88f406504b0 100644 --- a/Build/source/texk/cjkutils/TLpatches/ChangeLog +++ b/Build/source/texk/cjkutils/TLpatches/ChangeLog @@ -1,3 +1,8 @@ +2022-01-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + Import cjk-4.8.5/utils as cjkutils-4.8.5. + * patch-04-mingw64, patch-05-win32: Adapted. + 2021-07-18 Hironobu Yamashita <h.y.acetaminophen@gmail.com> * patch-05-win32: patches should be applied to CWEB source. diff --git a/Build/source/texk/cjkutils/TLpatches/TL-Changes b/Build/source/texk/cjkutils/TLpatches/TL-Changes index fb91f1e4516..9bf9228f637 100644 --- a/Build/source/texk/cjkutils/TLpatches/TL-Changes +++ b/Build/source/texk/cjkutils/TLpatches/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the cjk-4.8.4/utils tree as obtained from: - http://cjk.ffii.org/cjk-4.8.4.tar.gz +Changes applied to the cjk-4.8.5/utils tree as obtained from: + https://download.savannah.nongnu.org/releases/cjk/cjk-4.8.5.tar.gz Moved from top level to here: ChangeLog diff --git a/Build/source/texk/cjkutils/TLpatches/patch-04-mingw64 b/Build/source/texk/cjkutils/TLpatches/patch-04-mingw64 index d429f5cb873..68261d43c4c 100644 --- a/Build/source/texk/cjkutils/TLpatches/patch-04-mingw64 +++ b/Build/source/texk/cjkutils/TLpatches/patch-04-mingw64 @@ -1,6 +1,6 @@ -diff -ur cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w cjkutils-4.8.4/hbf2gf/hbf2gf.w ---- cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w 2015-04-18 08:51:28.000000000 +0200 -+++ cjkutils-4.8.4/hbf2gf/hbf2gf.w 2015-04-18 12:44:01.000000000 +0200 +diff -ur cjkutils-4.8.5.orig/hbf2gf/hbf2gf.w cjkutils-4.8.5/hbf2gf/hbf2gf.w +--- cjkutils-4.8.5.orig/hbf2gf/hbf2gf.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/hbf2gf/hbf2gf.w 2022-01-23 03:37:41.000000000 +0900 @@ -486,7 +486,7 @@ @d GF_ID 131 @d PRE 247@# diff --git a/Build/source/texk/cjkutils/TLpatches/patch-05-win32 b/Build/source/texk/cjkutils/TLpatches/patch-05-win32 index a8d10ed30e2..aebb4b6555b 100644 --- a/Build/source/texk/cjkutils/TLpatches/patch-05-win32 +++ b/Build/source/texk/cjkutils/TLpatches/patch-05-win32 @@ -1,6 +1,6 @@ -diff -ur cjkutils-4.8.4.orig/Bg5conv/bg5conv.w cjkutils-4.8.4/Bg5conv/bg5conv.w ---- cjkutils-4.8.4.orig/Bg5conv/bg5conv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/Bg5conv/bg5conv.w 2021-07-18 19:52:36.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/Bg5conv/bg5conv.w cjkutils-4.8.5/Bg5conv/bg5conv.w +--- cjkutils-4.8.5.orig/Bg5conv/bg5conv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/Bg5conv/bg5conv.w 2022-01-23 03:37:41.000000000 +0900 @@ -93,12 +93,19 @@ @c @@ -22,9 +22,9 @@ diff -ur cjkutils-4.8.4.orig/Bg5conv/bg5conv.w cjkutils-4.8.4/Bg5conv/bg5conv.w fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@# ch = fgetc(stdin);@# -diff -ur cjkutils-4.8.4.orig/CEFconv/cef5conv.w cjkutils-4.8.4/CEFconv/cef5conv.w ---- cjkutils-4.8.4.orig/CEFconv/cef5conv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/CEFconv/cef5conv.w 2021-07-18 19:53:46.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/CEFconv/cef5conv.w cjkutils-4.8.5/CEFconv/cef5conv.w +--- cjkutils-4.8.5.orig/CEFconv/cef5conv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/CEFconv/cef5conv.w 2022-01-23 03:37:41.000000000 +0900 @@ -108,7 +108,11 @@ @c #include <ctype.h> @@ -48,9 +48,9 @@ diff -ur cjkutils-4.8.4.orig/CEFconv/cef5conv.w cjkutils-4.8.4/CEFconv/cef5conv. fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@# ch = fgetc(stdin);@# -diff -ur cjkutils-4.8.4.orig/CEFconv/cefconv.w cjkutils-4.8.4/CEFconv/cefconv.w ---- cjkutils-4.8.4.orig/CEFconv/cefconv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/CEFconv/cefconv.w 2021-07-18 19:55:21.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/CEFconv/cefconv.w cjkutils-4.8.5/CEFconv/cefconv.w +--- cjkutils-4.8.5.orig/CEFconv/cefconv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/CEFconv/cefconv.w 2022-01-23 03:37:41.000000000 +0900 @@ -100,7 +100,11 @@ @c #include <ctype.h> @@ -74,9 +74,9 @@ diff -ur cjkutils-4.8.4.orig/CEFconv/cefconv.w cjkutils-4.8.4/CEFconv/cefconv.w fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@# ch = fgetc(stdin);@# -diff -ur cjkutils-4.8.4.orig/CEFconv/cefsconv.w cjkutils-4.8.4/CEFconv/cefsconv.w ---- cjkutils-4.8.4.orig/CEFconv/cefsconv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/CEFconv/cefsconv.w 2021-07-18 19:56:04.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/CEFconv/cefsconv.w cjkutils-4.8.5/CEFconv/cefsconv.w +--- cjkutils-4.8.5.orig/CEFconv/cefsconv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/CEFconv/cefsconv.w 2022-01-23 03:37:41.000000000 +0900 @@ -111,7 +111,11 @@ @c #include <ctype.h> @@ -100,9 +100,9 @@ diff -ur cjkutils-4.8.4.orig/CEFconv/cefsconv.w cjkutils-4.8.4/CEFconv/cefsconv. fprintf(stdout, "\\def\\CNSpreproc{%s}", banner);@# ch = fgetc(stdin);@# -diff -ur cjkutils-4.8.4.orig/SJISconv/sjisconv.w cjkutils-4.8.4/SJISconv/sjisconv.w ---- cjkutils-4.8.4.orig/SJISconv/sjisconv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/SJISconv/sjisconv.w 2021-07-18 19:57:11.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/SJISconv/sjisconv.w cjkutils-4.8.5/SJISconv/sjisconv.w +--- cjkutils-4.8.5.orig/SJISconv/sjisconv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/SJISconv/sjisconv.w 2022-01-23 03:37:41.000000000 +0900 @@ -95,12 +95,19 @@ @c @@ -124,9 +124,9 @@ diff -ur cjkutils-4.8.4.orig/SJISconv/sjisconv.w cjkutils-4.8.4/SJISconv/sjiscon fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@# ch = fgetc(stdin);@# -diff -ur cjkutils-4.8.4.orig/extconv/extconv.w cjkutils-4.8.4/extconv/extconv.w ---- cjkutils-4.8.4.orig/extconv/extconv.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/extconv/extconv.w 2021-07-18 19:58:13.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/extconv/extconv.w cjkutils-4.8.5/extconv/extconv.w +--- cjkutils-4.8.5.orig/extconv/extconv.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/extconv/extconv.w 2022-01-23 03:37:41.000000000 +0900 @@ -93,12 +93,19 @@ @c @@ -148,9 +148,9 @@ diff -ur cjkutils-4.8.4.orig/extconv/extconv.w cjkutils-4.8.4/extconv/extconv.w fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@# -diff -ur cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w cjkutils-4.8.4/hbf2gf/hbf2gf.w ---- cjkutils-4.8.4.orig/hbf2gf/hbf2gf.w 2015-04-18 15:51:28.000000000 +0900 -+++ cjkutils-4.8.4/hbf2gf/hbf2gf.w 2021-07-18 20:22:51.000000000 +0900 +diff -ur cjkutils-4.8.5.orig/hbf2gf/hbf2gf.w cjkutils-4.8.5/hbf2gf/hbf2gf.w +--- cjkutils-4.8.5.orig/hbf2gf/hbf2gf.w 2021-10-17 02:25:02.000000000 +0900 ++++ cjkutils-4.8.5/hbf2gf/hbf2gf.w 2022-01-23 03:37:41.000000000 +0900 @@ -148,9 +148,9 @@ FILE *config, *out; HBF *hbf;@# diff --git a/Build/source/texk/cjkutils/bg5conv.c b/Build/source/texk/cjkutils/bg5conv.c index c92ff5abeb9..3e120fc0977 100644 --- a/Build/source/texk/cjkutils/bg5conv.c +++ b/Build/source/texk/cjkutils/bg5conv.c @@ -1,5 +1,5 @@ #define banner \ -"bg5conv (CJK ver. 4.8.4)" \ +"bg5conv (CJK ver. 4.8.5)" \ /*2:*/ #line 94 "./cjkutils-src/Bg5conv/bg5conv.w" diff --git a/Build/source/texk/cjkutils/cef5conv.c b/Build/source/texk/cjkutils/cef5conv.c index f97b9c272c2..ab5b72a716a 100644 --- a/Build/source/texk/cjkutils/cef5conv.c +++ b/Build/source/texk/cjkutils/cef5conv.c @@ -1,5 +1,5 @@ #define banner \ -"cef5conv (CJK ver. 4.8.4)" \ +"cef5conv (CJK ver. 4.8.5)" \ /*2:*/ #line 108 "./cjkutils-src/CEFconv/cef5conv.w" diff --git a/Build/source/texk/cjkutils/cefconv.c b/Build/source/texk/cjkutils/cefconv.c index 7a666a64bbb..653a78ea8c1 100644 --- a/Build/source/texk/cjkutils/cefconv.c +++ b/Build/source/texk/cjkutils/cefconv.c @@ -1,5 +1,5 @@ #define banner \ -"cefconv (CJK ver. 4.8.4)" \ +"cefconv (CJK ver. 4.8.5)" \ /*2:*/ #line 100 "./cjkutils-src/CEFconv/cefconv.w" diff --git a/Build/source/texk/cjkutils/cefsconv.c b/Build/source/texk/cjkutils/cefsconv.c index 18f47a62de8..36239626d13 100644 --- a/Build/source/texk/cjkutils/cefsconv.c +++ b/Build/source/texk/cjkutils/cefsconv.c @@ -1,5 +1,5 @@ #define banner \ -"cefsconv (CJK ver. 4.8.4)" \ +"cefsconv (CJK ver. 4.8.5)" \ /*2:*/ #line 111 "./cjkutils-src/CEFconv/cefsconv.w" diff --git a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1 b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1 index a9e83901cf0..c18087e1c36 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.1 @@ -1,5 +1,5 @@ .\" man page for bg5conv -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH BG5CONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH BG5CONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w index 92852374086..7e8c98f6c17 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5conv.w @@ -1,6 +1,6 @@ -% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{bg5conv (CJK Version 4.8.4)} +\def\title{bg5conv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont bg5conv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -89,7 +89,7 @@ which will see the output of \.{bg5conv} complains loudly if something is wrong. @d banner -"bg5conv (CJK ver. 4.8.4)" +"bg5conv (CJK ver. 4.8.5)" @c #include <stdio.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex index 2540f9524d8..91eca16d778 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex +++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd index facf871970c..401a426ec07 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5latex.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\
bg5latex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex index 9adacad3a68..a89ab4ea8ff 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/Bg5conv/bg5pdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1 index d04c5271029..5c5c3cd1c35 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.1 @@ -1,5 +1,5 @@ .\" man page for cef5conv -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH CEF5CONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH CEF5CONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w index 8cac23766ff..1c6e4acb26b 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5conv.w @@ -1,6 +1,6 @@ -% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cef5conv (CJK Version 4.8.4)} +\def\title{cef5conv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cef5conv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -103,7 +103,7 @@ which will see the output of \.{cef5conv} complains loudly if something is wrong. @d banner -"cef5conv (CJK ver. 4.8.4)" +"cef5conv (CJK ver. 4.8.5)" @c #include <ctype.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex index 1b51a711d1b..3a0f5a300c2 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5latex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd index f089e831c62..29496f8967a 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5ltx.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\
cef5ltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex index 1ae7b5953ef..cdd4384ec7b 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cef5pdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1 index 7be7fae6ba8..50a8bbf6f62 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.1 @@ -1,5 +1,5 @@ .\" man page for cefconv -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH CEFCONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH CEFCONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w index 900a41a98c3..ad57bf162bb 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefconv.w @@ -1,6 +1,6 @@ -% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cefconv (CJK Version 4.8.4)} +\def\title{cefconv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cefconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -95,7 +95,7 @@ which will see the output of \.{cefconv} complains loudly if something is wrong. @d banner -"cefconv (CJK ver. 4.8.4)" +"cefconv (CJK ver. 4.8.5)" @c #include <ctype.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex index 79bcd8abe36..8102e177fa1 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd index dcc3183431e..43666071bc9 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/ceflatex.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\
ceflatex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex index c1b776cffdf..16847a515c5 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefpdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1 b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1 index 4c38133298e..58f0ad8e81d 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.1 @@ -1,5 +1,5 @@ .\" man page for cefsconv -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH CEFSCONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH CEFSCONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w index c6f1bdbd971..eff6a3f966b 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsconv.w @@ -1,6 +1,6 @@ -% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cefsconv (CJK Version 4.8.4)} +\def\title{cefsconv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cefsconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -106,7 +106,7 @@ Note that the user-defined character area of SJIS (with the first bytes in the range 0xF0--0xFC) is not supported because it is not portable. @d banner -"cefsconv (CJK ver. 4.8.4)" +"cefsconv (CJK ver. 4.8.5)" @c #include <ctype.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex index 3d3daa175b1..fd78a244682 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefslatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd index 7150e8aad1b..dc7663d2749 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefsltx.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\
cefsltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex index ed981d4dfb2..ee78cd3bd5b 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/CEFconv/cefspdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/ChangeLog b/Build/source/texk/cjkutils/cjkutils-src/ChangeLog index f943ead7ea7..d5563c1f7b0 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/ChangeLog +++ b/Build/source/texk/cjkutils/cjkutils-src/ChangeLog @@ -1,3 +1,120 @@ +2021-10-16 Werner LEMBERG <wl@gnu.org> + + Version 4.8.5 released + ====================== + + Set version to 4.8.5. + + * doc/history.txt: Updated. + + Update headers in all text files. + +2021-10-16 Werner LEMBERG <wl@gnu.org> + + [hbf2gf] Update config and auxiliary scripts. + + * utils/hbf2gf/config.guess, utils/hbf2gf/config.sub, + utils/hbf2gf/install-sh, utils/hbf2gf/mkinstalldirs: Updated to + current versions. + + * utils/hbf2gf/configure: Regenerated with autoconf 2.71. + +2021-10-16 Werner Lemberg <wl@gnu.org> + + Update to current LaTeX version. + + Currently, there is a first-aid patch in the LaTeX kernel to make + the CJK package work. This commit moves the corresponding code to + here so that the first-aid stuff can be removed. + + * texinput/CJK.sty (\IfFormatAtLeastTF): New macro. + (\selectfont): Use the `\selectfont' hook for recent LaTeX versions. + +2018-11-25 Werner Lemberg <wl@gnu.org> + + Generate pinyin hyphenation pattern files from last commit. + + * utils/pyhyphen/hyph-zh-latn-pinyin.tex, + utils/pyhyphen/hyph-zh-latn-tonepinyin.tex: New files. + +2018-11-25 Werner Lemberg <wl@gnu.org> + + Rewrite pinyin hyphenation support. + + Investigation has shown that the apostrophe before a syllable + starting with `a', `e', or `o' should vanish if a line break occurs. + This commit fixes this bug: The apostrophe should now be entered + with the Babel shorthand "'; character ' itself is no longer part of + the hyphenation patterns. + + It also adds support for pinyin syllables with tone markers, to be + used with Unicode engines like XeTeX or luatex. + + Finally, the license for the resulting pattern files have been + changed from GPL to MIT to allow broader usage. + + * utils/pyhyphen/GNUmakefile: New file. Saying `make' will generate + the hyphenation pattern files `hyph-zh-latn-pinyin.tex' and + `hyph-zh-latn-tonepinyin.tex'. + + * utils/pyhyphen/hyph-zh-latn-pinyin.in, + utils/pyhyphen/make-patterns.sh: New auxiliary files. + + * utils/pyhyphen/pyhyph.tex: Removed. Obsolete. + + * utils/pyhyphen/pytestutf8.tex: New file to demonstrate patterns + for tone pinyin. + + * utils/pyhyphen/pinyin.c, utils/pyhyphen/pinyin.ldf, + utils/pyhyphen/pinyin.tr, utils/pytest.tex: Updated. + + * doc/pyhyphen.txt, MANIFEST: Updated. + +2016-12-27 Werner Lemberg <wl@gnu.org> + + * utils/lisp/emacs/cjk-enc.el (cjk-coding): Remove `chinese-big5'. + + Hin-Tak reports this doesn't work... + +2016-12-26 Hin-Tak Leung <htl10@users.sourceforge.net> + + [cjk-enc.el] Updated to work with Emacs 25 and later. + + In batch mode, `message' in Emacs 25+ obeys coding-system-for-write. + + http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=c63246628461f748d66a8a07ba008de2e00fd33a + + `cjk-encode' can mis-behave and, at worst, crash from `message' + recursing. + + https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25203 + + The charset priority system introduced with Emacs 23+ changes + further in Emacs 25+. Charset `big5' has been updated (together + with `big5-hkscs') and now takes priority over the historical + `chinese-big5-2' and `chinese-big5-1'. + + http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=9f89ea1f84dbf708228ced0202774b36f30f2b01 + http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=49fa1919e9be863f22ec8042704bf3436d0ec26d + + Also worth noting is that, "Wrote output.cjk" is no longer seen with + Emacs 25+. + + http://git.savannah.gnu.org/cgit/emacs.git/commit/?h=emacs-25&id=d20f82e6f1ab902469723ebd530ca21bea9cc41b + + Tested against example/{Big5.tex, Big5vert.tex, CJKbabel.tex, + muletest.tex, rubytest.tex, thai.tex}, and LANG'ed non-'coding:'ed + big5 example, with emacs 21.4, 22.3, 23.3, 24.5 and 25.1. + + Thanks for advice from Eli Zaretskii. + + * utils/lisp/emacs/cjk-enc.el (cjk-enc-table, + cjk-format-spec-table): Add `big5' encoding. + (cjk-coding): Add `chinese-big5'. + (cjk-encode): Adjust Big5 language detection heuristics for Emacs + 25+; support `big5' encoding. + Use `terminal-coding-system' while emitting messages. + 2015-04-18 Werner LEMBERG <wl@gnu.org> Version 4.8.4 released @@ -47,7 +164,7 @@ This finally works due to the recent lgrx package which delivers good Babel UTF8 support for LGR encoding. - An unsolved problem yet, however, is proper cut-and-paste support. + An unsolved problem yet, however, is proper cut-and-paste support. While dvipdfmx properly generates CMaps for CJK encodings (even for virtual fonts which pdftex doesn't handle at all), it doesn't handle encodings like LGR correctly, something the `cmap' package @@ -181,7 +298,7 @@ original charset is preserved in the text property `charset'. Another change is the new charset/text-property called `tis620-2533' - (a superset of `ascii' and `thai-tis620'), introduced in emacs 23. + (a superset of `ascii' and `thai-tis620'), introduced in emacs 23. This has the tendency of swallowing up every ASCII character and goes into an infinite loop with `examples/thai.tex', so we have to handle this also. diff --git a/Build/source/texk/cjkutils/cjkutils-src/README b/Build/source/texk/cjkutils/cjkutils-src/README index cf33f17eb75..17f44a66d94 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/README +++ b/Build/source/texk/cjkutils/cjkutils-src/README @@ -1,4 +1,4 @@ -Welcome to CJK version 4.8.4 (18-Apr-2015), a LaTeX2e macro package which +Welcome to CJK version 4.8.5 (16-Oct-2021), a LaTeX2e macro package which enables the use of CJK scripts (Chinese/Japanese/Korean) in various encodings, written by Werner Lemberg <wl@gnu.org>. @@ -17,7 +17,7 @@ also provides snapshots. The home site of the CJK package is - http://cjk.ffii.org + http://www.nongnu.org/cjk Additionally, the latest non-development version can be found on all CTAN hosts and its mirrors in the directory <CTAN>/language/chinese. @@ -25,8 +25,8 @@ hosts and its mirrors in the directory <CTAN>/language/chinese. The package comes in two parts: - cjk-4.8.4.tar.gz: The source files. Needed for all platforms. - cjk-4.8.4-doc.tar.gz: Preformatted documentation files: DVI, PS, + cjk-4.8.5.tar.gz: The source files. Needed for all platforms. + cjk-4.8.5-doc.tar.gz: Preformatted documentation files: DVI, PS, output from cjk-enc.el, etc. Note that on CTAN and its mirrors, the `src' archive is unpacked; you must diff --git a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1 b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1 index c385eb616d4..2ad865721c4 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.1 @@ -1,5 +1,5 @@ .\" man page for sjisconv -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH SJISCONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH SJISCONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w index f7d38aff373..6a606265518 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisconv.w @@ -1,6 +1,6 @@ -% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{sjisconv (CJK Version 4.8.4)} +\def\title{sjisconv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont sjisconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -91,7 +91,7 @@ Note that the user-defined character area of SJIS (with the first bytes in the range 0xF0--0xFC) is not supported because it is not portable. @d banner -"sjisconv (CJK ver. 4.8.4)" +"sjisconv (CJK ver. 4.8.5)" @c #include <stdio.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex index b1086cba768..9cc170468b5 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex +++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjislatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd index 2ff4e03e54d..12c8a394c89 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjisltx.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\
sjisltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex index 651570da7f2..4a5d4817eea 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/SJISconv/sjispdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c b/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c index 678c1dd3a89..ebea1fc3c5b 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c +++ b/Build/source/texk/cjkutils/cjkutils-src/cjklatex/cjklatex.c @@ -11,7 +11,7 @@ #endif /* - Copyright (C) 2001-2015 F. Popineau <Fabrice.Popineau@supelec.fr> + Copyright (C) 2001-2021 F. Popineau <Fabrice.Popineau@supelec.fr> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex index 82e706a44f7..257d8c43adb 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+latex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex index 16377e9dc17..c3ab62a343e 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5+pdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd index 69a94952089..ee93548a0d4 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/bg5pltx.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\
bg5pltx.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1 b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1 index 1ef4b011d84..9d275b73458 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.1 @@ -1,6 +1,6 @@ .\" man page for bg5conv .\" -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ .\" Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, .\" MA 02110-1301 USA . -.TH EXTCONV 1 18-Apr-2015 "CJK Version 4.8.4" +.TH EXTCONV 1 16-Oct-2021 "CJK Version 4.8.5" . .\" ==== .\" ==== macro definitions diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w index d9016728c61..2df05814f1f 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/extconv.w @@ -1,6 +1,6 @@ -% This is the cweb file extconv.w of the CJK Package Ver. 4.8.4 18-Apr-2015 +% This is the cweb file extconv.w of the CJK Package Ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{extconv (CJK Version 4.8.4)} +\def\title{extconv (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont extconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -89,7 +89,7 @@ which will see the output of \.{extconv} complains loudly if something is wrong. @d banner -"extconv (CJK ver. 4.8.4)" +"extconv (CJK ver. 4.8.5)" @c #include <stdio.h> diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex index 82e706a44f7..257d8c43adb 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd index 9bd1237934a..c53de7b5e1b 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbklatex.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\
gbklatex.cmd
- This file is part of the CJK macro package for LaTeX2e ver. 4.8.4
+ This file is part of the CJK macro package for LaTeX2e ver. 4.8.5
- Copyright (C) 1994-2015 Wonkoo Kim <wkim+@pitt.edu>
+ Copyright (C) 1994-2021 Wonkoo Kim <wkim+@pitt.edu>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex index 16377e9dc17..c3ab62a343e 100755 --- a/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex +++ b/Build/source/texk/cjkutils/cjkutils-src/extconv/gbkpdflatex @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu index 1248c4f508a..7dd88f3b228 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.gnu @@ -1,6 +1,6 @@ -# This file is part of the CJK package Version 4.8.4 (18-Apr-2015) +# This file is part of the CJK package Version 4.8.5 (16-Oct-2021) -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in index 937d5d6f818..bf6022f818b 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/Makefile.in @@ -1,6 +1,6 @@ # Makefile for hbf2gf -- wl@gnu.org -# Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac index 4c28719516c..2fb38785162 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/configure.ac @@ -1,6 +1,6 @@ -dnl This file is part of the CJK package ver. 4.8.4 +dnl This file is part of the CJK package ver. 4.8.5 -dnl Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +dnl Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -30,9 +30,6 @@ dnl Checks for programs. AC_PROG_CC -dnl Checks for header files. -AC_HEADER_STDC - AC_ARG_WITH(kpathsea-include, [ --with-kpathsea-include=DIR location of the kpathsea include dir],[ diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm index 4ec03d0bf20..9b43c091001 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/dvidrv.btm @@ -1,6 +1,6 @@ setdos /y1 :: -:: Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +:: Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> :: :: This program is free software; you can redistribute it and/or modify :: it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1 index 144e7e68930..c856eff1c97 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1 +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.1 @@ -1,6 +1,6 @@ .\" man page for hbf2gf .\" -.\" Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +.\" Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> .\" .\" This program is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ .\" MA 02110-1301 USA .\" . -.TH HBF2GF 1 18-Apr-2015 "CJK Version 4.8.4" +.TH HBF2GF 1 16-Oct-2021 "CJK Version 4.8.5" .SH NAME hbf2gf \- convert a CJK bitmap font into subfonts usable by TeX and Omega. . diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def index 583767e897d..6f4d22ee8c1 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.def @@ -1,3 +1,3 @@ NAME HBF2GF WINDOWCOMPAT -DESCRIPTION 'hbf2gf (CJK Ver. 4.8.4)' +DESCRIPTION 'hbf2gf (CJK Ver. 4.8.5)' STACKSIZE 0x80000 diff --git a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w index 457a1bb89bd..1d06120d642 100644 --- a/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w +++ b/Build/source/texk/cjkutils/cjkutils-src/hbf2gf/hbf2gf.w @@ -1,6 +1,6 @@ -% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.4 18-Apr-2015 +% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -30,13 +30,13 @@ \def\mf{{\meta META}\-{\meta FONT}} \def\Om{\char "0A} % Omega symbol -\def\title{hbf2gf (CJK Version 4.8.4)} +\def\title{hbf2gf (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont hbf2gf} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -81,7 +81,7 @@ The ``banner line'' defined here should be changed whenever \.{hbf2gf} is modified. @d banner -"hbf2gf (CJK ver. 4.8.4)" +"hbf2gf (CJK ver. 4.8.5)" @ diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure index 0b5f6773b82..ae6757877c9 100755 --- a/Build/source/texk/cjkutils/configure +++ b/Build/source/texk/cjkutils/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for CJK utils (TeX Live) 4.8.4. +# Generated by GNU Autoconf 2.71 for CJK utils (TeX Live) 4.8.5. # # Report bugs to <tex-k@tug.org>. # @@ -629,8 +629,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CJK utils (TeX Live)' PACKAGE_TARNAME='cjk-utils--tex-live-' -PACKAGE_VERSION='4.8.4' -PACKAGE_STRING='CJK utils (TeX Live) 4.8.4' +PACKAGE_VERSION='4.8.5' +PACKAGE_STRING='CJK utils (TeX Live) 4.8.5' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1383,7 +1383,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 CJK utils (TeX Live) 4.8.4 to adapt to many kinds of systems. +\`configure' configures CJK utils (TeX Live) 4.8.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CJK utils (TeX Live) 4.8.4:";; + short | recursive ) echo "Configuration of CJK utils (TeX Live) 4.8.5:";; esac cat <<\_ACEOF @@ -1574,7 +1574,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CJK utils (TeX Live) configure 4.8.4 +CJK utils (TeX Live) configure 4.8.5 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2098,7 +2098,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 CJK utils (TeX Live) $as_me 4.8.4, which was +It was created by CJK utils (TeX Live) $as_me 4.8.5, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -8421,7 +8421,7 @@ fi # Define the identity of the package. PACKAGE='cjk-utils--tex-live-' - VERSION='4.8.4' + VERSION='4.8.5' # Some tools Automake needs. @@ -14601,7 +14601,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -CJK utils (TeX Live) config.lt 4.8.4 +CJK utils (TeX Live) config.lt 4.8.5 configured by $0, generated by GNU Autoconf 2.71. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16447,7 +16447,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 CJK utils (TeX Live) $as_me 4.8.4, which was +This file was extended by CJK utils (TeX Live) $as_me 4.8.5, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16515,7 +16515,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -CJK utils (TeX Live) config.status 4.8.4 +CJK utils (TeX Live) config.status 4.8.5 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/cjkutils/extconv.c b/Build/source/texk/cjkutils/extconv.c index 301b2c9f446..da0f8ea059e 100644 --- a/Build/source/texk/cjkutils/extconv.c +++ b/Build/source/texk/cjkutils/extconv.c @@ -1,5 +1,5 @@ #define banner \ -"extconv (CJK ver. 4.8.4)" \ +"extconv (CJK ver. 4.8.5)" \ /*2:*/ #line 94 "./cjkutils-src/extconv/extconv.w" diff --git a/Build/source/texk/cjkutils/hbf2gf.c b/Build/source/texk/cjkutils/hbf2gf.c index 808ea01dc4d..d1ac2f15cbe 100644 --- a/Build/source/texk/cjkutils/hbf2gf.c +++ b/Build/source/texk/cjkutils/hbf2gf.c @@ -1,5 +1,5 @@ #define banner \ -"hbf2gf (CJK ver. 4.8.4)" \ +"hbf2gf (CJK ver. 4.8.5)" \ \ #define TRUE 1 diff --git a/Build/source/texk/cjkutils/hbf2gf.dvi b/Build/source/texk/cjkutils/hbf2gf.dvi Binary files differindex 85aa9b28d36..23f36249747 100644 --- a/Build/source/texk/cjkutils/hbf2gf.dvi +++ b/Build/source/texk/cjkutils/hbf2gf.dvi diff --git a/Build/source/texk/cjkutils/hbf2gf.idx b/Build/source/texk/cjkutils/hbf2gf.idx index 256371b905d..8662482e661 100644 --- a/Build/source/texk/cjkutils/hbf2gf.idx +++ b/Build/source/texk/cjkutils/hbf2gf.idx @@ -120,7 +120,7 @@ \I\\{hbfGetCodeRange}, 60, 61. \I\\{hbfOpen}, 57. \I\\{hbfProperty}, 57. -\I\\{headertstring}, \[13], 14. +\I\\{headerstring}, \[13], 14. \I\|{i}, \[21], \[46], \[48], \[51], \[56], \[63]. \I\\{input\_size\_x}, \[15], 28, 32, 33, 34, 36, 37, 57. \I\\{input\_size\_y}, \[15], 28, 31, 32, 33, 37, 57. @@ -158,7 +158,6 @@ \I\\{miktex\_get\_miktex\_version\_string\_ex}, 72. \I\\{min\_char}, 9, 28, 48, 51, \[60], 61. \I\\{min\_2\_byte}, 28, 30, \[62], 63. -\I$\msdos$, 2. \I\\{name}, \[77], \[80]. \I\\{name\_buffer}, \[76], 77. \I\\{need\_col}, \[34], 35. @@ -303,6 +302,7 @@ \I\.{VALID\_SUBCODE}, 48, \[62], 63. \I\.{VERSION}, \[5]. \I\.{WHITE}, \[27], 42, 44. +\I\.{WIN32}, 2. \I\.{WRITE\_BIN}, \[2], 12. \I\\{write\_coding}, 18, \[41], \[42]. \I\\{write\_data}, 11, 12, 15, \[16], \[17]. diff --git a/Build/source/texk/cjkutils/hbf2gf.tex b/Build/source/texk/cjkutils/hbf2gf.tex index 8cdb1320b30..f3aba969c24 100644 --- a/Build/source/texk/cjkutils/hbf2gf.tex +++ b/Build/source/texk/cjkutils/hbf2gf.tex @@ -1,7 +1,7 @@ \input cwebmac -% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.4 18-Apr-2015 +% This is the cweb file hbf2gf.w of the CJK package ver. 4.8.5 16-Oct-2021 -% Copyright (C) 1994-2015 Werner Lemberg <wl@gnu.org> +% Copyright (C) 1994-2021 Werner Lemberg <wl@gnu.org> % % This program is free software; you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -31,13 +31,13 @@ \def\mf{{\meta META}\-{\meta FONT}} \def\Om{\char "0A} % Omega symbol -\def\title{hbf2gf (CJK Version 4.8.4)} +\def\title{hbf2gf (CJK Version 4.8.5)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont hbf2gf} program} \vskip 20pt - \centerline{(CJK Version 4.8.4)} + \centerline{(CJK Version 4.8.5)} \vfill} \def\botofcontents{ @@ -77,8 +77,8 @@ This is the \.{hbf2gf} program by Werner Lemberg The ``banner line'' defined here should be changed whenever \.{hbf2gf} is modified. -\Y\B\4\D$\\{banner}$ \5 -\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{8.4)"}\par +\Y\B\4\D\\{banner}\5 +\.{"hbf2gf\ (CJK\ ver.\ 4.}\)\.{8.5)"}\par \fi \M{2} @@ -116,13 +116,13 @@ A batch file created by \.{hbf2gf} too (if the program computes a whole set of subfonts) will convert the \.{GF} files to \.{PK} files using \.{GFtoPK}, a part of every \TeX\ package. -\Y\B\4\D$\.{TRUE}$ \5 +\Y\B\4\D\.{TRUE}\5 \T{1}\par -\B\4\D$\.{FALSE}$ \5 +\B\4\D\.{FALSE}\5 \T{0}\Y\par -\B\4\D$\.{STRING\_LENGTH}$ \5 +\B\4\D\.{STRING\_LENGTH}\5 \T{255}\C{ the maximal length of an input string in the configuration file }\par -\B\4\D$\.{FILE\_NAME\_LENGTH}$ \5 +\B\4\D\.{FILE\_NAME\_LENGTH}\5 \T{1024}\C{ the maximal length (including the path) of a filename }\Y\par \Y\B\4\X2:Global variables\X${}\E{}$\6 \&{int} \\{nmb\_files}${}\K{-}\T{1}{}$;\C{ create all files by default }\6 @@ -144,16 +144,16 @@ probably must add `\.{.cfg}' }\6 \&{char} ${}\\{output\_name}[\.{STRING\_LENGTH}+\T{1}]{}$;\7 \&{FILE} ${}{*}\\{config},{}$ ${}{*}\\{out};{}$\6 \&{HBF} ${}{*}\\{hbf}{}$;\7 -\8\#\&{ifdef} ${}\msdos{}$\C{ if we compile under DOS or OS/2 }\6 -\8\#\&{define} \.{WRITE\_BIN} \5\.{"wb"}\6 -\8\#\&{define} \.{WRITE\_TXT} \5\.{"wt"}\6 -\8\#\&{define} \.{READ\_BIN} \5\.{"rb"}\6 -\8\#\&{define} \.{READ\_TXT} \5\.{"rt"}\6 +\8\#\&{ifdef} \.{WIN32}\6 +\8\#\&{define} \.{WRITE\_BIN}\5\.{"wb"}\6 +\8\#\&{define} \.{WRITE\_TXT}\5\.{"wb"}\6 +\8\#\&{define} \.{READ\_BIN}\5\.{"rb"}\6 +\8\#\&{define} \.{READ\_TXT}\5\.{"rt"}\6 \8\#\&{else}\6 -\8\#\&{define} \.{WRITE\_BIN} \5\.{"w"}\6 -\8\#\&{define} \.{WRITE\_TXT} \5\.{"w"}\6 -\8\#\&{define} \.{READ\_BIN} \5\.{"r"}\6 -\8\#\&{define} \.{READ\_TXT} \5\.{"r"}\6 +\8\#\&{define} \.{WRITE\_BIN}\5\.{"w"}\6 +\8\#\&{define} \.{WRITE\_TXT}\5\.{"w"}\6 +\8\#\&{define} \.{READ\_BIN}\5\.{"r"}\6 +\8\#\&{define} \.{READ\_TXT}\5\.{"r"}\6 \8\#\&{endif}\7 \&{int} \\{end\_of\_file}${}\K\.{FALSE}{}$;\par \As15, 19, 27, 38, 49, 53, 58, 60, 62, 70, 73\ETs76. @@ -193,8 +193,8 @@ variables, \PB{\\{write\_file}(\,)} writes the \.{GF} files, \PB{\\{write\_pl}(% \Y\B\X10:Include files\X\6 \X11:Prototypes\X\6 \X2:Global variables\X\7 -\&{int} \\{main}(\&{int} \\{argc}${},\39{}$\&{char} ${}{*}\\{argv}[\,]){}$\1\1% -\2\2\6 +\1\1\&{int} \\{main}(\&{int} \\{argc}${},\39{}$\&{char} ${}{*}\\{argv}[\,])\2% +\2{}$\6 ${}\{{}$\1\6 \&{char} ${}{*}\|p;{}$\7 \X78:Initialize \TeX\ file searching\X\7 @@ -237,7 +237,7 @@ ${}\\{mf\_like}\K\.{TRUE};{}$\6 \fi \M{5} -\Y\B\4\D$\.{VERSION}$ \6 +\Y\B\4\D\.{VERSION}\6 \.{"\\n"}\6 \.{"Copyright\ (C)\ 1996-}\)\.{1999\ Werner\ Lemberg.}\)\.{\\n"}\6 \.{"There\ is\ NO\ warrant}\)\.{y.\ \ You\ may\ redistri}\)\.{bute\ this\ @@ -260,7 +260,7 @@ ${}\\{printf}(\.{"\ (\%s)\\n"},\39\\{TeX\_search\_version}(\,));{}$\6 \U7.\fi \M{6} -\Y\B\4\D$\.{USAGE}$ \6 +\Y\B\4\D\.{USAGE}\6 \.{"\\n"}\6 \.{"Usage:\ hbf2gf\ [-q]\ }\)\.{configuration\_file[.}\)\.{cfg]\\n"}\6 \.{"\ \ \ \ \ \ \ hbf2gf\ [opti}\)\.{ons]\ font\_name\ x\_res}\)\.{olution\ [y% @@ -454,7 +454,7 @@ functions \PB{\\{write\_pre}(\,)}, \PB{\\{write\_data}(\,)}, and \PB{\\{write% In \mf-like mode we create font file name extensions similar to \mf\ if the \.{-n} option isn't specified; otherwise only `\.{.gf}' will be appended. -\Y\B\&{static} \&{void} \\{write\_file}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_file}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{char} ${}\\{output\_file}[\.{FILE\_NAME\_LENGTH}+\T{1}];{}$\7 \&{if} (\\{pk\_files})\5 @@ -508,23 +508,23 @@ bytes are a string in Pascal format containing a header, the date, and the time. Strings in Pascal format start with the length of the string and have no terminating NULL byte. -\Y\B\4\D$\.{GF\_ID}$ \5 +\Y\B\4\D\.{GF\_ID}\5 \T{131}\par -\B\4\D$\.{PRE}$ \5 +\B\4\D\.{PRE}\5 \T{247}\Y\par -\B\4\D$\\{headertstring}$ \5 +\B\4\D\\{headerstring}\5 \.{"\ hbf2gf\ output\ "}\par \Y\B\4\X11:Prototypes\X${}\mathrel+\E{}$\6 \&{static} \&{void} \\{write\_pre}(\&{void});\par \fi \M{14} -\Y\B\&{static} \&{void} \\{write\_pre}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_pre}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{char} \\{out\_s}[\T{40}]${},{}$ \|s[\T{20}];\6 \&{time\_t} \\{secs\_now};\6 \&{struct} \&{tm} ${}{*}\\{time\_now};{}$\7 -${}\\{strcpy}(\\{out\_s},\39\\{headertstring}){}$;\7 +${}\\{strcpy}(\\{out\_s},\39\\{headerstring}){}$;\7 ${}\\{secs\_now}\K\\{time}(\NULL){}$;\C{ system date and time }\6 ${}\\{time\_now}\K\\{localtime}({\AND}\\{secs\_now});{}$\6 ${}\\{strftime}(\|s,\39\T{20},\39\.{"\%Y.\%m.\%d:\%H.\%M"},\39\\{time% @@ -605,7 +605,7 @@ empty }\6 \fi \M{17} -\Y\B\&{static} \&{void} \\{write\_data}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_data}(\&{void})\2\2\6 ${}\{{}$\1\6 ${}\\{dot\_count}\K\T{0};{}$\6 ${}\\{char\_adr\_p}\K\\{char\_adr}{}$;\7 @@ -628,11 +628,11 @@ the character code and the dimensions of the character as explained in Of Character) finishes the current character. -\Y\B\4\D$\.{BOC}$ \5 +\Y\B\4\D\.{BOC}\5 \T{67}\par -\B\4\D$\.{BOC1}$ \5 +\B\4\D\.{BOC1}\5 \T{68}\C{ simplified version of \PB{\.{BOC}} }\par -\B\4\D$\.{EOC}$ \5 +\B\4\D\.{EOC}\5 \T{69}\par \Y\B\4\X18:Write character\X${}\E{}$\6 ${}\{{}$\1\6 @@ -694,9 +694,9 @@ drawing the character is \PB{\\{pk\_dx}}. \PB{\\{tfm\_width}} is the width in multiples of the design size ignoring the target size. -\Y\B\4\D$\.{\_2\_16}$ \5 +\Y\B\4\D\.{\_2\_16}\5 \T{65536.0}\C{ $2^{16}$ }\par -\B\4\D$\.{\_2\_20}$ \5 +\B\4\D\.{\_2\_20}\5 \T{1048576.0}\C{ $2^{20}$ }\par \Y\B\4\X2:Global variables\X${}\mathrel+\E{}$\6 \&{char} ${}\\{coding}[\.{STRING\_LENGTH}+\T{1}]{}$;\C{ a comment describing @@ -725,7 +725,7 @@ and configuration file also. \fi \M{21} -\Y\B\&{static} \&{void} \\{write\_post}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_post}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{long} \\{special\_adr};\6 \&{long} \\{post\_adr};\7 @@ -757,15 +757,15 @@ connected with the preceding string (but not used here). \PB{\\{special\_adr}} contains the address of the ``special section''. All items here are optional. -\Y\B\4\D$\.{XXX1}$ \5 +\Y\B\4\D\.{XXX1}\5 \T{239}\C{ these are all special command bytes }\par -\B\4\D$\.{XXX2}$ \5 +\B\4\D\.{XXX2}\5 \T{240}\C{ not used }\par -\B\4\D$\.{XXX3}$ \5 +\B\4\D\.{XXX3}\5 \T{241}\C{ not used }\par -\B\4\D$\.{XXX4}$ \5 +\B\4\D\.{XXX4}\5 \T{242}\C{ not used }\Y\par -\B\4\D$\.{YYY}$ \5 +\B\4\D\.{YYY}\5 \T{243}\C{ not used }\par \Y\B\4\X22:Special section\X${}\E{}$\6 $\\{special\_adr}\K\\{ftell}(\\{out}){}$;\7 @@ -795,11 +795,11 @@ locator postamble, and \PB{\\{post\_adr}} points to the beginning byte of the postamble. -\Y\B\4\D$\.{POST}$ \5 +\Y\B\4\D\.{POST}\5 \T{248}\Y\par -\B\4\D$\.{CHAR\_LOC}$ \5 +\B\4\D\.{CHAR\_LOC}\5 \T{245}\par -\B\4\D$\.{CHAR\_LOC0}$ \5 +\B\4\D\.{CHAR\_LOC0}\5 \T{246}\C{ simplified version of \PB{\.{CHAR\_LOC}} }\par \Y\B\4\X23:Post section\X${}\E{}$\6 $\\{post\_adr}\K\\{ftell}(\\{out});{}$\6 @@ -853,9 +853,9 @@ Jumping to the postamble, a \PB{\.{POST}} byte comes first, then the address of the special section, and afterwards all character offsets. These offsets and addresses describe the whole file. -\Y\B\4\D$\.{POSTPOST}$ \5 +\Y\B\4\D\.{POSTPOST}\5 \T{249}\par -\B\4\D$\.{POSTPOST\_ID}$ \5 +\B\4\D\.{POSTPOST\_ID}\5 \T{223}\par \Y\B\4\X24:Postpost section\X${}\E{}$\6 $\\{fputc}(\.{POSTPOST},\39\\{out});{}$\6 @@ -875,8 +875,8 @@ ${}\\{fputc}(\.{POSTPOST\_ID},\39\\{out}){}$;\2\par \fi \M{26} -\Y\B\&{static} \&{void} \\{fputl}(\&{long} \\{num}${},\39{}$\&{FILE} ${}{*}% -\|f){}$\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{fputl}(\&{long} \\{num}${},\39{}$\&{FILE} ${}{*}% +\|f)\2\2{}$\6 ${}\{{}$\1\6 ${}\\{fputc}(\\{num}\GG\T{24},\39\|f);{}$\6 ${}\\{fputc}(\\{num}\GG\T{16},\39\|f);{}$\6 @@ -901,17 +901,17 @@ If \PB{\.{EOF}} is encountered, \PB{\\{end\_of\_file}} is set and the function returns immediately. -\Y\B\4\D$\.{BLACK}$ \5 +\Y\B\4\D\.{BLACK}\5 \T{1}\par -\B\4\D$\.{WHITE}$ \5 +\B\4\D\.{WHITE}\5 \T{0}\Y\par -\B\4\D$\.{PIXEL\_MAXVAL}$ \5 +\B\4\D\.{PIXEL\_MAXVAL}\5 \T{255}\par -\B\4\D$\.{SCALE}$ \5 +\B\4\D\.{SCALE}\5 \T{4096}\par -\B\4\D$\.{HALFSCALE}$ \5 +\B\4\D\.{HALFSCALE}\5 \T{2048}\Y\par -\B\4\D$\.{MAX\_CHAR\_SIZE}$ \5 +\B\4\D\.{MAX\_CHAR\_SIZE}\5 \T{1023}\par \Y\B\4\X2:Global variables\X${}\mathrel+\E{}$\6 \&{HBF\_CHAR} \\{code};\6 @@ -1048,7 +1048,7 @@ result into an output array. \fi \M{30} -\Y\B\&{static} \&{void} \\{make\_pixel\_array}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{make\_pixel\_array}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{unsigned} \&{char} ${}{*}\\{prP};{}$\6 \&{unsigned} \&{char} ${}{*}\\{temp\_prP};{}$\6 @@ -1280,11 +1280,11 @@ glyph). \fi \M{37} -\Y\B\&{static}\6 +\Y\B\1\1\&{static}\6 \8\#\&{ifdef} \.{\_\_GNUC\_\_}\6 \&{\_\_inline\_\_}\6 \8\#\&{endif}\6 -\&{void} \\{read\_row}(\&{unsigned} \&{char} ${}{*}\\{pixelrow}){}$\1\1\2\2\6 +\&{void} \\{read\_row}(\&{unsigned} \&{char} ${}{*}\\{pixelrow})\2\2{}$\6 ${}\{{}$\1\6 \&{register} \&{int} \\{col}${},{}$ \\{bitshift}${},{}$ \\{offset};\6 \&{register} \&{unsigned} \&{char} ${}{*}\\{xP};{}$\6 @@ -1340,11 +1340,11 @@ threshold. \fi \M{40} -\Y\B\&{static}\6 +\Y\B\1\1\&{static}\6 \8\#\&{ifdef} \.{\_\_GNUC\_\_}\6 \&{\_\_inline\_\_}\6 \8\#\&{endif}\6 -\&{void} \\{write\_row}(\&{unsigned} \&{char} ${}{*}\\{pixelrow}){}$\1\1\2\2\6 +\&{void} \\{write\_row}(\&{unsigned} \&{char} ${}{*}\\{pixelrow})\2\2{}$\6 ${}\{{}$\1\6 \&{register} \&{int} \\{col};\6 \&{register} \&{unsigned} \&{char} ${}{*}\\{xP};{}$\7 @@ -1375,25 +1375,25 @@ should be read as the counter. Example: \PB{\.{SKIP1}}~26 means `skip the next For further details please refer to ``\mf---the program''. -\Y\B\4\D$\.{PAINT\_}(\|x)$ \5 +\Y\B\4\D\.{PAINT\_}$(\|x)$\5 (\|x)\C{ $0 \le x \le 63$ }\par -\B\4\D$\.{PAINT1}$ \5 +\B\4\D\.{PAINT1}\5 \T{64}\par -\B\4\D$\.{PAINT2}$ \5 +\B\4\D\.{PAINT2}\5 \T{65}\par -\B\4\D$\.{PAINT3}$ \5 +\B\4\D\.{PAINT3}\5 \T{66}\C{ not used }\Y\par -\B\4\D$\.{SKIP0}$ \5 +\B\4\D\.{SKIP0}\5 \T{70}\par -\B\4\D$\.{SKIP1}$ \5 +\B\4\D\.{SKIP1}\5 \T{71}\par -\B\4\D$\.{SKIP2}$ \5 +\B\4\D\.{SKIP2}\5 \T{72}\par -\B\4\D$\.{SKIP3}$ \5 +\B\4\D\.{SKIP3}\5 \T{73}\C{ not used }\Y\par -\B\4\D$\.{NEW\_ROW\_}(\|x)$ \5 +\B\4\D\.{NEW\_ROW\_}$(\|x)$\5 $((\|x)+\T{74}{}$)\C{ $0 \le x \le 164$ }\Y\par -\B\4\D$\.{NOOP}$ \5 +\B\4\D\.{NOOP}\5 \T{244}\C{ not used }\par \Y\B\4\X11:Prototypes\X${}\mathrel+\E{}$\6 \&{static} \&{void} \\{write\_coding}(\&{void});\par @@ -1403,7 +1403,7 @@ $((\|x)+\T{74}{}$)\C{ $0 \le x \le 164$ }\Y\par The \PB{\&{goto} \\{start}} instruction causes some compilers to complain about ``Unreachable code $\ldots$'' or something similar. -\Y\B\&{static} \&{void} \\{write\_coding}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_coding}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{register} \&{int} \\{count}${},{}$ \\{skip};\6 \&{register} \&{unsigned} \&{char} \\{paint};\6 @@ -1577,7 +1577,7 @@ single bytes and use the \.{HEADER} command repeatedly. \fi \M{46} -\Y\B\&{static} \&{void} \\{write\_pl}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_pl}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{int} \|i${},{}$ \\{pos};\6 \&{char} ${}\\{output\_file}[\.{FILE\_NAME\_LENGTH}+\T{1}];{}$\6 @@ -1674,7 +1674,7 @@ of the subfonts back to the original encoding positions. \fi \M{48} -\Y\B\&{static} \&{void} \\{write\_ovp}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_ovp}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{int} \|c${},{}$ \|i${},{}$ \\{nmb\_subfonts}${},{}$ \\{remainder}${},{}$ % \\{count}${},{}$ \\{pos};\6 @@ -1797,13 +1797,13 @@ a \.{TFM} file and copy it \PB{\\{nmb\_files}} times. The name of the job file is \PB{\\{output\_name}}. -\Y\B\4\D$\.{EXTENSION\_LENGTH}$ \5 +\Y\B\4\D\.{EXTENSION\_LENGTH}\5 \T{8}\C{ the maximal length of a file extension }\Y\par -\B\4\D$\.{GFTOPK\_NAME}$ \5 +\B\4\D\.{GFTOPK\_NAME}\5 \.{"gftopk"}\par -\B\4\D$\.{PLTOTF\_NAME}$ \5 +\B\4\D\.{PLTOTF\_NAME}\5 \.{"pltotf"}\par -\B\4\D$\.{OVP2OVF\_NAME}$ \5 +\B\4\D\.{OVP2OVF\_NAME}\5 \.{"ovp2ovf"}\par \Y\B\4\X2:Global variables\X${}\mathrel+\E{}$\6 \&{char} ${}\\{job\_extension}[\.{EXTENSION\_LENGTH}+\T{1}];{}$\6 @@ -1820,7 +1820,7 @@ is \fi \M{51} -\Y\B\&{static} \&{void} \\{write\_job}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{write\_job}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{FILE} ${}{*}\\{out};{}$\6 \&{int} \|i${},{}$ \|j;\6 @@ -2063,9 +2063,9 @@ always be set to~\PB{\T{1}}; no job file will be created. \fi \M{53} -\Y\B\4\D$\.{PRINTER\_MIN\_RES\_X}$ \5 +\Y\B\4\D\.{PRINTER\_MIN\_RES\_X}\5 \T{50}\par -\B\4\D$\.{PRINTER\_MIN\_RES\_Y}$ \5 +\B\4\D\.{PRINTER\_MIN\_RES\_Y}\5 \T{50}\par \Y\B\4\X2:Global variables\X${}\mathrel+\E{}$\6 \&{char} ${}\\{Buffer}[\.{STRING\_LENGTH}+\T{1}]{}$;\par @@ -2080,7 +2080,7 @@ always be set to~\PB{\T{1}}; no job file will be created. If \PB{\\{config\_file}} isn't found in \mf-like mode we assume that the font isn't a HBF font at all. -\Y\B\&{static} \&{void} \\{read\_config}(\&{void})\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{read\_config}(\&{void})\2\2\6 ${}\{{}$\1\6 \&{HBF\_BBOX} ${}{*}\\{boxp};{}$\6 \&{char} ${}{*}\\{real\_config\_file};{}$\7 @@ -2374,7 +2374,7 @@ Successive calls return the byte~2 ranges in ascending order. We raise in subcode ranges. -\Y\B\4\D$\.{VALID\_SUBCODE}$ \5 +\Y\B\4\D\.{VALID\_SUBCODE}\5 \T{1}\par \Y\B\4\X2:Global variables\X${}\mathrel+\E{}$\6 \&{char} \\{b2\_codes}[\T{256}];\6 @@ -2418,8 +2418,8 @@ fills \fi \M{65} -\Y\B\&{static} \&{int} \\{fsearch}(\&{const} \&{char} ${}{*}\\{search% -\_string}){}$\1\1\2\2\6 +\Y\B\1\1\&{static} \&{int} \\{fsearch}(\&{const} \&{char} ${}{*}\\{search% +\_string})\2\2{}$\6 ${}\{{}$\1\6 \&{char} ${}{*}\|P,{}$ \|p;\6 \&{const} \&{char} ${}{*}\|Q;{}$\6 @@ -2570,8 +2570,8 @@ message. \fi \M{68} -\Y\B\&{static} \&{void} \\{config\_error}(\&{const} \&{char} ${}{*}% -\\{message}){}$\1\1\2\2\6 +\Y\B\1\1\&{static} \&{void} \\{config\_error}(\&{const} \&{char} ${}{*}% +\\{message})\2\2{}$\6 ${}\{{}$\1\6 ${}\\{fprintf}(\\{stderr},\39\.{"Couldn't\ find\ `\%s'\ }\)\.{entry\ in\ configurati}\)\.{on\ file\\n"},\39\\{message});{}$\6 @@ -2613,8 +2613,8 @@ be used instead. \fi \M{72} -\Y\B\&{static} \&{const} \&{char} ${}{*}\\{TeX\_search\_version}(\&{void}){}$\1% -\1\2\2\6 +\Y\B\1\1\&{static} \&{const} \&{char} ${}{*}\\{TeX\_search\_version}(\&{void})% +\2\2{}$\6 ${}\{{}$\6 \8\#\&{if} \&{defined} (\.{HAVE\_LIBKPATHSEA})\1\6 \&{return} \\{kpathsea\_version\_string};\6 @@ -2657,9 +2657,10 @@ We slightly modify \PB{\\{emtex\_dir\_setup}(\,)} (from the file % output a warning in case the environment variable \PB{\\{env}} isn't set properly. -\Y\B\8\#\&{ifdef} \.{HAVE\_EMTEXDIR}\6 +\Y\B\1\1\6 +\8\#\&{ifdef} \.{HAVE\_EMTEXDIR}\6 \&{static} \&{int} ${}\\{dir\_setup}(\\{ed},\39\\{env},\39\\{dir},\39% -\\{flags}){}$\1\1\6 +\\{flags}){}$\6 \&{struct} \&{emtex\_dir} ${}{*}\\{ed};{}$\6 \&{const} \&{char} ${}{*}\\{env};{}$\6 \&{const} \&{char} ${}{*}\\{dir};{}$\6 @@ -2689,8 +2690,9 @@ use\ }\)\.{current\ directory\\n"},\39\\{env}){}$;\2\7 \fi \M{77} -\Y\B\8\#\&{ifdef} \.{HAVE\_EMTEXDIR}\6 -\&{static} \&{char} ${}{*}\\{file\_find}(\\{name},\39\\{list}){}$\1\1\6 +\Y\B\1\1\6 +\8\#\&{ifdef} \.{HAVE\_EMTEXDIR}\6 +\&{static} \&{char} ${}{*}\\{file\_find}(\\{name},\39\\{list}){}$\6 \&{char} ${}{*}\\{name};{}$\6 \&{struct} \&{emtex\_dir} ${}{*}\\{list};\2\2{}$\6 ${}\{{}$\1\6 @@ -2743,33 +2745,34 @@ versions, and within \.{HBF2GFINPUTS} for new versions. \fi \M{80} -\Y\B\8\#\&{if} \&{defined} (\.{HAVE\_LIBKPATHSEA})\6 +\Y\B\1\1\6 +\8\#\&{if} \&{defined} (\.{HAVE\_LIBKPATHSEA})\6 \&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{kpse\_find\_file}${}(\\{name},\39\\{kpse\_program\_text\_format},% \39\.{TRUE});{}$\6 \4${}\}{}$\2\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{kpse\_find\_file}${}(\\{name},\39\\{kpse\_miscfonts\_format},\39% \.{TRUE});{}$\6 \4${}\}{}$\2\7 \8\#\&{elif} \&{defined} (\.{HAVE\_EMTEXDIR})\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{file\_find}${}(\\{name},\39{\AND}\\{cfg\_path});{}$\6 \4${}\}{}$\2\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{file\_find}${}(\\{name},\39{\AND}\\{hbf\_path});{}$\6 \4${}\}{}$\2\7 \8\#\&{elif} \&{defined} (\.{HAVE\_MIKTEX})\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{char} \\{result}[\.{\_MAX\_PATH}];\7 \&{if} ${}(\R\\{miktex\_find\_input\_file}(\.{"hbf2gf"},\39{*}\\{name},\39% @@ -2777,8 +2780,8 @@ ${}\{{}$\1\6 \&{return} \T{0};\2\6 \&{return} \\{strdup}(\\{result});\6 \4${}\}{}$\2\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{char} \\{result}[\.{\_MAX\_PATH}];\7 \&{if} ${}(\R\\{miktex\_find\_miscfont\_file}({*}\\{name},\39\\{result})){}$\1\5 @@ -2786,13 +2789,13 @@ ${}\{{}$\1\6 \&{return} \\{strdup}(\\{result});\6 \4${}\}{}$\2\7 \8\#\&{else}\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_cfg\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{name};\6 \4${}\}{}$\2\7 -\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% -\\{name}){}$\1\1\2\2\6 +\1\1\&{static} \&{char} ${}{*}{}$\\{TeX\_search\_hbf\_file}(\&{char} ${}{*}% +\\{name})\2\2{}$\6 ${}\{{}$\1\6 \&{return} \\{name};\6 \4${}\}{}$\2\6 diff --git a/Build/source/texk/cjkutils/sjisconv.c b/Build/source/texk/cjkutils/sjisconv.c index 3ec34eb0e80..aa94e78add5 100644 --- a/Build/source/texk/cjkutils/sjisconv.c +++ b/Build/source/texk/cjkutils/sjisconv.c @@ -1,5 +1,5 @@ #define banner \ -"sjisconv (CJK ver. 4.8.4)" \ +"sjisconv (CJK ver. 4.8.5)" \ /*2:*/ #line 96 "./cjkutils-src/SJISconv/sjisconv.w" diff --git a/Build/source/texk/cjkutils/tests/bg5conv.cjk b/Build/source/texk/cjkutils/tests/bg5conv.cjk index c500740ebae..1fba56fe2f1 100644 --- a/Build/source/texk/cjkutils/tests/bg5conv.cjk +++ b/Build/source/texk/cjkutils/tests/bg5conv.cjk @@ -1,4 +1,4 @@ -\def\CJKpreproc{bg5conv (CJK ver. 4.8.4)} +\def\CJKpreproc{bg5conv (CJK ver. 4.8.5)} 0x81 0x41:A 0xa0 0x5a:Z 0xa1 0x7b:123 diff --git a/Build/source/texk/cjkutils/tests/cef5conv.cjk b/Build/source/texk/cjkutils/tests/cef5conv.cjk index 797276c94c6..74d988cf091 100644 --- a/Build/source/texk/cjkutils/tests/cef5conv.cjk +++ b/Build/source/texk/cjkutils/tests/cef5conv.cjk @@ -1,4 +1,4 @@ -\def\CNSpreproc{cef5conv (CJK ver. 4.8.4)} +\def\CNSpreproc{cef5conv (CJK ver. 4.8.5)} 0x81 0x41:A 0xa0 0x5a:Z 0xa1 0x7b:123 diff --git a/Build/source/texk/cjkutils/tests/cefconv.cjk b/Build/source/texk/cjkutils/tests/cefconv.cjk index 16ebebc11bf..ca60f19637a 100644 --- a/Build/source/texk/cjkutils/tests/cefconv.cjk +++ b/Build/source/texk/cjkutils/tests/cefconv.cjk @@ -1,4 +1,4 @@ -\def\CNSpreproc{cefconv (CJK ver. 4.8.4)} +\def\CNSpreproc{cefconv (CJK ver. 4.8.5)} AC0-0f0f; 72Bg5"00F"00F AC1-0F0F; 72CNS1"00F"00F AC7-f0f0; 72CNS7"0F0"0F0 diff --git a/Build/source/texk/cjkutils/tests/cefsconv.cjk b/Build/source/texk/cjkutils/tests/cefsconv.cjk index f6b2deb8c9c..93ec324daa7 100644 --- a/Build/source/texk/cjkutils/tests/cefsconv.cjk +++ b/Build/source/texk/cjkutils/tests/cefsconv.cjk @@ -1,4 +1,4 @@ -\def\CNSpreproc{cefsconv (CJK ver. 4.8.4)} +\def\CNSpreproc{cefsconv (CJK ver. 4.8.5)} 0x81 0x7b:123 0x9f 0x5c:92 0xe0 0x7d:125 diff --git a/Build/source/texk/cjkutils/tests/extconv.cjk b/Build/source/texk/cjkutils/tests/extconv.cjk index 4b5c92a6b2d..2401acb1b56 100644 --- a/Build/source/texk/cjkutils/tests/extconv.cjk +++ b/Build/source/texk/cjkutils/tests/extconv.cjk @@ -1,4 +1,4 @@ -\def\CJKpreproc{extconv (CJK ver. 4.8.4)} +\def\CJKpreproc{extconv (CJK ver. 4.8.5)} 0x81 0x7b:123 0xfe 0x5c:92 0xc3 0x7d:125 diff --git a/Build/source/texk/cjkutils/tests/sjisconv.cjk b/Build/source/texk/cjkutils/tests/sjisconv.cjk index 4fad18fa2d5..fdac0bafc0e 100644 --- a/Build/source/texk/cjkutils/tests/sjisconv.cjk +++ b/Build/source/texk/cjkutils/tests/sjisconv.cjk @@ -1,4 +1,4 @@ -\def\CJKpreproc{sjisconv (CJK ver. 4.8.4)} +\def\CJKpreproc{sjisconv (CJK ver. 4.8.5)} 0x81 0x7b:123 0x9f 0x5c:92 0xe0 0x7d:125 diff --git a/Build/source/texk/cjkutils/version.ac b/Build/source/texk/cjkutils/version.ac index e698a5d180a..808bd23f8a3 100644 --- a/Build/source/texk/cjkutils/version.ac +++ b/Build/source/texk/cjkutils/version.ac @@ -1,5 +1,6 @@ dnl -dnl Copyright (C) 2012-2015 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright 2016-2021 Karl Berry <tex-live@tug.org> +dnl Copyright 2012-2015 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +9,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current cjk version -m4_define([cjk_version], [4.8.4]) +m4_define([cjk_version], [4.8.5]) |