summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-25 21:51:34 +0000
committerKarl Berry <karl@freefriends.org>2018-01-25 21:51:34 +0000
commita9ea419ebd55aaec94d688b156d13c6231fa9a8d (patch)
tree57b647968d59816361626a02a62146a7edf1e288 /Master
parenta78bf17f0608c626c48ce3c0e7811169f978b9a8 (diff)
jfmutil (25jan18)
git-svn-id: svn://tug.org/texlive/trunk@46439 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/jfmutil/LICENSE2
-rw-r--r--Master/texmf-dist/doc/fonts/jfmutil/README-ja.md3
-rw-r--r--Master/texmf-dist/doc/fonts/jfmutil/README.md3
-rwxr-xr-xMaster/texmf-dist/scripts/jfmutil/jfmutil.pl10
4 files changed, 12 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/LICENSE b/Master/texmf-dist/doc/fonts/jfmutil/LICENSE
index 8ada757fbc8..fbe40a0146b 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) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2018 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 a3beac4fb75..1e1da84e299 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
@@ -460,6 +460,9 @@ upTeX 標準の `upjpnrm-h.vf` の場合、以下の出力になる:
更新履歴
--------
+ * Version 1.1.1 〈2018/01/20〉
+ - バグ修正。
+
* Version 1.1.0 〈2017/09/16〉
- pxcopyfont 由来の機能(`vfinfo`、`vfcopy` サブコマンド)を追加。
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README.md b/Master/texmf-dist/doc/fonts/jfmutil/README.md
index 73a64b44d5d..894ec837320 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README.md
@@ -73,6 +73,9 @@ Please refer to README-ja.md (in Japanese) for detail.
Revision History
----------------
+ * Version 1.1.1 〈2018/01/20〉
+ - Bug fix.
+
* Version 1.1.0 〈2017/09/16〉
- Add subcommands `vfinfo` and `vfcopy`.
diff --git a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
index 5243ba75da1..63835b85b69 100755
--- a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
+++ b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
@@ -2,7 +2,7 @@
#
# This is file 'jfmutil.pl'.
#
-# Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+# Copyright (c) 2018 Takayuki YATO (aka. "ZR")
# GitHub: https://github.com/zr-tex8r
# Twitter: @zr_tex8r
#
@@ -12,8 +12,8 @@ use strict;
#------------------------------------------------- ZRTeXtor module
package ZRTeXtor;
-our $VERSION = 1.004_00;
-our $mod_date = "2017/07/17";
+our $VERSION = 1.004_01;
+our $mod_date = "2018/01/20";
use Encode qw(encode decode);
# Here follows excerpt from ZRTeXtor.pm
@@ -1343,8 +1343,8 @@ sub vf_parse
#-- give a cooked list for efficiency
#$pe = pl_cook(['CHARACTER', 'C', 0,
# ['CHARWD', 'R', 0], undef]);
- $pe = (['CHARACTER', [CNUM, 'C', 0], 0,
- ['CHARWD', [CNUM, 'R', 0], 0], undef]);
+ $pe = (['CHARACTER', [CNUM, 0, 'C'], 0,
+ ['CHARWD', [CNUM, 0, 'R'], 0], undef]);
if (defined($t = vf_dvi_parse($u))) { $pe->[4] = $t; }
elsif (!$swdh) {
return vf_synerror("illegal dvi code (char $fs[2])");