From 24a26d6f89a97e7ba548a2c42c0e6a6c80e6fb2a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Jun 2015 22:32:36 +0000 Subject: ctex (19jun15) git-svn-id: svn://tug.org/texlive/trunk@37615 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex | 12 +++++++++--- Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex | 12 +++++++++--- Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex | 12 +++++++++--- Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex | 12 +++++++++--- Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex | 12 +++++++++--- 5 files changed, 45 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/generic/ctex') 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@