japanese-otf (15Apr)

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

8 files changed, 53 insertions, 9 deletions

diff --git a/Master/texmf-dist/source/fonts/japanese-otf/makeotf b/Master/texmf-dist/source/fonts/japanese-otf/makeotf
index 0be08aa13da..7b134c9fd46 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/makeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/makeotf
@@ -54,6 +54,14 @@ ppltotf basepl/base3-v.pl tfm/cidjmgr3-v.tfm
 #for extra fonts
 ppltotf basepl/base-h.pl tfm/nmlgotheb-h.tfm
 ppltotf basepl/base-v.pl tfm/nmlgotheb-v.tfm
+ppltotf basepl/base-h.pl tfm/expgotheb-h.tfm
+ppltotf basepl/base-v.pl tfm/expgotheb-v.tfm
+ppltotf basepl/base-v.pl tfm/rubygotheb-v.tfm
+ppltotf basepl/base-h.pl tfm/rubygotheb-h.tfm
+ppltotf basepl/base0-h.pl tfm/cidjge0-h.tfm
+ppltotf basepl/base2-h.pl tfm/cidjge2-h.tfm
+ppltotf basepl/base2-v.pl tfm/cidjge2-v.tfm
+ppltotf basepl/base3-v.pl tfm/cidjge3-v.tfm
 ppltotf basepl/base-h.pl tfm/nmlminl-h.tfm
 ppltotf basepl/base-v.pl tfm/nmlminl-v.tfm
 ppltotf basepl/base-h.pl tfm/expminl-h.tfm
@@ -83,7 +91,7 @@ perl script/mkaltutfvf.pl
 ./mkjvf -cm -cp nmlmgothr-v hmgothr-v
 #extra fonts
 ./mkjvf nmlgotheb-h hgotheb-h
-./mkjvf -cp nmlgotheb-v hgotheb-v
+./mkjvf -cm -cp nmlgotheb-v hgotheb-v
 ./mkjvf nmlminl-h hminl-h
 ./mkjvf -cm -cp nmlminl-v hminl-v
 echo "making alt. kana ..."
@@ -111,6 +119,10 @@ echo "making alt. kana ..."
 ./mkjvf -cm -cp -expert expminl-v hminl-v cidjminl
 ./mkjvf -ruby rubyminl-h hminl-h cidjminl
 ./mkjvf -cm -cp -ruby rubyminl-v hminl-v cidjminl
+./mkjvf -expert expgotheb-h hgotheb-h cidjgotheb
+./mkjvf -cm -cp -expert expgotheb-v hgotheb-v cidjgotheb
+./mkjvf -ruby rubygotheb-h hgotheb-h cidjgotheb
+./mkjvf -cm -cp -ruby rubygotheb-v hgotheb-v cidjgotheb
 echo "making proportional kana tfm/vf"
 perl script/mkpkana.pl
 ppltotf -kanji=euc pl/phiraminw6-h.pl tfm/phiraminw6-h.tfm
@@ -171,6 +183,8 @@ ppltotf basepl/brsg-h.pl tfm/brsgexpmgothr-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgexpmgothr-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgnmlgotheb-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgnmlgotheb-v.tfm
+ppltotf basepl/brsg-h.pl tfm/brsgexpgotheb-h.tfm
+ppltotf basepl/brsg-v.pl tfm/brsgexpgotheb-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgnmlminl-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgnmlminl-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgexpminl-h.tfm
@@ -186,7 +200,7 @@ ppltotf basepl/brsg-v.pl tfm/brsgexpminl-v.tfm
 ./mkjvf -sage brsgnmlmgothr-h hmgothr-h
 ./mkjvf -sage -cm -cp brsgnmlmgothr-v hmgothr-v
 ./mkjvf -sage brsgnmlgotheb-h hgotheb-h
-./mkjvf -sage -cp brsgnmlgotheb-v hgotheb-v
+./mkjvf -sage -cm -cp brsgnmlgotheb-v hgotheb-v
 ./mkjvf -sage brsgnmlminl-h hminl-h
 ./mkjvf -sage -cm -cp brsgnmlminl-v hminl-v
 ./mkjvf -sage -expert brsgexpminr-h hminr-h cidjminr
