summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-01-30 00:06:03 +0000
committerKarl Berry <karl@freefriends.org>2009-01-30 00:06:03 +0000
commitb51a317576a6238db0b50d51a6cc66475500d66a (patch)
tree9ccaf4f5de91ab54795a25da260a9eab38afd3a1
parent41385d6ac9ae8bcf6f4b97607babb55681255e43 (diff)
ifxetex update (29jan09)
git-svn-id: svn://tug.org/texlive/trunk@12011 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/ifxetex/README6
-rw-r--r--Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdfbin66547 -> 70044 bytes
-rw-r--r--Master/texmf-dist/source/generic/ifxetex/ifxetex.ins2
-rw-r--r--Master/texmf-dist/source/generic/ifxetex/ifxetex.tex59
-rw-r--r--Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty38
5 files changed, 52 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/generic/ifxetex/README b/Master/texmf-dist/doc/generic/ifxetex/README
index 1c2ed5a676b..aa1e9dd5140 100644
--- a/Master/texmf-dist/doc/generic/ifxetex/README
+++ b/Master/texmf-dist/doc/generic/ifxetex/README
@@ -1,5 +1,5 @@
------------------------
-THE IFXETEX PACKAGE v0.4
+THE IFXETEX PACKAGE v0.5
This very simple package, for both Plain TeX and LaTeX,
defines the \ifxetex boolean for testing whether XeTeX
@@ -10,8 +10,8 @@ an error if XeTeX is not the engine in use.
To extract the package from the source file "ifxetex.tex",
execute `latex ifxetex.ins`. Executing `xelatex ifxetex.tex`
-compiles the documentation.
+compiles the documentation and generates this README.
-------------------
Will Robertson
-Copyright 2006-2008
+Copyright 2006-2009
diff --git a/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf b/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf
index 95c61a856dc..7550ee2bee6 100644
--- a/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf
+++ b/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/ifxetex/ifxetex.ins b/Master/texmf-dist/source/generic/ifxetex/ifxetex.ins
index 2978784a08a..e661620d72a 100644
--- a/Master/texmf-dist/source/generic/ifxetex/ifxetex.ins
+++ b/Master/texmf-dist/source/generic/ifxetex/ifxetex.ins
@@ -1,4 +1,4 @@
%&latex
-\def\asyfigCompile{N}
+\def\DocCompile{N}
\input ifxetex.tex
\csname@@end\endcsname
diff --git a/Master/texmf-dist/source/generic/ifxetex/ifxetex.tex b/Master/texmf-dist/source/generic/ifxetex/ifxetex.tex
index 5b0905f52c7..e64c91fc4df 100644
--- a/Master/texmf-dist/source/generic/ifxetex/ifxetex.tex
+++ b/Master/texmf-dist/source/generic/ifxetex/ifxetex.tex
@@ -1,7 +1,7 @@
\RequirePackage{filecontents}
\begin{filecontents*}{README.txt}
------------------------
-THE IFXETEX PACKAGE v0.4
+THE IFXETEX PACKAGE v0.5
This very simple package, for both Plain TeX and LaTeX,
defines the \ifxetex boolean for testing whether XeTeX
@@ -16,20 +16,19 @@ compiles the documentation and generates this README.
-------------------
Will Robertson
-Copyright 2006-2008
+Copyright 2006-2009
\end{filecontents*}
%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
-\begin{filecontents}{ifxetex.sty}
+\begin{filecontents*}{ifxetex.sty}
% \iffalse
-% Copyright 2006-2008 by Will Robertson <wspr81@gmail.com>
+% Copyright 2006-2009 by Will Robertson <wspr81@gmail.com>
%
% Distributable under the LaTeX Project Public License,
% version 1.3c or higher (your choice). The latest version of
% this license is at: http://www.latex-project.org/lppl.txt
%
-% This work is "maintained" (as per LPPL maintenance status)
-% by Will Robertson.
+% This work is maintained by Will Robertson.
% \fi
% Ensure loading a single time only
@@ -39,19 +38,7 @@ Copyright 2006-2008
% Declare ourselves to \LaTeX
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{ifxetex}
- [2008/09/18 v0.4 Provides ifxetex conditional]
-\fi
-
-% Create, if necessary, the \cmd\ifxetex\ conditional
-\expandafter\ifx\csname ifxetex\endcsname\relax
- \newif\ifxetex
-\fi
-
-% Set \cmd\ifxetex\ accordingly
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
- \xetexfalse
-\else
- \xetextrue
+ [2009/01/23 v0.5 Provides ifxetex conditional]
\fi
% For \XeTeX-exclusive packages
@@ -67,16 +54,30 @@ Copyright 2006-2008
********************************************}%
\endgroup
\fi}
-\end{filecontents}
+
+% Abort if \cmd\ifxetex\ is already defined
+% (assume that it has already been set correctly)^^A
+% \footnote{Thanks to \textit{Dan Luecking} for suggesting this.}
+\expandafter\ifx\csname ifxetex\endcsname\relax\else
+ \expandafter\endinput
+\fi
+
+% Create and set \cmd\ifxetex\ accordingly
+\newif\ifxetex
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \xetexfalse
+\else
+ \xetextrue
+\fi
+\end{filecontents*}
%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
% Conditionally compile the documentation & generate the .ins file:
-\providecommand\asyfigCompile{Y}
-\makeatletter
-\if\asyfigCompile N
- \expandafter\@@end
+\providecommand\DocCompile{Y}
+\if\DocCompile N
+ \expandafter\csname @@end\expandafter\endcsname
\fi
@@ -84,7 +85,7 @@ Copyright 2006-2008
\begin{filecontents*}{ifxetex.ins}
%&latex
-\def\asyfigCompile{N}
+\def\DocCompile{N}
\input ifxetex.tex
\csname@@end\endcsname
\end{filecontents*}
@@ -179,10 +180,10 @@ Users of \LaTeX's \pkg{ifthen} package can also use it as |\boolean{xetex}|:
\bigskip
\noindent
-Finally, the |\RequireXeTeX| command tests for \XeTeX\ use and
-throws an error if a different engine is being used. This is used
-for packages like \pkg{fontspec} that take advantage of \XeTeX's new
-features and cannot be used otherwise.
+Finally, this package also defines the |\RequireXeTeX| command,
+which tests for \XeTeX\ use and throws an error if a different engine
+is being used. This is used for packages like \pkg{fontspec} that take
+advantage of \XeTeX's new features and cannot be used otherwise.
\clearpage
diff --git a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
index b2d466ac3b4..d3707febc03 100644
--- a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+++ b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
@@ -1,16 +1,11 @@
-%% LaTeX2e file `ifxetex.sty'
-%% generated by the `filecontents' environment
-%% from source `ifxetex' on 2008/09/18.
-%%
% \iffalse
-% Copyright 2006-2008 by Will Robertson <wspr81@gmail.com>
+% Copyright 2006-2009 by Will Robertson <wspr81@gmail.com>
%
% Distributable under the LaTeX Project Public License,
% version 1.3c or higher (your choice). The latest version of
% this license is at: http://www.latex-project.org/lppl.txt
%
-% This work is "maintained" (as per LPPL maintenance status)
-% by Will Robertson.
+% This work is maintained by Will Robertson.
% \fi
% Ensure loading a single time only
@@ -20,19 +15,7 @@
% Declare ourselves to \LaTeX
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{ifxetex}
- [2008/09/18 v0.4 Provides ifxetex conditional]
-\fi
-
-% Create, if necessary, the \cmd\ifxetex\ conditional
-\expandafter\ifx\csname ifxetex\endcsname\relax
- \newif\ifxetex
-\fi
-
-% Set \cmd\ifxetex\ accordingly
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
- \xetexfalse
-\else
- \xetextrue
+ [2009/01/23 v0.5 Provides ifxetex conditional]
\fi
% For \XeTeX-exclusive packages
@@ -48,3 +31,18 @@
********************************************}%
\endgroup
\fi}
+
+% Abort if \cmd\ifxetex\ is already defined
+% (assume that it has already been set correctly)^^A
+% \footnote{Thanks to \textit{Dan Luecking} for suggesting this.}
+\expandafter\ifx\csname ifxetex\endcsname\relax\else
+ \expandafter\endinput
+\fi
+
+% Create and set \cmd\ifxetex\ accordingly
+\newif\ifxetex
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+ \xetexfalse
+\else
+ \xetextrue
+\fi