diff options
author | Karl Berry <karl@freefriends.org> | 2019-08-16 20:37:33 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-08-16 20:37:33 +0000 |
commit | 9449c2817a83033a9394748a8441d4bac65a15d8 (patch) | |
tree | c1e9972829b9378932f7a01b7b92a6c31fe3d243 /Master | |
parent | 29f8471607e3a9d4b654af95f7e6a458df75b0c6 (diff) |
cjk-gs-integrate (16aug19)
git-svn-id: svn://tug.org/texlive/trunk@51888 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
4 files changed, 80 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog index c763974f5fd..cd697a8e08a 100644 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog @@ -1,10 +1,38 @@ +2019-08-16 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Release 20190816.0 (HEAD -> master) [089a440] + +2019-08-16 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * gs-9.27 doesn't like snippets for TTF/TTC it seems gs-9.25 and gs-9.26 does not require snippets for TTF/TTC so it will be safe enough (origin/master, origin/HEAD) [22bc208] + +2019-05-22 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * mention requirement of kpsewhich in help message [fd6f3d2] + +2019-05-19 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * make sure CR is stripped [2120e9f] + +2019-05-19 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * \/dev\/null -> $nul (origin/check-kpse) [1145435] + +2019-05-19 Norbert Preining <norbert@preining.info> + + * test for kpsewhich (Issue: #33) [68ae7ce] + +2019-04-06 Hironobu Yamashita <h.y.acetaminophen@gmail.com> + + * Add info for latest BIZ-UD fonts [ce8d802] + 2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * Release 20190303.0 (HEAD -> master) [131b0f4] + * Release 20190303.0 (tag: 20190303.0) [131b0f4] 2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * copyright year (origin/master, origin/HEAD) [0732219] + * copyright year [0732219] 2019-03-03 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -140,7 +168,7 @@ 2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * don't discard when otfinfo exits with non-zero (origin/otfinfo-rewrite, otfinfo-rewrite) [9e630e3] + * don't discard when otfinfo exits with non-zero [9e630e3] 2018-02-15 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -496,7 +524,7 @@ 2017-06-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * NTFS symlink on win32 has file size = 0, we can distinguish it (origin/cleanup) [ab9b543] + * NTFS symlink on win32 has file size = 0, we can distinguish it [ab9b543] 2017-06-20 Hironobu Yamashita <h.y.acetaminophen@gmail.com> @@ -588,7 +616,7 @@ 2017-05-05 Hironobu Yamashita <h.y.acetaminophen@gmail.com> - * fix a mistake, adjust help message for search path (origin/win32-support, aminophen/win32-support) [8fd2c88] + * fix a mistake, adjust help message for search path (aminophen/win32-support) [8fd2c88] 2017-05-02 Hironobu Yamashita <h.y.acetaminophen@gmail.com> diff --git a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md index a2d9feec265..9f948f7b24b 100644 --- a/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md +++ b/Master/texmf-dist/doc/fonts/cjk-gs-integrate/README.md @@ -5,6 +5,9 @@ This script searches a list of directories for CJK fonts, and makes them available to an installed Ghostscript. In the simplest case with sufficient privileges, a run without arguments should effect in a complete setup of Ghostscript. +Search is done using the kpathsea library, in particular `kpsewhich` +program. To run this script, you will need some TeX distribution in +your system. Usage ----- diff --git a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat index 784024d1faa..3ab501673eb 100644 --- a/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat +++ b/Master/texmf-dist/fonts/misc/cjk-gs-integrate/cjkgs-bizud.dat @@ -4,7 +4,35 @@ # Note: # BIZ-UD*.ttc (3 files) -# are available from https://bizplus.morisawa.co.jp for Win/Mac. +# are bundled with Windows 10 (October 2018 Update). +# Also available from https://bizplus.morisawa.co.jp for Win/Mac. + +Name: BIZ-UDGothic-Bold +Class: Japan +TTCname: BIZ-UDGothicB.ttc(0) + +Name: BIZ-UDPGothic-Bold +Class: Japan +TTCname: BIZ-UDGothicB.ttc(1) + +Name: BIZ-UDGothic +Class: Japan +TTCname: BIZ-UDGothicR.ttc(0) + +Name: BIZ-UDPGothic +Class: Japan +TTCname: BIZ-UDGothicR.ttc(1) + +Name: BIZ-UDMincho-Medium +Class: Japan +TTCname: BIZ-UDMinchoM.ttc(0) + +Name: BIZ-UDPMincho-Medium +Class: Japan +TTCname: BIZ-UDMinchoM.ttc(1) + +# Version 2018-10-23 or earlier (before official October 2018 Update) +# had different filename and PSName Name: BIZ-UDGothic-B Class: Japan diff --git a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl index 3da4763053e..6fce593611f 100755 --- a/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl +++ b/Master/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl @@ -39,7 +39,7 @@ use Cwd 'abs_path'; use strict; (my $prg = basename($0)) =~ s/\.pl$//; -my $version = '20190303.0'; +my $version = '20190816.0'; if (win32()) { # conversion between internal (utf-8) and console (cp932): @@ -348,6 +348,12 @@ if ($opt_help || $opt_markdown) { exit(0); } +# check for the existence of kpsewhich, otherwise we cannot do anything +if (system("kpsewhich --version >$nul 2>&1 <$nul" ) != 0) { + print_error("We need `kpsewhich' being installed! Exiting.\n"); + exit(1); +} + if ($opt_debug >= 2) { require Data::Dumper; $Data::Dumper::Indent = 1; @@ -676,15 +682,15 @@ sub do_nonotf_fonts { if $opt_texmflink; for my $k (sort keys %fontdb) { if ($fontdb{$k}{'available'} && $fontdb{$k}{'type'} eq 'TTF') { - generate_font_snippet($fontdest, - $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}); + # generate_font_snippet($fontdest, + # $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}); $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttfname'}, -1); link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttfname'}); link_font($fontdb{$k}{'target'}, "$opt_texmflink/$ttf_pathpart", $fontdb{$k}{'ttfname'}) if $opt_texmflink; } elsif ($fontdb{$k}{'available'} && $fontdb{$k}{'type'} eq 'TTC') { - generate_font_snippet($fontdest, - $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}); + # generate_font_snippet($fontdest, + # $k, $fontdb{$k}{'class'}, $fontdb{$k}{'target'}); $outp .= generate_cidfmap_entry($k, $fontdb{$k}{'class'}, $fontdb{$k}{'ttcname'}, $fontdb{$k}{'subfont'}); link_font($fontdb{$k}{'target'}, $cidfsubst, $fontdb{$k}{'ttcname'}); link_font($fontdb{$k}{'target'}, "$opt_texmflink/$ttf_pathpart", $fontdb{$k}{'ttcname'}) @@ -1439,6 +1445,7 @@ sub check_for_files { $bname = $b; last; } + $actualpsname =~ s/[\r\n]+\z//; # perl's chomp() on git-bash cannot strip CR of CRLF ?? if ($actualpsname ne $k) { print_debug("... PSName returned by otfinfo ($actualpsname) is\n"); print_debug("different from our database ($k), discarding!\n"); @@ -2030,6 +2037,9 @@ This script searches a list of directories for CJK fonts, and makes them available to an installed Ghostscript. In the simplest case with sufficient privileges, a run without arguments should effect in a complete setup of Ghostscript. +Search is done using the kpathsea library, in particular `kpsewhich` +program. To run this script, you will need some TeX distribution in +your system. "; my $operation = " |