japanese-otf-uptex (27nov13)

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

9 files changed, 178 insertions, 196 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}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch
index 34a3fd0764c..ea34da1d6fb 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.12.patch
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/patch/otfbeta_uptex-0.13.patch
@@ -1,6 +1,6 @@
-diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips)
---- otfbeta.orig/fontmap/hiragino.map(for udvips)	2010-03-27 09:38:48 +0900
-+++ otfbeta/fontmap/hiragino.map(for udvips)	2013-06-02 15:49:35 +0900
+diff -urN otfbeta-1.7b6/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino.map(for udvips)
+--- otfbeta-1.7b6/fontmap/hiragino.map(for udvips)	2010-03-27 09:38:48.000000000 +0900
++++ otfbeta/fontmap/hiragino.map(for udvips)	2013-06-02 16:55:51.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v 	HiraMinPro-W3-Identity-V
  hminr-h HiraMinPro-W3-H
@@ -101,9 +101,9 @@ diff -urN otfbeta.orig/fontmap/hiragino.map(for udvips) otfbeta/fontmap/hiragino
  hminln-v    HiraMinProN-W2-V
 +uphminln-h     HiraMinProN-W2-UniJIS2004-UTF16-H
 +uphminln-v     HiraMinProN-W2-UniJIS2004-UTF16-V
-diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx)
---- otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx)	2010-03-27 09:39:08 +0900
-+++ otfbeta/fontmap/hiraginox.map(for dvipdfmx)	2013-06-02 15:43:07 +0900
+diff -urN otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hiraginox.map(for dvipdfmx)
+--- otfbeta-1.7b6/fontmap/hiraginox.map(for dvipdfmx)	2010-03-27 09:39:08.000000000 +0900
++++ otfbeta/fontmap/hiraginox.map(for dvipdfmx)	2013-06-02 16:55:51.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v       Identity-V  HiraMinPro-W3
  hminr-h   H HiraMinPro-W3
@@ -204,9 +204,9 @@ diff -urN otfbeta.orig/fontmap/hiraginox.map(for dvipdfmx) otfbeta/fontmap/hirag
  hminln-v V HiraMinProN-W2
 +uphminln-h       UniJIS2004-UTF16-H        HiraMinProN-W2
 +uphminln-v       UniJIS2004-UTF16-V        HiraMinProN-W2
-diff -urN otfbeta.orig/fontmap/kozuka.map otfbeta/fontmap/kozuka.map
---- otfbeta.orig/fontmap/kozuka.map	2004-12-23 23:56:18 +0900
-+++ otfbeta/fontmap/kozuka.map	2012-01-01 16:52:24 +0900
+diff -urN otfbeta-1.7b6/fontmap/kozuka.map otfbeta/fontmap/kozuka.map
+--- otfbeta-1.7b6/fontmap/kozuka.map	2004-12-23 23:56:18.000000000 +0900
++++ otfbeta/fontmap/kozuka.map	2012-01-01 16:52:24.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v      KozMinPro-Regular-Acro-Identity-V
  hminr-h         KozMinPro-Regular-Acro-H
@@ -252,9 +252,9 @@ diff -urN otfbeta.orig/fontmap/kozuka.map otfbeta/fontmap/kozuka.map
  
  %
  %for Adobe Reader 7
-diff -urN otfbeta.orig/fontmap/kozukax.map otfbeta/fontmap/kozukax.map
---- otfbeta.orig/fontmap/kozukax.map	2004-12-23 23:54:40 +0900
-+++ otfbeta/fontmap/kozukax.map	2012-01-01 16:52:55 +0900
+diff -urN otfbeta-1.7b6/fontmap/kozukax.map otfbeta/fontmap/kozukax.map
+--- otfbeta-1.7b6/fontmap/kozukax.map	2004-12-23 23:54:40.000000000 +0900
++++ otfbeta/fontmap/kozukax.map	2012-01-01 16:52:55.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v    Identity-V KozMinPro-Regular-Acro.otf
  hminr-h       H KozMinPro-Regular-Acro.otf
