From 056201c217eda00b26ae345567c1bab442455503 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 May 2018 21:52:41 +0000 Subject: japanese-otf-uptex (13may18) git-svn-id: svn://tug.org/texlive/trunk@47702 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/fonts/japanese-otf-uptex/00otf-uptex.txt | 19 ++- .../texmf-dist/doc/fonts/japanese-otf-uptex/README | 6 +- .../fonts/japanese-otf-uptex/test/uplatex/Makefile | 17 ++- .../japanese-otf-uptex/test/uplatex/exclam.tex | 133 +++++++++++++++++++++ .../test/uplatex/upkanatest1.tex | 74 +++--------- .../public/japanese-otf-uptex/upbrsgexpgothb-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpgothb-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpgothbn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpgothbn-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpgotheb-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpgotheb-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpgothebn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpgothebn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpgothr-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpgothrn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpgothrn-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpmgothr-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpmgothr-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgexpmgothrn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgexpmgothrn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminb-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminb-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminbn-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminbn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminl-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminl-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminln-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminln-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminr-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminr-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgexpminrn-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgexpminrn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlgothbn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlgothbn-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlgotheb-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlgotheb-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlgothebn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlgothebn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlgothrn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlgothrn-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlmgothr-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlmgothr-v.tfm | Bin 644 -> 660 bytes .../japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm | Bin 936 -> 952 bytes .../japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminb-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminl-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminln-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminln-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminr-v.tfm | Bin 644 -> 660 bytes .../public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm | Bin 936 -> 952 bytes .../public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm | Bin 644 -> 660 bytes .../tfm/public/japanese-otf-uptex/upexpgothb-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpgothb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpgothbn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpgothbn-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpgotheb-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpgotheb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpgothebn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpgothebn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpgothr-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpgothr-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpgothrn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpgothrn-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpmgothr-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpmgothr-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upexpmgothrn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upexpmgothrn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminb-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminb-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminbn-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminbn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminl-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminl-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminln-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminln-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminr-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminr-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upexpminrn-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upexpminrn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlgothbn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlgothbn-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlgotheb-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlgotheb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlgothebn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlgothebn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlgothrn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlgothrn-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlmgothr-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlmgothr-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/upnmlmgothrn-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/upnmlmgothrn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminb-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminb-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminl-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminl-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminln-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminln-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminr-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminr-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/uprubygothb-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/uprubygothb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/uprubygotheb-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/uprubygotheb-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/uprubygothr-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/uprubygothr-v.tfm | Bin 572 -> 588 bytes .../public/japanese-otf-uptex/uprubymgothr-h.tfm | Bin 852 -> 868 bytes .../public/japanese-otf-uptex/uprubymgothr-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/uprubyminb-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/uprubyminb-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/uprubyminl-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/uprubyminl-v.tfm | Bin 572 -> 588 bytes .../tfm/public/japanese-otf-uptex/uprubyminr-h.tfm | Bin 852 -> 868 bytes .../tfm/public/japanese-otf-uptex/uprubyminr-v.tfm | Bin 572 -> 588 bytes .../fonts/japanese-otf-uptex/basepl/ubase-h.pl | 1 + .../fonts/japanese-otf-uptex/basepl/ubase-v.pl | 1 + .../fonts/japanese-otf-uptex/basepl/ubrsg-h.pl | 1 + .../fonts/japanese-otf-uptex/basepl/ubrsg-v.pl | 1 + .../fonts/japanese-otf-uptex/script/mkutf32list.pl | 43 ++++--- .../fonts/japanese-otf-uptex/script/umkpkana.pl | 56 +++++++-- .../fonts/japanese-otf-uptex/script/umkvpkana.pl | 7 +- .../source/fonts/japanese-otf-uptex/umakeotf_prop | 2 +- .../tex/platex/japanese-otf-uptex/mlutf.sty | 2 +- .../tex/platex/japanese-otf-uptex/otf.sty | 2 +- 141 files changed, 262 insertions(+), 103 deletions(-) create mode 100644 Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex (limited to 'Master') 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 TANAKA Takuji -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{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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm differ 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 Binary files a/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm and b/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm differ 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 <