@@ -199,6 +213,8 @@ ppltotf basepl/brsg-v.pl tfm/brsgexpminl-v.tfm
 ./mkjvf -sage -cm -cp -expert brsgexpgothb-v hgothb-v cidjgothb
 ./mkjvf -sage -expert brsgexpmgothr-h hmgothr-h cidjmgothr
 ./mkjvf -sage -cm -cp -expert brsgexpmgothr-v hmgothr-v cidjmgothr
+./mkjvf -sage -expert brsgexpgotheb-h hgotheb-h cidjgotheb
+./mkjvf -sage -cm -cp -expert brsgexpgotheb-v hgotheb-v cidjgotheb
 ./mkjvf -sage -expert brsgexpminl-h hminl-h cidjminl
 ./mkjvf -sage -cm -cp -expert brsgexpminl-v hminl-v cidjminl
 echo "making tfm/vf for UTF jp04 (wait a while)..."
@@ -228,6 +244,10 @@ ppltotf basepl/base-h.pl tfm/nmlminln-h.tfm
 ppltotf basepl/base-v.pl tfm/nmlminln-v.tfm
 ppltotf basepl/base-h.pl tfm/expminln-h.tfm
 ppltotf basepl/base-v.pl tfm/expminln-v.tfm
+ppltotf basepl/base-h.pl tfm/nmlgothebn-h.tfm
+ppltotf basepl/base-v.pl tfm/nmlgothebn-v.tfm
+ppltotf basepl/base-h.pl tfm/expgothebn-h.tfm
+ppltotf basepl/base-v.pl tfm/expgothebn-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgnmlminrn-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgnmlminrn-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgnmlgothrn-h.tfm
@@ -252,6 +272,10 @@ ppltotf basepl/brsg-h.pl tfm/brsgnmlminln-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgnmlminln-v.tfm
 ppltotf basepl/brsg-h.pl tfm/brsgexpminln-h.tfm
 ppltotf basepl/brsg-v.pl tfm/brsgexpminln-v.tfm
+ppltotf basepl/brsg-h.pl tfm/brsgnmlgothebn-h.tfm
+ppltotf basepl/brsg-v.pl tfm/brsgnmlgothebn-v.tfm
+ppltotf basepl/brsg-h.pl tfm/brsgexpgothebn-h.tfm
+ppltotf basepl/brsg-v.pl tfm/brsgexpgothebn-v.tfm
 echo "making jvf for jp04 ..."
 ./mkjvf -jp04 nmlminrn-h hminrn-h
 ./mkjvf -jp04 -cm -cp nmlminrn-v hminrn-v
@@ -265,6 +289,8 @@ echo "making jvf for jp04 ..."
 ./mkjvf -jp04 -cm -cp nmlmgothrn-v hmgothrn-v
 ./mkjvf -jp04 nmlminln-h hminln-h
 ./mkjvf -jp04 -cm -cp nmlminln-v hminln-v
+./mkjvf -jp04 nmlgothebn-h hgothebn-h
+./mkjvf -jp04 -cm -cp nmlgothebn-v hgothebn-v
 ./mkjvf -jp04 -expert expminrn-h hminrn-h cidjminr
 ./mkjvf -jp04 -cm -cp -expert expminrn-v hminrn-v cidjminr
 ./mkjvf -jp04 -expert expgothrn-h hgothrn-h cidjgothr
@@ -275,6 +301,8 @@ echo "making jvf for jp04 ..."
 ./mkjvf -jp04 -cm -cp -expert expgothbn-v hgothbn-v cidjgothb
 ./mkjvf -jp04 -expert expmgothrn-h hmgothrn-h cidjmgothr
 ./mkjvf -jp04 -cm -cp -expert expmgothrn-v hmgothrn-v cidjmgothr
+./mkjvf -jp04 -expert expgothebn-h hgothebn-h cidjgotheb
+./mkjvf -jp04 -cm -cp -expert expgothebn-v hgothebn-v cidjgotheb
 ./mkjvf -jp04 -expert expminln-h hminln-h cidjminl
 ./mkjvf -jp04 -cm -cp -expert expminln-v hminln-v cidjminl
 ./mkjvf -jp04 -sage brsgnmlminrn-h hminrn-h
@@ -287,6 +315,8 @@ echo "making jvf for jp04 ..."
 ./mkjvf -jp04 -sage -cm -cp brsgnmlgothbn-v hgothbn-v
 ./mkjvf -jp04 -sage brsgnmlmgothrn-h hmgothrn-h
 ./mkjvf -jp04 -sage -cm -cp brsgnmlmgothrn-v hmgothrn-v