@@ -300,9 +300,9 @@ diff -urN otfbeta.orig/fontmap/kozukax.map otfbeta/fontmap/kozukax.map
  
  
  %
-diff -urN otfbeta.orig/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips)
---- otfbeta.orig/fontmap/morisawa.map(for udvips)	2003-12-16 23:43:02 +0900
-+++ otfbeta/fontmap/morisawa.map(for udvips)	2012-01-01 16:47:01 +0900
+diff -urN otfbeta-1.7b6/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa.map(for udvips)
+--- otfbeta-1.7b6/fontmap/morisawa.map(for udvips)	2003-12-16 23:43:02.000000000 +0900
++++ otfbeta/fontmap/morisawa.map(for udvips)	2012-01-01 16:47:01.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v 	RyuminPro-Light-Identity-V
  hminr-h RyuminPro-Light-H
@@ -345,9 +345,9 @@ diff -urN otfbeta.orig/fontmap/morisawa.map(for udvips) otfbeta/fontmap/morisawa
  hmgothr-v Jun101Pro-Light-V
 +uphmgothr-h	Jun101Pro-Light-UniJIS-UTF16-H
 +uphmgothr-v	Jun101Pro-Light-UniJIS-UTF16-V
-diff -urN otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx)
---- otfbeta.orig/fontmap/morisawax.map(for dvipdfmx)	2004-08-17 21:35:30 +0900
-+++ otfbeta/fontmap/morisawax.map(for dvipdfmx)	2012-01-01 16:47:01 +0900
+diff -urN otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/morisawax.map(for dvipdfmx)
+--- otfbeta-1.7b6/fontmap/morisawax.map(for dvipdfmx)	2004-08-17 21:35:30.000000000 +0900
++++ otfbeta/fontmap/morisawax.map(for dvipdfmx)	2012-01-01 16:47:01.000000000 +0900
 @@ -4,6 +4,8 @@
  otf-cjmr-v    Identity-V    A-OTF-RyuminPro-Light.otf
  hminr-h    H    A-OTF-RyuminPro-Light.otf
@@ -390,9 +390,9 @@ diff -urN otfbeta.orig/fontmap/morisawax.map(for dvipdfmx) otfbeta/fontmap/moris
  hmgothr-v    V    A-OTF-Jun101Pro-Light.otf
 +uphmgothr-h    UniJIS-UTF16-H    A-OTF-Jun101Pro-Light.otf
 +uphmgothr-v    UniJIS-UTF16-V    A-OTF-Jun101Pro-Light.otf
-diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt
---- otfbeta.orig/fontmap/vfontmap.txt	2003-11-10 19:23:12 +0900
-+++ otfbeta/fontmap/vfontmap.txt	2012-01-01 16:47:01 +0900
+diff -urN otfbeta-1.7b6/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt
+--- otfbeta-1.7b6/fontmap/vfontmap.txt	2003-11-10 19:23:12.000000000 +0900
++++ otfbeta/fontmap/vfontmap.txt	2012-01-01 16:47:01.000000000 +0900
 @@ -20,6 +20,8 @@
  otf-cjmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf adobejapan
  hminr-h /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
@@ -438,13 +438,13 @@ diff -urN otfbeta.orig/fontmap/vfontmap.txt otfbeta/fontmap/vfontmap.txt
  
  otf-ukmr-h /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
  otf-ukmr-v /usr/local/share/texmf/dvipdfm/CIDFont/HYSMyeongJoStd-Medium-Acro.otf unicode
-diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty
---- otfbeta.orig/sty/mlutf.sty	2010-03-22 14:50:54 +0900
-+++ otfbeta/sty/mlutf.sty	2013-05-25 18:24:54 +0900
+diff -urN otfbeta-1.7b6/sty/mlutf.sty otfbeta/sty/mlutf.sty
+--- otfbeta-1.7b6/sty/mlutf.sty	2010-03-22 14:50:54.000000000 +0900
++++ otfbeta/sty/mlutf.sty	2013-11-23 22:32:27.000000000 +0900
 @@ -1,5 +1,5 @@
  \NeedsTeXFormat{pLaTeX2e}
 -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau]
