japanese-otf (24nov13)

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

7 files changed, 92 insertions, 81 deletions

diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT b/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
index 2dc5c82f81e..5c7ad318981 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2003--2010 SAITO Shuzaburo and INOUE Koichi
+Copyright (C) 2003--2013 SAITO Shuzaburo and INOUE Koichi
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/fontmap.zip b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap.zip
new file mode 100644
index 00000000000..633644ffbaa
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/fontmap.zip
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/otf-script-gteb.diff b/Master/texmf-dist/doc/fonts/japanese-otf/otf-script-gteb.diff
index bf9b15cf4b3..a00aa7ac8d3 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/otf-script-gteb.diff
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/otf-script-gteb.diff
@@ -134,69 +134,69 @@
 --- japanese-otf/script/mkcidvf.pl.orig	2010-03-23 07:50:02.000000000 +0900
 +++ japanese-otf/script/mkcidvf.pl	2013-04-13 14:44:40.000000000 +0900
 @@ -4,9 +4,10 @@
- &makevf;

- 

- sub makevf {

--	for ($k=0; $k<=5; $k++){#face

-+	for ($k=0; $k<=6; $k++){#face

- 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}

- 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}

-+			elsif ($k==6){$face="ge";}

- 		for ($i=0; $i<=1; $i++){#direction

- 			if ($i==0) {$dir="h";}elsif ($i==1){$dir="v";}

- 			$cidcode=0;

+ &makevf;
+ 
+ sub makevf {
+-	for ($k=0; $k<=5; $k++){#face
++	for ($k=0; $k<=6; $k++){#face
+ 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}
+ 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}
++			elsif ($k==6){$face="ge";}
+ 		for ($i=0; $i<=1; $i++){#direction
+ 			if ($i==0) {$dir="h";}elsif ($i==1){$dir="v";}
+ 			$cidcode=0;
 --- japanese-otf/script/mkjp04tfmvf.pl.orig	2010-03-26 11:36:32.000000000 +0900
 +++ japanese-otf/script/mkjp04tfmvf.pl	2013-04-13 14:45:50.000000000 +0900
 @@ -11,9 +11,10 @@
- &makejvf;

- 

- sub make_utf_tfm {

--	for ($k=0; $k<=5; $k++){#face

-+	for ($k=0; $k<=6; $k++){#face

- 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}

- 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}

-+			elsif ($k==6){$face="ge";}

- 		for ($l=0; $l<=0; $l++){#language

- 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 

- 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}

+ &makejvf;
+ 
+ sub make_utf_tfm {
+-	for ($k=0; $k<=5; $k++){#face
++	for ($k=0; $k<=6; $k++){#face
+ 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}
+ 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}
++			elsif ($k==6){$face="ge";}
+ 		for ($l=0; $l<=0; $l++){#language
+ 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 
+ 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}
 @@ -43,9 +44,10 @@
- }

- 

- sub makejvf {

--	for ($k=0; $k<=5; $k++){#face

-+	for ($k=0; $k<=6; $k++){#face

- 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}

- 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}

-+			elsif ($k==6){$face="ge";}

- 		for ($l=0; $l<=0; $l++){#language

- 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 

- 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}

+ }
+ 
+ sub makejvf {
+-	for ($k=0; $k<=5; $k++){#face
++	for ($k=0; $k<=6; $k++){#face
+ 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}
+ 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}
++			elsif ($k==6){$face="ge";}
+ 		for ($l=0; $l<=0; $l++){#language
+ 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 
+ 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}
 --- japanese-otf/script/mktfm.pl.orig	2004-12-23 22:50:06.000000000 +0900
 +++ japanese-otf/script/mktfm.pl	2013-04-13 14:46:37.000000000 +0900
 @@ -13,9 +13,10 @@
- &make_multi_cid_tfm;

- 

- sub make_utf_tfm {

--	for ($k=0; $k<=5; $k++){#face

-+	for ($k=0; $k<=6; $k++){#face

- 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}

- 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}

-+			elsif ($k==6){$face="ge";}

- 		for ($l=0; $l<=0; $l++){#language

- 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 

- 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}

+ &make_multi_cid_tfm;
+ 
+ sub make_utf_tfm {
+-	for ($k=0; $k<=5; $k++){#face
++	for ($k=0; $k<=6; $k++){#face
+ 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}
+ 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}
++			elsif ($k==6){$face="ge";}
+ 		for ($l=0; $l<=0; $l++){#language
+ 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 
+ 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}
 @@ -45,9 +46,10 @@
- }

- 

- sub make_cid_tfm {

--	for ($k=0; $k<=5; $k++){#face

-+	for ($k=0; $k<=6; $k++){#face

- 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}

- 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}

-+			elsif ($k==6){$face="ge";}

- 		for ($l=0; $l<=0; $l++){#language

- 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 

- 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}

+ }
+ 
+ sub make_cid_tfm {
+-	for ($k=0; $k<=5; $k++){#face
++	for ($k=0; $k<=6; $k++){#face
+ 		if ($k==0) {$face="mr";}elsif ($k==1){$face="gr";}elsif ($k==2){$face="mb";}
+ 			elsif ($k==3){$face="gb";}elsif ($k==4){$face="mgr";}elsif ($k==5){$face="ml";}
++			elsif ($k==6){$face="ge";}
+ 		for ($l=0; $l<=0; $l++){#language
+ 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 
+ 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}
 --- japanese-otf/script/mkutfvf.pl.orig	2010-03-26 11:23:42.000000000 +0900
 +++ japanese-otf/script/mkutfvf.pl	2013-04-13 14:43:21.000000000 +0900
 @@ -6,9 +6,10 @@
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt b/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
index 8f7e577cfa8..3bddafe2af2 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/readme.en.txt
@@ -8,16 +8,19 @@ choosing to general names on CTAN (and in TeX Live) it will be
 called "japanese-otf". This change has been discussed with
 the author of the package, Saito Shuzaburo. The version of
 the package used is 
-	otfbeta.zip v1.7b5 2012/4/11
+	otfbeta.zip v1.7b6 2013/11/17
 
 In addition a patch by Hironori Kitagawa was applied
 	otf-script-gteb.diff
 (included) to build tfm/vf/ofm for gteb font series.
 
+The map file in TeXLive-maps/otf-cktx.map was generated from the
+provided font maps.
+
 The original source has been downloaded from
 	http://psitau.kitunebi.com/otf.html
 as
-	http://psitau.kitunebi.com/otfbeta.zip
+	http://psitau.kitunebi.com/otf1.7b6.zip
 
 This package provides advanced typesetting options for platex and 
 friends.
@@ -29,4 +32,4 @@ The contents of this package is under the license given in the
 COPYRIGHT file, which is more or less BSD license.
 
 Norbert Preining
-2013-04-13
+2013-11-23
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt b/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
index 854c9e4f44a..478de2bac91 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
+++ b/Master/texmf-dist/doc/fonts/japanese-otf/readme.txt
@@ -1,12 +1,12 @@
-OTF$B%Q%C%1!<%83+H/HG!J(Bv1.7b5 2012/4/11$B!K(B
+OTF$B%Q%C%1!<%83+H/HG!J(Bv1.7b6 2013/11/17$B!K(B
 $Bc7F#=$;0O:(B
 
 $B!Z%i%$%;%s%9![(B
 $B=$@5(B BSD$B$H$7$^$9!%(B
 
 $B!ZI,MW$JJ*![(B
-$B!&(Bovp2ovf$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
-$B!&(Bopl2ofm$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!$(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
+$B!&(Bovp2ovf$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!"(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
+$B!&(Bopl2ofm$B!'(BWEB$BHG$N$b$N$@$H3N<B$K$&$^$/$$$-$^$9!%(BC$BHG$N>l9g!"(B2011$BG/(B12$B7n0J9_$N(BVersion$B$G$7$?$i$&$^$/$$$-$^$9!%(B
 $B!&(Bperl
 $B!&(Bppltotf
 
@@ -71,6 +71,13 @@ CID$B$K$h$k;XDj$O!$4JBN;z$O(B\CIDC$B$r!$HKqs;z$O(B\CIDT$B$r!$D+A/8l$O(B\CI
 $B%k%SMQ$N%U%)%s%H$*$h$S(B\ebseries$B$K$OE,MQ$5$l$^$;$s!%(B
 $B$^$?!$<B:]$K;HMQ$9$k%U%)%s%H$K$h$C$F$O;z7A$NJQ99$,9T$o$l$J$$$3$H$,$"$j$^$9!%(B
 
+$B!~(Bscale$B%*%W%7%g%s!N(Bv1.7b6$B0J9_!O(B
+$B%U%)%s%H$r@k8@$9$k$H$-$KL@<(E*$K(Bscale$B$r;XDj$7$?$$>l9g$K;HMQ$7$^$9!%(B
+\usepackage[scale=1.0]{otf}
+$B$G!$2$J8(B10pt$B$KBP$7$F!$OBJ8$b(B10pt$B$K$J$j$^$9!%(B
+$B>0!$@k8@$7$J$$>l9g!$(Bjs$B%/%i%9$r;HMQ$7$F$$$l$P(Bscale=0.92469$B!$$=$l0J30$N%/%i%9%U%!%$%k$N>l9g!$(Bscale=0.962216$B$H$J$j$^$9!%(B
+
+
 $B!Z$*$^$1![(Bmkjvf$B$K$D$$$F(B
 $B@8@.%9%/%j%W%H$NCf$G;H$C$F$$$k(Bmkjvf$B$O(Bovp2ovf$B$rMxMQ$7$F(BVF$B$r:n@.$9$k(Bperl$B%9%/%j%W%H$G$9!%(B
 $B$=$l<+BN$G$b;H$($^$9$N$G!$$4MxMQBW$1$l$P9,$$$G$9!%(B
@@ -84,17 +91,18 @@ makejvf$B$H$N0c$$$O!$(B
 
 $B!Z;HMQ5vBz![(B
 $BK\%Q%C%1!<%8$N%$%s%9%H!<%k$^$?$O;HMQ$K4XO"$7$F;HMQ<T$KD>@\E*$^$?$O4V@\E*$KH/@8$9$k0l@Z$NB;32(B
-$B!J%O!<%I%&%'%"!$B>$N%=%U%H%&%'%"$NGKB;!$IT6q9gEy$r4^$`!%$^$?!$DL>oB;32!$FCJLB;32!$7k2LB;32$r(B
-$BLd$o$J$$!K$*$h$SBh;0<T$+$i$J$5$l$k@A5a$K$D$$$FCx:n8"<T$O0l@Z@UG$$rIiC4$7$^$;$s!%(B
-$BK\%Q%C%1!<%8$r;HMQ$7$FF@$i$l$k7k2L$O!$>&MQ!$Hs>&MQ$K4X$o$i$:L5=~$G;HMQ$9$k$3$H$,2DG=$G$9!%(B
-$B<+8J@UG$$G;HMQ$7$F$/$@$5$$!%K\%Q%C%1!<%8$r;HMQ$7$?>l9g!$>e5-$N5-:\;v9`$KF10U$7$?$b$N$H8+$J$7(B
-$B$^$9!%(B
+$B!J%O!<%I%&%'%"!"B>$N%=%U%H%&%'%"$NGKB;!"IT6q9gEy$r4^$`!#$^$?!"DL>oB;32!"FCJLB;32!"7k2LB;32$r(B
+$BLd$o$J$$!K$*$h$SBh;0<T$+$i$J$5$l$k@A5a$K$D$$$FCx:n8"<T$O0l@Z@UG$$rIiC4$7$^$;$s!#(B
+$BK\%Q%C%1!<%8$r;HMQ$7$FF@$i$l$k7k2L$O!">&MQ!"Hs>&MQ$K4X$o$i$:L5=~$G;HMQ$9$k$3$H$,2DG=$G$9!#(B
+$B<+8J@UG$$G;HMQ$7$F$/$@$5$$!#K\%Q%C%1!<%8$r;HMQ$7$?>l9g!">e5-$N5-:\;v9`$KF10U$7$?$b$N$H8+$J$7(B
+$B$^$9!#(B
 
 $B!ZJQ99MzNr![(B
+v1.7b5-->v1.7b6(2013/11/17)
+$B!&(Bscale$B%*%W%7%g%s$NDI2C!%(B[otf.sty]
+$B!J<BAu$O!$(BZ.R.$B$5$s$N(BBXjscls$B%Q%C%1!<%8$r;29M$K$5$;$F$$$?$@$-$-$^$7$?!K(B
 v1.7b4-->v1.7b5(2012/4/11)
-$B!&(Bnoreplace$B%*%W%7%g%s;HMQ;~$G!$(B\if@enablejfam$B$,Dj5A$5$l$F$$$J$$>l9g!$%(%i!<$H$J$kIT6q9g$r=$@5!%(B
-$B!!(BZ.R.$B$5$s$K$h$k=$@5$r<h$j9~$^$;$F$$$?$@$-$^$7$?!J>eED$5$s!$A0ED$5$s!$;3K\$5$s!$(BZ.R.$B$5$s$"$j$,$H$&$4$6$$$^$9!K!%(B
-$B!!(B[otf.sty]
+$B!&(Bnoreplace$B%*%W%7%g%s;HMQ;~$G!$(B\if@enablejfam$B$,Dj5A$5$l$F$$$J$$>l9g!$%(%i!<$H$J$kIT6q9g$r=$@5!%(BZ.R.$B$5$s$K$h$k=$@5$r<h$j9~$^$;$F$$$?$@$-$^$7$?!J>eED$5$s!$A0ED$5$s!$;3K\$5$s!$(BZ.R.$B$5$s$"$j$,$H$&$4$6$$$^$9!K!%(B[otf.sty]
 v1.7b3-->v1.7b4(2012/1/22)
 $B!&9uLZM52p$5$s$K$h$k!$D+A/8l$NAHHG$9$k$?$a$NJd=u%U%!%$%k$NDI2C!%>\$7$/$O(Bhttp://ptetexwin.sourceforge.jp/jkexample/$B$r;2>H$N$3$H!%(B
 $B!!(B[otf-hangul.dfu$B$NDI2C(B, koreanexample.tex$B$NDI2C(B]
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/makeotf b/Master/texmf-dist/source/fonts/japanese-otf/makeotf
index 7b134c9fd46..4a8e5c2b043 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/makeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/makeotf
@@ -130,22 +130,22 @@ ppltotf -kanji=euc pl/phirakakuw3-h.pl tfm/phirakakuw3-h.tfm
 ppltotf -kanji=euc pl/phiraminw3-h.pl tfm/phiraminw3-h.tfm
 ppltotf -kanji=euc pl/phiramaruw4-h.pl tfm/phiramaruw4-h.tfm
 ppltotf -kanji=euc pl/phirakakuw6-h.pl tfm/phirakakuw6-h.tfm
-ovp2ovf ovp/phirakakuw3-h.ovp vf/phirakakuw3-h.vf vf/phirakakuw3-h.ofm
-ovp2ovf ovp/phiraminw6-h.ovp vf/phiraminw6-h.vf vf/phiraminw6-h.ofm
-ovp2ovf ovp/phiraminw3-h.ovp vf/phiraminw3-h.vf vf/phiraminw3-h.ofm
-ovp2ovf ovp/phirakakuw6-h.ovp vf/phirakakuw6-h.vf vf/phirakakuw6-h.ofm
-ovp2ovf ovp/phiramaruw4-h.ovp vf/phiramaruw4-h.vf vf/phiramaruw4-h.ofm
+wovp2ovf ovp/phirakakuw3-h.ovp vf/phirakakuw3-h.vf vf/phirakakuw3-h.ofm
+wovp2ovf ovp/phiraminw6-h.ovp vf/phiraminw6-h.vf vf/phiraminw6-h.ofm
+wovp2ovf ovp/phiraminw3-h.ovp vf/phiraminw3-h.vf vf/phiraminw3-h.ofm
+wovp2ovf ovp/phirakakuw6-h.ovp vf/phirakakuw6-h.vf vf/phirakakuw6-h.ofm
+wovp2ovf ovp/phiramaruw4-h.ovp vf/phiramaruw4-h.vf vf/phiramaruw4-h.ofm
 perl script/mkvpkana.pl
 ppltotf -kanji=euc pl/phiraminw6-v.pl tfm/phiraminw6-v.tfm
 ppltotf -kanji=euc pl/phirakakuw3-v.pl tfm/phirakakuw3-v.tfm
 ppltotf -kanji=euc pl/phiraminw3-v.pl tfm/phiraminw3-v.tfm
 ppltotf -kanji=euc pl/phiramaruw4-v.pl tfm/phiramaruw4-v.tfm
 ppltotf -kanji=euc pl/phirakakuw6-v.pl tfm/phirakakuw6-v.tfm
-ovp2ovf ovp/phirakakuw3-v.ovp vf/phirakakuw3-v.vf vf/phirakakuw3-v.ofm
-ovp2ovf ovp/phiraminw6-v.ovp vf/phiraminw6-v.vf vf/phiraminw6-v.ofm
-ovp2ovf ovp/phiraminw3-v.ovp vf/phiraminw3-v.vf vf/phiraminw3-v.ofm
-ovp2ovf ovp/phirakakuw6-v.ovp vf/phirakakuw6-v.vf vf/phirakakuw6-v.ofm
-ovp2ovf ovp/phiramaruw4-v.ovp vf/phiramaruw4-v.vf vf/phiramaruw4-v.ofm
+wovp2ovf ovp/phirakakuw3-v.ovp vf/phirakakuw3-v.vf vf/phirakakuw3-v.ofm
+wovp2ovf ovp/phiraminw6-v.ovp vf/phiraminw6-v.vf vf/phiraminw6-v.ofm
+wovp2ovf ovp/phiraminw3-v.ovp vf/phiraminw3-v.vf vf/phiraminw3-v.ofm
+wovp2ovf ovp/phirakakuw6-v.ovp vf/phirakakuw6-v.vf vf/phirakakuw6-v.ofm
+wovp2ovf ovp/phiramaruw4-v.ovp vf/phiramaruw4-v.vf vf/phiramaruw4-v.ofm
 cp hminr-h.tfm tfm/hiramin-w3-h.tfm
 cp hminr-h.tfm tfm/hiramin-w6-h.tfm
 cp hminr-h.tfm tfm/hirakaku-w3-h.tfm
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/mkjvf b/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
index 35c3b443939..c5483fd892e 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
@@ -238,7 +238,7 @@ sub write_char {
 }
 sub make_vf {
 	close(OVP);
-	system("ovp2ovf $tfm_name.ovp $tfm_name.vf $tfm_name.ofm");
+	system("wovp2ovf $tfm_name.ovp $tfm_name.vf $tfm_name.ofm");
 	unlink "$tfm_name.ovp";
 	unlink "$tfm_name.ofm";
 }