summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-06 23:01:35 +0000
committerKarl Berry <karl@freefriends.org>2014-03-06 23:01:35 +0000
commiteac3699c6b426ce060acf916c17d2b25f06f8818 (patch)
tree54505bc7d92d8b4fd31316f862765e75aa19fb78
parent3731208d7fb52ead680b0a31cae7e086b536a97b (diff)
convbkmk
git-svn-id: svn://tug.org/texlive/trunk@33110 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb17
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl15
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl4
-rw-r--r--Master/texmf-dist/doc/support/convbkmk/README8
-rwxr-xr-xMaster/texmf-dist/scripts/convbkmk/convbkmk.rb17
5 files changed, 43 insertions, 18 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb b/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb
index 2c566fe6301..d2c41ca9d7a 100755
--- a/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb
+++ b/Build/source/texk/texlive/linked_scripts/convbkmk/convbkmk.rb
@@ -3,9 +3,9 @@
=begin
-= convbkmk Ver.0.08
+= convbkmk Ver.0.09
- 2013.05.11
+ 2014.03.02
Takuji Tanaka
KXD02663 (at) nifty.ne.jp
((<URL:http://homepage3.nifty.com/ttk/comp/tex/uptex_en.html>))
@@ -26,6 +26,7 @@ the encoding conversion and formatting the bookmark data.
== Requirement
ruby 1.8.3 or later
+ruby 1.8.x will not be supported in the near future release.
== Examples
@@ -63,7 +64,7 @@ More examples are included in the uptex source archive.
convbkmk
-Copyright (c) 2009-2013 Takuji Tanaka
+Copyright (c) 2009-2014 Takuji Tanaka
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -108,10 +109,12 @@ THE SOFTWARE.
: 2013.05.11 0.08
* Add -O option: overwrite output files onto input files instead of creating foo-convbkmk.ps .
* Make comments rd/rdtool friendly.
+: 2014.03.02 0.09
+ * Bug fix: Conversion was not complete in some cases.
=end
-Version = "0.08"
+Version = "0.09"
require "optparse"
@@ -439,6 +442,12 @@ def file_treatment(ifile, ofile, enc)
ofile.print $`
line = $& + $'
+ if Opts[:mode] != 'out'
+ while line =~ %r!(/Title|/Author|/Keywords|/Subject|/Creator|/Producer)\Z! do
+ line += ifile.gets
+ end
+ end
+
if enc.status == 'guess'
if tmp_enc = try_guess_encoding(line, enc)
# succeeded in guess or ascii only
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
index 0b013f74c3e..c255c8c8215 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-config-updmap.pl
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# kanji-config-updmap: setup Japanese font embedding
-# Version 20140120.0
+# Version 20140301.0
#
# formerly known as updmap-setup-kanji
#
@@ -22,7 +22,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
use strict;
my $prg = "kanji-config-updmap";
-my $version = '20140120.0';
+my $version = '20140301.0';
my $updmap_real = "updmap";
my $updmap = $updmap_real;
@@ -74,7 +74,8 @@ my %representatives = (
"ipa" => "ipam.ttf",
"ipaex" => "ipaexm.ttf",
"ms" => "msgothic.ttc",
- "yu" => "yumin.ttf",
+ "yu-win" => "yumin.ttf",
+ "yu-osx" => "YuMin-Medium.otf",
);
my %available;
@@ -112,7 +113,8 @@ sub Usage {
auto: embed one of the following supported font families
automatically:
hiragino, hiragino-pron, morisawa, morisawa-pr6n,
- kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms, yu
+ kozuka, kozuka-pr6, kozuka-pr6n, ipaex, ipa, ms,
+ yu-osx, yu-win
and fall back to not embedding any font if none of them
is available
nofont: embed no fonts (and rely on system fonts when displaying pdfs)
@@ -240,9 +242,10 @@ sub SetupReplacement {
# if we are in the noEmbed or nothing set case, but one
# of the three fonts hiragino/morisawa/kozuka are present
# then use them
- for my $i (qw/morisawa-pr6n kozuka-pr6n kozuka-pr6
+ for my $i (qw/
+ morisawa-pr6n yu-osx kozuka-pr6n kozuka-pr6
hiragino-pron hiragino
- morisawa kozuka ipaex ipa ms/) {
+ morisawa kozuka yu-win ipaex ipa ms/) {
if ($available{$i}) {
return SetupMapFile($i);
}
diff --git a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
index 90c5c25778c..75e632e3cd8 100755
--- a/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
+++ b/Build/source/texk/texlive/linked_scripts/jfontmaps/kanji-fontmap-creator.pl
@@ -2,7 +2,7 @@
#
# kanji-fontmap-creator
# (c) 2012-2014 Norbert Preining
-# Version: 20140120.0
+# Version: 20140301.0
# Licenced under the GPLv2 or any higher version
#
# gui to create map files for updmap(-setup-kanji)
@@ -41,7 +41,7 @@ my $opt_help = 0;
my $opt_version = 0;
my $prg = "kanji-fontmap-creator";
-my $version = "20140120.0";
+my $version = "20140301.0";
#
# global vars configuring operation
diff --git a/Master/texmf-dist/doc/support/convbkmk/README b/Master/texmf-dist/doc/support/convbkmk/README
index d6528f62b45..b2ec1482e54 100644
--- a/Master/texmf-dist/doc/support/convbkmk/README
+++ b/Master/texmf-dist/doc/support/convbkmk/README
@@ -1,6 +1,6 @@
-convbkmk Ver.0.08
+convbkmk Ver.0.09
-2013.05.11
+2014.03.02
Takuji Tanaka
KXD02663 (at) nifty.ne.jp
http://homepage3.nifty.com/ttk/comp/tex/uptex_en.html
@@ -16,4 +16,8 @@ Thus, data conversion is required to create correct bookmarks.
convbkmk provides a function of
the encoding conversion and formatting the bookmark data.
+Lisence notice is written in the convbkmk.rb.
+It is as same as the MIT license.
+Ref. http://opensource.org/licenses/MIT
+
More information is within the convbkmk.rb with the RD format.
diff --git a/Master/texmf-dist/scripts/convbkmk/convbkmk.rb b/Master/texmf-dist/scripts/convbkmk/convbkmk.rb
index 2c566fe6301..d2c41ca9d7a 100755
--- a/Master/texmf-dist/scripts/convbkmk/convbkmk.rb
+++ b/Master/texmf-dist/scripts/convbkmk/convbkmk.rb
@@ -3,9 +3,9 @@
=begin
-= convbkmk Ver.0.08
+= convbkmk Ver.0.09
- 2013.05.11
+ 2014.03.02
Takuji Tanaka
KXD02663 (at) nifty.ne.jp
((<URL:http://homepage3.nifty.com/ttk/comp/tex/uptex_en.html>))
@@ -26,6 +26,7 @@ the encoding conversion and formatting the bookmark data.
== Requirement
ruby 1.8.3 or later
+ruby 1.8.x will not be supported in the near future release.
== Examples
@@ -63,7 +64,7 @@ More examples are included in the uptex source archive.
convbkmk
-Copyright (c) 2009-2013 Takuji Tanaka
+Copyright (c) 2009-2014 Takuji Tanaka
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -108,10 +109,12 @@ THE SOFTWARE.
: 2013.05.11 0.08
* Add -O option: overwrite output files onto input files instead of creating foo-convbkmk.ps .
* Make comments rd/rdtool friendly.
+: 2014.03.02 0.09
+ * Bug fix: Conversion was not complete in some cases.
=end
-Version = "0.08"
+Version = "0.09"
require "optparse"
@@ -439,6 +442,12 @@ def file_treatment(ifile, ofile, enc)
ofile.print $`
line = $& + $'
+ if Opts[:mode] != 'out'
+ while line =~ %r!(/Title|/Author|/Keywords|/Subject|/Creator|/Producer)\Z! do
+ line += ifile.gets
+ end
+ end
+
if enc.status == 'guess'
if tmp_enc = try_guess_encoding(line, enc)
# succeeded in guess or ascii only