japanese-otf-uptex (7apr18)

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

7 files changed, 57 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl
index 448ef34b3c4..febaa03e8b9 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl
@@ -70,11 +70,13 @@
    )
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
-   UFF5F U3018 U3016 U301D 
+   UFF5F U3018 U3016 U301D U00AB 
+   U2329 U301A 
    )
 (CHARSINTYPE O 2
    、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
-   UFF60 U3019 U3017 U301F 
+   UFF60 U3019 U3017 U301F U00BB 
+   U232A U301B U301E 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
index fb3ff4e03df..b14032c76a0 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
@@ -60,11 +60,13 @@
    )
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
-   UFF5F U3018 U3016 U301D 
+   UFF5F U3018 U3016 U301D U00AB 
+   U2329 U301A 
    )
 (CHARSINTYPE O 2
    、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
-   UFF60 U3019 U3017 U301F 
+   UFF60 U3019 U3017 U301F U00BB 
+   U232A U301B U301E 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
index ccf7e2c5419..8e0768f7c7e 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
@@ -85,11 +85,13 @@
    )
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
-   UFF5F U3018 U3016 U301D 
+   UFF5F U3018 U3016 U301D U00AB 
+   U2329 U301A 
    )
 (CHARSINTYPE O 2
    ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
-   UFF60 U3019 U3017 U301F 
+   UFF60 U3019 U3017 U301F U00BB 
+   U232A U301B U301E 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
index 4b162156da2..8606b47040d 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
@@ -75,11 +75,13 @@
    )
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
-   UFF5F U3018 U3016 U301D 
+   UFF5F U3018 U3016 U301D U00AB 
+   U2329 U301A 
    )
 (CHARSINTYPE O 2
    ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
-   UFF60 U3019 U3017 U301F 
+   UFF60 U3019 U3017 U301F U00BB 
+   U232A U301B U301E 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
index 5e8bdcbccaa..a3fea2a3ea8 100644
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/CheckDVICode.pm
@@ -150,7 +150,11 @@ sub is_dvicode($){
 		 $code == 0xFF5F || $code == 0xFF60 || # X0213 1-02-54,55
 		 $code == 0x3018 || $code == 0x3019 || # X0213 1-02-56,57
 		 $code == 0x3016 || $code == 0x3017 || # X0213 1-02-58,59
-		 $code == 0x301D || $code == 0x301F    # X0213 1-13-64,65
+		 $code == 0x301D || $code == 0x301F || # X0213 1-13-64,65
+		 $code == 0x00AB || $code == 0x00BB || # X0213 1-09-08,18
+		 $code == 0x2329 || $code == 0x232A ||
+		 $code == 0x301A || $code == 0x301B ||
+		 $code == 0x301E
 		);}
 	if ($key eq 'open')  { return &is_ucs_open; }
 	if ($key eq 'close') { return (!&is_ucs_open); }
@@ -160,17 +164,23 @@ sub is_dvicode($){
 }
 
 sub is_ucs_open{
-	if ($dvicode == 0x301D) { return 1;}
-	if ($dvicode <= 0xFF09) { return ($dvicode%2==0);}
-	if ($dvicode == 0xFF3B || $dvicode == 0xFF5B) { return 1;}
-	if ($dvicode == 0xFF5F) { return 1;}
-	return 0;
+	if ($dvicode == 0x00AB || $dvicode == 0x2329
+	 || $dvicode == 0x301D
+	 || $dvicode == 0xFF3B || $dvicode == 0xFF5B
+	 || $dvicode == 0xFF5F) { return 1;}
+	if ($dvicode == 0x00BB || $dvicode == 0x232A
+	 || $dvicode == 0x301E || $dvicode == 0x301F
+	 || $dvicode == 0xFF3D || $dvicode == 0xFF5D
+	 || $dvicode == 0xFF60) { return 0;}
+	return ($dvicode%2==0);
 }
 
 sub is_ucs_kigo{
+	return 1 if ($dvicode==0x00AB || $dvicode==0x00BB);
 	return 1 if ($dvicode==0x00B7);
 	return 1 if ($dvicode>=0x2018 && $dvicode<=0x2019);
 	return 1 if ($dvicode>=0x201C && $dvicode<=0x201D);
+	return 1 if ($dvicode>=0x2329 && $dvicode<=0x232A);
 	return 1 if ($dvicode>=0x3001 && $dvicode<=0x301F);
 	return 1 if ($dvicode>=0x3090 && $dvicode<=0x3093);
 	return 1 if ($dvicode>=0x3097 && $dvicode<=0x309F);
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
index 444f007b4dd..081eab8bbf6 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
@@ -150,14 +150,23 @@ sub glue_kern{
 	print  JPL "   )\n";
 }
 sub chars_in_type_jis{
-	my ($type3add) = $ucs ? "U00B7" : "";
-	my ($type5) = $ucs ? "— ― … ‥" : "— … ‥";
+	my ($type1add, $type2add, $type3add, $type5)=();
+	if ($ucs) {
+		$type1add = "UFF5F U3018 U3016 U301D U00AB U2329 U301A";
+		$type2add = "UFF60 U3019 U3017 U301F U00BB U232A U301B U301E";
+		$type3add = "U00B7";
+		$type5 = "— ― … ‥";
+	} else {
+		$type5 = "— … ‥";
+	}
 print JPL <<END_OF_DATA;
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
+   $type1add 
    )
 (CHARSINTYPE O 2
    、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
+   $type2add 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
@@ -324,8 +333,8 @@ sub print_type_prop{
 }
 
 sub get_charwidth{
-	local ($i,$dvicode)=@_;
-	local ($char,$u,$l);
+	my ($i,$dvicode)=@_;
+	my ($char,$u,$l);
 
 	if (!$ucs) {
 		if ($dvicode>=0x2474 && $dvicode<=0x2476) {
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
index 9d460314d1b..a7095628a29 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
@@ -152,14 +152,23 @@ sub glue_kern{
 	print  JPL "   )\n";
 }
 sub chars_in_type_jis{
-	my ($type3add) = $ucs ? "U00B7" : "";
-	my ($type5) = $ucs ? "— ― … ‥" : "— … ‥";
+	my ($type1add, $type2add, $type3add, $type5)=();
+	if ($ucs) {
+		$type1add = "UFF5F U3018 U3016 U301D U00AB U2329 U301A";
+		$type2add = "UFF60 U3019 U3017 U301F U00BB U232A U301B U301E";
+		$type3add = "U00B7";
+		$type5 = "— ― … ‥";
+	} else {
+		$type5 = "— … ‥";
+	}
 print JPL <<END_OF_DATA;
 (CHARSINTYPE O 1
    ‘ “ （ 〔 ［ ｛ 〈 《 「 『 【 
+   $type1add 
    )
 (CHARSINTYPE O 2
    、 ， ’ ” ） 〕 ］ ｝ 〉 》 」 』 】 
+   $type2add 
    )
 (CHARSINTYPE O 3
    ・ ： ； 
@@ -327,7 +336,7 @@ sub print_type_prop{
 
 sub get_charwidth{
 	my ($i,$dvicode)=@_;
-	my ($char,$eucchar,$testchar,$u,$l);
+	my ($char,$u,$l);
 
 	if (!$ucs) {
 		if ($dvicode>=0x2474 && $dvicode<=0x2476) {