From dcbb864cb90f4dc188c81d329a5ca0d9c9f5ce38 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 7 Nov 2021 21:27:12 +0000
Subject: jfmutil (7nov21)

git-svn-id: svn://tug.org/texlive/trunk@60987 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/fonts/jfmutil/README-ja.md |  4 ++++
 Master/texmf-dist/doc/fonts/jfmutil/README.md    |  5 ++++-
 Master/texmf-dist/scripts/jfmutil/jfmutil.pl     | 14 ++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
index de2e7a8831f..ccd8db9a3e2 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.3 〈2021/10/09〉
+      - ZRTeXtor 1.8.1 版に同期。変更点は：
+          + バグ修正。
+
   * Version 1.3.2 〈2021/05/29〉
       - ZRTeXtor 1.8.0 版に同期。変更点は：
           + charpacket のない VF を許容する。
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README.md b/Master/texmf-dist/doc/fonts/jfmutil/README.md
index cf40599168e..98c9cd4f244 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README.md
+++ b/Master/texmf-dist/doc/fonts/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/Master/texmf-dist/scripts/jfmutil/jfmutil.pl b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
index c1fe8ca7275..a3a93c8516f 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.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);
-- 
cgit v1.2.3