texlive[53793] Master/texmf-dist: zxjafont (15feb20)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 15 23:13:30 CET 2020
Revision: 53793
http://tug.org/svn/texlive?view=revision&revision=53793
Author: karl
Date: 2020-02-15 23:13:29 +0100 (Sat, 15 Feb 2020)
Log Message:
-----------
zxjafont (15feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/zxjafont/README-ja.md
trunk/Master/texmf-dist/doc/latex/zxjafont/README.md
trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.pdf
trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.tex
trunk/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
Modified: trunk/Master/texmf-dist/doc/latex/zxjafont/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zxjafont/README-ja.md 2020-02-15 22:13:17 UTC (rev 53792)
+++ trunk/Master/texmf-dist/doc/latex/zxjafont/README-ja.md 2020-02-15 22:13:29 UTC (rev 53793)
@@ -36,6 +36,8 @@
更新履歴
--------
+ * Version 1.1a 〈2020/02/15〉
+ - NFSS 改修に対する調整。
* Version 1.1 〈2020/02/08〉
- 和文処理モードでも `prop` が使えるようにした。
* Version 1.0 〈2020/02/02〉
Modified: trunk/Master/texmf-dist/doc/latex/zxjafont/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zxjafont/README.md 2020-02-15 22:13:17 UTC (rev 53792)
+++ trunk/Master/texmf-dist/doc/latex/zxjafont/README.md 2020-02-15 22:13:29 UTC (rev 53793)
@@ -39,6 +39,8 @@
Revision History
----------------
+ * Version 1.1a 〈2020/02/15〉
+ - Adjustment for the revision of NFSS.
* Version 1.1 〈2020/02/08〉
- Now `prop` is available even in Japanese-font mode.
* Version 1.0 〈2020/02/02〉
Modified: trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.tex 2020-02-15 22:13:17 UTC (rev 53792)
+++ trunk/Master/texmf-dist/doc/latex/zxjafont/zxjafont.tex 2020-02-15 22:13:29 UTC (rev 53793)
@@ -12,8 +12,8 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.1}
-\newcommand{\PkgDate}{2020/02/08}
+\newcommand{\PkgVersion}{1.1a}
+\newcommand{\PkgDate}{2020/02/15}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -324,6 +324,7 @@
\item |nothreeweight|\Means
|threeweight|\>の否定。
多ウェイト用のメイン設定は2ウェイトのみ使える。
+\Note |(no)threeweight|\>は1.0版で追加された。
\Note 既定は\>|threeweight|\>であるが、使用中の\Pkg{fontspec}の版が
古くて追加ウェイトに対応できない場合は\>|nothreeweight|\>が既定になる。
@@ -345,6 +346,8 @@
既定で用いるのは等幅のフォントだが、
「欧文のみプロポーショナル」の変種（HGフォントの場合「HGS～」名称のもの）
がある場合はそれを優先させている。
+\Note 1.1版より、\Pkg{xeCJK}\JSl\Pkg{zxjatype}併用時でも\>|prop|\>が
+指定できるようになった。
\item |noprop|（既定）\Means
|prop|\>の否定。
（和文が）等幅のフォントを用いる。
@@ -370,6 +373,7 @@
ほぼないと思われる。
\item |noignorejatype|（既定）\Means
|ignorejatype|\>の否定。
+\Note |(no)ignorejatype|\>は1.0版で追加された。
\item |feature={|\Meta{属性リスト}|}|\Means
このパッケージで指定されるフォント全てに通用する
Modified: trunk/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty 2020-02-15 22:13:17 UTC (rev 53792)
+++ trunk/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty 2020-02-15 22:13:29 UTC (rev 53793)
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjafont}[2020/02/08 v1.1]
+\ProvidesPackage{zxjafont}[2020/02/15 v1.1a]
\def\zxjf at pkgname{zxjafont}
%% preparation
@@ -56,6 +56,13 @@
\def\zxjf at isvalid#1{%
\ifcsvoid{#1}{F}{T}T}
+%% \zxjf at if@font at exists
+\ifdefined\IfFontExistsTF
+ \let\zxjf at if@font at exists\IfFontExistsTF
+\else % fallback
+ \def\zxjf at if@font at exists#1{\@firstoftwo}
+\fi
+
%--------------------------------------- handle options
%% errors
@@ -275,7 +282,34 @@
\zxjf at onlypreamble@def\zxjf at declare@preset#1{%
\zxjf at with@cs\zxjf at onlypreamble@def{zxjf at the@preset@#1}}
\zxjf at declare@preset{}{}
+\ifzxjf at fontspec@mw %TODO: temporary fix
\zxjf at onlypreamble@def\zxjf at uniweight#1#2#3{%
+ \zxjf at setmainfont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#1}%
+ \zxjf at setsansfont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#2}%
+ \zxjf at setmonofont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#2}}
+\zxjf at onlypreamble@def\zxjf at multiweight#1#2#3#4#5#6#7#8{%
+ \ifzxjf at bold
+ \zxjf at setmainfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#2}%
+ \zxjf at setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#5}%
+ \zxjf at setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#5}%
+ \else\ifzxjf at oneweight
+ \zxjf at setmainfont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#2}%
+ \zxjf at setsansfont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#7}%
+ \zxjf at setmonofont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#7}%
+ \else\ifzxjf at threeweight
+ \zxjf at setmainfont{#8,FontFace={bx}{n}{#3},BoldFont=#3,
+ FontFace={l}{n}{#1}}{#2}%
+ \zxjf at setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
+ \zxjf at setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
+ \else
+ \zxjf at setmainfont{#8,FontFace={bx}{n}{#3},BoldFont=#3}{#2}%
+ \zxjf at setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#4}%
+ \zxjf at setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#4}%
+ \fi\fi\fi}
+\else
+\zxjf at onlypreamble@def\zxjf at uniweight#1#2#3{%
\zxjf at setmainfont{#3,BoldFont=#2}{#1}%
\zxjf at setsansfont{#3,BoldFont=#2}{#2}%
\zxjf at setmonofont{#3,BoldFont=#2}{#2}}
@@ -300,6 +334,7 @@
\zxjf at setsansfont{#8,BoldFont=#5}{#4}%
\zxjf at setmonofont{#8,BoldFont=#5}{#4}%
\fi\fi\fi}
+\fi
%% \zxjf at declare@preset at with@prop{<name>}{<text>}
\zxjf at onlypreamble@def\zxjf at declare@preset at with@prop#1#2{%
\zxjf at declare@preset{#1}{#2{RawFeature=-palt;-kern}}%
@@ -314,8 +349,17 @@
\zxjf at declare@preset at alias{#1}{#2}%
\zxjf at declare@preset at alias{#1/prop}{#2/prop}}
+%% \zxjf at declare@preproc{<name>}{<text>}
+\zxjf at onlypreamble@def\zxjf at declare@preproc#1{%
+ \zxjf at with@cs\zxjf at onlypreamble@def{zxjf at the@preproc@#1}}
+%% \zxjf at declare@preproc at alias{<name1>}{<name2>}
+\zxjf at onlypreamble@def\zxjf at declare@preproc at alias#1#2{%
+ \zxjf at with@cs\@onlypreamble{zxjf at the@preproc@#1}%
+ \csletcs{zxjf at the@preproc@#1}{zxjf at the@preproc@#2}}
+
%% \zxjf at use@preset{<name>}
\zxjf at onlypreamble@def\zxjf at use@preset#1{%
+ \csuse{zxjf at the@preproc@#1}%
\undef\zxjf at do
\ifzxjf at prop \letcs\zxjf at do{zxjf at the@preset@#1/prop}\fi
\unless\ifdefined\zxjf at do \letcs\zxjf at do{zxjf at the@preset@#1}\fi
@@ -343,10 +387,15 @@
\zxjf at multiweight{IPAPMincho}{IPAPMincho}{HGPMinchoE}%
{HGPGothicM}{HGGothicE}{hgrsgu.ttc}{IPAPGothic}{}}
\zxjf at declare@preset{ipaex}{%
- \zxjf at uniweight{ipaexm.ttf}{ipaexg.ttf}{}}
+ \zxjf at uniweight{\zxjf at Fa}{\zxjf at Fb}{}}
+\zxjf at declare@preproc{ipaex}{%
+ \zxjf at if@font at exists{ipaexm.ttf}%
+ {\def\zxjf at Fa{ipaexm.ttf}\def\zxjf at Fb{ipaexg.ttf}}%
+ {\def\zxjf at Fa{IPAexMincho}\def\zxjf at Fb{IPAexGothic}}}
\zxjf at declare@preset{ipaex-hg}{%
- \zxjf at multiweight{ipaexm.ttf}{ipaexm.ttf}{HGSMinchoE}%
- {HGSGothicM}{HGSGothicE}{hgrsgu.ttc}{ipaexg.ttf}{}}
+ \zxjf at multiweight{\zxjf at Fa}{\zxjf at Fa}{HGSMinchoE}%
+ {HGSGothicM}{HGSGothicE}{hgrsgu.ttc}{\zxjf at Fb}{}}
+\zxjf at declare@preproc at alias{ipaex-hg}{ipaex}
\zxjf at declare@preset{moga}{%
\zxjf at multiweight{MogaExMincho}{MogaExMincho}{MogaExMincho Bold}%
{MogaExGothic}{MogaExGothic Bold}{MogaExGothic Bold}{MogaExGothic}{}}
@@ -413,9 +462,12 @@
{NotoSansJP-Regular}{NotoSansJP-Bold}{NotoSansJP-Black}%
{NotoSansJP-Medium}}
\zxjf at declare@preset at with@prop{haranoaji}{%
- \zxjf at multiweight{HaranoAjiMincho-Light}{HaranoAjiMincho-Regular}{HaranoAjiMincho-Bold}%
- {HaranoAjiGothic-Regular}{HaranoAjiGothic-Bold}{HaranoAjiGothic-Heavy}%
- {HaranoAjiGothic-Medium}}
+ \zxjf at multiweight{HaranoAjiMincho-Light\zxjf at Fa}{HaranoAjiMincho-Regular\zxjf at Fa}{HaranoAjiMincho-Bold\zxjf at Fa}%
+ {HaranoAjiGothic-Regular\zxjf at Fa}{HaranoAjiGothic-Bold\zxjf at Fa}{HaranoAjiGothic-Heavy\zxjf at Fa}%
+ {HaranoAjiGothic-Medium\zxjf at Fa}}
+\zxjf at declare@preproc{haranoaji}{%
+ \zxjf at if@font at exists{HaranoAjiMincho-Regular.otf}%
+ {\def\zxjf at Fa{.otf}}{\let\zxjf at Fa\@empty}}
%(alias)
\zxjf at declare@preset at alias@with at prop{kozuka}{kozuka-pro}
\zxjf at declare@preset at alias@with at prop{morisawa}{morisawa-pro}
@@ -474,13 +526,15 @@
\def\ltdefault{l}
\DeclareRobustCommand\ltseries{%
\not at math@alphabet\ltseries\relax
- \fontseries\ltdefault\selectfont
+ % \fontseries{\ltdefault} fails on New NFSS
+ % unless alphabetic font also has 'l' series.
+ \edef\f at series{\ltdefault}\selectfont
}
%%<*> \ebdefault/\ebseries
\def\ebdefault{eb}
\DeclareRobustCommand\ebseries{%
\not at math@alphabet\ebseries\relax
- \fontseries\ebdefault\selectfont
+ \edef\f at series{\ebdefault}\selectfont
}
\fi
More information about the tex-live-commits
mailing list.