summaryrefslogtreecommitdiff
path: root/Master/tlpkg/libexec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-21 21:53:45 +0000
committerKarl Berry <karl@freefriends.org>2021-10-21 21:53:45 +0000
commitb02107eda020fcf744cd893cb8157ff030e8b73b (patch)
tree0d19dcb76c6a749c193169f4533c4b2a63debf71 /Master/tlpkg/libexec
parent112eb735b477217c2d39ccb9b81191bbdc28f026 (diff)
cjk 4.8.5
git-svn-id: svn://tug.org/texlive/trunk@60829 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/libexec')
-rw-r--r--Master/tlpkg/libexec/c90.pl2
-rw-r--r--Master/tlpkg/libexec/cjk-build.pl5
-rw-r--r--Master/tlpkg/libexec/cjk.pl22
-rw-r--r--Master/tlpkg/libexec/cjkutils.pl (renamed from Master/tlpkg/libexec/bin-cjkutils.pl)22
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds8
-rw-r--r--Master/tlpkg/libexec/dnp.pl2
-rw-r--r--Master/tlpkg/libexec/garuda-c90.pl2
-rw-r--r--Master/tlpkg/libexec/norasi-c90.pl2
8 files changed, 37 insertions, 28 deletions
diff --git a/Master/tlpkg/libexec/c90.pl b/Master/tlpkg/libexec/c90.pl
index 637ba8b71bc..c7cbbacf6ad 100644
--- a/Master/tlpkg/libexec/c90.pl
+++ b/Master/tlpkg/libexec/c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "doc/fonts/enc/c90";
diff --git a/Master/tlpkg/libexec/cjk-build.pl b/Master/tlpkg/libexec/cjk-build.pl
index 444cba09dfa..8837c28ee2c 100644
--- a/Master/tlpkg/libexec/cjk-build.pl
+++ b/Master/tlpkg/libexec/cjk-build.pl
@@ -8,18 +8,21 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory. For installation, it
# simply uses `install -d' so that missing subdirectories are created
# automatically.
+
# XXX: This installs files in the Build hierarchy!
+
my $B = "cjkutils/bat";
my $C = "cjkutils/conv";
my $H = "cjkutils/hbf2gf";
my $S = "cjkutils/scripts";
+
&I("utils/Bg5conv/bg5conv.c", "$C/bg5conv.c");
&I("utils/Bg5conv/bg5latex", "$S/bg5latex");
&I("utils/Bg5conv/bg5pdflatex", "$S/bg5pdflatex");
diff --git a/Master/tlpkg/libexec/cjk.pl b/Master/tlpkg/libexec/cjk.pl
index f92e5295345..a2ee65be55e 100644
--- a/Master/tlpkg/libexec/cjk.pl
+++ b/Master/tlpkg/libexec/cjk.pl
@@ -8,11 +8,11 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
#
-# cjk-4.8.2
+# cjk-4.8.5
# ---------
#
@@ -121,6 +121,7 @@ my $T = "tex/latex/cjk";
&I("examples/rubytest.tex", "$D/examples/rubytest.tex");
&I("examples/SJIS.tex", "$D/examples/SJIS.tex");
&I("examples/thai.tex", "$D/examples/thai.tex");
+&I("examples/thai_utf8.tex","$D/examples/thai_utf8.tex");
&I("examples/UTF8.tex", "$D/examples/UTF8.tex");
&I("texinput/CJK.enc", "$T/texinput/CJK.enc");
@@ -394,11 +395,16 @@ my $T = "tex/latex/cjk";
&I("utils/lisp/mule-2.3/cjk-enc.el", "$S/utils/lisp/mule-2.3/cjk-enc.el");
-&I("utils/pyhyphen/pinyin.c", "$S/utils/pyhyphen/pinyin.c");
-&I("utils/pyhyphen/pinyin.ldf", "$T/utils/pyhyphen/pinyin.ldf"); # $T
-&I("utils/pyhyphen/pinyin.tr", "$S/utils/pyhyphen/pinyin.tr");
-&I("utils/pyhyphen/pyhyph.tex", "$S/utils/pyhyphen/pyhyph.tex");
-&I("utils/pyhyphen/pytest.tex", "$D/utils/pyhyphen/pytest.tex"); # $D
+&I("utils/pyhyphen/GNUmakefile", "$S/utils/pyhyphen/GNUmakefile");
+&I("utils/pyhyphen/hyph-zh-latn-pinyin.in", "$S/utils/pyhyphen/hyph-zh-latn-pinyin.in");
+&I("utils/pyhyphen/hyph-zh-latn-pinyin.tex", "$S/utils/pyhyphen/hyph-zh-latn-pinyin.tex");
+&I("utils/pyhyphen/hyph-zh-latn-tonepinyin.tex", "$S/utils/pyhyphen/hyph-zh-latn-tonepinyin.tex");
+&I("utils/pyhyphen/make-patterns.sh", "$S/utils/pyhyphen/make-patterns.sh");
+&I("utils/pyhyphen/pinyin.c", "$S/utils/pyhyphen/pinyin.c");
+&I("utils/pyhyphen/pinyin.ldf", "$T/utils/pyhyphen/pinyin.ldf"); # $T
+&I("utils/pyhyphen/pinyin.tr", "$S/utils/pyhyphen/pinyin.tr");
+&I("utils/pyhyphen/pytest.tex", "$D/utils/pyhyphen/pytest.tex"); # $D
+&I("utils/pyhyphen/pytestutf8.tex", "$D/utils/pyhyphen/pytestutf8.tex"); # $D
&I("utils/SJISconv/sjisconv.w", "$S/utils/SJISconv/sjisconv.w");
&I("utils/SJISconv/sjisltx.bat", "$S/utils/SJISconv/sjisltx.bat");
@@ -423,7 +429,7 @@ my $T = "tex/latex/cjk";
#
-# cjk-4.8.2-doc
+# cjk-4.8.5-doc
# -------------
#
diff --git a/Master/tlpkg/libexec/bin-cjkutils.pl b/Master/tlpkg/libexec/cjkutils.pl
index 8373988cf90..f56c66b1eac 100644
--- a/Master/tlpkg/libexec/bin-cjkutils.pl
+++ b/Master/tlpkg/libexec/cjkutils.pl
@@ -1,4 +1,4 @@
-# bin-cjkutils.pl
+# cjkutils.pl
#
# Public domain.
#
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
@@ -21,7 +21,7 @@ my $H = "hbf2gf";
#
-# cjk-4.8.2
+# cjk-4.8.5
# ---------
#
@@ -56,7 +56,7 @@ my $H = "hbf2gf";
#
-# cjk-4.8.2-doc
+# cjk-4.8.5-doc
# -------------
#
@@ -100,13 +100,13 @@ my $H = "hbf2gf";
# doc/man/txt/hbf2gf.txt ---
# doc/man/txt/sjisconv.txt ---
-&I("doc/pdf/bg5conv.pdf", "$D/bg5conv/bg5conv.pdf");
-&I("doc/pdf/cef5conv.pdf", "$D/cef5conv/cef5conv.pdf");
-&I("doc/pdf/cefconv.pdf", "$D/cefconv/cefconv.pdf");
-&I("doc/pdf/cefsconv.pdf", "$D/cefsconv/cefsconv.pdf");
-&I("doc/pdf/extconv.pdf", "$D/extconv/extconv.pdf");
-&I("doc/pdf/hbf2gf.pdf", "$D/hbf2gf/hbf2gf.pdf");
-&I("doc/pdf/sjisconv.pdf", "$D/sjisconv/sjisconv.pdf");
+&I("doc/pdf/bg5conv.pdf", "$M/bg5conv.man1.pdf");
+&I("doc/pdf/cef5conv.pdf", "$M/cef5conv.man1.pdf");
+&I("doc/pdf/cefconv.pdf", "$M/cefconv.man1.pdf");
+&I("doc/pdf/cefsconv.pdf", "$M/cefsconv.man1.pdf");
+&I("doc/pdf/extconv.pdf", "$M/extconv.man1.pdf");
+&I("doc/pdf/hbf2gf.pdf", "$M/hbf2gf.man1.pdf");
+&I("doc/pdf/sjisconv.pdf", "$M/sjisconv.man1.pdf");
1;
# EOF
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c221df6d624..21b68a17d20 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -216,7 +216,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'bibutils', "die 'skipping, requires compilation'",
'bickham', "die 'skipping, support for nonfree font'",
'bigints', "&MAKEflatten",
- 'bin-cjkutils',"&MAKEbin_cjkutils",
'biolinum-type1', "die 'skipping, replaced by libertine'",
'bitfield', "die 'skipping, obsolete on CTAN'",
'blanks', "die 'skipping, unknown license (and c.1992)'",
@@ -285,6 +284,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'circuitikz', "&MAKEcopy",
'cirth', "die 'skipping, nosell license'",
'cjk', "&MAKEcjk",
+ 'cjkutils', "&MAKEcjkutils",
'cjw', "die 'skipping, nosell license'",
'clara', "&MAKEflatten",
'clarendo', "die 'skipping, nonfree font'",
@@ -5754,7 +5754,7 @@ sub MAKEcjk_common {
print "\t SPECIAL $package wholesale rearranging for cjk\n";
&xchdir ($packagedir);
- # also need cjk doc tarball. should move in next release.
+ # also need cjk doc tarball. would be nice if they were combined.
my $cjkdoc = "cjk-?.?.?-doc.tar.gz";
&SYSTEM ("tar -C cjk-?.?.? -xf $cjkdoc --strip-components=1");
@@ -5767,9 +5767,9 @@ sub MAKEcjk {
require "cjk.pl"; # in tlpkg/libexec
}
-sub MAKEbin_cjkutils {
+sub MAKEcjkutils {
&MAKEcjk_common ();
- require "bin-cjkutils.pl";
+ require "cjkutils.pl";
}
sub MAKEc90 {
diff --git a/Master/tlpkg/libexec/dnp.pl b/Master/tlpkg/libexec/dnp.pl
index 2d9923c20d4..f7e75555ebd 100644
--- a/Master/tlpkg/libexec/dnp.pl
+++ b/Master/tlpkg/libexec/dnp.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
diff --git a/Master/tlpkg/libexec/garuda-c90.pl b/Master/tlpkg/libexec/garuda-c90.pl
index a5f6714ad70..539e7bf63c7 100644
--- a/Master/tlpkg/libexec/garuda-c90.pl
+++ b/Master/tlpkg/libexec/garuda-c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "dvips/garuda-c90";
diff --git a/Master/tlpkg/libexec/norasi-c90.pl b/Master/tlpkg/libexec/norasi-c90.pl
index e85acabe2c5..88dd7cbf7ff 100644
--- a/Master/tlpkg/libexec/norasi-c90.pl
+++ b/Master/tlpkg/libexec/norasi-c90.pl
@@ -8,7 +8,7 @@
# the ctan2tds perl script. It installs the necessary files from the CJK
# package into the correct destinations.
#
-# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been
+# It expects that the CJK packages (cjk-4.8.5 and cjk-4.8.5-doc) have been
# unpacked (unmodified) in the current directory.
my $D = "dvips/norasi-c90";