japanese-otf-uptex (27nov13)

git-svn-id: svn://tug.org/texlive/trunk@32255 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 111 insertions, 139 deletions

diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
index d0cd423b329..2f63da171b5 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
@@ -1,10 +1,10 @@
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.12  2013/06/02
+otfbeta-uptex (japanese-otf-uptex) Ver.0.13  2013/11/23
 
 
 [ Abstract ]
 This is a package for upLaTeX support of
-japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san
+japanese-otf package "otfbeta (v1.7b6 2013/11/17)" by psitau-san
 ( http://psitau.kitunebi.com/otf.html )
 It requires upTeX-0.20 or later.
 
@@ -218,4 +218,14 @@ to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
     Revise.
   test/uplatex/upjis2004.tex, test/uplatex/Makefile::
     Add new test.
+2013.11.21 Ver0.13
+  sty/otf.sty ::
+    Add scale option by following otfbeta v1.7b6.
+    Increment version number.
+  sty/mlutf.sty ::
+    Increment version number.
+  patch/*.patch::
+    Revise.
+  test/uplatex/otfscale.tex, test/uplatex/Makefile::
+    Add new test.
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
index dda342b34f6..0a73d782d41 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
@@ -3,12 +3,12 @@ README
 
 From 00otf-uptex.txt:
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.12  2013/06/02
+otfbeta-uptex (japanese-otf-uptex) Ver.0.13  2013/11/23
 
 
 [ Abstract ]
 This is a package for upLaTeX support of
-japanese-otf package "otfbeta (v1.7b5 2012/4/11)" by psitau-san
+japanese-otf package "otfbeta (v1.7b6 2012/11/17)" by psitau-san
 ( http://psitau.kitunebi.com/otf.html )
 It requires upTeX-0.20 or later.
 
@@ -21,11 +21,11 @@ For copyright and licensing, please see COPYRIGHT
 The original source has been downloaded from
 	http://homepage3.nifty.com/ttk/comp/tex/uptex.html
 as
-	http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.12.tar.xz
+	http://homepage3.nifty.com/ttk/comp/tex/otfbeta-uptex-0.13.tar.xz
 
 After that the scripts run and the generated tfm and vf files included.
 The scripts were run with the env variable OVP2OVF=wovp2ovf
 
 Norbert Preining <preining@logic.at>
-2013-11-20
+2013-11-23
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip
new file mode 100644
index 00000000000..7eea5f4fa6b
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/fontmap.zip
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff
deleted file mode 100644
index d6c16a9cd9e..00000000000
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/otf-script-gteb.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl japanese-otf-uptex/script/mktfm_sp.pl
---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl	2012-02-21 00:32:33.000000000 +0900
-+++ japanese-otf-uptex/script/mktfm_sp.pl	2013-03-27 17:41:18.483841871 +0900
-@@ -24,7 +24,7 @@
- 
- opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm";
- 
--my @face = qw/mr gr mb gb mgr ml/;
-+my @face = qw/mr gr mb gb mgr ml ge/;
- my @lang = qw/j t c k/;
- my @dir = qw/h v/;
- my %font_id = qw/1b g      1d h 1e i 1f j
-diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl japanese-otf-uptex/script/mkutfvf_sp.pl
---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl	2012-02-21 00:32:33.000000000 +0900
-+++ japanese-otf-uptex/script/mkutfvf_sp.pl	2013-03-27 17:41:09.147842163 +0900
-@@ -24,7 +24,7 @@
- opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp";
- opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
- 
--my @face = qw/mr gr mb gb mgr ml/;
-+my @face = qw/mr gr mb gb mgr ml ge/;
- my @lang = qw/j t c k/; ## priority: j > t > c > k
- my %lang_id; foreach $_ (0..$#lang) { $lang_id{$lang[$_]}=$_; }
- my @dir = qw/h v/;
-diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf japanese-otf-uptex/umakeotf
---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf	2012-04-24 08:52:46.000000000 +0900
-+++ japanese-otf-uptex/umakeotf	2013-03-27 17:37:19.275849360 +0900
-@@ -1,8 +1,8 @@
- #!/bin/sh
- 
- #OVP2OVF='omfonts -ovp2ovf'
--#OVP2OVF='wovp2ovf'
--#export OVP2OVF
-+OVP2OVF='wovp2ovf'
-+export OVP2OVF
- 
- if test ! -d tfm; then
- mkdir tfm
-@@ -42,6 +42,10 @@
- #for extra fonts
- uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlgotheb-h.tfm
- uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlgotheb-v.tfm
-+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpgotheb-h.tfm
-+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upexpgotheb-v.tfm
-+uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubygotheb-v.tfm
-+uppltotf -kanji=uptex basepl/ubase-h.pl tfm/uprubygotheb-h.tfm
- uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upnmlminl-h.tfm
- uppltotf -kanji=uptex basepl/ubase-v.pl tfm/upnmlminl-v.tfm
- uppltotf -kanji=uptex basepl/ubase-h.pl tfm/upexpminl-h.tfm
-@@ -62,7 +66,7 @@
- ./umkjvf -ucs -sp 1 -cm -cp upnmlmgothr-v uphmgothr-v
- #extra fonts
- ./umkjvf -ucs -sp 1 -cq upnmlgotheb-h uphgotheb-h
--./umkjvf -ucs -sp 1 -cp upnmlgotheb-v uphgotheb-v
-+./umkjvf -ucs -sp 1 -cm -cp upnmlgotheb-v uphgotheb-v
- ./umkjvf -ucs -sp 1 -cq upnmlminl-h uphminl-h
- ./umkjvf -ucs -sp 1 -cm -cp upnmlminl-v uphminl-v
- echo "making alt. kana ..."
-@@ -90,6 +94,10 @@
- ./umkjvf -ucs -sp 1 -cm -cp -expert upexpminl-v uphminl-v cidjminl
- ./umkjvf -ucs -sp 1 -cq -ruby uprubyminl-h uphminl-h cidjminl
- ./umkjvf -ucs -sp 1 -cm -cp -ruby uprubyminl-v uphminl-v cidjminl
-+./umkjvf -ucs -sp 1 -cq -expert upexpgotheb-h uphgotheb-h cidjgotheb
-+./umkjvf -ucs -sp 1 -cm -cp -expert upexpgotheb-v uphgotheb-v cidjgotheb
-+./umkjvf -ucs -sp 1 -cq -ruby uprubygotheb-h uphgotheb-h cidjgotheb
-+./umkjvf -ucs -sp 1 -cm -cp -ruby uprubygotheb-v uphgotheb-v cidjgotheb
- echo "making tfm for supplementary plane ..."
- perl script/mktfm_sp.pl
- echo "making vf for supplementary plane ..."
-diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg japanese-otf-uptex/umakeotf_brsg
---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg	2012-04-24 08:52:46.000000000 +0900
-+++ japanese-otf-uptex/umakeotf_brsg	2013-03-27 17:36:30.655850882 +0900
-@@ -1,8 +1,8 @@
- #!/bin/sh
- 
- #OVP2OVF='omfonts -ovp2ovf'
--#OVP2OVF='wovp2ovf'
--#export OVP2OVF
-+OVP2OVF='wovp2ovf'
-+export OVP2OVF
- 
- if test ! -d tfm; then
- mkdir tfm
-@@ -31,6 +31,8 @@
- uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpmgothr-v.tfm
- uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlgotheb-h.tfm
- uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlgotheb-v.tfm
-+uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpgotheb-h.tfm
-+uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpgotheb-v.tfm
- uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgnmlminl-h.tfm
- uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgnmlminl-v.tfm
- uppltotf -kanji=uptex basepl/ubrsg-h.pl tfm/upbrsgexpminl-h.tfm
-@@ -46,7 +48,7 @@
- ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlmgothr-h uphmgothr-h
- ./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlmgothr-v uphmgothr-v
- ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlgotheb-h uphgotheb-h
--./umkjvf -ucs -sp 1 -sage -cp upbrsgnmlgotheb-v uphgotheb-v
-+./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlgotheb-v uphgotheb-v
- ./umkjvf -ucs -sp 1 -sage -cq upbrsgnmlminl-h uphminl-h
- ./umkjvf -ucs -sp 1 -sage -cm -cp upbrsgnmlminl-v uphminl-v
- ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminr-h uphminr-h cidjminr
-@@ -59,6 +61,8 @@
- ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgothb-v uphgothb-v cidjgothb
- ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpmgothr-h uphmgothr-h cidjmgothr
- ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpmgothr-v uphmgothr-v cidjmgothr
-+./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpgotheb-h uphgotheb-h cidjgotheb
-+./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpgotheb-v uphgotheb-v cidjgotheb
- ./umkjvf -ucs -sp 1 -sage -cq -expert upbrsgexpminl-h uphminl-h cidjminl
- ./umkjvf -ucs -sp 1 -sage -cm -cp -expert upbrsgexpminl-v uphminl-v cidjminl
- 
-diff -udr /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf japanese-otf-uptex/umkjvf
---- /opt/texlive/2012/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf	2012-04-24 08:52:46.000000000 +0900
-+++ japanese-otf-uptex/umkjvf	2013-03-27 17:35:31.923852721 +0900
-@@ -554,6 +554,8 @@
- 		$face="cidjmgr";
- 	}elsif($kana_font eq "cidjminl"){
- 		$face="cidjml";
-+	}elsif($kana_font eq "cidjgotheb"){
-+		$face="cidjge";
- 	}elsif($kana_font eq "cidmin"){
- 		$face="cidm";
- 	}elsif($kana_font eq "cidgoth"){
-@@ -567,6 +569,8 @@
- 			$face="cidjmb";
- 		}elsif($kanji_font =~ /hgothb/){
- 			$face="cidjgb";
-+		}elsif($kanji_font =~ /hgotheb/){
-+			$face="cidjge";
- 		}elsif($kanji_font =~ /hmgothr/){
- 			$face="cidjmgr";
- 		}elsif($kanji_font =~ /hminl/){
-
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
index 872b8e1eb80..ef8933cf9a5 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
@@ -6,13 +6,14 @@ DVIPS = dvips
 DVIPDFMX = dvipdfmx
 PDVITYPE = pdvitype
 
-all: otf sp art bsrg jis04
+all: otf sp art bsrg jis04 scale
 
 otf: uplatex-otf platex-otf
 sp: uplatex-sp platex-sp
 art: uplatex-article platex-article
 brsg: uplatex-brsg platex-brsg
 jis04: uplatex-jis04 platex-jis04
+scale: uplatex-scale platex-scale
 
 uplatex-otf:
 	for opt in default deluxe expert bold noreplace; do \
@@ -120,5 +121,29 @@ platex-jis04:
 	done \
 	done
 
+uplatex-scale:
+	for scl in default 0.5 1.0 1.5 2.0; do \
+		$(UPLATEX) "\def\scale{$$scl}\def\class{ujarticle}\input" otfscale.tex ; \
+		mv otfscale.dvi otfscale-$$scl-uplatex.dvi ; \
+		$(DVIPDFMX) otfscale-$$scl-uplatex.dvi ; \
+	done
+	for scl in default 1.0; do \
+		$(UPLATEX) "\def\scale{$$scl}\def\class{jsarticle}\input" otfscale.tex ; \
+		mv otfscale.dvi otfscale-$$scl-js-uplatex.dvi ; \
+		$(DVIPDFMX) otfscale-$$scl-js-uplatex.dvi ; \
+	done
+
+platex-scale:
+	for scl in default 0.5 1.0 1.5 2.0; do \
+		$(PLATEX) "\def\scale{$$scl}\def\class{jarticle}\input" otfscale.tex ; \
+		mv otfscale.dvi otfscale-$$scl-platex.dvi ; \
+		$(DVIPDFMX) otfscale-$$scl-platex.dvi ; \
+	done
+	for scl in default 1.0; do \
+		$(PLATEX) "\def\scale{$$scl}\def\class{jsarticle}\input" otfscale.tex ; \
+		mv otfscale.dvi otfscale-$$scl-js-platex.dvi ; \
+		$(DVIPDFMX) otfscale-$$scl-js-platex.dvi ; \
+	done
+
 clean:
 	rm *.aux *.log *.dvi *.pdf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex
new file mode 100644
index 00000000000..49d42eb1770
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/otfscale.tex
@@ -0,0 +1,69 @@
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+\def\@tarticle{tarticle}
+\def\@op@cls{}
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\scale\@undefined
+ \edef\scale{default}
+\else
+ \ifx\scale\@default
+ \else
+  \edef\@opt@{scale=\scale,\@opt@}
+ \fi
+\fi
+\typeout{## scale: \scale ##}
+
+\ifx\class\@undefined
+ \def\class{jarticle}
+\fi
+\ifx\class\@jarticle
+\else
+ \ifx\class\@tarticle
+ \else
+  \ifnum\jis"2121="3000
+   \edef\@opt@{uplatex,\@opt@}
+   \def\@op@cls{,uplatex}
+  \else
+  \fi
+ \fi
+\fi
+
+\documentclass[a4paper,titlepage,draft\@op@cls]{\class}
+
+\usepackage[\@opt@]{otf}
+\usepackage{color}
+\newcommand{\redframe}[1]{%
+ \textcolor{red}{\frame{\textcolor{black}{#1}}}}
+
+\begin{document}
+\section{見出し}
+
+クラス：\texttt{\class}\\
+オプション：\texttt{\option}\\
+スケール：\texttt{\scale}
+
+\parindent0mm
+\xkanjiskip=0pt plus.1pt minus.1pt
+
+\vbox{\tate
+\hbox{\Large \redframe{HMH}\redframe{回□回}\redframe{HMH}\redframe{回□回}\redframe{HMH}}
+\hbox{\Large HMH回□回HMH回□回HMH}
+}
+
+\vbox{\yoko
+\hbox{\Large \redframe{HMH}\redframe{回□回}\redframe{HMH}\redframe{回□回}\redframe{HMH}}
+\hbox{\Large HMH回□回HMH回□回HMH}
+}
+
+\end{document}