texlive[60987] trunk: jfmutil (7nov21)

[commits+karl at tug.org]

Revision: 60987
          http://tug.org/svn/texlive?view=revision&revision=60987
Author:   karl
Date:     2021-11-07 22:27:12 +0100 (Sun, 07 Nov 2021)
Log Message:
-----------
jfmutil (7nov21)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
    trunk/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
    trunk/Master/texmf-dist/doc/fonts/jfmutil/README.md
    trunk/Master/texmf-dist/scripts/jfmutil/jfmutil.pl

Modified: trunk/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl	2021-11-07 21:26:56 UTC (rev 60986)
+++ trunk/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl	2021-11-07 21:27:12 UTC (rev 60987)
@@ -12,8 +12,8 @@
 
 #------------------------------------------------- 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 @@
       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 @@
 #================================================= 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);

Modified: trunk/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md	2021-11-07 21:26:56 UTC (rev 60986)
+++ trunk/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md	2021-11-07 21:27:12 UTC (rev 60987)
@@ -466,6 +466,10 @@
 更新履歴
 --------
 
+  * Version 1.3.3 〈2021/10/09〉
+      - ZRTeXtor 1.8.1 版に同期。変更点は：
+          + バグ修正。
+
   * Version 1.3.2 〈2021/05/29〉
       - ZRTeXtor 1.8.0 版に同期。変更点は：
           + charpacket のない VF を許容する。

Modified: trunk/Master/texmf-dist/doc/fonts/jfmutil/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/jfmutil/README.md	2021-11-07 21:26:56 UTC (rev 60986)
+++ trunk/Master/texmf-dist/doc/fonts/jfmutil/README.md	2021-11-07 21:27:12 UTC (rev 60987)
@@ -1,4 +1,3 @@
-
 jfmutil
 =======
 
@@ -86,6 +85,10 @@
 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.

Modified: trunk/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/jfmutil/jfmutil.pl	2021-11-07 21:26:56 UTC (rev 60986)
+++ trunk/Master/texmf-dist/scripts/jfmutil/jfmutil.pl	2021-11-07 21:27:12 UTC (rev 60987)
@@ -12,8 +12,8 @@
 
 #------------------------------------------------- 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 @@
       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 @@
 #================================================= 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);