japanese-otf-uptex (13may18)

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

141 files changed, 262 insertions, 103 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
 
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm
index f96f323df9d..03141ee7383 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm
index 8615a5ce4ec..d3c90b3701d 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm
index 61b4301d2df..1cafb877f49 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm
diff --git a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm
index e6f8c273574..cc9084c2b6a 100644
--- a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm
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 febaa03e8b9..b0db092336d 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
@@ -90,6 +90,7 @@
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   U203C U2047 U2048 U2049
    )
 (CHARSINTYPE O 7
    UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
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 b14032c76a0..48ef4396428 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
@@ -80,6 +80,7 @@
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   U203C U2047 U2048 U2049
    )
 (TYPE O 0
    (CHARWD R 1.0)
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 8e0768f7c7e..787bf0a3e51 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
@@ -105,6 +105,7 @@
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   U203C U2047 U2048 U2049
    )
 (CHARSINTYPE O 7
    UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
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 8606b47040d..7a5afbf9e35 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
@@ -95,6 +95,7 @@
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   U203C U2047 U2048 U2049
    )
 (CHARSINTYPE O 7
    、 ， 
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
index 82b60bbcb51..b71dc60947f 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
@@ -25,7 +25,6 @@ This software is a part of otfbeta-uptex (a.k.a. japanese-otf-uptex).
 
 use strict;
 use encoding 'utf8';
-use feature 'switch';
 
 our ($style, $allrange);
 our (@count, %reset_ch, $icollec, $cid2code, $line);
@@ -47,23 +46,25 @@ if (/cid2code/) {
     $cid2code=~s/^#/%/;
 }
 
-if ($.<8 & /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) {
+if ($.<8 && /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) {
     $collection_n=$1;
     $collection=$2;
-    given($collection) {
-	when (/cns/i) { @cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155 19178/;
-			$utfmac="UTFT"; $cmap="UniCNS-UTF32";
-			$source="Adobe-CNS1-7/cid2code.txt"; }
-	when (/gb/i)  { @cid_max = qw/-1 7716 9896 22126 22352 29063 30283/;
-			$utfmac="UTFC"; $cmap="UniGB-UTF32";
-			$source="Adobe-GB1-5/cid2code.txt"; }
-	when (/kor/i) { @cid_max = qw/-1 9332 18154 18351/;
-			$utfmac="UTFK"; $cmap="UniKS-UTF32";
-			$source="Adobe-Korea1-2/cid2code.txt"; }
-	default       { @cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/;
-			$utfmac="UTF";  $cmap="UniJIS-UTF32";
-			$source="Adobe-Japan1-6/cid2code.txt"; }
-    }
+    if ($collection =~ /cns/i)    {
+	@cid_max = qw/-1 14098 17407 17600 18845 18964 19087 19155 19178/;
+	$utfmac="UTFT"; $cmap="UniCNS-UTF32";
+	$source="Adobe-CNS1-7/cid2code.txt"; }
+    elsif ($collection =~ /gb/i)  {
+	@cid_max = qw/-1 7716 9896 22126 22352 29063 30283/;
+	$utfmac="UTFC"; $cmap="UniGB-UTF32";
+	$source="Adobe-GB1-5/cid2code.txt"; }
+    elsif ($collection =~ /kor/i) {
+	@cid_max = qw/-1 9332 18154 18351/;
+	$utfmac="UTFK"; $cmap="UniKS-UTF32";
+	$source="Adobe-Korea1-2/cid2code.txt"; }
+    else                          {
+	@cid_max = qw/-1 8283 8358 8719 9353 15443 20316 23057/;
+	$utfmac="UTF";  $cmap="UniJIS-UTF32";
+	$source="Adobe-Japan1-6/cid2code.txt"; }
 }
 
 next if (/^#/);
@@ -141,12 +142,10 @@ END {
 	}
 
 	$i++;
-	given($style) {
-	    when (/utf/)   { $out=sprintf "\\${utfmac}{%X}", $ch; }
-	    when (/kchar/) { $out=sprintf "\\kchar\"%X", $ch; }
-	    when (/list/)  { $out=sprintf "%X", $ch; }
-	    default        { $out=chr($ch); }
-	}
+	if    ($style =~ /utf/)   { $out=sprintf "\\${utfmac}{%X}", $ch; }
+	elsif ($style =~ /kchar/) { $out=sprintf "\\kchar\"%X", $ch; }
+	elsif ($style =~ /list/)  { $out=sprintf "%X", $ch; }
+	else                      { $out=chr($ch); }
 	my ($newline);
 	$newline = $allrange ? 25 : 10;
 	if ($i % $newline != 1) {
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 081eab8bbf6..09d0c095a95 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
@@ -49,12 +49,17 @@ closedir(VF);
 closedir(JPL);
 closedir(JFM);
 
+$n_fixed=7; ## type 0..6
 $ucs=1; # 1: upphiraXXX or 0: phiraXXX
 if ($ucs) {
 	$CheckDVICode::is_ucs=1;
 	foreach(@font_name, @kanji_font_name) {
 		$_="up$_";
 	}
+	if ($hk) { ## command line option -hk: Enable halfwidth katakana
+		$hk_mode=1;
+		$n_fixed=8; ## type 0..7
+	}
 }
 
 #main
@@ -108,7 +113,7 @@ sub glue_kern{
 	print  JPL "   (KRN O 5 R 0.0)\n";
 	print  JPL "   (LABEL O 0)\n";
 	for ($char=0; $char<=$#uniq_char_width_array; $char++){
-		printf JPL "   (LABEL H %X)\n",($char+7);
+		printf JPL "   (LABEL H %X)\n",($char+$n_fixed);
 	}
 	printf JPL "   (GLUE O 1 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	print  JPL "   (LABEL O 1)\n";
@@ -117,12 +122,20 @@ sub glue_kern{
 	print  JPL "   (LABEL O 2)\n";
 	printf JPL "   (GLUE O 5 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	printf JPL "   (GLUE O 6 R %f R 0.0 R %f)\n", $half_width, $half_width;
+	printf JPL "   (GLUE O 7 R %f R 0.0 R %f)\n", $half_width, $half_width if $hk_mode;
+	print  JPL "   (STOP)\n";
+	if ($hk_mode) {
+		print  JPL "   (LABEL O 7)\n";
+		printf JPL "   (GLUE O 1 R %f R 0.0 R %f)\n", $half_width, $half_width;
+		printf JPL "   (GLUE O 3 R %f R 0.0 R %f)\n", $quater_width, $quater_width;
+		print  JPL "   (STOP)\n";
+	}
 	print  JPL "   (LABEL O 6)\n";
 	printf JPL "   (GLUE O 0 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	printf JPL "   (GLUE O 1 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	printf JPL "   (GLUE O 3 R %f R 0.0 R %f)\n", $quater_width, $quater_width;
 	for ($char=0; $char<=$#uniq_char_width_array; $char++){
-		printf JPL "   (GLUE H %X R %f R 0.0 R %f)\n",($char+7), $half_width, $half_width;
+		printf JPL "   (GLUE H %X R %f R 0.0 R %f)\n",($char+$n_fixed), $half_width, $half_width;
 	}
 	print  JPL "   (STOP)\n";
 	print  JPL "   (LABEL O 4)\n";
@@ -131,8 +144,9 @@ sub glue_kern{
 	printf JPL "   (GLUE O 3 R %f R 0.0 R %f)\n", $half_width+$quater_width, $quater_width;
 	printf JPL "   (GLUE O 5 R %f R 0.0 R 0.0)\n", $half_width;
 	printf JPL "   (GLUE O 6 R %f R 0.0 R 0.0)\n", $half_width;
+	printf JPL "   (GLUE O 7 R %f R 0.0 R %f)\n", $half_width, $half_width if $hk_mode;
 	for ($char=0; $char<=$#uniq_char_width_array; $char++){
-		printf JPL "   (GLUE H %X R %f R 0.0 R 0.0)\n",($char+7), $half_width;
+		printf JPL "   (GLUE H %X R %f R 0.0 R 0.0)\n",($char+$n_fixed), $half_width;
 	}
 	print  JPL "   (STOP)\n";
 	print  JPL "   (LABEL O 3)\n";
@@ -143,19 +157,21 @@ sub glue_kern{
 	printf JPL "   (GLUE O 4 R %f R 0.0 R %f)\n", $quater_width, $quater_width;
 	printf JPL "   (GLUE O 5 R %f R 0.0 R %f)\n", $quater_width, $quater_width;
 	printf JPL "   (GLUE O 6 R %f R 0.0 R %f)\n", $quater_width, $quater_width;
+	printf JPL "   (GLUE O 7 R %f R 0.0 R %f)\n", $half_width, $half_width if $hk_mode;
 	for ($char=0; $char<=$#uniq_char_width_array; $char++){
-		printf JPL "   (GLUE H %X R %f R 0.0 R %f)\n",($char+7), $quater_width, $quater_width;
+		printf JPL "   (GLUE H %X R %f R 0.0 R %f)\n",($char+$n_fixed), $quater_width, $quater_width;
 	}
 	print  JPL "   (STOP)\n";
 	print  JPL "   )\n";
 }
 sub chars_in_type_jis{
-	my ($type1add, $type2add, $type3add, $type5)=();
+	my ($type1add, $type2add, $type3add, $type5, $type6add)=();
 	if ($ucs) {
 		$type1add = "UFF5F U3018 U3016 U301D U00AB U2329 U301A";
 		$type2add = "UFF60 U3019 U3017 U301F U00BB U232A U301B U301E";
 		$type3add = "U00B7";
 		$type5 = "— ― … ‥";
+		$type6add = "U203C U2047 U2048 U2049";
 	} else {
 		$type5 = "— … ‥";
 	}
@@ -180,12 +196,26 @@ print JPL <<END_OF_DATA;
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   $type6add 
+   )
+END_OF_DATA
+print JPL <<END_OF_DATA if ($hk_mode) ; ## Halfwidth Katakana
+(CHARSINTYPE O 7
+   UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
+   UFF68 UFF69 UFF6A UFF6B UFF6C UFF6D UFF6E UFF6F
+   UFF70 UFF71 UFF72 UFF73 UFF74 UFF75 UFF76 UFF77
+   UFF78 UFF79 UFF7A UFF7B UFF7C UFF7D UFF7E UFF7F
+   UFF80 UFF81 UFF82 UFF83 UFF84 UFF85 UFF86 UFF87
+   UFF88 UFF89 UFF8A UFF8B UFF8C UFF8D UFF8E UFF8F
+   UFF90 UFF91 UFF92 UFF93 UFF94 UFF95 UFF96 UFF97
+   UFF98 UFF99 UFF9A UFF9B UFF9C UFF9D UFF9E UFF9F
    )
 END_OF_DATA
 }
 sub print_type_jis{
 	@type_width=($font_at, $half_width, $half_width, $half_width, $half_width, $font_at, $font_at);
-	for ($k=0; $k<=6; $k++){
+	if ($hk_mode) { push @type_width, $half_width; }
+	for ($k=0; $k<$n_fixed; $k++){
 		printf  JPL "(TYPE H %x\n", $k;
 		printf  JPL "   (CHARWD R %f)\n", $type_width[$k];
 		&char_foot_h;
@@ -229,7 +259,7 @@ sub write_char {
 		if   (&is_ucs_kigo){&print_kigo_char;}
 		elsif(&is_ucs_hira){&print_kana_char;}
 		elsif(&is_ucs_kata){&print_kana_char;}
-		elsif(&is_ucs_hankana && $direction eq "y"){&print_hankana_char;}
+		elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;}
 		else{&print_char;}
 	}
     }
@@ -292,6 +322,14 @@ sub print_kana_char{
 	print  OVP "      )\n";
 	print  OVP "   )\n";
 }
+sub print_hankana_char{
+	printf OVP "(CHARACTER H %X\n", $dvicode;
+	printf OVP "   (CHARWD R %f)\n", $half_width;
+	print  OVP "   (MAP\n";
+	printf OVP "      (SETCHAR H %X)\n",$dvicode;
+	print  OVP "      )\n";
+	print  OVP "   )\n";
+}
 sub chars_in_type_prop{
 	%char_width_hash=();
 	for ($j=0; $j<@character; $j++){
@@ -307,7 +345,7 @@ sub chars_in_type_prop{
 	$x = '-';
 	@uniq_char_width_array = grep( $_ ne $x && ($x = $_), sort values(%char_width_hash));
 	for ($j=0; $j<=$#uniq_char_width_array; $j++){
-		printf JPL "(CHARSINTYPE H %X\n",($j+7);
+		printf JPL "(CHARSINTYPE H %X\n",($j+$n_fixed);
 		print  JPL "   ";
 		@char_in_this_type = ();
 		while (($name, $value) = each(%char_width_hash)) {
@@ -326,7 +364,7 @@ sub chars_in_type_prop{
 sub print_type_prop{
 	for ($j=0; $j<=$#uniq_char_width_array; $j++){
 		$char_width=$uniq_char_width_array[$j];
-		printf JPL "(TYPE H %X\n", ($j+7);
+		printf JPL "(TYPE H %X\n", ($j+$n_fixed);
 		printf JPL "   (CHARWD R %f)\n", $char_width;
 		&char_foot_h;
 	}
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 a7095628a29..c9f39bffe83 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
@@ -119,6 +119,7 @@ sub glue_kern{
 	print  JPL "   (LABEL O 2)\n";
 	printf JPL "   (GLUE O 5 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	printf JPL "   (GLUE O 6 R %f R 0.0 R %f)\n", $half_width, $half_width;
+	print  JPL "   (STOP)\n";
 	print  JPL "   (LABEL O 6)\n";
 	printf JPL "   (GLUE O 0 R %f R 0.0 R %f)\n", $half_width, $half_width;
 	printf JPL "   (GLUE O 1 R %f R 0.0 R %f)\n", $half_width, $half_width;
@@ -152,12 +153,13 @@ sub glue_kern{
 	print  JPL "   )\n";
 }
 sub chars_in_type_jis{
-	my ($type1add, $type2add, $type3add, $type5)=();
+	my ($type1add, $type2add, $type3add, $type5, $type6add)=();
 	if ($ucs) {
 		$type1add = "UFF5F U3018 U3016 U301D U00AB U2329 U301A";
 		$type2add = "UFF60 U3019 U3017 U301F U00BB U232A U301B U301E";
 		$type3add = "U00B7";
 		$type5 = "— ― … ‥";
+		$type6add = "U203C U2047 U2048 U2049";
 	} else {
 		$type5 = "— … ‥";
 	}
@@ -182,6 +184,7 @@ print JPL <<END_OF_DATA;
    )
 (CHARSINTYPE O 6
    ？ ！ 
+   $type6add 
    )
 END_OF_DATA
 }
@@ -231,7 +234,7 @@ sub write_char {
 		if   (&is_ucs_kigo){&print_kigo_char;}
 		elsif(&is_ucs_hira){&print_kana_char;}
 		elsif(&is_ucs_kata){&print_kana_char;}
-		elsif(&is_ucs_hankana && $direction eq "y"){&print_hankana_char;}
+#		elsif(&is_ucs_hankana && $hk_mode){&print_hankana_char;}
 		else{&print_char;}
 	}
     }
diff --git a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
index 5088696713d..378429ed44b 100755
--- a/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
+++ b/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
@@ -18,7 +18,7 @@ mkdir ovp
 fi
 
 echo "making proportional kana tfm/vf ..."
-perl -s script/umkpkana.pl -sp=1
+perl -s script/umkpkana.pl -sp=1 -hk
 perl -s script/umkvpkana.pl -sp=1
 
 for face in minw3 minw6 kakuw3 kakuw6 maruw4
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
index 422e34e0e2b..9b3880cd283 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.20 ttk]
+\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.21 ttk]
 %force catcode of \" be 12
 \count@\catcode`\"
 \catcode`\"=12
diff --git a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
index 93d64768bfb..f187e06bc00 100644
--- a/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
+++ b/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.20 ttk]
+\ProvidesPackage{otf}[2018/02/01 v1.7b7 psitau, u0.21 ttk]
 \RequirePackage{keyval}
 %for processing options 
 \newif\if@kana \@kanafalse