-+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk]
++\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.13 ttk]
  %force catcode of \" be 12
  \count@\catcode`\"
  \catcode`\"=12
@@ -484,17 +484,17 @@ diff -urN otfbeta.orig/sty/mlutf.sty otfbeta/sty/mlutf.sty
 +\Declare@FontShape{utf}{m}{0123456789abcdefjklmnopqrstuvz}{utfmr}
 +\Declare@FontShape{utf}{bx}{0123456789abcdefjklmnopqrstuvz}{utfgr}
  \endinput
-diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
---- otfbeta.orig/sty/otf.sty	2012-04-11 13:08:12 +0900
-+++ otfbeta/sty/otf.sty	2013-06-02 09:30:31 +0900
+diff -urN otfbeta-1.7b6/sty/otf.sty otfbeta/sty/otf.sty
+--- otfbeta-1.7b6/sty/otf.sty	2013-11-17 09:30:36.000000000 +0900
++++ otfbeta/sty/otf.sty	2013-11-23 12:27:24.000000000 +0900
 @@ -1,5 +1,5 @@
  \NeedsTeXFormat{pLaTeX2e}
--\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau]
-+\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk]
+-\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau]
++\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.13 ttk]
+ \RequirePackage{keyval}
  %for processing options 
  \newif\if@kana \@kanafalse
- \newif\if@macro \@macrotrue
-@@ -57,9 +57,142 @@
+@@ -66,9 +66,142 @@
  	}
  \fi
  \gdef\Redefine@UTF{\@ifpackageloaded{hyperref}{%
@@ -638,7 +638,7 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
  \AtBeginDocument{\Redefine@UTF}
  %internal macros
  %macros by iNOUE Koich!
-@@ -67,7 +200,9 @@
+@@ -76,7 +209,9 @@
  \newcommand\put@character{%
  	\@tempcntb=\@tempcnta
  	\divide\@tempcntb by "1000
@@ -649,7 +649,7 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
  	\selectfont%
  	\multiply\@tempcntb by "1000
  	\advance\@tempcnta by -\@tempcntb
-@@ -254,6 +389,8 @@
+@@ -264,6 +399,8 @@
  		\DeclareFontShape{\otf@JTn}{rubymg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubymgothr-v}{}
  		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-h}{}
  		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expminl\nlck@sfx@-v}{}
@@ -658,7 +658,7 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
  		\DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-h}{}
  		\DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ rubyminl-v}{}
  	\else
-@@ -262,8 +399,8 @@
+@@ -272,8 +409,8 @@
  		\DeclareFontShape{\otf@JYn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-h}{}
  		\DeclareFontShape{\otf@JTn}{hmc}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ nmlminl\nlck@sfx@-v}{}
  	\fi
@@ -669,7 +669,7 @@ diff -urN otfbeta.orig/sty/otf.sty otfbeta/sty/otf.sty
  	\DeclareFontShape{\otf@JYn}{hmc}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw3-h}{}
  	\DeclareFontShape{\otf@JYn}{hmc}{bx}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phiraminw6-h}{}
  	\DeclareFontShape{\otf@JYn}{hgt}{m}{prp}{<-> s * [\utf@sc@le] \otf@pfx@ phirakakuw3-h}{}
-@@ -280,34 +417,36 @@
+@@ -290,34 +427,36 @@
  \DeclareKanjiFamily{\otf@JTn}{utfj}{}
  \DeclareKanjiFamily{\otf@JYn}{cidj}{}
  \DeclareKanjiFamily{\otf@JTn}{cidj}{}
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
index 077153c39f9..f41f813ad6f 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.12 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.13 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
index 1e6a0faf9a9..3834fe48458 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
@@ -1,5 +1,6 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2012/04/11 v1.7b5 psitau, u0.12 ttk]
+\ProvidesPackage{otf}[2013/11/17 v1.7b6 psitau, u0.13 ttk]
+\RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse
 \newif\if@macro \@macrotrue
