texlive[47702] Master/texmf-dist: japanese-otf-uptex (13may18)
commits+karl at tug.org
commits+karl at tug.org
Sun May 13 23:52:41 CEST 2018
Revision: 47702
http://tug.org/svn/texlive?view=revision&revision=47702
Author: karl
Date: 2018-05-13 23:52:41 +0200 (Sun, 13 May 2018)
Log Message:
-----------
japanese-otf-uptex (13may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm
trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex
Modified: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/00otf-uptex.txt 2018-05-13 21:52:41 UTC (rev 47702)
@@ -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 @@
[ 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 @@
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.
Modified: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/README 2018-05-13 21:52:41 UTC (rev 47702)
@@ -3,7 +3,7 @@
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 @@
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 at logic.at>
TANAKA Takuji <ttk at t-lab.opal.ne.jp>
-2018-04-07
+2018-05-13
Modified: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/Makefile 2018-05-13 21:52:41 UTC (rev 47702)
@@ -6,7 +6,7 @@
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 @@
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 @@
$(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
Added: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex 2018-05-13 21:52:41 UTC (rev 47702)
@@ -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}
+
Property changes on: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/exclam.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/doc/fonts/japanese-otf-uptex/test/uplatex/upkanatest1.tex 2018-05-13 21:52:41 UTC (rev 47702)
@@ -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 @@
𠩤浩𫝆𫝷滋𠮟勺爵周将𠀋城𩙿真𠆢𫝑成𧾷𣳾炭
𥫗彫潮𡈽冬𤴔姬𫞉諭輸𥙿𦚰𠘨𠂊𠦄卉寃拔𦦙𣏌
杞𪧦𫞽絣𠔿𦉪𠂰𨦇𨸗𫠚𤋮桒𣲾𠘑嶲你𣘺𣏾𢘉
+｡｢｣､･ｦｧｨｩｪｫｬｭｮｯ
+ｰｱｲｳｴｵｶｷｸｹｺｻｼｽｾｿ
+ﾀﾁﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌﾍﾎﾏ
+ﾐﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜﾝﾞﾟ
+}
+{\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
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgotheb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothebn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpmgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminl-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminln-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgexpminrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgotheb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothebn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlmgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminl-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminln-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upbrsgnmlminrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgotheb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothebn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpmgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminl-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminln-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upexpminrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgotheb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothebn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlmgothrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminbn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminl-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminln-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/upnmlminrn-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygotheb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubygothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubymgothr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminb-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminl-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-h.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/japanese-otf-uptex/uprubyminr-v.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-h.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -90,6 +90,7 @@
)
(CHARSINTYPE O 6
？ ！
+ U203C U2047 U2048 U2049
)
(CHARSINTYPE O 7
UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubase-v.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -80,6 +80,7 @@
)
(CHARSINTYPE O 6
？ ！
+ U203C U2047 U2048 U2049
)
(TYPE O 0
(CHARWD R 1.0)
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-h.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -105,6 +105,7 @@
)
(CHARSINTYPE O 6
？ ！
+ U203C U2047 U2048 U2049
)
(CHARSINTYPE O 7
UFF61 UFF62 UFF63 UFF64 UFF65 UFF66 UFF67
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/basepl/ubrsg-v.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -95,6 +95,7 @@
)
(CHARSINTYPE O 6
？ ！
+ U203C U2047 U2048 U2049
)
(CHARSINTYPE O 7
、 ，
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/mkutf32list.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -25,7 +25,6 @@
use strict;
use encoding 'utf8';
-use feature 'switch';
our ($style, $allrange);
our (@count, %reset_ch, $icollec, $cid2code, $line);
@@ -47,23 +46,25 @@
$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 @@
}
$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) {
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkpkana.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -49,6 +49,7 @@
closedir(JPL);
closedir(JFM);
+$n_fixed=7; ## type 0..6
$ucs=1; # 1: upphiraXXX or 0: phiraXXX
if ($ucs) {
$CheckDVICode::is_ucs=1;
@@ -55,6 +56,10 @@
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 @@
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 @@
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 @@
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 @@
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 @@
)
(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 @@
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 @@
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 @@
$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 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;
}
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/script/umkvpkana.pl 2018-05-13 21:52:41 UTC (rev 47702)
@@ -119,6 +119,7 @@
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 @@
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 @@
)
(CHARSINTYPE O 6
？ ！
+ $type6add
)
END_OF_DATA
}
@@ -231,7 +234,7 @@
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;}
}
}
Modified: trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop
===================================================================
--- trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/source/fonts/japanese-otf-uptex/umakeotf_prop 2018-05-13 21:52:41 UTC (rev 47702)
@@ -18,7 +18,7 @@
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
Modified: trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/mlutf.sty 2018-05-13 21:52:41 UTC (rev 47702)
@@ -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
Modified: trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty 2018-05-13 21:45:23 UTC (rev 47701)
+++ trunk/Master/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty 2018-05-13 21:52:41 UTC (rev 47702)
@@ -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 at kana \@kanafalse
More information about the tex-live-commits
mailing list