texlive[52325] Master/texmf-dist: pxchfon (9oct19)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 9 23:57:10 CEST 2019
Revision: 52325
http://tug.org/svn/texlive?view=revision&revision=52325
Author: karl
Date: 2019-10-09 23:57:10 +0200 (Wed, 09 Oct 2019)
Log Message:
-----------
pxchfon (9oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
trunk/Master/texmf-dist/doc/platex/pxchfon/README.md
trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/README.md
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty 2019-10-09 21:56:43 UTC (rev 52324)
+++ trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty 2019-10-09 21:57:10 UTC (rev 52325)
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/07/10 v1.5a]
+\ProvidesPackage{pxchfon}[2019/10/07 v1.6]
\def\pxcz at pkgname{pxchfon}
%--------------------------------------- general
@@ -113,6 +113,50 @@
\chardef\pxcz at pxufont@loaded=0
}
+%--------------------------------------- custom presets
+
+%% \pxcz at custom@presets
+\pxcz at onlypreamble@let\pxcz at custom@presets\@empty
+%% \pxcz at custom@apply at opt@unicode
+\pxcz at onlypreamble@let\pxcz at custom@apply at opt@unicode\@empty
+%% freeze
+\pxcz at onlypreamble@let\pxcz at custom\relax
+\let\pxcz at uniweight\relax
+\let\pxcz at multiweight\relax
+
+%% \pxcz at declare@oneweight at preset{<name>}{<m>}{<g>}
+\pxcz at onlypreamble@def\pxcz at declare@oneweight at preset#1#2#3{%
+ \xdef\pxcz at custom@presets{\pxcz at custom@presets
+ \pxcz at custom{#1}{\pxcz at uniweight{#2}{#3}}}}
+%% \pxcz at declare@multiweight at preset{<name>}{<1>}...{<8>}
+\pxcz at onlypreamble@def\pxcz at declare@multiweight at preset#1#2#3#4#5#6#7#8#9{%
+ \xdef\pxcz at custom@presets{\pxcz at custom@presets
+ \pxcz at custom{#1}{\pxcz at multiweight{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}}}
+%%<+> \pxchfonDeclareOneWeightPreset{<name>}{<m>}{<g>}
+\@onlypreamble\pxchfonDeclareOneWeightPreset
+\newcommand*\pxchfonDeclareOneWeightPreset[1]{%
+ \pxcz at declare@oneweight at preset{user:#1}}
+%%<+> \pxchfonDeclareMultiWeightPreset{<name>}{<1>}...{<8>}
+\@onlypreamble\pxchfonDeclareMultiWeightPreset
+\newcommand*\pxchfonDeclareMultiWeightPreset[1]{%
+ \pxcz at declare@multiweight at preset{user:#1}}
+
+%% Load custom preset definitions
+\IfFileExists{pxchfon-extras.def}{%
+ \PackageInfo\pxcz at pkgname
+ {Extra preset settings are loaded\@gobble}%
+ \input{pxchfon-extras.def}%
+}{}
+\IfFileExists{pxchfon.cfg}{%
+ \PackageInfo\pxcz at pkgname
+ {Custom preset settings are loaded\@gobble}%
+ \begingroup
+ \makeatother\input{pxchfon.cfg}%
+ \endgroup
+}{}
+\let\pxcz at declare@oneweight at preset\@undefined
+\let\pxcz at declare@multiweight at preset\@undefined
+
%--------------------------------------- handle options
%% variables
@@ -218,6 +262,7 @@
hiragino-elcapitan-pro,hiragino-elcapitan-pron,%
morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-win10+,yu-osx,%
sourcehan-otc,sourcehan,sourcehan-jp,noto-otc,noto,noto-jp,%
+ haranoaji,%
sourcehan-otc+,sourcehan+,noto-otc+,noto+,%
%(alias)
hiragino,noto-otf,%
@@ -231,6 +276,8 @@
\expandafter\pxcz at do\expandafter{\pxcz at x}}
\@for\pxcz at x:=\pxcz at all@abolished at preset\do{%
\expandafter\pxcz at do\expandafter{\pxcz at x}}
+\def\pxcz at custom#1#2{\pxcz at do{#1}}
+\pxcz at custom@presets
% others
% The 'unicode' option means a Unicode-oriented mapping, and requires
% dvipdfmx of version 20170627 or later. The 'unicode-fwid' is a variant.
@@ -252,20 +299,17 @@
\pxcz at parse@opt\CurrentOption
\ifpxcz at ok\else \@unknownoptionerror \fi}}
\pxcz at onlypreamble@def\pxcz at parse@opt#1{%
- \expandafter\pxcz at parse@opt at a#1\@nnil}
-\pxcz at onlypreamble@def\pxcz at parse@opt at a{%
- \futurelet\pxcz at tok\pxcz at parse@opt at b}
-\pxcz at onlypreamble@def\pxcz at parse@opt at b{%
\pxcz at okfalse
- \let\pxcz at tmpa\remove at to@nnil
- \ifx+\pxcz at tok
- \pxcz at file@preset at tltrue \let\pxcz at tmpa\pxcz at parse@opt at c
- \else\ifx*\pxcz at tok
- \pxcz at file@preset at tlfalse \let\pxcz at tmpa\pxcz at parse@opt at c
- \fi\fi \pxcz at tmpa}
-\pxcz at onlypreamble@def\pxcz at parse@opt at c#1#2\@nnil{%
- \pxcz at oktrue
- \edef\pxcz at file@preset{#2}}
+ \pxcz at parse@opt at a{+}{#1}{\pxcz at file@preset at tltrue}%
+ \pxcz at parse@opt at a{*}{#1}{\pxcz at file@preset at tlfalse}%
+ \pxcz at parse@opt at a{tl:}{#1}{\pxcz at file@preset at tltrue}%
+ \pxcz at parse@opt at a{file:}{#1}{\pxcz at file@preset at tlfalse}}
+\pxcz at onlypreamble@def\pxcz at parse@opt at a#1#2#3{%
+ \ifpxcz at ok\else
+ \pxcz at split{#1}{#2}\ifx\pxcz at pre\@empty
+ #3\let\pxcz at file@preset\pxcz at post \pxcz at oktrue
+ \fi
+ \fi}
% dispatch
\ProcessOptions*
@@ -418,6 +462,7 @@
\pxcz at do{noto+}{\pxcz at apply@opt at unicodeP}
\pxcz at do{noto-otc+}{\pxcz at apply@opt at unicodeP}
\pxcz at do{yu-win10+}{\pxcz at apply@opt at unicodeP}
+\pxcz at custom@apply at opt@unicode
% No-embed is not supported under the 'unicode' setup
\ifnum\pxcz at directunicode=\pxcz at directunicode@full
\pxcz at warn@unless at all@embeddedtrue
@@ -1841,6 +1886,10 @@
\pxcz at onlypreamble@def\pxcz at use@preset#1{%
\csname pxcz at the@preset@#1\endcsname}
+%% Redefine \pxcz at custom
+\let\pxcz at custom\pxcz at declare@preset
+\pxcz at custom@presets
+
%% definitions of main preset mappings
\pxcz at declare@preset{noembed}{%
\pxcz at uniweight{*}{*}}
@@ -1975,6 +2024,13 @@
{NotoSansJP-Regular.otf}{NotoSansJP-Bold.otf}%
{NotoSansJP-Black.otf}{NotoSansJP-Medium.otf}%
{NotoSansJP-Medium.otf}}
+\pxcz at declare@preset{haranoaji}{%
+ \usecmapforalphabet
+ \pxcz at multiweight{HaranoAjiMincho-Light.otf}%
+ {HaranoAjiMincho-Regular.otf}{HaranoAjiMincho-Bold.otf}%
+ {HaranoAjiGothic-Regular.otf}{HaranoAjiGothic-Bold.otf}%
+ {HaranoAjiGothic-Heavy.otf}{HaranoAjiGothic-Medium.otf}%
+ {HaranoAjiGothic-Medium.otf}}
%(alias)
\pxcz at declare@preset at alias{hiragino}{hiragino-pro}
\pxcz at declare@preset at alias{noEmbed}{noembed}
More information about the tex-live-commits
mailing list