@@ -9,6 +10,9 @@
 \newif\if@burasage \@burasagefalse
 \newif\if@newglyph \@newglyphfalse
 \newif\if@otf@uplatex \@otf@uplatexfalse
+\newif\if@otf@scale \@otf@scalefalse
+\newif\if@jsclasses \@jsclassesfalse
+
 \DeclareOption{nomacro}{\@macrofalse}
 \DeclareOption{nomacros}{\@macrofalse}
 \DeclareOption{noreplace}{\@replacefalse}
@@ -19,6 +23,11 @@
 \DeclareOption{burasage}{\@burasagetrue}
 \DeclareOption{uplatex}{\@otf@uplatextrue}
 \DeclareOption{jis2004}{\@newglyphtrue}
+\DeclareOption*{\otfpkg@setkey}
+\def\otfpkg@setkey{\expandafter\otfpkg@setkey@a\expandafter{\CurrentOption}}
+\def\otfpkg@setkey@a{\setkeys{otfpkg}}
+\define@key{otfpkg}{scale}{\@otf@scaletrue\def\utf@sc@le{#1}}
+
 \def\otf@JYn{\if@otf@uplatex JY2\else JY1\fi}
 \def\otf@JTn{\if@otf@uplatex JT2\else JT1\fi}
 \def\otf@pfx@{\if@otf@uplatex up\else \fi}
@@ -227,17 +236,15 @@
 	\DeclareFontShape{#1}{#2}{#3}{#6}{<->s*[\utf@sc@le]#4#6-#5}{}%
 	\Declare@FontShape@Enc{#1}{#2}{#3}{#4}{#5}\fi}
 \def\Declare@FontShape@Enc#1\fi{\fi\Declare@FontShapeEnc#1}
-%for jsclasses
-\newif\if@jsclasses \@jsclassesfalse
-\@ifclassloaded{jsarticle}{\@jsclassestrue}{}
-\@ifclassloaded{jsbook}{\@jsclassestrue}{}
-\if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
+\if@otf@scale
+	\relax
+\else
+	%for jsclasses
+	\@ifclassloaded{jsarticle}{\@jsclassestrue}{}
+	\@ifclassloaded{jsbook}{\@jsclassestrue}{}
+	\if@jsclasses\def\utf@sc@le{0.92469}\else\def\utf@sc@le{0.962216}\fi
+\fi
 %definitions of alt-normal font family
-\@ifundefined{if@enablejfam}{%
-	\let\if@jfam@used\iffalse
-}{%
-	\let\if@jfam@used\if@enablejfam
-}
 \if@replace
 	\DeclareErrorKanjiFont{\otf@JYn}{hmc}{m}{n}{10}
 	\DeclareKanjiSubstitution{\otf@JYn}{hmc}{m}{n}
@@ -262,16 +269,19 @@
 		\DeclareRelationFont{\otf@JTn}{hgt}{bx}{}{OT1}{cmr}{bx}{}
 	\fi
 	\@ifpackageloaded{jisx0213}{\relax}{\def\mcdefault{hmc}\def\gtdefault{hgt}}
-	\if@jfam@used
-		\if@compatibility\else
-			\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
-			\DeclareSymbolFontAlphabet{\mathmc}{mincho}
-			\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
-			\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
-			\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
-			\jfam\symmincho
+	\@ifundefined{if@enablejfam}{%if disablejfam option is not available, do nothing.
+	}{%
+		\if@enablejfam
+			\if@compatibility\else
+				\DeclareSymbolFont{mincho}{\otf@JYn}{hmc}{m}{n}
+				\DeclareSymbolFontAlphabet{\mathmc}{mincho}
+				\SetSymbolFont{mincho}{bold}{\otf@JYn}{hmc}{bx}{n}
+				\DeclareMathAlphabet{\mathgt}{\otf@JYn}{hgt}{m}{n}
+				\SetMathAlphabet{\mathgt}{bold}{\otf@JYn}{hgt}{bx}{n}
+				\jfam\symmincho
+			\fi
 		\fi
-	\fi
+	}
 \fi
 \if@kana
 	\DeclareKanjiFamily{\otf@JYn}{ruby}{}