summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-14 22:30:43 +0000
committerKarl Berry <karl@freefriends.org>2015-10-14 22:30:43 +0000
commitd8affc4836b36f9a08f2502e9650bf302952561c (patch)
tree02849b2b705c93f78c5abc9afd7d22433f2cfce4 /Master
parentae98cc0fd3cb34092da2981d4d235b25a8e077cd (diff)
pxchfon (14oct15)
git-svn-id: svn://tug.org/texlive/trunk@38637 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/README-ja.md (renamed from Master/texmf-dist/doc/platex/pxchfon/README-ja)4
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/README.md (renamed from Master/texmf-dist/doc/platex/pxchfon/README)4
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdfbin231524 -> 234746 bytes
-rw-r--r--Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex43
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty53
5 files changed, 93 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/platex/pxchfon/README-ja b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
index 97d399ef83a..6488599a1db 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/README-ja
+++ b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
@@ -70,6 +70,10 @@ MIT ライセンス
更新履歴
--------
+ * Version 0.7h [2015/10/14]
+ - バグ修正(\usefontmapline/file など)。
+ * Version 0.7g [2015/09/30]
+ - プリセット `hiragino-elcapitan-*`、`yu-win10` を追加。
* Version 0.7f [2015/08/04]
- `\diruni` / `\textdiruni` を追加。
* Version 0.7e [2015/05/07]
diff --git a/Master/texmf-dist/doc/platex/pxchfon/README b/Master/texmf-dist/doc/platex/pxchfon/README.md
index 73d3994ba14..5d8d01db4b5 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/README
+++ b/Master/texmf-dist/doc/platex/pxchfon/README.md
@@ -36,6 +36,10 @@ This package is distributed under the MIT License.
Revision History
----------------
+ * Version 0.7h [2015/10/14]
+ - Bug fix.
+ * Version 0.7g [2015/09/30]
+ - Presets `hiragino-elcapitan-*` and `yu-win10`.
* Version 0.7f [2015/08/04]
- `\diruni` and `\textdiruni`.
* Version 0.7e [2015/05/07]
diff --git a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
index e8c4451996e..46456a753b8 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 df3d50fa00c..81947edf7d2 100644
--- a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
+++ b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
@@ -4,8 +4,8 @@
\usepackage{metalogo}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{0.7f}
-\newcommand{\PkgDate}{2015/08/04}
+\newcommand{\PkgVersion}{0.7h}
+\newcommand{\PkgDate}{2015/10/14}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -501,6 +501,30 @@ dvipdfmx 専用である。
\setmarugothicfont{HiraMaruProN-W4.otf} % ヒラギノ丸ゴ ProN W4
\end{verbatim}\end{quote}
+\item |hiragino-elcapitan-pro|\Means
+ ヒラギノフォント(Mac~OS~X El~Capitan 搭載;Pro/Std版) + 明朝W2。
+\begin{quote}\small\begin{verbatim}
+\setminchofont[1]{HiraginoSerif-W3.ttc}
+\setlightminchofont{HiraMinPro-W2.otf}
+\setboldminchofont[1]{HiraginoSerif-W6.ttc}
+\setgothicfont[3]{HiraginoSans-W3.ttc}
+\setboldgothicfont[3]{HiraginoSans-W6.ttc}
+\setxboldgothicfont[2]{HiraginoSans-W8.ttc}
+\setmarugothicfont[0]{HiraginoSansR-W4.ttc}
+\end{verbatim}\end{quote}
+
+\item |hiragino-elcapitan-pron|\Means
+ ヒラギノフォント(Mac~OS~X El~Capitan 搭載;ProN/StdN版) + 明朝W2。
+\begin{quote}\small\begin{verbatim}
+\setminchofont[0]{HiraginoSerif-W3.ttc}
+\setlightminchofont{HiraMinProN-W2.otf}
+\setboldminchofont[0]{HiraginoSerif-W6.ttc}
+\setgothicfont[2]{HiraginoSans-W3.ttc}
+\setboldgothicfont[2]{HiraginoSans-W6.ttc}
+\setxboldgothicfont[3]{HiraginoSans-W8.ttc}
+\setmarugothicfont[1]{HiraginoSansR-W4.ttc}
+\end{verbatim}\end{quote}
+
\item |morisawa-pro|\Means
モリサワフォント基本7書体(Pro版)。
\begin{quote}\small\begin{verbatim}
@@ -524,7 +548,7 @@ dvipdfmx 専用である。
\end{verbatim}\end{quote}
\item |yu-win|\Means
- 游書体(Windows搭載版)。
+ 游書体(Windows~8.1搭載版)。
\begin{quote}\small\begin{verbatim}
\setminchofont{yumin.ttf} % 游明朝 Regular
\setlightminchofont{yuminl.ttf} % 游明朝 Light
@@ -535,6 +559,19 @@ dvipdfmx 専用である。
\setmarugothicfont{yugothic.ttf} % 游ゴシック Regular
\end{verbatim}\end{quote}
+\item |yu-win10|\Means
+ 游書体(Windows~10搭載版)。
+\begin{quote}\small\begin{verbatim}
+\setminchofont{yumin.ttf}
+\setlightminchofont{yuminl.ttf}
+\setboldminchofont{yumindb.ttf}
+\setgothicfont[0]{YuGothM.ttc}
+\setmediumgothicfont[0]{YuGothR.ttc}
+\setboldgothicfont[0]{YuGothB.ttc}
+\setxboldgothicfont[0]{YuGothB.ttc}
+\setmarugothicfont[0]{YuGothM.ttc}
+\end{verbatim}\end{quote}
+
\item |yu-osx|\Means
游書体(Mac OS X搭載版)。
\begin{quote}\small\begin{verbatim}
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index a7715eca47e..c22984d33c0 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -4,12 +4,13 @@
%%%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2015/08/04 v0.7f]
+\ProvidesPackage{pxchfon}[2015/10/14 v0.7h]
\def\pxcz@pkgname{pxchfon}
%%%% definitions
\def\pxcz@error{\PackageError\pxcz@pkgname}
-\def\pxcz@warn{\PackageInfo\pxcz@pkgname}
+\def\pxcz@warn{\PackageWarning\pxcz@pkgname}
+\def\pxcz@info{\PackageInfo\pxcz@pkgname}
\newif\ifpxcz@ok
\newif\ifpxcz@utf
@@ -63,11 +64,14 @@
%(multiweight)
ms-hg,ipa-hg,ipaex-hg,moga-mobo,moga-maruberi,%
kozuka-pro,kozuka-pr6,kozuka-pr6n,hiragino-pro,hiragino-pron,%
- morisawa-pro,morisawa-pr6n,yu-win,yu-osx,%
+ hiragino-elcapitan-pro,hiragino-elcapitan-pron,%
+ morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-osx,%
%(obsolete)
ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n,hiragino,%
%(alias)
- ms-dx,ipa-ttf,ipa-ttf-dx,ipav2,ipav2-dx,ipa-dx,hiragino-dx}
+ ms-dx,ipa-ttf,ipa-ttf-dx,ipav2,ipav2-dx,ipa-dx,hiragino-dx,%
+ noEmbed,kozuka,hiragino-elcapitan,morisawa}
+ % But note, 'hiragino' != 'hiragino-pro'
\let\pxcz@main@preset\relax
\def\pxcz@do#1{\DeclareOption{#1}{\def\pxcz@main@preset{#1}}}
\@for\pxcz@x:=\pxcz@all@main@preset\do{%
@@ -247,12 +251,12 @@
%%<+> \usefontmapline{<map-line>}
\newcommand*\usefontmapline[1]{%
- \JaFontUserDefinedMap{\pxcz@addtospec@alt\pxcz@mapline#1}}
+ \JaFontUserDefinedMap{\pxcz@addtospec@alt\pxcz@mapline{#1}}}
\@onlypreamble\usefontmapline
%%<+> \usefontmapfile{<map-file>}
\newcommand*\usefontmapfile[1]{%
- \JaFontUserDefinedMap{\pxcz@addtospec@alt\pxcz@mapfile#1}}
+ \JaFontUserDefinedMap{\pxcz@addtospec@alt\pxcz@mapfile{#1}}}
\@onlypreamble\usefontmapfile
%%------------------ map entry handling
@@ -626,10 +630,20 @@
\def\pxcz@do#1#2#3{%
\DeclareFontShape{#1}{#2}{#3}{diruni}{<->ssub*#2/#3/n}{}}%
\@for\pxcz@tmpa:={\rmdefault,\sfdefault,\ttdefault}\do{%
+ \pxcz@force@load@font@fam\pxcz@tmpa
\@for\pxcz@tmpb:={m,bx}\do{%
\edef\pxcz@tmpb{{\f@encoding}{\pxcz@tmpa}{\pxcz@tmpb}}%
\expandafter\pxcz@do\pxcz@tmpb}}%
}
+\@onlypreamble\pxcz@force@load@font@fam
+\def\pxcz@force@load@font@fam#1{%
+ \begingroup
+ \edef\f@family{#1}\def\f@series{m}\def\f@shape{n}%
+ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
+ \let\extract@font\relax
+ \pickup@font
+ \endgroup
+}
\else %---- <*!diruni-ok>
@@ -639,7 +653,7 @@
}
\def\pxcz@err@diruni{%
\pxcz@error{Command '\string\diruni' not availble}%
- {You must load this package with 'directunicode' option on upLaTex,%
+ {You must load this package with 'directunicode' option on upLaTeX,%
\MessageBreak after loading 'otf' package.\MessageBreak\@ehc}%
\global\let\pxcz@err@diruni\relax
}
@@ -732,6 +746,11 @@
\ifpxcz@ok \renewcommand\rmdefault{cfjar}\fi
\pxcz@check@alldefined{gtr,gtb,gtx}%
\ifpxcz@ok \renewcommand\sfdefault{cfjas}\fi
+ \edef\pxcz@tmpa{\encodingdefault}\def\pxcz@tmpb{OT1}
+ \ifx\pxcz@tmpa\pxcz@tmpb\else
+ \pxcz@warn{Default encoding is changed to 'OT1' because%
+ \MessageBreak'alphabet' option is in effect}%
+ \fi
\renewcommand\encodingdefault{OT1}\normalfont
\pxcz@addtospec{ALPHA}%
\fi
@@ -771,7 +790,7 @@
\ifpxcz@otf@deluxe
\DeclareRelationFont{\k@encoding}{#1}{#3}{}{OT1}{#2}{#3}{}%
\fi
- \pxcz@warn{Relation font set for \k@encoding/#1}%
+ \pxcz@info{Relation font set for \k@encoding/#1}%
}
%%------------------ preset japanese font mappings
@@ -862,6 +881,16 @@
\pxcz@multiweight{HiraMinProN-W2.otf}{HiraMinProN-W3.otf}%
{HiraMinProN-W6.otf}{HiraKakuProN-W3.otf}{HiraKakuProN-W6.otf}%
{HiraKakuStdN-W8.otf}{HiraKakuProN-W6.otf}{HiraMaruProN-W4.otf}}
+\pxcz@declare@preset{hiragino-elcapitan-pro}{%
+ \usecmapforalphabet
+ \pxcz@multiweight{HiraMinPro-W2.otf}{:1:HiraginoSerif-W3.ttc}%
+ {:1:HiraginoSerif-W6.ttc}{:3:HiraginoSans-W3.ttc}{:3:HiraginoSans-W6.ttc}%
+ {:2:HiraginoSans-W8.ttc}{:3:HiraginoSans-W6.ttc}{:0:HiraginoSansR-W4.ttc}}
+\pxcz@declare@preset{hiragino-elcapitan-pron}{%
+ \usecmapforalphabet
+ \pxcz@multiweight{HiraMinProN-W2.otf}{:0:HiraginoSerif-W3.ttc}%
+ {:0:HiraginoSerif-W6.ttc}{:2:HiraginoSans-W3.ttc}{:2:HiraginoSans-W6.ttc}%
+ {:3:HiraginoSans-W8.ttc}{:2:HiraginoSans-W6.ttc}{:1:HiraginoSansR-W4.ttc}}
\pxcz@declare@preset{morisawa-pro}{%
\usecmapforalphabet
\pxcz@multiweight{A-OTF-RyuminPro-Light.otf}{A-OTF-RyuminPro-Light.otf}%
@@ -878,6 +907,10 @@
\pxcz@multiweight{yuminl.ttf}{yumin.ttf}%
{yumindb.ttf}{yugothic.ttf}{yugothib.ttf}%
{yugothib.ttf}{yugothic.ttf}{yugothic.ttf}}
+\pxcz@declare@preset{yu-win10}{%
+ \pxcz@multiweight{yuminl.ttf}{yumin.ttf}%
+ {yumindb.ttf}{:0:YuGothR.ttc}{:0:YuGothB.ttc}%
+ {:0:YuGothB.ttc}{:0:YuGothM.ttc}{:0:YuGothM.ttc}}
\pxcz@declare@preset{yu-osx}{%
\usecmapforalphabet
\pxcz@multiweight{YuMin-Medium.otf}{YuMin-Medium.otf}%
@@ -909,6 +942,10 @@
\pxcz@declare@preset@alias{ipav2-dx}{ipa-hg}
\pxcz@declare@preset@alias{ipa-dx}{ipa-hg}
\pxcz@declare@preset@alias{hiragino-dx}{hiragino-pro}
+\pxcz@declare@preset@alias{noEmbed}{noembed}
+\pxcz@declare@preset@alias{kozuka}{kozuka-pro}
+\pxcz@declare@preset@alias{hiragino-elcapitan}{hiragino-elcapitan-pro}
+\pxcz@declare@preset@alias{morisawa}{morisawa-pro}
%%%% ... and invokes the specified one!
\if\pxcz@main@preset\relax\else