diff options
| author | Karl Berry <karl@freefriends.org> | 2021-10-21 21:53:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-10-21 21:53:45 +0000 |
| commit | b02107eda020fcf744cd893cb8157ff030e8b73b (patch) | |
| tree | 0d19dcb76c6a749c193169f4533c4b2a63debf71 /Master/texmf-dist/source | |
| parent | 112eb735b477217c2d39ccb9b81191bbdc28f026 (diff) | |
cjk 4.8.5
git-svn-id: svn://tug.org/texlive/trunk@60829 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
42 files changed, 867 insertions, 360 deletions
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada index 378fea87756..8f37b5bc9e7 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada @@ -1,4 +1,4 @@ -# 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/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl index 620bd7196db..af2477c306f 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# 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 # This script fixes the Wadalab fonts which have been created with the -# `makefont' script version 1.0 (from CJK 4.8.4), or which have been updated +# `makefont' script version 1.0 (from CJK 4.8.5), or which have been updated # with the `fixwada' script. # # . Make all glyph names compliant to the Adobe Glyph List (AGL) to diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont index bb1880939bc..98b20cd541a 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont @@ -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/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl index 95be460e229..826ea3d3cba 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# 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/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd index ac1ba4bbf3b..cd99102f694 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.4 (18-Apr-2015) +% Version 4.8.5 (16-Oct-2021) -\def\fileversion{4.8.4} -\def\filedate{2015/04/18} +\def\fileversion{4.8.5} +\def\filedate{2021/10/16} \ProvidesFile{c63mj.fd}[\filedate\space\fileversion] % Korean characters (Hangul) diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd index 6d2abe0dcdc..1673eaa14b8 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.4 (18-Apr-2015) +% Version 4.8.5 (16-Oct-2021) -\def\fileversion{4.8.4} -\def\filedate{2015/04/18} +\def\fileversion{4.8.5} +\def\filedate{2021/10/16} \ProvidesFile{c64mj.fd}[\filedate\space\fileversion] % Korean characters (Symbols) diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd index e0214d2167b..6e998adf3f5 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.4 (18-Apr-2015) +% Version 4.8.5 (16-Oct-2021) -\def\fileversion{4.8.4} -\def\filedate{2015/04/18} +\def\fileversion{4.8.5} +\def\filedate{2021/10/16} \ProvidesFile{c65mj.fd}[\filedate\space\fileversion] % Korean characters (Hanja) diff --git a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w index 13165032d66..fdce159e14c 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd index fb34abe3eaa..141a05d3be5 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w index 575ba253aea..59942012ab4 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd index b48c39d4f7c..92f9dca6c68 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w index 142a5d862be..93fe237f242 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd index cb66c840cba..3e2b884c311 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w index 7e033f34ea4..5f8d7870caa 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd index 96dfbfd0bab..e22a8073c73 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w index c1044cf36d9..c3e72454e46 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd index 26857cb52a8..1126d44347a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd index ff493a5ab32..89b77d1f101 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w b/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w index 019976889b9..fe1b1ff0064 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd index 397a889d78a..9e95a9ada89 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu index 1248c4f508a..7dd88f3b228 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in index 937d5d6f818..bf6022f818b 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h index 0bdbc5f782e..96e9b06279a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h +++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h @@ -1,12 +1,12 @@ /* * c-auto.h * - * This file is part of the CJK package ver 4.8.4 18-Apr-2015 + * This file is part 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm index 4ec03d0bf20..9b43c091001 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm +++ b/Master/texmf-dist/source/latex/cjk/utils/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/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el index 89b072111f7..4903f300de1 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el @@ -1,7 +1,7 @@ ;;; cjkspace.el --- provide a tilde character if you type a space. ;;; use this file with AUCTeX. -;; 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 @@ ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ;; MA 02110-1301 USA -;; 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) ;; Insert tilde characters instead of spaces for LaTeX CJK documents. ;; If `CJK-space-after-space' is non-nil, typing a space yields a space. diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el index 1d075fc688c..2d961ddd12f 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el @@ -1,6 +1,6 @@ ;;; cjktilde.el -- minor mode exchanging `~' and ` ' keys. -;; 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 -;; 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) ;; Function `cjk-tilde-mode' activates a minor mode (`cjk-tilde-minor-mode') ;; which exchanges the tilde key with the space key. This is useful for diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el index da2052eb56a..93add2d75bf 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el @@ -23,7 +23,7 @@ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;; -;; CJK Version 4.8.4 (18-Apr-2015) +;; CJK Version 4.8.5 (16-Oct-2021) ;; ;;; Code @@ -444,6 +444,7 @@ (korean-ksc5601 . KS) (chinese-big5-1 . Bg5) (chinese-big5-2 . Bg5) + (big5 . Bg5) (chinese-cns11643-1 . CNS1) (chinese-cns11643-2 . CNS2) (chinese-cns11643-3 . CNS3) @@ -505,6 +506,7 @@ (chinese-gb2312 . ("\17767\177\177" . "\177%c\177%d\177")) (chinese-big5-1 . ("\17768\177\177" . "\177%c\177%d\177")) (chinese-big5-2 . ("\17768\177\177" . "\177%c\177%d\177")) + (big5 . ("\17768\177\177" . "\177%c\177%d\177")) (korean-ksc5601 . ("\17769\177\177" . "\177%c\177%d\177")) ;; Cdr part is a formatter string FORMAT. Each character is @@ -629,7 +631,8 @@ ch ch1 ch2 format-spec (skipped-whitespace nil) - (last-pos 0)) + (last-pos 0) + (unsupported-charset-warned nil)) ;; Now we go to beginning of TEMP-BUF and start the loop. (goto-char (point-min)) (setq prev-charset 'ascii) @@ -653,6 +656,13 @@ (if (eq charset 'tis620-2533) (setq charset (char-charset ch '(thai-tis620 ascii)))) + ;; emacs 25+: Language-detection heuristics changed. + ;; `big5' is preferred over `chinese-big5-1' and `chinese-big5-1'. + ;; If not overridden, can also swallow LaTeX (ascii) instructions + ;; afterwards. + (if (eq charset 'big5) + (setq charset (char-charset ch '(ascii big5)))) + ;; Check whether we have Unicode based input. (if (eq charset 'unicode) (let ((l (split-char ch))) @@ -685,8 +695,9 @@ ;; CH1 -- first character code ;; CH2 -- second character code (of two-byte characters) ;; if any - (if (or (eq charset 'chinese-big5-1) - (eq charset 'chinese-big5-2)) + (if (or (eq charset 'big5) + (or (eq charset 'chinese-big5-1) + (eq charset 'chinese-big5-2))) ;; Emacs uses two special character sets for Big5 ;; characters. We must decode the current character to ;; get the real Big5 character code. @@ -712,8 +723,14 @@ ;; FORMAT-SPEC tells how to encode this character. (setq format-spec (cdr (assq charset cjk-format-spec-table))) (if (null format-spec) - ;; Unsupported character set. Do nothing. - nil + ;; Unsupported character set. + (when (not unsupported-charset-warned) + (let ((coding-system-for-write (terminal-coding-system))) + (message "WARNING: Detected unsupported character set %s" + charset) + (message "Consider using \`coding:\' or setting LANG.")) + ;; Suppress further warning in the same lang block. + (setq unsupported-charset-warned t)) ;; Ok, it is supported. If this character set is a CJK ;; character set (i.e., it is in CJK-ENC-TABLE), we need a ;; special header at the beginning of the output file. @@ -765,6 +782,9 @@ (re-search-forward "\\ct+" nil t) (setq end (point-marker)) (goto-char start) + ;; THAI-BREAK-WORDS is in `thai-word.el', + ;; shipped with emacs 22+ onwards. + ;; loads from cjk for emacs 21 or below. (thai-break-words "|" end) ;; Extract this run. (setq str (buffer-substring start end) @@ -879,8 +899,9 @@ (if (> (- (point) last-pos) 1000) (progn (setq last-pos (point)) - (message "Converting: %2d%%" - (/ (* 100 (point)) (point-max))))) + (let ((coding-system-for-write (terminal-coding-system))) + (message "Converting: %2d%%" + (/ (* 100 (point)) (point-max)))))) ;; Advance to the next character and loop. (forward-char 1)) diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el index d93d53e5ca4..9f2371bba5a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el @@ -22,7 +22,7 @@ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;; -;; CJK Version 4.8.4 (18-Apr-2015) +;; CJK Version 4.8.5 (16-Oct-2021) ;; ;;; Code diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile new file mode 100644 index 00000000000..de8c7c41de0 --- /dev/null +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/GNUmakefile @@ -0,0 +1,75 @@ +# Makefile to create hyphenation patterns for pinyin with tone marks and +# pinyin without tone marks. + +BASH = bash +CC = cc +DATE = date +GIT = git +ICONV = iconv -f latin1 -t utf8 +RM = rm -f +SED = sed # should be GNU sed + +GIT_VERSION = $(shell $(GIT) log --format=%H -1 HEAD --) +LEFTHYPHENMIN = $(strip $(shell $(SED) 's/^\(..\).*/\1/;q' < pinyin.tr)) +RIGHTHYPHENMIN = $(strip $(shell $(SED) 's/^..\(..\).*/\1/;q' < pinyin.tr)) +TODAY = $(shell $(DATE) '+%Y-%m-%d') + + +all: hyph-zh-latn-pinyin.tex \ + hyph-zh-latn-tonepinyin.tex + +pinyin: pinyin.c + $(CC) -o $@ $< + +pinyin.dic: pinyin + ./$< > $@ + +pattern.rules pinyin.pat: make-patterns.sh \ + pinyin.dic \ + pinyin.tr + $(BASH) make-patterns.sh pinyin.dic pinyin.tr \ + && $(ICONV) < pattern.2 > pinyin.pat + +tonepinyin.pat: pinyin.pat + LANG=en_US.UTF-8 \ + $(SED) -e 's/\(.*\)a\(.*\)/\1a\2 \1ā\2 \1á\2 \1ǎ\2 \1à\2/' \ + -e 's/\(.*\)e\(.*\)/\1e\2 \1ē\2 \1é\2 \1ě\2 \1è\2/' \ + -e 's/\(.*\)i\(.*\)/\1i\2 \1ī\2 \1í\2 \1ǐ\2 \1ì\2/' \ + -e 's/\(.*\)o\(.*\)/\1o\2 \1ō\2 \1ó\2 \1ǒ\2 \1ò\2/' \ + -e 's/\(.*\)u\(.*\)/\1u\2 \1ū\2 \1ú\2 \1ǔ\2 \1ù\2/' \ + -e 's/\(.*\)ü\(.*\)/\1ü\2 \1ǖ\2 \1ǘ\2 \1ǚ\2 \1ǜ\2/' \ + < $< > $@ + +hyph-zh-latn-pinyin.tex: hyph-zh-latn-pinyin.in \ + pattern.rules \ + pinyin.pat + $(SED) -e 's/@WITH@/without/' \ + -e 's/@DATE@/$(TODAY)/' \ + -e 's/@GIT_VERSION@/$(GIT_VERSION)/' \ + -e 's/@LEFTHYPHENMIN@/$(LEFTHYPHENMIN)/' \ + -e 's/@RIGHTHYPHENMIN@/$(RIGHTHYPHENMIN)/' \ + -e '/used patgen parameters/ r pattern.rules' \ + -e '/\\patterns/ r pinyin.pat' \ + < $< > $@ + +hyph-zh-latn-tonepinyin.tex: hyph-zh-latn-pinyin.in \ + pattern.rules \ + tonepinyin.pat + $(SED) -e 's/@WITH@/with/' \ + -e 's/@DATE@/$(TODAY)/' \ + -e 's/@GIT_VERSION@/$(GIT_VERSION)/' \ + -e 's/@LEFTHYPHENMIN@/$(LEFTHYPHENMIN)/' \ + -e 's/@RIGHTHYPHENMIN@/$(RIGHTHYPHENMIN)/' \ + -e '/used patgen parameters/ r pattern.rules' \ + -e '/\\patterns/ r tonepinyin.pat' \ + < $< > $@ + +clean: + $(RM) pinyin pinyin.dic pinyin.pat tonepinyin.pat + $(RM) pattern.* + $(RM) pattmp.* + +# Local Variables: +# mode: makefile +# coding: utf-8 +# End: diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in new file mode 100644 index 00000000000..f905d3000c3 --- /dev/null +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.in @@ -0,0 +1,66 @@ +% title: Hyphenation patterns for Chinese pinyin (Mandarin), @WITH@ tone +% markers +% +% version: @DATE@ +% +% authors: +% - +% name: Werner Lemberg +% contact: wl (at) gnu.org +% +% copyright: Copyright (C) 1994-2018 Werner Lemberg +% +% licence: +% name: MIT +% url: http://opensource.org/licenses/mit-license.php +% text: > +% Permission is hereby granted, free of charge, to any person +% obtaining a copy of this software and associated documentation +% files (the “Software”), to deal in the Software without +% restriction, including without limitation the rights to use, +% copy, modify, merge, publish, distribute, sublicense, and/or +% sell copies of the Software, and to permit persons to whom the +% Software is furnished to do so, subject to the following +% conditions: +% +% The above copyright notice and this permission notice shall be +% included in all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +% OTHER DEALINGS IN THE SOFTWARE. +% +% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=@GIT_VERSION@ +% +% language: +% name: Mandarin Chinese, pinyin transliteration (@WITH@ tone markers) +% tag: zh-latn-pinyin +% +% hyphenmins: +% generation: +% left: @LEFTHYPHENMIN@ +% right: @RIGHTHYPHENMIN@ +% typesetting: +% left: @LEFTHYPHENMIN@ +% right: @RIGHTHYPHENMIN@ + +\message{Pinyin Hyphenation Patterns (@WITH@ tone markers) @DATE@ (WL)} + +% +% The used patgen parameters are +% + +\patterns{ +} + +\endinput + +%%% Local Variables: +%%% mode: tex +%%% coding: utf-8 +%%% End: diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex new file mode 100644 index 00000000000..71808598862 --- /dev/null +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-pinyin.tex @@ -0,0 +1,253 @@ +% title: Hyphenation patterns for Chinese pinyin (Mandarin), without tone +% markers +% +% version: 2018-11-25 +% +% authors: +% - +% name: Werner Lemberg +% contact: wl (at) gnu.org +% +% copyright: Copyright (C) 1994-2018 Werner Lemberg +% +% licence: +% name: MIT +% url: http://opensource.org/licenses/mit-license.php +% text: > +% Permission is hereby granted, free of charge, to any person +% obtaining a copy of this software and associated documentation +% files (the “Software”), to deal in the Software without +% restriction, including without limitation the rights to use, +% copy, modify, merge, publish, distribute, sublicense, and/or +% sell copies of the Software, and to permit persons to whom the +% Software is furnished to do so, subject to the following +% conditions: +% +% The above copyright notice and this permission notice shall be +% included in all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +% OTHER DEALINGS IN THE SOFTWARE. +% +% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33828f593b094c8b57f6a72e +% +% language: +% name: Mandarin Chinese, pinyin transliteration (without tone markers) +% tag: zh-latn-pinyin +% +% hyphenmins: +% generation: +% left: 1 +% right: 2 +% typesetting: +% left: 1 +% right: 2 + +\message{Pinyin Hyphenation Patterns (without tone markers) 2018-11-25 (WL)} + +% +% The used patgen parameters are +% +% 1 1 | 2 5 | 1 1 1 +% 2 2 | 2 5 | 1 2 1 +% + +\patterns{ +a1b +a1c +a1d +a1f +a1g +a1h +a1j +a1k +a1l +a1m +a1p +a1q +a1r +a1s +a1t +a1w +a1x +a1y +a1z +e1b +e1c +e1d +e1f +e1g +e1h +e1j +e1k +e1l +e1m +e1p +e1q +e1r +e1s +e1t +e1w +e1x +e1y +e1z +1ga +g1b +g1c +g1d +1ge +g1f +g1g +g1h +g1j +g1k +g1l +g1m +g1n +1go +g1p +g1q +g1r +g1s +g1t +1gu +g1w +g1x +g1y +g1z +i1b +i1c +i1d +i1f +i1g +i1h +i1j +i1k +i1l +i1m +i1p +i1q +i1r +i1s +i1t +i1w +i1x +i1y +i1z +1na +n1b +n1c +n1d +1ne +n1f +n1h +1ni +n1j +n1k +n1l +n1m +n1n +1no +n1p +n1q +n1r +n1s +n1t +1nu +1nü +n1w +n1x +n1y +n1z +o1b +o1c +o1d +o1f +o1g +o1h +o1j +o1k +o1l +o1m +o1p +o1q +o1r +o1s +o1t +o1w +o1x +o1y +o1z +2r1b +2r1c +2r1d +2r1f +2r1g +2r1h +2r1j +2r1k +2r1l +2r1m +2r1n +2r1p +2r1q +2r1r +2r1s +2r1t +2r1w +2r1x +2r1y +2r1z +u1b +u1c +u1d +u1f +u1g +u1h +u1j +u1k +u1l +u1m +u1p +u1q +u1r +u1s +u1t +u1w +u1x +u1y +u1z +ü1b +ü1c +ü1d +ü1f +ü1g +ü1h +ü1j +ü1k +ü1l +ü1m +ü1n +ü1p +ü1q +ü1r +ü1s +ü1t +ü1w +ü1x +ü1y +ü1z +} + +\endinput + +%%% Local Variables: +%%% mode: tex +%%% coding: utf-8 +%%% End: diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex new file mode 100644 index 00000000000..2e927ca70f2 --- /dev/null +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex @@ -0,0 +1,253 @@ +% title: Hyphenation patterns for Chinese pinyin (Mandarin), with tone +% markers +% +% version: 2018-11-25 +% +% authors: +% - +% name: Werner Lemberg +% contact: wl (at) gnu.org +% +% copyright: Copyright (C) 1994-2018 Werner Lemberg +% +% licence: +% name: MIT +% url: http://opensource.org/licenses/mit-license.php +% text: > +% Permission is hereby granted, free of charge, to any person +% obtaining a copy of this software and associated documentation +% files (the “Software”), to deal in the Software without +% restriction, including without limitation the rights to use, +% copy, modify, merge, publish, distribute, sublicense, and/or +% sell copies of the Software, and to permit persons to whom the +% Software is furnished to do so, subject to the following +% conditions: +% +% The above copyright notice and this permission notice shall be +% included in all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +% OTHER DEALINGS IN THE SOFTWARE. +% +% source: http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=commit;h=e058ceae5561a89e33828f593b094c8b57f6a72e +% +% language: +% name: Mandarin Chinese, pinyin transliteration (with tone markers) +% tag: zh-latn-pinyin +% +% hyphenmins: +% generation: +% left: 1 +% right: 2 +% typesetting: +% left: 1 +% right: 2 + +\message{Pinyin Hyphenation Patterns (with tone markers) 2018-11-25 (WL)} + +% +% The used patgen parameters are +% +% 1 1 | 2 5 | 1 1 1 +% 2 2 | 2 5 | 1 2 1 +% + +\patterns{ +a1b ā1b á1b ǎ1b à1b +a1c ā1c á1c ǎ1c à1c +a1d ā1d á1d ǎ1d à1d +a1f ā1f á1f ǎ1f à1f +a1g ā1g á1g ǎ1g à1g +a1h ā1h á1h ǎ1h à1h +a1j ā1j á1j ǎ1j à1j +a1k ā1k á1k ǎ1k à1k +a1l ā1l á1l ǎ1l à1l +a1m ā1m á1m ǎ1m à1m +a1p ā1p á1p ǎ1p à1p +a1q ā1q á1q ǎ1q à1q +a1r ā1r á1r ǎ1r à1r +a1s ā1s á1s ǎ1s à1s +a1t ā1t á1t ǎ1t à1t +a1w ā1w á1w ǎ1w à1w +a1x ā1x á1x ǎ1x à1x +a1y ā1y á1y ǎ1y à1y +a1z ā1z á1z ǎ1z à1z +e1b ē1b é1b ě1b è1b +e1c ē1c é1c ě1c è1c +e1d ē1d é1d ě1d è1d +e1f ē1f é1f ě1f è1f +e1g ē1g é1g ě1g è1g +e1h ē1h é1h ě1h è1h +e1j ē1j é1j ě1j è1j +e1k ē1k é1k ě1k è1k +e1l ē1l é1l ě1l è1l +e1m ē1m é1m ě1m è1m +e1p ē1p é1p ě1p è1p +e1q ē1q é1q ě1q è1q +e1r ē1r é1r ě1r è1r +e1s ē1s é1s ě1s è1s +e1t ē1t é1t ě1t è1t +e1w ē1w é1w ě1w è1w +e1x ē1x é1x ě1x è1x +e1y ē1y é1y ě1y è1y +e1z ē1z é1z ě1z è1z +1ga 1gā 1gá 1gǎ 1gà +g1b +g1c +g1d +1ge 1gē 1gé 1gě 1gè +g1f +g1g +g1h +g1j +g1k +g1l +g1m +g1n +1go 1gō 1gó 1gǒ 1gò +g1p +g1q +g1r +g1s +g1t +1gu 1gū 1gú 1gǔ 1gù +g1w +g1x +g1y +g1z +i1b ī1b í1b ǐ1b ì1b +i1c ī1c í1c ǐ1c ì1c +i1d ī1d í1d ǐ1d ì1d +i1f ī1f í1f ǐ1f ì1f +i1g ī1g í1g ǐ1g ì1g +i1h ī1h í1h ǐ1h ì1h +i1j ī1j í1j ǐ1j ì1j +i1k ī1k í1k ǐ1k ì1k +i1l ī1l í1l ǐ1l ì1l +i1m ī1m í1m ǐ1m ì1m +i1p ī1p í1p ǐ1p ì1p +i1q ī1q í1q ǐ1q ì1q +i1r ī1r í1r ǐ1r ì1r +i1s ī1s í1s ǐ1s ì1s +i1t ī1t í1t ǐ1t ì1t +i1w ī1w í1w ǐ1w ì1w +i1x ī1x í1x ǐ1x ì1x +i1y ī1y í1y ǐ1y ì1y +i1z ī1z í1z ǐ1z ì1z +1na 1nā 1ná 1nǎ 1nà +n1b +n1c +n1d +1ne 1nē 1né 1ně 1nè +n1f +n1h +1ni 1nī 1ní 1nǐ 1nì +n1j +n1k +n1l +n1m +n1n +1no 1nō 1nó 1nǒ 1nò +n1p +n1q +n1r +n1s +n1t +1nu 1nū 1nú 1nǔ 1nù +1nü 1nǖ 1nǘ 1nǚ 1nǜ +n1w +n1x +n1y +n1z +o1b ō1b ó1b ǒ1b ò1b +o1c ō1c ó1c ǒ1c ò1c +o1d ō1d ó1d ǒ1d ò1d +o1f ō1f ó1f ǒ1f ò1f +o1g ō1g ó1g ǒ1g ò1g +o1h ō1h ó1h ǒ1h ò1h +o1j ō1j ó1j ǒ1j ò1j +o1k ō1k ó1k ǒ1k ò1k +o1l ō1l ó1l ǒ1l ò1l +o1m ō1m ó1m ǒ1m ò1m +o1p ō1p ó1p ǒ1p ò1p +o1q ō1q ó1q ǒ1q ò1q +o1r ō1r ó1r ǒ1r ò1r +o1s ō1s ó1s ǒ1s ò1s +o1t ō1t ó1t ǒ1t ò1t +o1w ō1w ó1w ǒ1w ò1w +o1x ō1x ó1x ǒ1x ò1x +o1y ō1y ó1y ǒ1y ò1y +o1z ō1z ó1z ǒ1z ò1z +2r1b +2r1c +2r1d +2r1f +2r1g +2r1h +2r1j +2r1k +2r1l +2r1m +2r1n +2r1p +2r1q +2r1r +2r1s +2r1t +2r1w +2r1x +2r1y +2r1z +u1b ū1b ú1b ǔ1b ù1b +u1c ū1c ú1c ǔ1c ù1c +u1d ū1d ú1d ǔ1d ù1d +u1f ū1f ú1f ǔ1f ù1f +u1g ū1g ú1g ǔ1g ù1g +u1h ū1h ú1h ǔ1h ù1h +u1j ū1j ú1j ǔ1j ù1j +u1k ū1k ú1k ǔ1k ù1k +u1l ū1l ú1l ǔ1l ù1l +u1m ū1m ú1m ǔ1m ù1m +u1p ū1p ú1p ǔ1p ù1p +u1q ū1q ú1q ǔ1q ù1q +u1r ū1r ú1r ǔ1r ù1r +u1s ū1s ú1s ǔ1s ù1s +u1t ū1t ú1t ǔ1t ù1t +u1w ū1w ú1w ǔ1w ù1w +u1x ū1x ú1x ǔ1x ù1x +u1y ū1y ú1y ǔ1y ù1y +u1z ū1z ú1z ǔ1z ù1z +ü1b ǖ1b ǘ1b ǚ1b ǜ1b +ü1c ǖ1c ǘ1c ǚ1c ǜ1c +ü1d ǖ1d ǘ1d ǚ1d ǜ1d +ü1f ǖ1f ǘ1f ǚ1f ǜ1f +ü1g ǖ1g ǘ1g ǚ1g ǜ1g +ü1h ǖ1h ǘ1h ǚ1h ǜ1h +ü1j ǖ1j ǘ1j ǚ1j ǜ1j +ü1k ǖ1k ǘ1k ǚ1k ǜ1k +ü1l ǖ1l ǘ1l ǚ1l ǜ1l +ü1m ǖ1m ǘ1m ǚ1m ǜ1m +ü1n ǖ1n ǘ1n ǚ1n ǜ1n +ü1p ǖ1p ǘ1p ǚ1p ǜ1p +ü1q ǖ1q ǘ1q ǚ1q ǜ1q +ü1r ǖ1r ǘ1r ǚ1r ǜ1r +ü1s ǖ1s ǘ1s ǚ1s ǜ1s +ü1t ǖ1t ǘ1t ǚ1t ǜ1t +ü1w ǖ1w ǘ1w ǚ1w ǜ1w +ü1x ǖ1x ǘ1x ǚ1x ǜ1x +ü1y ǖ1y ǘ1y ǚ1y ǜ1y +ü1z ǖ1z ǘ1z ǚ1z ǜ1z +} + +\endinput + +%%% Local Variables: +%%% mode: tex +%%% coding: utf-8 +%%% End: diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh new file mode 100644 index 00000000000..d4b6591732e --- /dev/null +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/make-patterns.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# -*- coding: utf-8 -*- + +# +# This script generates patterns for pinyin. +# +# Usage: +# +# sh make-patterns.sh pinyin.dic pinyin.tr +# +# +# Input: pinyin.dic List of all two-syllable combinations of pinyin +# syllables (which don't need an apostrophe), with +# hyphens inbetween. +# pinyin.tr Translation file for patgen. +# +# Output: pattmp.[1-2] patgen results. +# pattern.[0-2] patterns -- pattern.2 is the final pattern file. +# pattern.[0-2].log Log files. +# pattern.rules A compact description of the used patgen +# parameters. +# + + +# patgen parameters for levels one and two. + +hyph_start_finish[1]='1 1' +hyph_start_finish[2]='2 2' + +pat_start_finish[1]='2 5' +pat_start_finish[2]='2 5' + +good_bad_thres[1]='1 1 1' +good_bad_thres[2]='1 2 1' + + +# Create empty start patterns. +rm -f pattern.0 +touch pattern.0 + +printf "%%\n" > pattern.rules + +for i in 1 2; do + + # Create patterns for current level. Control instructions for patgen are + # sent using a pipe. + printf "%s\n%s\n%s\n%s" "${hyph_start_finish[$i]}" \ + "${pat_start_finish[$i]}" \ + "${good_bad_thres[$i]}" \ + "y" \ + | patgen $1 pattern.$(($i-1)) pattern.$i $2 \ + | tee pattern.$i.log + + # Collect the used patgen parameters. + printf "%% %s | %s | %s\n" "${hyph_start_finish[$i]}" \ + "${pat_start_finish[$i]}" \ + "${good_bad_thres[$i]}" \ + >> pattern.rules + +done + +# eof diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c index a728991c73c..f7648db6997 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c @@ -1,7 +1,7 @@ /* - This is the file pinyin.c of the CJK macro package ver. 4.8.4 - (18-Apr-2015). + This is the file pinyin.c of the CJK macro package ver. 4.8.5 + (16-Oct-2021). Use this file to generate a hyphenation input file for patgen. @@ -12,7 +12,7 @@ */ /* - 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 @@ -34,15 +34,36 @@ /* A list of all Chinese syllables. We use latin-1 encoding for the - `umlaut u' character. */ + `umlaut u' character. + + In the array below, syllables starting with `a', `e', or `u' are marked + with a leading exclamation mark, which we filter out later on to ensure + that those syllables are omitted on the right side. If written without a + line break, an apostrophe must be inserted before such syllables, e.g., + + Tien'anmen + + However, if there is a line break, the apostrophe disappears: + + Tien- + anmen + + This situation can't be handled by patgen; instead, a solution to this + problem can be provided by TeX with + + \discretionary{-}{}{'} + + The babel support file (`pinyin.ldf') provides "' as a shorthand for this + situation. + */ char *py[] = { - "a", - "ai", - "an", - "ang", - "ao", + "!a", + "!ai", + "!an", + "!ang", + "!ao", "ba", "bai", "ban", @@ -114,11 +135,11 @@ char *py[] = "dui", "dun", "duo", - "e", - "ei", - "en", - "eng", - "er", + "!e", + "!ei", + "!en", + "!eng", + "!er", "fa", "fan", "fang", @@ -268,8 +289,8 @@ char *py[] = "nuo", "n", "ne", - "o", - "ou", + "!o", + "!ou", "pa", "pai", "pan", @@ -450,31 +471,24 @@ char *py[] = int main(void) { - int i, j, off; + size_t i, j; size_t size = sizeof (py) / sizeof (char*); - char s[20]; /* Now we loop through all possible syllable combinations. */ for (i = 0; i < size; i++) + { for (j = 0; j < size; j++) { - /* The seldom used `%n' construct yields the number of processed - characters so far. */ - - sprintf(s, "%s%n%s", py[i], &off, py[j]); - - /* We check the first character of the second syllable. If it is - a vowel, a quote will be inserted. Example: Tian'anmen. */ - - if (s[off] == 'a' || s[off] == 'e' || s[off] == 'o') - printf("%s'-%s\n", py[i], py[j]); - - /* No special case. */ + if (py[j][0] == '!') + continue; + if (py[i][0] == '!') + printf("%s-%s\n", py[i] + 1, py[j]); else printf("%s-%s\n", py[i], py[j]); } + } return 0; } diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr index 8002b91033a..b6007eb3f29 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr @@ -1,13 +1,13 @@ - 1 1 + 1 2 %% This is the file pinyin.tr of the CJK package %% defining the letters used for generating pinyin hyphenation patterns %% with patgen. -% +%% %% created by Werner Lemberg <wl@gnu.org> %% -%% Version 4.8.4 (18-Apr-2015) +%% 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 @@ -49,4 +49,3 @@ x X y Y z Z - ' diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex deleted file mode 100644 index f118f420012..00000000000 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex +++ /dev/null @@ -1,236 +0,0 @@ -% This is the file pyhyph.tex of the CJK package -% for hyphenating Chinese pinyin syllables. -% -% We use the latin-1 character code for `umlaut u' (0xfc). Additionally, -% the quote character "'" is used in its standard sense (resolving syllabic -% ambiguities). -% -% created by Werner Lemberg <wl@gnu.org> -% -% Version 4.8.4 (18-Apr-2015) - -% Copyright (C) 1994-2015 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 -% the Free Software Foundation; either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program in doc/COPYING; if not, write to the Free -% Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -% MA 02110-1301 USA - -\message{Hyphenation patterns for unaccented pinyin syllables (CJK 4.8.4)} - -\begingroup - -\catcode"0FC = 11 % umlaut u -\catcode"027 = 11 % quote (') -\lccode"0FC = "0FC -\lccode"027 = "027 - -\patterns{ -a1b -a1c -a1d -a1f -a1g -a1h -a1j -a1k -a1l -a1m -a1p -a1q -a1r -a1s -a1t -a1w -a1x -a1y -a1z -e1b -e1c -e1d -e1f -e1g -e1h -e1j -e1k -e1l -e1m -e1p -e1q -e1s -e1t -e1w -e1x -e1y -e1z -1ga -g1b -g1c -g1d -1ge -g1f -g1g -g1h -g1j -g1k -g1l -g1m -g1n -1go -g1p -g1q -g1r -g1s -g1t -1gu -g1w -g1x -g1y -g1z -i1b -i1c -i1d -i1f -i1g -i1h -i1j -i1k -i1l -i1m -i1p -i1q -i1r -i1s -i1t -i1w -i1x -i1y -i1z -1na -n1b -n1c -n1d -1ne -n1f -n1h -1ni -n1j -n1k -n1l -n1m -n1n -1no -n1p -n1q -n1r -n1s -n1t -1nu -1n^^fc -n1w -n1x -n1y -n1z -o1b -o1c -o1d -o1f -o1g -o1h -o1j -o1k -o1l -o1m -o1p -o1q -o1r -o1s -o1t -o1w -o1x -o1y -o1z -1ra -r1b -r1c -r1d -1re -r1f -r1g -r1h -1ri -r1j -r1k -r1l -r1m -r1n -1ro -r1p -r1q -r1r -r1s -r1t -1ru -r1w -r1x -r1y -r1z -u1b -u1c -u1d -u1f -u1g -u1h -u1j -u1k -u1l -u1m -u1p -u1q -u1r -u1s -u1t -u1w -u1x -u1y -u1z -^^fc1b -^^fc1c -^^fc1d -^^fc1f -^^fc1g -^^fc1h -^^fc1j -^^fc1k -^^fc1l -^^fc1m -^^fc1n -^^fc1p -^^fc1q -^^fc1r -^^fc1s -^^fc1t -^^fc1w -^^fc1x -^^fc1y -^^fc1z -'1a -'1e -'1o -} -\endgroup - -\lefthyphenmin 1 -\righthyphenmin 1 - -\endinput diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl index ab345b00cbe..74a7964a426 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl @@ -13,7 +13,7 @@ # # perl clonevf.pl bsmiuv bsmilpv -# 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/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl index 22ca69446a5..d0b0ffea026 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl @@ -28,7 +28,7 @@ # # perl hlatex2agl.pl wmj umj UKS-HLaTeX.sfd -# 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/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl index bed1c4b8574..5363e5b63d5 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl @@ -39,7 +39,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 @@ -110,10 +110,10 @@ my $oldfh = select(FDX); print("% This is the file $fdxfile of the CJK package % for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e % -% created by the script makefdx.pl for CJK Version 4.8.4 (18-Apr-2015). +% created by the script makefdx.pl for CJK Version 4.8.5 (16-Oct-2021). -\\def\\fileversion{4.8.4} -\\def\\filedate{2015/04/18} +\\def\\fileversion{4.8.5} +\\def\\filedate{2021/10/16} \\ProvidesFile{$fdxfile}[\\filedate\\space\\fileversion] \\CJKvdef{fullheight}{1em} diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl index a82a3cb10f3..5aa1946d329 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl @@ -26,7 +26,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe index feb9d3a56c8..347e53b6df4 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe @@ -9,7 +9,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl index d28796c8747..fc89bf7017d 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl @@ -24,7 +24,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 |