+./mkjvf -jp04 -sage brsgnmlgothebn-h hgothebn-h
+./mkjvf -jp04 -sage -cm -cp brsgnmlgothebn-v hgothebn-v
 ./mkjvf -jp04 -sage brsgnmlminln-h hminln-h
 ./mkjvf -jp04 -sage -cm -cp brsgnmlminln-v hminln-v
 ./mkjvf -jp04 -sage -expert brsgexpminrn-h hminrn-h cidjminr
@@ -299,6 +329,8 @@ echo "making jvf for jp04 ..."
 ./mkjvf -jp04 -sage -cm -cp -expert brsgexpgothbn-v hgothbn-v cidjgothb
 ./mkjvf -jp04 -sage -expert brsgexpmgothrn-h hmgothrn-h cidjmgothr
 ./mkjvf -jp04 -sage -cm -cp -expert brsgexpmgothrn-v hmgothrn-v cidjmgothr
+./mkjvf -jp04 -sage -expert brsgexpgothebn-h hgothebn-h cidjgotheb
+./mkjvf -jp04 -sage -cm -cp -expert brsgexpgothebn-v hgothebn-v cidjgotheb
 ./mkjvf -jp04 -sage -expert brsgexpminln-h hminln-h cidjminl
 ./mkjvf -jp04 -sage -cm -cp -expert brsgexpminln-v hminln-v cidjminl
 echo "finishing ..."
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/mkjvf b/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
index 3cf5d49a44c..35c3b443939 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
+++ b/Master/texmf-dist/source/fonts/japanese-otf/mkjvf
@@ -381,6 +381,8 @@ sub get_face{
 		$face="cidjmb";
 	}elsif($kana_font eq "cidjgothb"){
 		$face="cidjgb";
+	}elsif($kana_font eq "cidjgotheb"){
+		$face="cidjge";
 	}elsif($kana_font eq "cidjmgothr"){
 		$face="cidjmgr";
 	}elsif($kana_font eq "cidjminl"){
@@ -398,6 +400,8 @@ sub get_face{
 			$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/source/fonts/japanese-otf/script/mkaltutfvf.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkaltutfvf.pl
index 27adaeaf9ed..8cf536b8f64 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkaltutfvf.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkaltutfvf.pl
@@ -24,6 +24,7 @@ sub make_uni_vf {
 	for ($k=0; $k<=1; $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";}
 			for ($first_hex=0x0; $first_hex <= 0xf; $first_hex++){
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidofm.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidofm.pl
index 512ef60ab74..81aeca7ebf5 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidofm.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidofm.pl
@@ -1,7 +1,7 @@
 opendir(OPLD, "opl") || mkdir("opl",0755) || die "cannot mkdir opl";
 opendir(OFMD, "ofm") || mkdir("ofm",0755) || die "cannot mkdir ofm";
 $font_at=1.0;
-@font_base_name=("cjmr", "cjgr", "cjmb", "cjgb", "cjmgr", "cjml");
+@font_base_name=("cjmr", "cjgr", "cjmb", "cjgb", "cjmgr", "cjml", "cjge");
 for ($d=0; $d<=1; $d++){
 	if ($d==0){$dir="h";}elsif($d==1){$dir="v";}
 	foreach $base_name(@font_base_name){
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl
index 39ecc104855..13f0c760a9a 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl
@@ -4,9 +4,10 @@ opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
 &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;
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl
index 573d638c801..5e09925da46 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl
@@ -11,9 +11,10 @@ opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
 &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 make_utf_tfm {
 }
 
 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";}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl
index db35e3e5c33..ae0b82a2c11 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl
@@ -13,9 +13,10 @@ opendir(TFM, "tfm") || mkdir("tfm",0755) || die "cannot mkdir tfm";
 &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_utf_tfm {
 }
 
 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";}
diff --git a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl
index bf76bb9246b..2a499c7fdcb 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl
@@ -6,9 +6,10 @@ opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf";
 &makemlvf;
 
 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";}
@@ -33,6 +34,7 @@ sub makemlvf {
 	for ($k=0; $k<=1; $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=1; $l<=$multi; $l++){#language
 			if ($l==0) {$lang="j";} elsif ($l==1) {$lang="k";} 
 				elsif ($l==2) {$lang="c";} elsif ($l==3){$lang="t";}