summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/ctex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-06-19 22:32:36 +0000
committerKarl Berry <karl@freefriends.org>2015-06-19 22:32:36 +0000
commit24a26d6f89a97e7ba548a2c42c0e6a6c80e6fb2a (patch)
treec87c15ce0105a3b7f9dfef8548ea2b0bb368d91c /Master/texmf-dist/tex/generic/ctex
parent28cb2b214ad9bcb5ac65fdf512b438f388a68b1e (diff)
ctex (19jun15)
git-svn-id: svn://tug.org/texlive/trunk@37615 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/ctex')
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex12
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex12
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex12
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex12
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex12
5 files changed, 45 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
index bd63bc0c8af..15290ad2039 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
@@ -59,7 +59,13 @@
\noexpand\noexpand\noexpand\endinput}%
\the\toks2}%
\expandafter\x\csname ctex@zhmap@endinput\endcsname
-\input ifpdf.sty\relax
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
\begingroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\long\def\x#1\ProvidesFile#2[#3]{%
@@ -70,9 +76,9 @@
\fi
\endgroup
\ProvidesFile{zhadobefonts.tex}%
- [2014/06/03 v2.0 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2015/05/25 v2.1 Adobe font map loader for DVIPDFMx (CTEX)]
-\ifpdf
+\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
index 3d2806f552d..301c2d9e893 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
@@ -59,7 +59,13 @@
\noexpand\noexpand\noexpand\endinput}%
\the\toks2}%
\expandafter\x\csname ctex@zhmap@endinput\endcsname
-\input ifpdf.sty\relax
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
\begingroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\long\def\x#1\ProvidesFile#2[#3]{%
@@ -70,9 +76,9 @@
\fi
\endgroup
\ProvidesFile{zhfandolfonts.tex}%
- [2014/06/03 v2.0 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2015/05/25 v2.1 Fandol font map loader for DVIPDFMx (CTEX)]
-\ifpdf
+\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
diff --git a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
index 763eb012fce..9295e4b5b0f 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
@@ -59,7 +59,13 @@
\noexpand\noexpand\noexpand\endinput}%
\the\toks2}%
\expandafter\x\csname ctex@zhmap@endinput\endcsname
-\input ifpdf.sty\relax
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
\begingroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\long\def\x#1\ProvidesFile#2[#3]{%
@@ -70,9 +76,9 @@
\fi
\endgroup
\ProvidesFile{zhfounderfonts.tex}%
- [2014/06/03 v2.0 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2015/05/25 v2.1 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
-\ifpdf
+\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <FZSSK.TTF}
\pdfmapline{=gbksong@UGBK@ <FZSSK.TTF}
\pdfmapline{=gbkkai@UGBK@ <FZKTK.TTF}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
index bd427a1464c..00e952ffa53 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
@@ -59,7 +59,13 @@
\noexpand\noexpand\noexpand\endinput}%
\the\toks2}%
\expandafter\x\csname ctex@zhmap@endinput\endcsname
-\input ifpdf.sty\relax
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
\begingroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\long\def\x#1\ProvidesFile#2[#3]{%
@@ -70,9 +76,9 @@
\fi
\endgroup
\ProvidesFile{zhubuntufonts.tex}%
- [2014/06/03 v2.0 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2015/05/25 v2.1 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
-\ifpdf
+\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <uming.ttc}
\pdfmapline{=gbksong@UGBK@ <uming.ttc}
\pdfmapline{=gbkkai@UGBK@ <ukai.ttc}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
index d7878965922..9b163944cbf 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
@@ -59,7 +59,13 @@
\noexpand\noexpand\noexpand\endinput}%
\the\toks2}%
\expandafter\x\csname ctex@zhmap@endinput\endcsname
-\input ifpdf.sty\relax
+\begingroup\expandafter\endgroup
+\expandafter\let\csname ifzhmappdf\expandafter\endcsname\csname
+ \expandafter\ifx\csname ifctexpdf\endcsname\relax
+ \expandafter\ifx\csname pdfoutput\endcsname\relax
+ iffalse\else\ifnum\pdfoutput < 1 iffalse\else iftrue\fi\fi
+ \else ifctexpdf\fi
+\endcsname
\begingroup
\expandafter\ifx\csname ProvidesFile\endcsname\relax
\long\def\x#1\ProvidesFile#2[#3]{%
@@ -70,9 +76,9 @@
\fi
\endgroup
\ProvidesFile{zhwindowsfonts.tex}%
- [2014/06/03 v2.0 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2015/05/25 v2.1 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
-\ifpdf
+\ifzhmappdf
\pdfmapline{=gbk@UGBK@ <simsun.ttc}
\pdfmapline{=gbksong@UGBK@ <simsun.ttc}
\pdfmapline{=gbkkai@UGBK@ <simkai.ttf}