From 48eedda2cb4d2644886b862409b24a1d8e9a136f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 10 Oct 2023 03:01:54 +0000 Subject: CTAN sync 202310100301 --- .../jptex/latex/japanese-otf/doc/00otf-uptex.txt | 17 ++++- .../japanese-otf/doc/test/uplatex/sp_gb_utf.tex | 28 +++++++- .../doc/test/uplatex/uotftest-utf8.tex | 83 ++++++++++++++++++---- 3 files changed, 110 insertions(+), 18 deletions(-) (limited to 'macros/jptex/latex/japanese-otf/doc') 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} -- cgit v1.2.3