japanese-otf-uptex (15Apr)

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

5 files changed, 24 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl
index 7e1334f25c9..f9f6026d83b 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mktfm_sp.pl
@@ -24,7 +24,7 @@ $multi=3;
 
 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 --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
index da2292d9917..65b549480f2 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutfvf_sp.pl
@@ -24,7 +24,7 @@ $multi=3;
 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 --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
index c0a35164518..bdbd5006a06 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf
@@ -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 @@ uppltotf -kanji=uptex basepl/ubase-v.pl tfm/uprubymgothr-v.tfm
 #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 @@ perl script/mkutfvf_sp.pl
 ./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 @@ echo "making alt. kana ..."
 ./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 --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
index ef1d2ecc20e..f143b77fe43 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_brsg
@@ -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-h.pl tfm/upbrsgexpmgothr-h.tfm
 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 @@ uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpminl-v.tfm
 ./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 @@ uppltotf -kanji=uptex basepl/ubrsg-v.pl tfm/upbrsgexpminl-v.tfm
 ./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 --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf
index 7106ed9ef1b..ee88ff50e2a 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umkjvf
@@ -554,6 +554,8 @@ sub get_face{
 		$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 @@ 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/){