summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-01 22:13:57 +0000
committerKarl Berry <karl@freefriends.org>2020-02-01 22:13:57 +0000
commit2a9a1696c2280e52bbfc92d254b7f6420369ba28 (patch)
tree0ea5912ff76c2e698d083fe17c51bc31708aa0a0
parente911000609e83f69e810f935c454bae7b3539e98 (diff)
pxchfon (1feb20)
git-svn-id: svn://tug.org/texlive/trunk@53629 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/LICENSE2
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/README-ja.md2
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdfbin304031 -> 304241 bytes
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex18
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty31
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty2
7 files changed, 40 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/platex/pxchfon/LICENSE b/Master/texmf-dist/doc/platex/pxchfon/LICENSE
index 534324b7566..0c208cdd77f 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/LICENSE
+++ b/Master/texmf-dist/doc/platex/pxchfon/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/Master/texmf-dist/doc/platex/pxchfon/README-ja.md b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
index 6399a160600..18ce88c7624 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
+++ b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
@@ -54,6 +54,8 @@ MITライセンスの下で配布される。
更新履歴
--------
+ * Version 1.7b ‹2020/02/01›
+ - '\textdiruni' を頑強にする。
* Version 1.7a ‹2019/11/22›
- バグ修正。
* Version 1.7 ‹2019/11/19›
diff --git a/Master/texmf-dist/doc/platex/pxchfon/README.md b/Master/texmf-dist/doc/platex/pxchfon/README.md
index 4f5ac6d434a..e587fa36003 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/README.md
+++ b/Master/texmf-dist/doc/platex/pxchfon/README.md
@@ -39,6 +39,8 @@ This package is distributed under the MIT License.
Revision History
----------------
+ * Version 1.7b ‹2020/02/01›
+ - Make '\textdiruni' robust.
* Version 1.7a ‹2019/11/22›
- Bug fix.
* Version 1.7 ‹2019/11/19›
diff --git a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
index ffb14a58721..21aeda43357 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
+++ b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
index 8d761615fed..30d5ee909b8 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
+++ b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
@@ -13,8 +13,8 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.7a}
-\newcommand{\PkgDate}{2019/11/22}
+\newcommand{\PkgVersion}{1.7b}
+\newcommand{\PkgDate}{2020/02/01}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -880,6 +880,20 @@ OpenTypeフォントをユーザが指定する機能を提供する。
\setmarugothicfont{NotoSansJP-Medium.otf}
\end{verbatim}\end{quote}
+\item |haranoaji|\Means
+ 原ノ味フォント。
+
+\begin{quote}\small\begin{verbatim}
+\setminchofont{HaranoAjiMincho-Regular.otf}
+\setlightminchofont{HaranoAjiMincho-Light.otf}
+\setboldminchofont{HaranoAjiMincho-Bold.otf}
+\setgothicfont{HaranoAjiGothic-Medium.otf}
+\setmediumgothicfont{HaranoAjiGothic-Regular.otf}
+\setboldgothicfont{HaranoAjiGothic-Bold.otf}
+\setxboldgothicfont{HaranoAjiGothic-Heavy.otf}
+\setmarugothicfont{HaranoAjiGothic-Medium.otf}
+\end{verbatim}\end{quote}
+
\end{itemize}
%-------------------
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index 4c0cab8d312..23b76158e65 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxchfon.sty'.
%%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/11/22 v1.7a]
+\ProvidesPackage{pxchfon}[2020/02/01 v1.7b]
\def\pxcz@pkgname{pxchfon}
%--------------------------------------- general
@@ -1267,18 +1267,20 @@
\fi
%%<*> \diruni
-\DeclareRobustCommand*{\diruni}{%
- \not@math@alphabet\diruni\relax
- \ifx\cy@encoding\pxcz@JYn % if in standard Japanese encoding
- \expandafter\let\csname UTF \endcsname\pxcz@du@UTF
- \fontshape{diruni}\selectfont
- \fi
-}
+\@ifdefinable{\diruni}{%
+ \DeclareRobustCommand*{\diruni}{%
+ \not@math@alphabet\diruni\relax
+ \ifx\cy@encoding\pxcz@JYn % if in standard Japanese encoding
+ \expandafter\let\csname UTF \endcsname\pxcz@du@UTF
+ \kanjishape{diruni}\selectfont
+ \fi
+ }}
%%<*> \textdiruni{<text>}
-\newcommand*{\textdiruni}[1]{%
- \relax\ifmmode\hbox\fi{\diruni#1}%
-}
+\@ifdefinable{\textdiruni}{%
+ \DeclareRobustCommand*{\textdiruni}[1]{%
+ \relax\ifmmode\hbox\fi{\diruni#1}%
+ }}
%% \pxcz@du@UTF
\def\pxcz@du@UTF#1{%
@@ -1462,7 +1464,10 @@
%% check for textcomp
\newif\ifpxcz@textcomp
-\@ifpackageloaded{textcomp}{\pxcz@textcomptrue}{}
+\ifx\DeclareEncodingSubset\@undefined\else
+ \expandafter\ifx\csname T@TS1\endcsname\relax\else
+ \pxcz@textcomptrue
+\fi\fi
%% \pxcz@afont@enc@list
\def\pxcz@afont@enc@list{OT1,T1}
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index ad79f5bcbdb..1b243e9893d 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjafont.sty'.
%%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%