summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-11 22:04:43 +0000
committerKarl Berry <karl@freefriends.org>2019-02-11 22:04:43 +0000
commit7cfff294bffe3ca9370153cb8f9417d37cfa3a19 (patch)
tree088d5c6f8865b3da3effba367df1afa2c547b4cf
parentf9c51627d8c29175d94c5f6369819e6d5ba5d680 (diff)
jfmutil (11feb19)
git-svn-id: svn://tug.org/texlive/trunk@50002 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl12
-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.pl12
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
5 files changed, 19 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
index 3b4b5b76bc0..179275068c6 100755
--- a/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfmutil/jfmutil.pl
@@ -2772,8 +2772,8 @@ package main;
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.2.1';
-my $mod_date = '2019/02/08';
+my $version = '1.2.2';
+my $mod_date = '2019/02/09';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient);
@@ -2916,9 +2916,9 @@ sub read_option {
$sw_hex = 1; $sw_uptool = 0;
while ($ARGV[0] =~ m/^-/) {
$opt = shift(@ARGV);
- if ($opt =~ m/--?h(elp)?/) {
+ if ($opt =~ m/^--?h(elp)?$/) {
show_usage();
- } elsif ($opt =~ m/-(?:V|-version)?/) {
+ } elsif ($opt =~ m/^-(?:V|-version)?$/) {
show_version();
} elsif ($opt eq '--hex') {
$sw_hex = 1;
@@ -3159,9 +3159,9 @@ sub read_option {
$op_zero = 0; $op_uptex = 0; $op_quiet = 0;
while ($ARGV[0] =~ m/^-/) {
my $opt = shift(@ARGV);
- if ($opt =~ m/--?h(elp)?/) {
+ if ($opt =~ m/^--?h(elp)?$/) {
main::show_usage();
- } elsif ($opt =~ m/-(?:V|-version)?/) {
+ } elsif ($opt =~ m/^-(?:V|-version)?$/) {
main::show_version();
} elsif ($opt eq '-z' || $opt eq '--zero') {
$op_zero = 1;
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
index 94e0fced96c..87f5a30c881 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README-ja.md
@@ -466,6 +466,9 @@ upTeX 標準の `upjpnrm-h.vf` の場合、以下の出力になる:
更新履歴
--------
+ * Version 1.2.2 〈2019/02/09〉
+ - バグ修正。
+
* Version 1.2.1 〈2019/02/08〉
- (試験的) `jodel` コマンドを追加。
diff --git a/Master/texmf-dist/doc/fonts/jfmutil/README.md b/Master/texmf-dist/doc/fonts/jfmutil/README.md
index b5edca80cba..cdb6a2bb7c2 100644
--- a/Master/texmf-dist/doc/fonts/jfmutil/README.md
+++ b/Master/texmf-dist/doc/fonts/jfmutil/README.md
@@ -85,6 +85,9 @@ Please refer to README-ja.md (in Japanese) for detail.
Revision History
----------------
+ * Version 1.2.2 〈2019/02/09〉
+ - Bug fix.
+
* Version 1.2.1 〈2019/02/08〉
- (experimental) Add `jodel` subcommand.
diff --git a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
index 3b4b5b76bc0..179275068c6 100755
--- a/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
+++ b/Master/texmf-dist/scripts/jfmutil/jfmutil.pl
@@ -2772,8 +2772,8 @@ package main;
#================================================= BEGIN
use Encode qw(encode decode);
my $prog_name = 'jfmutil';
-my $version = '1.2.1';
-my $mod_date = '2019/02/08';
+my $version = '1.2.2';
+my $mod_date = '2019/02/09';
#use Data::Dump 'dump';
#
my ($sw_hex, $sw_uptool, $sw_noencout, $inenc, $exenc, $sw_lenient);
@@ -2916,9 +2916,9 @@ sub read_option {
$sw_hex = 1; $sw_uptool = 0;
while ($ARGV[0] =~ m/^-/) {
$opt = shift(@ARGV);
- if ($opt =~ m/--?h(elp)?/) {
+ if ($opt =~ m/^--?h(elp)?$/) {
show_usage();
- } elsif ($opt =~ m/-(?:V|-version)?/) {
+ } elsif ($opt =~ m/^-(?:V|-version)?$/) {
show_version();
} elsif ($opt eq '--hex') {
$sw_hex = 1;
@@ -3159,9 +3159,9 @@ sub read_option {
$op_zero = 0; $op_uptex = 0; $op_quiet = 0;
while ($ARGV[0] =~ m/^-/) {
my $opt = shift(@ARGV);
- if ($opt =~ m/--?h(elp)?/) {
+ if ($opt =~ m/^--?h(elp)?$/) {
main::show_usage();
- } elsif ($opt =~ m/-(?:V|-version)?/) {
+ } elsif ($opt =~ m/^-(?:V|-version)?$/) {
main::show_version();
} elsif ($opt eq '-z' || $opt eq '--zero') {
$op_zero = 1;
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ab48f550678..0559738ff2f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2809,7 +2809,7 @@ $standardmf='[0-9]\.mf';
'ifsym', '\.mf|\.gen',
# no point in making tfm without pk for (black|gray|slant), is there?
'knuth-lib', 'manfnt\.mf|' . $standardmf,
- 'knuth-local', '(domino|mfman|random|snfont)\.mf',
+ 'knuth-local', '(domino|logo.*[0-9]|mfman|random|snfont)\.mf',
'logic', 'milstd\.mf',
'mfpic', 'grafbase\.mf',
'morse', 'morse10.mf|morse.def',