diff options
6 files changed, 21 insertions, 12 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl index d527eddfdbd..c1fe8ca7275 100755 --- a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl +++ b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl @@ -12,8 +12,8 @@ use strict; #------------------------------------------------- ZRTeXtor module package ZRTeXtor; -our $VERSION = 1.007_00; -our $mod_date = "2019/09/02"; +our $VERSION = 1.008_00; +our $mod_date = "2021/05/29"; use Encode qw(encode decode); # Here follows excerpt from ZRTeXtor.pm @@ -1373,7 +1373,7 @@ sub vf_parse pl_set_value($pe->[7], 1, $fs[4]); pl_set_value($pe, 1, unpack_num($fs[1])); if ($fs[5] eq '') { splice(@$pe, 3, 1); } - $stg = 1; push(@$pl, $pe); + $stg = 2; push(@$pl, $pe); } elsif ($stg == 2 && $t == 248) { # post (($u = substr($dat, $pos, $t)) =~ /^\xf8+$/) or return vf_synerror("in postamble"); @@ -2781,8 +2781,8 @@ package main; #================================================= BEGIN use Encode qw(encode decode); my $prog_name = 'jfmutil'; -my $version = '1.3.1'; -my $mod_date = '2020/05/04'; +my $version = '1.3.2'; +my $mod_date = '2021/05/29'; #use Data::Dump 'dump'; # my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient); diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 07fac213c32..86682dcb637 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -853,7 +853,7 @@ sub do_cmd_and_check { $out =~ s/\n+$//; # trailing newlines don't seem interesting my $outmsg = "output:\n$out\n--end of output of $cmd.\n"; if ($ret == $F_OK) { - info("done running $cmd.\n"); + info("done running $cmd.\n") unless $cmd =~ /^fmtutil/; logcommand("success, $outmsg"); ddebug("$cmd $outmsg"); return ($F_OK); diff --git a/Master/texmf-dist/doc/fonts/jfmutil/LICENSE b/Master/texmf-dist/doc/fonts/jfmutil/LICENSE index 7f5fde238b9..ead3a3702e3 100644 --- a/Master/texmf-dist/doc/fonts/jfmutil/LICENSE +++ b/Master/texmf-dist/doc/fonts/jfmutil/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2008-2020 Takayuki YATO (aka. "ZR") +Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md index 273fe739fad..de2e7a8831f 100644 --- a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md +++ b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md @@ -466,6 +466,10 @@ upTeX 標準の `upjpnrm-h.vf` の場合、以下の出力になる： 更新履歴 -------- + * Version 1.3.2 〈2021/05/29〉 + - ZRTeXtor 1.8.0 版に同期。変更点は： + + charpacket のない VF を許容する。 + * Version 1.3.1 〈2020/05/04〉 - `jodel` を jodhminrn フォントに対応させる。 diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README.md b/Master/texmf-dist/doc/fonts/jfmutil/README.md index 8b259a100cf..cf40599168e 100644 --- a/Master/texmf-dist/doc/fonts/jfmutil/README.md +++ b/Master/texmf-dist/doc/fonts/jfmutil/README.md @@ -1,3 +1,4 @@ + jfmutil ======= @@ -85,6 +86,10 @@ Please refer to README-ja.md (in Japanese) for detail. Revision History ---------------- + * Version 1.3.2 〈2021/05/29〉 + - Use ZRTeXtor v1.8.0. The changes are: + + Allow VFs with no charpackets. + * Version 1.3.1 〈2020/05/04〉 - Now `jodel` uses VF of jodhminrn family. diff --git a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl index d527eddfdbd..c1fe8ca7275 100755 --- a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl +++ b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl @@ -12,8 +12,8 @@ use strict; #------------------------------------------------- ZRTeXtor module package ZRTeXtor; -our $VERSION = 1.007_00; -our $mod_date = "2019/09/02"; +our $VERSION = 1.008_00; +our $mod_date = "2021/05/29"; use Encode qw(encode decode); # Here follows excerpt from ZRTeXtor.pm @@ -1373,7 +1373,7 @@ sub vf_parse pl_set_value($pe->[7], 1, $fs[4]); pl_set_value($pe, 1, unpack_num($fs[1])); if ($fs[5] eq '') { splice(@$pe, 3, 1); } - $stg = 1; push(@$pl, $pe); + $stg = 2; push(@$pl, $pe); } elsif ($stg == 2 && $t == 248) { # post (($u = substr($dat, $pos, $t)) =~ /^\xf8+$/) or return vf_synerror("in postamble"); @@ -2781,8 +2781,8 @@ package main; #================================================= BEGIN use Encode qw(encode decode); my $prog_name = 'jfmutil'; -my $version = '1.3.1'; -my $mod_date = '2020/05/04'; +my $version = '1.3.2'; +my $mod_date = '2021/05/29'; #use Data::Dump 'dump'; # my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient); |