3 files changed, 40 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/ifxetex/README b/Master/texmf-dist/doc/generic/ifxetex/README
index 0471f77e80f..f269b4cef6c 100644
--- a/Master/texmf-dist/doc/generic/ifxetex/README
+++ b/Master/texmf-dist/doc/generic/ifxetex/README
@@ -1,12 +1,12 @@
 ------------------------
-THE IFXETEX PACKAGE v0.1
+THE IFXETEX PACKAGE v0.2
 
 This very simple package, for both Plain and LaTeX, defines
 the \ifxetex boolean for testing whether the TeX-variant
 XeTeX is being used for typesetting.
 
-It assumes that eTeX extensions to the TeX language are
-present, since we've got to move on sometime.
+Also provides the \RequireXeTeX command which throws
+an error if XeTeX is not the engine in use.
 
 --------------
 Will Robertson
diff --git a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
index 82ce9869c3c..d95d2a8d6f5 100644
--- a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+++ b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
@@ -1,35 +1,58 @@
 % Copyright 2006 by Will Robertson <wspr81@gmail.com>
 % 
 % Distributable under the LaTeX Project Public License,
-% version 1.3b or higher (your choice). The latest version of
+% 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.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The ifxetex package
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% The ifxetex package, version 0.3
 %%
 %% Usage:     LaTeX - \usepackage{ifxetex}
 %%            Plain - \input ifxetex.sty
 %%
 %% Function:  Provides the \ifxetex boolean for testing
 %%            whether XeTeX is being used for typesetting.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%%            Provides the \RequireXeTeX command which throws
+%%            an error if XeTeX is not the engine in use.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% It's naughty, but I assume eTeX extensions here.
-% If a user has this package, then they're using eTeX.
-% (My assumption.)
+% Ensure loading a single time only
+\csname ifxetexloaded\endcsname
+\let\ifxetexloaded\endinput
 
-\ifdefined\ProvidesPackage
+% Declare ourselves to LaTeX
+\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
   \ProvidesPackage{ifxetex}
-    [2006/06/12 v0.1 Provides ifxetex condition]
+    [2006/08/21 v0.3 Provides ifxetex conditional]
 \fi
 
-\unless\ifdefined\ifxetex
+% Create, if necessary, the \ifxetex conditional
+\expandafter\ifx\csname ifxetex\endcsname\relax
   \newif\ifxetex
 \fi
 
-\ifdefined\XeTeXversion
+% Set \ifxetex accordingly
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+  \xetexfalse
+\else
   \xetextrue
 \fi
+
+%
+\def\RequireXeTeX{%
+  \ifxetex\else
+    \begingroup
+      \errorcontextlines=-1\relax
+      \newlinechar=10\relax
+      \errmessage{^^J
+      ********************************************^^J
+      * XeTeX is required to compile this document.^^J
+      * Sorry!^^J
+      ********************************************}%
+    \endgroup
+  \fi}
+\ No newline at end of file
diff --git a/Master/texmf-dist/tpm/ifxetex.tpm b/Master/texmf-dist/tpm/ifxetex.tpm
index 4dcfa0887a3..641936f28a4 100644
--- a/Master/texmf-dist/tpm/ifxetex.tpm
+++ b/Master/texmf-dist/tpm/ifxetex.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/ifxetex.zip">
     <TPM:Name>ifxetex</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/06/19 21:16:44</TPM:Date>
+    <TPM:Date>2006/11/04 23:36:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>karl</TPM:Creator>
     <TPM:Title>The ifxetex package.</TPM:Title>
@@ -11,11 +11,11 @@
     <TPM:Author>Will Robertson</TPM:Author>
     <TPM:Size>2211</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="1868">
+    <TPM:RunFiles size="2492">
 texmf-dist/tex/generic/ifxetex/ifxetex.sty
 texmf-dist/tpm/ifxetex.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="343">texmf-dist/doc/generic/ifxetex/README</TPM:DocFiles>
+    <TPM:DocFiles size="338">texmf-dist/doc/generic/ifxetex/README</TPM:DocFiles>
     <TPM:Provides>Package/ifxetex</TPM:Provides>
   </rdf:Description>
 </rdf:RDF>