summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-11-08 03:02:49 +0000
committerNorbert Preining <norbert@preining.info>2021-11-08 03:02:49 +0000
commitf3bd7117b5dfa4a51d51c4e416c8a656651f1ce2 (patch)
tree5053c95dab175775cc85badf7990ffa535676f23 /fonts
parent8389f0bb8e6af2c5dcbfe3cdad746a9c170d1157 (diff)
CTAN sync 202111080302
Diffstat (limited to 'fonts')
-rw-r--r--fonts/utilities/jfmutil/README-ja.md4
-rw-r--r--fonts/utilities/jfmutil/README.md5
-rw-r--r--fonts/utilities/jfmutil/jfmutil.pl14
3 files changed, 16 insertions, 7 deletions
diff --git a/fonts/utilities/jfmutil/README-ja.md b/fonts/utilities/jfmutil/README-ja.md
index de2e7a8831..ccd8db9a3e 100644
--- a/fonts/utilities/jfmutil/README-ja.md
+++ b/fonts/utilities/jfmutil/README-ja.md
@@ -466,6 +466,10 @@ upTeX 標準の `upjpnrm-h.vf` の場合、以下の出力になる:
更新履歴
--------
+ * Version 1.3.3 〈2021/10/09〉
+ - ZRTeXtor 1.8.1 版に同期。変更点は:
+ + バグ修正。
+
* Version 1.3.2 〈2021/05/29〉
- ZRTeXtor 1.8.0 版に同期。変更点は:
+ charpacket のない VF を許容する。
diff --git a/fonts/utilities/jfmutil/README.md b/fonts/utilities/jfmutil/README.md
index cf40599168..98c9cd4f24 100644
--- a/fonts/utilities/jfmutil/README.md
+++ b/fonts/utilities/jfmutil/README.md
@@ -1,4 +1,3 @@
-
jfmutil
=======
@@ -86,6 +85,10 @@ Please refer to README-ja.md (in Japanese) for detail.
Revision History
----------------
+ * Version 1.3.3 〈2021/10/09〉
+ - Use ZRTeXtor v1.8.1. The changes are:
+ + Bug fix.
+
* Version 1.3.2 〈2021/05/29〉
- Use ZRTeXtor v1.8.0. The changes are:
+ Allow VFs with no charpackets.
diff --git a/fonts/utilities/jfmutil/jfmutil.pl b/fonts/utilities/jfmutil/jfmutil.pl
index c1fe8ca727..a3a93c8516 100644
--- a/fonts/utilities/jfmutil/jfmutil.pl
+++ b/fonts/utilities/jfmutil/jfmutil.pl
@@ -12,8 +12,8 @@ use strict;
#------------------------------------------------- ZRTeXtor module
package ZRTeXtor;
-our $VERSION = 1.008_00;
-our $mod_date = "2021/05/29";
+our $VERSION = 1.008_01;
+our $mod_date = "2021/10/09";
use Encode qw(encode decode);
# Here follows excerpt from ZRTeXtor.pm
@@ -1373,13 +1373,15 @@ 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 = 2; push(@$pl, $pe);
- } elsif ($stg == 2 && $t == 248) { # post
+ $stg = 1; push(@$pl, $pe);
+ } elsif ($stg <= 2 && $t == 248) { # post
(($u = substr($dat, $pos, $t)) =~ /^\xf8+$/)
or return vf_synerror("in postamble");
+ $stg = 3;
last;
} else { return vf_synerror("unexpected byte $t"); }
}
+ ($swdh || $stg == 3) or return vf_synerror("premature end");
return $pl;
}
@@ -2781,8 +2783,8 @@ package main;
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.3.2';
-my $mod_date = '2021/05/29';
+my $version = '1.3.3';
+my $mod_date = '2021/10/09';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient);