japanese-otf-uptex (13may18)

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

5 files changed, 182 insertions, 67 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 29e25e7f38a..93424f9df54 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,5 +1,5 @@
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.20  2018/04/07
+otfbeta-uptex (japanese-otf-uptex) Ver.0.21  2018/05/13
 
 
 [ Abstract ]
@@ -67,10 +67,8 @@ to Adobe standard CMap "UniJIS2004-UTF16-{H,V}".
 
 [ About proportional kana ]
 otfbeta-uptex (japanese-otf-uptex) Ver.0.14 or later supports
-proportional kana at deluxe option and \propshape with limitation:
-* Halfwidth katakana letters are not supported:
-  ｱｲｳｴｵｶｷｸｹｺ ... (in UTF-8)
-To build tfm files, uppltotf in TeX live r43143 or later is required.
+proportional kana at deluxe option and \propshape.
+To build tfm files, uppltotf in TeX Live r43143 or TeX Live 2017 or later is required.
 
 
 [ History ]
@@ -325,4 +323,15 @@ To build tfm files, uppltotf in TeX live r43143 or later is required.
     Add U+00BB, U+232A, U+301B, U+301E to char_type 2.
   test/uplatex/{punctuation,punct0,paren0}.tex, test/uplatex/Makefile ::
     Add a new test for punctuations.
+2018.05.13 Ver0.21
+  sty/otf.sty, sty/mlutf.sty ::
+    Increment version number.
+  script/umk{,v}pkana.pl, basepl/u{base,brsg}-{h,v}.pl ::
+    Add U+203C, U+2047, U+2048, U+2049 to char_type 6.
+  script/umkpkana.pl, umakeotf_prop ::
+    Add -hk option to enable halfwidth katakana letters in hiraprop.
+  script/mkutf32list.pl ::
+    Remove feature 'switch'
+  test/uplatex/{exclam,upkanatest1}.tex, test/uplatex/Makefile ::
+    Add a new test for punctuations and halfwidth katakana.
 
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
index b12c0b3c6af..279d5b0ca66 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
@@ -3,7 +3,7 @@ README
 
 From 00otf-uptex.txt:
 [ Title ]
-otfbeta-uptex (japanese-otf-uptex) Ver.0.20  2018/04/07
+otfbeta-uptex (japanese-otf-uptex) Ver.0.21  2018/05/13
 
 
 [ Abstract ]
@@ -23,11 +23,11 @@ Ref. http://opensource.org/licenses/BSD-3-Clause
 The original source has been downloaded from
 	http://www.t-lab.opal.ne.jp/tex/uptex_en.html
 as
-	http://www.t-lab.opal.ne.jp/tex/otfbeta-uptex-0.20.tar.xz
+	http://www.t-lab.opal.ne.jp/tex/otfbeta-uptex-0.21.tar.xz
 
 After that the scripts run and the generated tfm and vf files included.
 
 Norbert Preining <preining@logic.at>
 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
-2018-04-07
+2018-05-13
 
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 007e6336b73..78974e127f6 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,7 +6,7 @@ DVIPS = dvips
 DVIPDFMX = dvipdfmx
 PDVITYPE = pdvitype
 
-all: otf sp art bsrg jis04 scale prop punct
+all: otf sp art bsrg jis04 scale prop punct exclam
 
 otf: uplatex-otf platex-otf
 sp: uplatex-sp platex-sp
@@ -15,6 +15,7 @@ brsg: uplatex-brsg platex-brsg
 jis04: uplatex-jis04 platex-jis04
 scale: uplatex-scale platex-scale
 prop: uplatex-prop platex-prop
+exclam: uplatex-exclam platex-exclam
 
 uplatex-otf:
 	for opt in default deluxe expert bold noreplace; do \
@@ -173,5 +174,19 @@ punct:
 		$(DVIPDFMX) punctuation-$$opt.dvi ; \
 	done
 
+uplatex-exclam:
+	for opt in default deluxe noreplace; do \
+		$(UPLATEX) "\def\option{$$opt}\input" exclam.tex ; \
+		mv exclam.dvi exclam-$$opt-uplatex.dvi ; \
+		$(DVIPDFMX) exclam-$$opt-uplatex.dvi ; \
+	done
+
+platex-exclam:
+	for opt in default deluxe noreplace; do \
+		$(PLATEX) "\def\option{$$opt}\input" exclam.tex ; \
+		mv exclam.dvi exclam-$$opt-platex.dvi ; \
+		$(DVIPDFMX) exclam-$$opt-platex.dvi ; \
+	done
+
 clean:
 	rm -f *.aux *.log *.dvi *.pdf
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex
new file mode 100644
index 00000000000..2f8f1c38185
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex
@@ -0,0 +1,133 @@
+% -*- coding: utf-8 -*-
+\newif\ifuptexmode\uptexmodefalse
+\ifnum\jis"2121="3000 \uptexmodetrue\fi
+
+\makeatletter
+
+\def\@opt@{multi}
+\def\@default{default}
+\def\@jarticle{jarticle}
+
+\ifx\option\@undefined
+ \def\option{default}
+\fi
+\ifx\option\@default
+\else
+ \edef\@opt@{\option,\@opt@}
+\fi
+
+\ifx\class\@undefined
+ \ifuptexmode
+  \def\class{ujarticle}
+ \else
+  \def\class{jarticle}
+ \fi
+\fi
+
+\ifuptexmode
+  \edef\@opt@{uplatex,\@opt@}
+\fi
+
+\documentclass[a4paper,draft]{\class}
+
+\usepackage{plext}
+\usepackage[\@opt@]{otf}
+
+\makeatother
+
+\begin{document}
+\parindent0pt
+
+クラス：\texttt{\class}\\
+オプション：\texttt{\option}
+
+\vskip1zh
+
+あっ！あっ？ああ！ああ？驚いた。\\
+あっ！ あっ？ ああ！ ああ？ 驚いた。\\
+あっ！あっ？と驚き、ああ！ああ？と嘆く。\\
+あっ！\inhibitglue あっ？\inhibitglue と驚き、
+ああ！\inhibitglue ああ？\inhibitglue と嘆く。\\
+あっ\,！\inhibitglue\,あっ\,？\inhibitglue\,と驚き、
+ああ\,！\inhibitglue\,ああ\,？\inhibitglue\,と嘆く。\\
+あっ！\<あっ？\<と驚き、
+ああ！\<ああ？\<と嘆く。\\
+あっ\,！\<\,あっ\,？\<\,と驚き、
+ああ\,！\<\,ああ\,？\<\,と嘆く。
+
+\ifuptexmode
+
+あっ‼あっ⁇ああ‼ああ⁇驚いた。\\
+あっ‼ あっ⁇ ああ‼ ああ⁇ 驚いた。\\
+あっ‼あっ⁇と驚き、ああ‼ああ⁇と嘆く。\\
+あっ‼\inhibitglue あっ⁇\inhibitglue と驚き、
+ああ‼\inhibitglue ああ⁇\inhibitglue と嘆く。\\
+あっ\,‼\inhibitglue\,あっ\,⁇\inhibitglue\,と驚き、
+ああ\,‼\inhibitglue\,ああ\,⁇\inhibitglue\,と嘆く。\\
+あっ‼\<あっ⁇\<と驚き、
+ああ‼\<ああ⁇\<と嘆く。\\
+あっ\,‼\<\,あっ\,⁇\<\,と驚き、
+ああ\,‼\<\,ああ\,⁇\<\,と嘆く。
+
+あっ⁈あっ⁉ああ⁈ああ⁉驚いた。\\
+あっ⁈ あっ⁉ ああ⁈ ああ⁉ 驚いた。\\
+あっ⁈あっ⁉と驚き、ああ⁈ああ⁉と嘆く。\\
+あっ⁈\inhibitglue あっ⁉\inhibitglue と驚き、
+ああ⁈\inhibitglue ああ⁉\inhibitglue と嘆く。\\
+あっ\,⁈\inhibitglue\,あっ\,⁉\inhibitglue\,と驚き、
+ああ\,⁈\inhibitglue\,ああ\,⁉\inhibitglue\,と嘆く。\\
+あっ⁈\<あっ⁉\<と驚き、
+ああ⁈\<ああ⁉\<と嘆く。\\
+あっ\,⁈\<\,あっ\,⁉\<\,と驚き、
+ああ\,⁈\<\,ああ\,⁉\<\,と嘆く。
+
+\fi
+
+\vskip1zh
+
+\parbox<t>{25.0zw}{
+
+あっ！あっ？ああ！ああ？驚いた。\\
+あっ！ あっ？ ああ！ ああ？ 驚いた。\\
+あっ！あっ？と驚き、ああ！ああ？と嘆く。\\
+あっ！\inhibitglue あっ？\inhibitglue と驚き、
+ああ！\inhibitglue ああ？\inhibitglue と嘆く。\\
+あっ\,！\inhibitglue\,あっ\,？\inhibitglue\,と驚き、
+ああ\,！\inhibitglue\,ああ\,？\inhibitglue\,と嘆く。\\
+あっ！\<あっ？\<と驚き、
+ああ！\<ああ？\<と嘆く。\\
+あっ\,！\<\,あっ\,？\<\,と驚き、
+ああ\,！\<\,ああ\,？\<\,と嘆く。
+
+\ifuptexmode
+
+あっ‼あっ⁇ああ‼ああ⁇驚いた。\\
+あっ‼ あっ⁇ ああ‼ ああ⁇ 驚いた。\\
+あっ‼あっ⁇と驚き、ああ‼ああ⁇と嘆く。\\
+あっ‼\inhibitglue あっ⁇\inhibitglue と驚き、
+ああ‼\inhibitglue ああ⁇\inhibitglue と嘆く。\\
+あっ\,‼\inhibitglue\,あっ\,⁇\inhibitglue\,と驚き、
+ああ\,‼\inhibitglue\,ああ\,⁇\inhibitglue\,と嘆く。\\
+あっ‼\<あっ⁇\<と驚き、
+ああ‼\<ああ⁇\<と嘆く。\\
+あっ\,‼\<\,あっ\,⁇\<\,と驚き、
+ああ\,‼\<\,ああ\,⁇\<\,と嘆く。
+
+あっ⁈あっ⁉ああ⁈ああ⁉驚いた。\\
+あっ⁈ あっ⁉ ああ⁈ ああ⁉ 驚いた。\\
+あっ⁈あっ⁉と驚き、ああ⁈ああ⁉と嘆く。\\
+あっ⁈\inhibitglue あっ⁉\inhibitglue と驚き、
+ああ⁈\inhibitglue ああ⁉\inhibitglue と嘆く。\\
+あっ\,⁈\inhibitglue\,あっ\,⁉\inhibitglue\,と驚き、
+ああ\,⁈\inhibitglue\,ああ\,⁉\inhibitglue\,と嘆く。\\
+あっ⁈\<あっ⁉\<と驚き、
+ああ⁈\<ああ⁉\<と嘆く。\\
+あっ\,⁈\<\,あっ\,⁉\<\,と驚き、
+ああ\,⁈\<\,ああ\,⁉\<\,と嘆く。
+
+\fi
+
+}
+
+\end{document}
+
diff --git a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
index 1a1289a6109..087bcbcece4 100644
--- a/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
+++ b/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
@@ -55,10 +55,10 @@
 }
 
 \ifuptexmode
-otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を拡張しました。
+otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を、
+Ver.0.21で半角片仮名を拡張しました。
 
-{\propshape
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
+\long\def\testA{〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
 𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
 🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
 🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
@@ -69,74 +69,32 @@ otfbeta-uptex (japanese-otf-uptex) Ver.0.18でProportional仮名を拡張しま�
 𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
 𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
 杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+}
+
+{\propshape
+\noindent\testA
 
 \bfseries
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
-𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
-🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
-🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
-🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🄰🄱🄲🄳🄴🄵🄶🄷
-🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
-🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
-𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
-杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+\noindent\testA
 }
 
 {\gtfamily\mdseries\propshape
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
-𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
-🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
-🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
-🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🄰🄱🄲🄳🄴🄵🄶🄷
-🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
-🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
-𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
-杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+\noindent\testA
 
 \bfseries\propshape
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
-𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
-🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
-🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
-🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🄰🄱🄲🄳🄴🄵🄶🄷
-🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
-🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
-𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
-杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+\noindent\testA
 }
 
 {\mgfamily\propshape
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
-𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
-🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
-🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
-🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🄰🄱🄲🄳🄴🄵🄶🄷
-🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
-🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
-𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
-杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+\noindent\testA
 }
 
 {\gtfamily\ebseries
-\noindent 〃〆ヿゟゔゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿヷヸヹヺ
-𨳝櫛𥡴𨻶杓巽屠兔冕冤𡨚𤏐爨🄀
-🄐🄑🄒🄓🄔🄕🄖🄗🄘🄙🄚🄛🄜🄝🄞🄟🄠🄡🄢🄣
-🄤🄥🄦🄧🄨🄩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝
-🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🄰🄱🄲🄳🄴🄵🄶🄷
-🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉🈂🈷
-🅰🅱🅲🅳🅴🅵🅶🅷🅸🅹🅺🅻🅼🅽🅾🅿🆀🆁🆂🆃
-🆄🆅🆆🆇🆈🆉眞𠤎𦥑𫟘沿芽槪割𦈢𠮷𩵋卿𫞎憲
-𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
-𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
-杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+\noindent\testA
 }
 \fi