diff options
| author | Norbert Preining <norbert@preining.info> | 2023-10-10 03:01:54 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2023-10-10 03:01:54 +0000 |
| commit | 48eedda2cb4d2644886b862409b24a1d8e9a136f (patch) | |
| tree | 190111d6cba7dfe025d542ba5f362198dbb23b82 /macros | |
| parent | 55c62aa6d5cc8ce94c28ac255b66a13ccd2375b2 (diff) | |
CTAN sync 202310100301
Diffstat (limited to 'macros')
163 files changed, 211 insertions, 74 deletions
diff --git a/macros/jptex/latex/japanese-otf/ChangeLog.md b/macros/jptex/latex/japanese-otf/ChangeLog.md index 37aaa951f3..61d84452bd 100644 --- a/macros/jptex/latex/japanese-otf/ChangeLog.md +++ b/macros/jptex/latex/japanese-otf/ChangeLog.md @@ -1,3 +1,14 @@ +# 2023-10-09 japanese-otf + +Based on japanese-otf-uptex Ver.0.30. + +japanese-otf-uptex: +* Fix issue related to ruby of extra bold. +* Fix issue related to insertion of penalty before \CID{} +* Update reference Unicode Blocks-15.1.0.txt, Adobe-GB1-6 cid2code.txt (Version 09/21/2023). + + + # 2023-06-25 japanese-otf Based on japanese-otf-uptex Ver.0.29. diff --git a/macros/jptex/latex/japanese-otf/README b/macros/jptex/latex/japanese-otf/README index da75f41804..ad589883f7 100644 --- a/macros/jptex/latex/japanese-otf/README +++ b/macros/jptex/latex/japanese-otf/README @@ -14,7 +14,7 @@ consists of following packages: - author: Tanaka Takuji - upstream: http://www.t-lab.opal.ne.jp/tex/uptex_en.html https://github.com/t-tk/japanese-otf-uptex - - currently japanese-otf-uptex Ver.0.29 (2023/06/25) + - currently japanese-otf-uptex Ver.0.30 (2023/10/08) - readme by the author: 00otf-uptex.txt In addition, several patches were applied to support extended @@ -29,4 +29,4 @@ The contents of this package is under the license given in the COPYRIGHT file, which is the 3-clause BSD license. Japanese TeX Development Community -20230625.0 +20231009.0 diff --git a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt index 70c2f0a21a..4ba509fbde 100644 --- a/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt +++ b/macros/jptex/latex/japanese-otf/doc/00otf-uptex.txt @@ -1,5 +1,5 @@ [ Title ] -japanese-otf-uptex Ver.0.29 2023/06/25 +japanese-otf-uptex Ver.0.30 2023/10/08 [ Abstract ] @@ -529,4 +529,19 @@ https://github.com/t-tk/japanese-otf-uptex test/uplatex/uotf-cid-{h,v}.tex, test/uplatex/cid_{jp,gb,cns,ks}_{h,v}.tex :: Add a new test for multi-weight \CID{}, \CIDC{}, \CIDT{}, \CIDK{}. +2023.10.08 Ver0.30 + sty/otf.sty, sty/mlutf.sty, sty/mlcid.sty :: + Bump version number. + sty/otf.sty :: + Fix issue related to ruby of extra bold. ## Thank 流橋 利樹 san. + Ref. https://okumuralab.org/tex/mod/forum/discuss.php?d=3068#p22269 + Fix issue related to insertion of penalty before \CID{} ## Thank @aminophen san. + Ref. https://github.com/t-tk/japanese-otf-uptex/issues/8#issuecomment-1741634553 + basepl/mjvf-upnm{kor,sch,tch}{,-slim}.cnf, script/sp_list_c.txt, + script/mkutf32list.pl, script/umkcid{tfm,vf}.pl, test/uplatex/sp_gb_utf.tex :: + Update references: + Unicode Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) + Adobe-GB1-6 cid2code.txt (Version 09/21/2023). + test/uplatex/uotftest-utf8.tex :: + Add tests for ruby with okumacro.sty and pxrubrica.sty . diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_gb_utf.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_gb_utf.tex index f03fc4c969..fa95e15162 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_gb_utf.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/sp_gb_utf.tex @@ -1,11 +1,11 @@ % % This file is generated from the data of UniGB-UTF32 -% in cid2code.txt (Version 12/05/2017) -% for Adobe-GB1-5 +% in cid2code.txt (Version 09/21/2023) +% for Adobe-GB1-6 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% Adobe-GB1-5/cid2code.txt +% Adobe-GB1-6/cid2code.txt % % A newer CMap may be required for some code points. % @@ -14,4 +14,26 @@ Adobe-GB1-2\\ \UTFC{20087}\UTFC{20089}\UTFC{200CC}\UTFC{215D7}\UTFC{2298F}\UTFC{20509}\UTFC{2099D}\UTFC{241FE} +Adobe-GB1-6\\ +\UTFC{20164}\UTFC{20676}\UTFC{20CD0}\UTFC{2139A}\UTFC{21413}\UTFC{235CB}\UTFC{23C97}\UTFC{23C98}\UTFC{23E23}\UTFC{249DB}% +\UTFC{24A7D}\UTFC{24AC9}\UTFC{25532}\UTFC{25562}\UTFC{255A8}\UTFC{25ED7}\UTFC{26221}\UTFC{2648D}\UTFC{26676}\UTFC{2677C}% +\UTFC{26B5C}\UTFC{26C21}\UTFC{27FF9}\UTFC{28408}\UTFC{28678}\UTFC{28695}\UTFC{287E0}\UTFC{28B49}\UTFC{28C47}\UTFC{28C4F}% +\UTFC{28C51}\UTFC{28C54}\UTFC{28E99}\UTFC{29F7E}\UTFC{29F83}\UTFC{29F8C}\UTFC{2A7DD}\UTFC{2A8FB}\UTFC{2A917}\UTFC{2AA30}% +\UTFC{2AA36}\UTFC{2AA58}\UTFC{2AFA2}\UTFC{2B127}\UTFC{2B128}\UTFC{2B137}\UTFC{2B138}\UTFC{2B1ED}\UTFC{2B300}\UTFC{2B363}% +\UTFC{2B36F}\UTFC{2B372}\UTFC{2B37D}\UTFC{2B404}\UTFC{2B410}\UTFC{2B413}\UTFC{2B461}\UTFC{2B4E7}\UTFC{2B4EF}\UTFC{2B4F6}% +\UTFC{2B4F9}\UTFC{2B50D}\UTFC{2B50E}\UTFC{2B536}\UTFC{2B5AE}\UTFC{2B5AF}\UTFC{2B5B3}\UTFC{2B5E7}\UTFC{2B5F4}\UTFC{2B61C}% +\UTFC{2B61D}\UTFC{2B626}\UTFC{2B627}\UTFC{2B628}\UTFC{2B62A}\UTFC{2B62C}\UTFC{2B695}\UTFC{2B696}\UTFC{2B6AD}\UTFC{2B6ED}% +\UTFC{2B7A9}\UTFC{2B7C5}\UTFC{2B7E6}\UTFC{2B7F9}\UTFC{2B7FC}\UTFC{2B806}\UTFC{2B80A}\UTFC{2B81C}\UTFC{2B8B8}\UTFC{2BAC7}% +\UTFC{2BB5F}\UTFC{2BB62}\UTFC{2BB7C}\UTFC{2BB83}\UTFC{2BC1B}\UTFC{2BD77}\UTFC{2BD87}\UTFC{2BDF7}\UTFC{2BE29}\UTFC{2C029}% +\UTFC{2C02A}\UTFC{2C0A9}\UTFC{2C0CA}\UTFC{2C1D5}\UTFC{2C1D9}\UTFC{2C1F9}\UTFC{2C27C}\UTFC{2C288}\UTFC{2C2A4}\UTFC{2C317}% +\UTFC{2C35B}\UTFC{2C361}\UTFC{2C364}\UTFC{2C488}\UTFC{2C494}\UTFC{2C497}\UTFC{2C542}\UTFC{2C613}\UTFC{2C618}\UTFC{2C621}% +\UTFC{2C629}\UTFC{2C62B}\UTFC{2C62C}\UTFC{2C62D}\UTFC{2C62F}\UTFC{2C642}\UTFC{2C64A}\UTFC{2C64B}\UTFC{2C72C}\UTFC{2C72F}% +\UTFC{2C79F}\UTFC{2C7C1}\UTFC{2C7FD}\UTFC{2C8D9}\UTFC{2C8DE}\UTFC{2C8E1}\UTFC{2C8F3}\UTFC{2C907}\UTFC{2C90A}\UTFC{2C91D}% +\UTFC{2CA02}\UTFC{2CA0E}\UTFC{2CA7D}\UTFC{2CAA9}\UTFC{2CB29}\UTFC{2CB2D}\UTFC{2CB2E}\UTFC{2CB31}\UTFC{2CB38}\UTFC{2CB39}% +\UTFC{2CB3B}\UTFC{2CB3F}\UTFC{2CB41}\UTFC{2CB4A}\UTFC{2CB4E}\UTFC{2CB5A}\UTFC{2CB5B}\UTFC{2CB64}\UTFC{2CB69}\UTFC{2CB6C}% +\UTFC{2CB6F}\UTFC{2CB73}\UTFC{2CB76}\UTFC{2CB78}\UTFC{2CB7C}\UTFC{2CBB1}\UTFC{2CBBF}\UTFC{2CBC0}\UTFC{2CBCE}\UTFC{2CC56}% +\UTFC{2CC5F}\UTFC{2CCF5}\UTFC{2CCF6}\UTFC{2CCFD}\UTFC{2CCFF}\UTFC{2CD02}\UTFC{2CD03}\UTFC{2CD0A}\UTFC{2CD8B}\UTFC{2CD8D}% +\UTFC{2CD8F}\UTFC{2CD90}\UTFC{2CD9F}\UTFC{2CDA0}\UTFC{2CDA8}\UTFC{2CDAD}\UTFC{2CDAE}\UTFC{2CDD5}\UTFC{2CE18}\UTFC{2CE1A}% +\UTFC{2CE23}\UTFC{2CE26}\UTFC{2CE2A}\UTFC{2CE7C}\UTFC{2CE88}\UTFC{2CE93} + % end diff --git a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex index eec37f62d5..cb42089f9a 100644 --- a/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex +++ b/macros/jptex/latex/japanese-otf/doc/test/uplatex/uotftest-utf8.tex @@ -1,5 +1,6 @@ % -*- coding: utf-8 -*- \newif\ifuptexmode\uptexmodefalse +\newif\iftatemode\tatemodefalse \ifnum\jis"2121="3000 \uptexmodetrue\fi \makeatletter @@ -32,8 +33,8 @@ \fi \def\baseshift{-.12zh} -\ifx\class\@tarticle\def\baseshift{-.5zh}\fi -\ifx\class\@utarticle\def\baseshift{-.5zh}\fi +\ifx\class\@tarticle\def\baseshift{-.5zh}\tatemodetrue\fi +\ifx\class\@utarticle\def\baseshift{-.5zh}\tatemodetrue\fi \ifuptexmode \edef\@opt@{uplatex,\@opt@} @@ -44,12 +45,20 @@ \usepackage[\@opt@]{otf} % -% furikana.sty があれば読み込む \newread\@istheresuchafile -\openin\@istheresuchafile furikana.sty +% +% okumacro.sty があれば読み込む +\openin\@istheresuchafile okumacro.sty \ifeof\@istheresuchafile\relax \else\closein\@istheresuchafile\relax -\usepackage{furikana}% found +\usepackage{okumacro}% found +\fi +% +% pxrubrica.sty があれば読み込む +\openin\@istheresuchafile pxrubrica.sty +\ifeof\@istheresuchafile\relax +\else\closein\@istheresuchafile\relax +\usepackage{pxrubrica}% found \fi \makeatother @@ -66,9 +75,20 @@ \ifx\rubyfamily\@undefined\let\rubyfamily=\relax\fi \ifx\mgfamily\@undefined\let\mgfamily=\relax\fi \makeatother + +\iftatemode +\textwidth250mm +\oddsidemargin0mm +\evensidemargin0mm +\textheight168mm +\topmargin-15mm +\else \textwidth160mm \oddsidemargin0mm \evensidemargin0mm +\textheight250mm +\topmargin-15mm +\fi \begin{document} \section{見出し} @@ -100,18 +120,53 @@ mg/m & {\mgfamily ひらかな} & {\mgfamily 漢字} & {\mgfamily\UTF{9DD7}} & { 日本：\UTF{8FF0} 簡体字：\UTFC{8FF0} 繁體字：\UTFT{8FF0} 朝鮮：\UTFK{8FF0} -% with furikana.sty -\makeatletter -\ifx\kana\@undefined -\else -\kana{漢字}{振りかな}{\bfseries \kana{漢字}{振りかな}}% -{\gtfamily\kana{漢字}{振りかな}\bfseries \kana{漢字}{振りかな}} -{\mgfamily\kana{漢字}{振りかな}} -\kana{\UTF{9DD7}}{かな}\kana{鴎}{かな} +% with okumacro.sty +\ifx\ruby\@undefined\else +\vspace{\baselineskip} +\ruby{漢字}{振りかな}~% +{\bfseries\ruby{漢字}{振りかな}}~% +\ifdeluxe + {\ltseries\ruby{漢字}{振りかな}}~% +\fi +{\gtfamily\ruby{漢字}{振りかな}~% + \bfseries\ruby{漢字}{振りかな}~% +\ifdeluxe + \ebseries\ruby{漢字}{振りかな}~% +\fi +}% +{\mgfamily\ruby{漢字}{振りかな}} + +\bgroup +\ruby{\UTFK{c548}}{アン}\ruby{\UTFK{b155}}{ニョン}\ruby{\UTFK{d558}}{ハ}\ruby{\UTFK{c138}}{セ}\ruby{\UTFK{c694}}{ヨ}~% +\gtfamily\ruby{\UTFK{c548}}{アン}\ruby{\UTFK{b155}}{ニョン}\ruby{\UTFK{d558}}{ハ}\ruby{\UTFK{c138}}{セ}\ruby{\UTFK{c694}}{ヨ} +\egroup +\fi + + +% with pxrubrica.sty +\makeatletter +\ifx\jruby\@undefined\else +\vspace{\baselineskip} +\jruby[g]{漢字}{振りかな}~% +{\bfseries\jruby[g]{漢字}{振りかな}}~% +\ifdeluxe + {\ltseries\jruby[g]{漢字}{振りかな}}~% +\fi +{\gtfamily\jruby[g]{漢字}{振りかな}~% + \bfseries\jruby[g]{漢字}{振りかな}~% +\ifdeluxe + \ebseries\jruby[g]{漢字}{振りかな}~% +\fi +}% +{\mgfamily\jruby[g]{漢字}{振りかな}} -\Kana[3]{\UTFK{c548},\UTFK{b155},\UTFK{d558},\UTFK{c138},\UTFK{c694}}{アン,ニョン,ハ,セ,ヨ} +\bgroup + \jruby[m]{{\UTFK{c548}}{\UTFK{b155}}{\UTFK{d558}}{\UTFK{c138}}{\UTFK{c694}}}{アン|ニョン|ハ|セ|ヨ}~% + \gtfamily\jruby[m]{{\UTFK{c548}}{\UTFK{b155}}{\UTFK{d558}}{\UTFK{c138}}{\UTFK{c694}}}{アン|ニョン|ハ|セ|ヨ} +\egroup \fi + \makeatother \vspace{\baselineskip} diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor-slim.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor-slim.cnf index d4b6fdc34e..dcb317ce57 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor-slim.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor-slim.cnf @@ -1,5 +1,5 @@ % makejvf settings for upnmkor* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) CHARSET % + 0080..00FF,% Latin-1 Supplement diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor.cnf index dc747b460d..574a679b69 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmkor.cnf @@ -1,5 +1,5 @@ % makejvf settings for upnmkor* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) % and Adobe-Korea1-2/cid2code.txt (Version 01/31/2012) CHARSET % diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch-slim.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch-slim.cnf index afa0f8ed60..e2e7b661a6 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch-slim.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch-slim.cnf @@ -1,5 +1,5 @@ % makejvf settings for upnmtch* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) CHARSET % + 0080..00FF,% Latin-1 Supplement diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch.cnf index 96d02b2549..7e7a11c290 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmsch.cnf @@ -1,6 +1,6 @@ % makejvf settings for upnmtch* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) -% and Adobe-GB1-5/cid2code.txt (Version 12/05/2017) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) +% and Adobe-GB1-5/cid2code.txt (Version 09/21/2023) CHARSET % + 0000..007F,% Basic Latin diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch-slim.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch-slim.cnf index afa0f8ed60..e2e7b661a6 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch-slim.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch-slim.cnf @@ -1,5 +1,5 @@ % makejvf settings for upnmtch* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) CHARSET % + 0080..00FF,% Latin-1 Supplement diff --git a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch.cnf b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch.cnf index f2e900aec6..f74b1a7703 100644 --- a/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch.cnf +++ b/macros/jptex/latex/japanese-otf/src/basepl/mjvf-upnmtch.cnf @@ -1,5 +1,5 @@ % makejvf settings for upnmtch* in japanese-otf-uptex -% based on Blocks-14.0.0.txt (Date: 2021-01-22, 23:29:00 GMT [KW]) +% based on Blocks-15.1.0.txt (Date: 2023-07-28, 15:47:20 GMT) % and Adobe-CNS1-7/cid2code.txt (Version 10/24/2017) CHARSET % diff --git a/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl b/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl index 2a05252074..903b6f0c65 100755 --- a/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl +++ b/macros/jptex/latex/japanese-otf/src/script/mkutf32list.pl @@ -54,9 +54,9 @@ if ($.<8 && /((Adobe-(?:Japan|CNS|GB|Korea).*)-\d)\s/) { $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/; + @cid_max = qw/-1 7716 9896 22126 22352 29063 30283 30571/; $utfmac="UTFC"; $cmap="UniGB-UTF32"; - $source="Adobe-GB1-5/cid2code.txt"; } + $source="Adobe-GB1-6/cid2code.txt"; } elsif ($collection =~ /kor/i) { @cid_max = qw/-1 9332 18154 18351/; $utfmac="UTFK"; $cmap="UniKS-UTF32"; diff --git a/macros/jptex/latex/japanese-otf/src/script/sp_list_c.txt b/macros/jptex/latex/japanese-otf/src/script/sp_list_c.txt index a4699d6ea8..818ff8a17b 100644 --- a/macros/jptex/latex/japanese-otf/src/script/sp_list_c.txt +++ b/macros/jptex/latex/japanese-otf/src/script/sp_list_c.txt @@ -1,11 +1,11 @@ % % This file is generated from the data of UniGB-UTF32 -% in cid2code.txt (Version 12/05/2017) -% for Adobe-GB1-5 +% in cid2code.txt (Version 09/21/2023) +% for Adobe-GB1-6 % % Reference: % https://github.com/adobe-type-tools/cmap-resources/ -% Adobe-GB1-5/cid2code.txt +% Adobe-GB1-6/cid2code.txt % % A newer CMap may be required for some code points. % @@ -14,4 +14,26 @@ %Adobe-GB1-2 20087,20089,200CC,215D7,2298F,20509,2099D,241FE +%Adobe-GB1-6 +20164,20676,20CD0,2139A,21413,235CB,23C97,23C98,23E23,249DB +24A7D,24AC9,25532,25562,255A8,25ED7,26221,2648D,26676,2677C +26B5C,26C21,27FF9,28408,28678,28695,287E0,28B49,28C47,28C4F +28C51,28C54,28E99,29F7E,29F83,29F8C,2A7DD,2A8FB,2A917,2AA30 +2AA36,2AA58,2AFA2,2B127,2B128,2B137,2B138,2B1ED,2B300,2B363 +2B36F,2B372,2B37D,2B404,2B410,2B413,2B461,2B4E7,2B4EF,2B4F6 +2B4F9,2B50D,2B50E,2B536,2B5AE,2B5AF,2B5B3,2B5E7,2B5F4,2B61C +2B61D,2B626,2B627,2B628,2B62A,2B62C,2B695,2B696,2B6AD,2B6ED +2B7A9,2B7C5,2B7E6,2B7F9,2B7FC,2B806,2B80A,2B81C,2B8B8,2BAC7 +2BB5F,2BB62,2BB7C,2BB83,2BC1B,2BD77,2BD87,2BDF7,2BE29,2C029 +2C02A,2C0A9,2C0CA,2C1D5,2C1D9,2C1F9,2C27C,2C288,2C2A4,2C317 +2C35B,2C361,2C364,2C488,2C494,2C497,2C542,2C613,2C618,2C621 +2C629,2C62B,2C62C,2C62D,2C62F,2C642,2C64A,2C64B,2C72C,2C72F +2C79F,2C7C1,2C7FD,2C8D9,2C8DE,2C8E1,2C8F3,2C907,2C90A,2C91D +2CA02,2CA0E,2CA7D,2CAA9,2CB29,2CB2D,2CB2E,2CB31,2CB38,2CB39 +2CB3B,2CB3F,2CB41,2CB4A,2CB4E,2CB5A,2CB5B,2CB64,2CB69,2CB6C +2CB6F,2CB73,2CB76,2CB78,2CB7C,2CBB1,2CBBF,2CBC0,2CBCE,2CC56 +2CC5F,2CCF5,2CCF6,2CCFD,2CCFF,2CD02,2CD03,2CD0A,2CD8B,2CD8D +2CD8F,2CD90,2CD9F,2CDA0,2CDA8,2CDAD,2CDAE,2CDD5,2CE18,2CE1A +2CE23,2CE26,2CE2A,2CE7C,2CE88,2CE93 + % end diff --git a/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl b/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl index 6f830a329c..aa8e7b10c8 100755 --- a/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl +++ b/macros/jptex/latex/japanese-otf/src/script/umkcidtfm.pl @@ -160,7 +160,7 @@ sub writechar { @type_1ov3 = (13274 .. 13294); } } - if ($lang eq "c") { # Adobe-GB1-5 + if ($lang eq "c") { # Adobe-GB1-6 if ($dir eq "h") { @type_1ov2 = (814 .. 939, 7716, 22355 .. 22357); } diff --git a/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl b/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl index 9cc6e11e1d..72ca79cecc 100755 --- a/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl +++ b/macros/jptex/latex/japanese-otf/src/script/umkcidvf.pl @@ -20,7 +20,7 @@ opendir(OVP, "ovp") || mkdir("ovp",0755) || die "cannot mkdir ovp"; opendir(VF, "vf") || mkdir("vf",0755) || die "cannot mkdir vf"; my %adobe_name = ( 'j' => 'Adobe-Japan1-7', - 'c' => 'Adobe-GB1-5', + 'c' => 'Adobe-GB1-6', 'k' => 'Adobe-Korea1-2', 't' => 'Adobe-CNS1-7' ); @@ -103,7 +103,7 @@ sub writechar_cid { } } } - if ($lang eq "c") { # Adobe-GB1-5 + if ($lang eq "c") { # Adobe-GB1-6 if ($dir eq "h") { if (($cidcode >= 814 && $cidcode <= 939) || $cidcode == 7716 diff --git a/macros/jptex/latex/japanese-otf/sty/mlcid.sty b/macros/jptex/latex/japanese-otf/sty/mlcid.sty index aa2b9f3226..1974e73248 100644 --- a/macros/jptex/latex/japanese-otf/sty/mlcid.sty +++ b/macros/jptex/latex/japanese-otf/sty/mlcid.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.29 ttk] +\ProvidesPackage{mlcid}[2004/04/17 v1.0.2 psitau, u0.30 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 diff --git a/macros/jptex/latex/japanese-otf/sty/mlutf.sty b/macros/jptex/latex/japanese-otf/sty/mlutf.sty index e777a9c398..1b3d7b6031 100644 --- a/macros/jptex/latex/japanese-otf/sty/mlutf.sty +++ b/macros/jptex/latex/japanese-otf/sty/mlutf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.29 ttk] +\ProvidesPackage{mlutf}[2004/04/17 v1.1.2 psitau, u0.30 ttk] %force catcode of \" be 12 \count@\catcode`\" \catcode`\"=12 @@ -136,13 +136,13 @@ \else \if@deluxe \Declare@FontShape{utfk}{l}{0123456789abcdef}{utfkmr} - \Declare@FontShape{utfc}{l}{0123456789abcdefklmo}{utfcmr} + \Declare@FontShape{utfc}{l}{0123456789abcdefklmnopqrstuvw}{utfcmr} \Declare@FontShape{utft}{l}{0123456789abcdefklmnopqrstuvwxz}{utftmr} \fi \Declare@FontShape{utfk}{m}{0123456789abcdef}{utfkmr} \Declare@FontShape{utfk}{bx}{0123456789abcdef}{utfkgr} - \Declare@FontShape{utfc}{m}{0123456789abcdefklmo}{utfcmr} - \Declare@FontShape{utfc}{bx}{0123456789abcdefklmo}{utfcgr} + \Declare@FontShape{utfc}{m}{0123456789abcdefklmnopqrstuvw}{utfcmr} + \Declare@FontShape{utfc}{bx}{0123456789abcdefklmnopqrstuvw}{utfcgr} \Declare@FontShape{utft}{m}{0123456789abcdefklmnopqrstuvwxz}{utftmr} \Declare@FontShape{utft}{bx}{0123456789abcdefklmnopqrstuvwxz}{utftgr} \fi diff --git a/macros/jptex/latex/japanese-otf/sty/otf.sty b/macros/jptex/latex/japanese-otf/sty/otf.sty index 39a2beaa90..45f645ae0e 100644 --- a/macros/jptex/latex/japanese-otf/sty/otf.sty +++ b/macros/jptex/latex/japanese-otf/sty/otf.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{otf}[2023/06/25 TeX JP org, v1.7b8 psitau, u0.29 ttk] +\ProvidesPackage{otf}[2023/10/09 TeX JP org, v1.7b8 psitau, u0.30 ttk] \RequirePackage{keyval} %for processing options \newif\if@kana \@kanafalse @@ -287,6 +287,7 @@ \newcommand\set@character@{\afterassignment\put@character@\@tempcnta} \newcommand\put@character@{% \otf@kanjishape{-}\selectfont% + \advance\@tempcnta by "110000 \kchar\@tempcnta% } \catcode`\"=\count@ @@ -470,6 +471,8 @@ \DeclareFontShape{\otf@JTn}{hgt}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ expgotheb\nlck@sfx@-v}{} \DeclareFontShape{\otf@JYn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-h}{} \DeclareFontShape{\otf@JTn}{ruby}{l}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ minl-v}{} + \DeclareFontShape{\otf@JYn}{rubyg}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gotheb-h}{} + \DeclareFontShape{\otf@JTn}{rubyg}{eb}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \ruby@pfx@ gotheb-v}{} \else \DeclareFontShape{\otf@JYn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-h}{} \DeclareFontShape{\otf@JTn}{mg}{m}{n}{<-> s * [\utf@sc@le] \otf@pfx@ \brsg@pfx@ nmlmgothr\nlck@sfx@-v}{} diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrn-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrn-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrn-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrn-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrn-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrn-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrp-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrp-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrp-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrp-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrp-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrp-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrq-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrq-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrq-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrq-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrq-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrq-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrr-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrr-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrr-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrr-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrs-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrs-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrs-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrs-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrs-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrs-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrt-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrt-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrt-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrt-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrt-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrt-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgru-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgru-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgru-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgru-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgru-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgru-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrv-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrv-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrv-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrv-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrv-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrv-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrw-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrw-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrw-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcgrw-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcgrw-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcgrw-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrn-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrn-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrn-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrn-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrn-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrn-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrp-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrp-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrp-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrp-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrp-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrp-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrq-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrq-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrq-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrq-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrq-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrq-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrr-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrr-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrr-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrr-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrr-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrr-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrs-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrs-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrs-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrs-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrs-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrs-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrt-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrt-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrt-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrt-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrt-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrt-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmru-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmru-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmru-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmru-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmru-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmru-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrv-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrv-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrv-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrv-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrv-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrv-v.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrw-h.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrw-h.tfm Binary files differnew file mode 100644 index 0000000000..29cb2cd42d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrw-h.tfm diff --git a/macros/jptex/latex/japanese-otf/tfm/utfcmrw-v.tfm b/macros/jptex/latex/japanese-otf/tfm/utfcmrw-v.tfm Binary files differnew file mode 100644 index 0000000000..00f00ca892 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/tfm/utfcmrw-v.tfm diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf Binary files differindex 92a25eb7a0..2788167cf2 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcgb--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf Binary files differindex 692fe41fd9..7e83f36f9f 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcgb--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf Binary files differindex e5442bb2cb..9450a17c1f 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcge--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf Binary files differindex f662d182b7..c629a2c24e 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcge--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf Binary files differindex c78ea3f306..bf6579ad33 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcgr--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf Binary files differindex 243fded67c..0d1b6e5c48 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcgr--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf Binary files differindex 1eddf2c77a..adf9692fb1 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmb--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf Binary files differindex 13e9ca7851..8b69939af4 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmb--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf Binary files differindex 189ba2befb..001975e381 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmgr--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf Binary files differindex 6117ee4323..2a48c45ace 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmgr--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf Binary files differindex 060175d773..c26f51bebf 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcml--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf Binary files differindex 23a6ffb1aa..55b6aff5c8 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcml--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf b/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf Binary files differindex bc78829bf9..2e06bb26be 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmr--h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf b/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf Binary files differindex f84172b154..1e64cf74a6 100644 --- a/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf +++ b/macros/jptex/latex/japanese-otf/vf/cidcmr--v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrk-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrk-h.vf Binary files differindex 8ae56ae5e3..d3e47bc744 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgrk-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrk-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrk-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrk-v.vf Binary files differindex afb7e68758..13b09684f8 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgrk-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrk-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrl-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrl-h.vf Binary files differindex 6caf8f8335..74d793b72e 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgrl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrl-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrl-v.vf Binary files differindex fd799e8546..589332b8ca 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgrl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrn-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrn-h.vf Binary files differnew file mode 100644 index 0000000000..e8b5adce6e --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrn-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrn-v.vf Binary files differnew file mode 100644 index 0000000000..9ca29b15ba --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgro-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgro-h.vf Binary files differindex 07eab72c95..52c2ff5651 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgro-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgro-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgro-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgro-v.vf Binary files differindex d443cc0d85..a83dfa03ea 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcgro-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcgro-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrp-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrp-h.vf Binary files differnew file mode 100644 index 0000000000..6ffbc9c934 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrp-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrp-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrp-v.vf Binary files differnew file mode 100644 index 0000000000..34d3246fa8 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrp-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrq-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrq-h.vf Binary files differnew file mode 100644 index 0000000000..7ac6fd7e1f --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrq-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrq-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrq-v.vf Binary files differnew file mode 100644 index 0000000000..75546b223d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrq-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrr-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrr-h.vf Binary files differnew file mode 100644 index 0000000000..939e3e2574 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrr-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrr-v.vf Binary files differnew file mode 100644 index 0000000000..70b0e22b7a --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrs-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrs-h.vf Binary files differnew file mode 100644 index 0000000000..f4e55b46d4 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrs-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrs-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrs-v.vf Binary files differnew file mode 100644 index 0000000000..daa8039a95 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrs-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrt-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrt-h.vf Binary files differnew file mode 100644 index 0000000000..80dd2dcd8a --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrt-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrt-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrt-v.vf Binary files differnew file mode 100644 index 0000000000..0885500447 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrt-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgru-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgru-h.vf Binary files differnew file mode 100644 index 0000000000..01e1ed0f62 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgru-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgru-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgru-v.vf Binary files differnew file mode 100644 index 0000000000..d0c64ed8f3 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgru-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrv-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrv-h.vf Binary files differnew file mode 100644 index 0000000000..fc784f39f7 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrv-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrv-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrv-v.vf Binary files differnew file mode 100644 index 0000000000..6a2d2c1e8a --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrv-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrw-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrw-h.vf Binary files differnew file mode 100644 index 0000000000..824a39636f --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrw-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcgrw-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcgrw-v.vf Binary files differnew file mode 100644 index 0000000000..d76d2aec4d --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcgrw-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrk-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrk-h.vf Binary files differindex 2a394e6895..c157a495e0 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmrk-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrk-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrk-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrk-v.vf Binary files differindex 4752755ac9..acb57f1a26 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmrk-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrk-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrl-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrl-h.vf Binary files differindex 5c46f29124..1f0ed78ee3 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmrl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrl-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrl-v.vf Binary files differindex 0d2e7d4026..2367d32662 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmrl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrn-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrn-h.vf Binary files differnew file mode 100644 index 0000000000..9d9ca3f357 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrn-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrn-v.vf Binary files differnew file mode 100644 index 0000000000..79b3c74b32 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmro-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmro-h.vf Binary files differindex 589b67627b..6ffd96998d 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmro-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmro-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmro-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmro-v.vf Binary files differindex b87e58b9e1..21c3695d86 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfcmro-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfcmro-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrp-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrp-h.vf Binary files differnew file mode 100644 index 0000000000..fadf6952c9 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrp-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrp-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrp-v.vf Binary files differnew file mode 100644 index 0000000000..6adb90ed63 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrp-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrq-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrq-h.vf Binary files differnew file mode 100644 index 0000000000..c692c756bc --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrq-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrq-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrq-v.vf Binary files differnew file mode 100644 index 0000000000..44e0e5afdf --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrq-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrr-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrr-h.vf Binary files differnew file mode 100644 index 0000000000..c86a13f2cb --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrr-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrr-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrr-v.vf Binary files differnew file mode 100644 index 0000000000..9ec4aa8f8f --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrr-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrs-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrs-h.vf Binary files differnew file mode 100644 index 0000000000..8a8d47bc9c --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrs-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrs-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrs-v.vf Binary files differnew file mode 100644 index 0000000000..e0464b5ef5 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrs-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrt-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrt-h.vf Binary files differnew file mode 100644 index 0000000000..02f1ba7da5 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrt-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrt-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrt-v.vf Binary files differnew file mode 100644 index 0000000000..a77b5b1485 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrt-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmru-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmru-h.vf Binary files differnew file mode 100644 index 0000000000..783646157e --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmru-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmru-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmru-v.vf Binary files differnew file mode 100644 index 0000000000..300ea24c24 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmru-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrv-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrv-h.vf Binary files differnew file mode 100644 index 0000000000..f5ec4558c6 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrv-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrv-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrv-v.vf Binary files differnew file mode 100644 index 0000000000..c2d02df2e9 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrv-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrw-h.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrw-h.vf Binary files differnew file mode 100644 index 0000000000..a41744bbd5 --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrw-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfcmrw-v.vf b/macros/jptex/latex/japanese-otf/vf/utfcmrw-v.vf Binary files differnew file mode 100644 index 0000000000..3147d8236e --- /dev/null +++ b/macros/jptex/latex/japanese-otf/vf/utfcmrw-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrk-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrk-h.vf Binary files differindex af719a0772..3e2ef14d66 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrk-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrk-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrk-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrk-v.vf Binary files differindex c3daed745b..c1d9362682 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrk-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrk-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrl-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrl-h.vf Binary files differindex 0a96b35a2a..84777d9648 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrl-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrl-v.vf Binary files differindex 9794421c7d..80b7dc7098 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrn-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrn-h.vf Binary files differindex 5668e5c4c1..b1aa80835a 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrn-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrn-v.vf Binary files differindex 22ed269a08..a52d44d9d1 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgro-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgro-h.vf Binary files differindex 7d74e4954c..d6c065c93b 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgro-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgro-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgro-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgro-v.vf Binary files differindex f1198712ed..b4ecb9180b 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgro-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgro-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrp-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrp-h.vf Binary files differindex cb21e8e019..02039edf97 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrp-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrp-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrp-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrp-v.vf Binary files differindex 86d783811c..6c799ca27b 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrp-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrp-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrq-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrq-h.vf Binary files differindex 20481206d3..b7b767c937 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrq-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrq-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrq-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrq-v.vf Binary files differindex 6775cc4208..142a21b5df 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrq-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrq-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrs-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrs-h.vf Binary files differindex 3edb7faeac..3be72de1ac 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrs-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrs-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrs-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrs-v.vf Binary files differindex 4f8e4aa71e..059d28dbe0 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrs-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrs-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrt-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrt-h.vf Binary files differindex 8e30ea8539..794061697d 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrt-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrt-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrt-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrt-v.vf Binary files differindex f18e4d2eee..a14fe50b11 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrt-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrt-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgru-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgru-h.vf Binary files differindex 7d80de2665..751c38cb87 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgru-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgru-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgru-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgru-v.vf Binary files differindex 108f1ba5c5..b5a28eb266 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgru-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgru-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrv-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrv-h.vf Binary files differindex fbda381b54..ba9d6aaf33 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrv-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrv-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrv-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrv-v.vf Binary files differindex 955e6936b7..d13fa8fcc6 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrv-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrv-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrw-h.vf b/macros/jptex/latex/japanese-otf/vf/utfgrw-h.vf Binary files differindex 3d7f69b8b3..fcf85ae132 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrw-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrw-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfgrw-v.vf b/macros/jptex/latex/japanese-otf/vf/utfgrw-v.vf Binary files differindex d6ac632a4d..01a97fca02 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfgrw-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfgrw-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrk-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrk-h.vf Binary files differindex 7b2a2935c8..718310f27e 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrk-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrk-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrk-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrk-v.vf Binary files differindex dfb85d1ac7..5b1601473e 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrk-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrk-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrl-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrl-h.vf Binary files differindex 75cceec250..a49ad6af73 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrl-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrl-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrl-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrl-v.vf Binary files differindex f518cef397..c205e212b0 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrl-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrl-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrn-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrn-h.vf Binary files differindex 6fb29d9cc5..b55054491b 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrn-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrn-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrn-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrn-v.vf Binary files differindex 0a832b421f..5e18cfc8e9 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrn-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrn-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmro-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmro-h.vf Binary files differindex 67b5aa4d9b..cedbea6526 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmro-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmro-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmro-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmro-v.vf Binary files differindex 9bb466dcf6..958707b13f 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmro-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmro-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrp-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrp-h.vf Binary files differindex 5c730d75b0..2732dd28b2 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrp-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrp-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrp-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrp-v.vf Binary files differindex 1fafb3eff7..01b4c5f4e9 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrp-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrp-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrq-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrq-h.vf Binary files differindex cee3d0c7e2..e434800cf0 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrq-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrq-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrq-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrq-v.vf Binary files differindex aba15b1aea..83bdb672b7 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrq-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrq-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrs-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrs-h.vf Binary files differindex b136918ae4..2f9945494a 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrs-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrs-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrs-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrs-v.vf Binary files differindex d6ab67cfe8..cb69a13eda 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrs-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrs-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrt-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrt-h.vf Binary files differindex c65e3ec576..16f9529485 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrt-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrt-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrt-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrt-v.vf Binary files differindex c60a162e82..dee6473412 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrt-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrt-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmru-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmru-h.vf Binary files differindex 50cfb26565..770f63f0c5 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmru-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmru-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmru-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmru-v.vf Binary files differindex f3fbe2eefb..c1ca33a7c2 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmru-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmru-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrv-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrv-h.vf Binary files differindex 288ae7bb12..eef69bf69a 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrv-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrv-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrv-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrv-v.vf Binary files differindex 385502dfa0..e9b2f6617b 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrv-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrv-v.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrw-h.vf b/macros/jptex/latex/japanese-otf/vf/utfmrw-h.vf Binary files differindex 1b3039506b..aebef48297 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrw-h.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrw-h.vf diff --git a/macros/jptex/latex/japanese-otf/vf/utfmrw-v.vf b/macros/jptex/latex/japanese-otf/vf/utfmrw-v.vf Binary files differindex e5756dc04c..d5bad6afd2 100644 --- a/macros/jptex/latex/japanese-otf/vf/utfmrw-v.vf +++ b/macros/jptex/latex/japanese-otf/vf/utfmrw-v.vf diff --git a/macros/latex/contrib/setspaceenhanced/README.md b/macros/latex/contrib/setspaceenhanced/README.md index ec433ed204..49e154a71b 100644 --- a/macros/latex/contrib/setspaceenhanced/README.md +++ b/macros/latex/contrib/setspaceenhanced/README.md @@ -2,7 +2,7 @@ Copyright © 2008–2023 Markus Kohm -Release: 2023-09-19 v1.01 +Release: 2023-10-09 v1.02 License: LPPL 1.3c @@ -159,5 +159,5 @@ v1.01 2023-09-19: - option `fontsize` has been renamed to `keepfontsize` because of incompatibility with KOMA-Script → [issue - #1](https://github.com/komascript/third-party-enhancements/issues/1) + 1](https://github.com/komascript/third-party-enhancements/issues/1) diff --git a/macros/latex/contrib/setspaceenhanced/setspaceenhanced.dtx b/macros/latex/contrib/setspaceenhanced/setspaceenhanced.dtx index 4045fd798b..17f0d32039 100644 --- a/macros/latex/contrib/setspaceenhanced/setspaceenhanced.dtx +++ b/macros/latex/contrib/setspaceenhanced/setspaceenhanced.dtx @@ -32,7 +32,7 @@ %</dtx> %<*dtx|package> %<package>\ProvidesExplPackage{setspaceenhanced} - {2023-09-19}{1.01} + {2023-10-09}{1.02} {% %<*dtx> sources and unpack driver of @@ -549,49 +549,58 @@ In my opinion this is more the expected result. See the previous % \end{macrocode} % \end{Constant} % -% \begin{Variable}{\@@_single_factor_fp, -% \@@_onehalf_factor_fp, -% \@@_double_factor_fp} +% \begin{Variable}{\g_@@_single_factor_fp, +% \g_@@_onehalf_factor_fp, +% \g_@@_double_factor_fp} % \ExplSyntaxOff +% \changes{v1.02}{2023-10-09}{missing prefix \texttt{g} added to variable +% name} % The internal variables used to store the configured stretch factors for % singlespacing, onehalfspacing and doublespacing. If \texttt{nan} % \cs{@@\_linespread} is calculated. % \begin{macrocode} -\fp_new:N \@@_single_factor_fp \fp_set:Nn \@@_single_factor_fp { 1.0 } -\fp_new:N \@@_onehalf_factor_fp \fp_set_eq:NN \@@_onehalf_factor_fp \c_nan_fp -\fp_new:N \@@_double_factor_fp \fp_set_eq:NN \@@_double_factor_fp \c_nan_fp +\fp_new:N \g_@@_single_factor_fp +\fp_set:Nn \g_@@_single_factor_fp { 1.0 } +\fp_new:N \g_@@_onehalf_factor_fp +\fp_set_eq:NN \g_@@_onehalf_factor_fp \c_nan_fp +\fp_new:N \g_@@_double_factor_fp +\fp_set_eq:NN \g_@@_double_factor_fp \c_nan_fp % \end{macrocode} % \end{Variable} % -% \begin{Variable}{\@@_linespread_fp,\@@_fp} +% \begin{Variable}{\g_@@_linespread_fp,\g_@@_fp} % \ExplSyntaxOff +% \changes{v1.02}{2023-10-09}{missing prefix \texttt{g} added to variable +% name} % Storage of the current calculated stretch factor and the used constant. % \begin{macrocode} -\fp_new:N \@@_linespread_fp \fp_set:Nn \@@_linespread_fp { 1.0 } +\fp_new:N \g_@@_linespread_fp +\fp_set:Nn \g_@@_linespread_fp { 1.0 } +\fp_new:N \g_@@_fp % \end{macrocode} % \end{Variable} % % \begin{macro}{\@@_set_spacing:nn} % \ExplSyntaxOff -% These commands are used to set the stretch factor for one of the +% This function is used to set the stretch factor for one of the % spacings. % \begin{macrocode} \cs_new:Nn \@@_set_spacing:nn { \tl_if_blank:nF { #1 } { - \fp_set:cn { @@_#2_factor_fp } { #1 } + \fp_set:cn { g_@@_#2_factor_fp } { #1 } } - \fp_if_nan:nTF { \tl_use:c { @@_#2_factor_fp } } + \fp_if_nan:nTF { \tl_use:c { g_@@_#2_factor_fp } } { - \fp_set_eq:Nc \@@_fp { c_@@_#2_fp } + \fp_set_eq:Nc \g_@@_fp { c_@@_#2_fp } \@@_calc_stretch: } { - \fp_set_eq:Nc \@@_linespread_fp { @@_#2_factor_fp } - \fp_set_eq:NN \@@_fp \c_nan_fp + \fp_set_eq:Nc \g_@@_linespread_fp { g_@@_#2_factor_fp } + \fp_set_eq:NN \g_@@_fp \c_nan_fp } - \setstretch{ \fp_to_decimal:N \@@_linespread_fp } + \setstretch{ \fp_to_decimal:N \g_@@_linespread_fp } } % \end{macrocode} % \end{macro} @@ -599,16 +608,16 @@ In my opinion this is more the expected result. See the previous % \begin{macro}{\@@_calc_stretch:} % \ExplSyntaxOff % This macro is used to (re-)calculate the stretch factor -% \cs{@@\_calcstretch} if the the current used constant is not +% \cs{@@\_calcstretch} if the currently used constant is not % \texttt{nan}. % \begin{macrocode} \cs_new:Nn \@@_calc_stretch: { - \fp_if_nan:nF { \@@_fp } + \fp_if_nan:nF { \g_@@_fp } { - \fp_set:Nn \@@_linespread_fp + \fp_set:Nn \g_@@_linespread_fp { - \f@size / \dim_to_fp:n { \f@baselineskip } * \@@_fp + \f@size / \dim_to_fp:n { \f@baselineskip } * \g_@@_fp } } } @@ -623,17 +632,17 @@ In my opinion this is more the expected result. See the previous % \begin{macrocode} \hook_gput_code:nnn { selectfont } { setspaceenhanced } {% - \bool_if:NT \__setspaceenhanced_byselectfont_bool + \bool_if:NT \g_@@_byselectfont_bool { \cs_if_exist:NT \size@update { \fp_set:Nn \l_tmpa_fp { \f@linespread } - \fp_compare:nNnT \__setspaceenhanced_linespread_fp = \l_tmpa_fp + \fp_compare:nNnT \g_@@_linespread_fp = \l_tmpa_fp { - \__setspaceenhanced_calc_stretch: + \@@_calc_stretch: \set@fontsize { - \fp_to_decimal:N \__setspaceenhanced_linespread_fp + \fp_to_decimal:N \g_@@_linespread_fp } \f@size \f@baselineskip } @@ -648,7 +657,7 @@ In my opinion this is more the expected result. See the previous % \pkg{setspace}. But with \opt{keepfontsize=true} we use \cs{linespread}: % \begin{macrocode} \renewcommand*{\setstretch}[1]{ - \bool_if:NTF \@@_fontsize_bool + \bool_if:NTF \g_@@_fontsize_bool { \linespread{#1}\selectfont } @@ -673,10 +682,10 @@ In my opinion this is more the expected result. See the previous onehalfspacing .usage = general, doublespacing .code = \@@_set_spacing:nn {#1} {double}, doublespacing .usage = general, - byselectfont .bool_set:N = \@@_byselectfont_bool, + byselectfont .bool_set:N = \g_@@_byselectfont_bool, byselectfont .default:n = true, byselectfont .initial:n = false, - keepfontsize .bool_set:N = \@@_fontsize_bool, + keepfontsize .bool_set:N = \g_@@_fontsize_bool, keepfontsize .default:n = true, keepfontsize .initial:n = false, } @@ -691,16 +700,16 @@ In my opinion this is more the expected result. See the previous % singlespacing, onehalfspacing and doublespacing. % \begin{macrocode} \renewcommand*{\singlespacing}{ - \__setspaceenhanced_set_spacing:nn {} {single} + \@@_set_spacing:nn {} {single} } \renewcommand*{\onehalfspacing}{ - \__setspaceenhanced_set_spacing:nn {} {onehalf} + \@@_set_spacing:nn {} {onehalf} } \renewcommand*{\doublespacing}{ - \__setspaceenhanced_set_spacing:nn {} {double} + \@@_set_spacing:nn {} {double} } \renewcommand*{\SetSinglespace}[1]{ - \fp_set:Nn \@@_single_factor_fp { #1 } + \fp_set:Nn \g_@@_single_factor_fp { #1 } } % \end{macrocode} % \end{command} diff --git a/macros/latex/contrib/setspaceenhanced/setspaceenhanced.pdf b/macros/latex/contrib/setspaceenhanced/setspaceenhanced.pdf Binary files differindex ba55cd2db0..f6c0c603f1 100644 --- a/macros/latex/contrib/setspaceenhanced/setspaceenhanced.pdf +++ b/macros/latex/contrib/setspaceenhanced/setspaceenhanced.pdf |