summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-12 22:41:30 +0000
committerKarl Berry <karl@freefriends.org>2010-09-12 22:41:30 +0000
commit5b78609106cd67951169ac7e33bf69bf41f22f11 (patch)
tree2b4d52ecee772a4016c5e8acc002228c480064b0 /Master
parentb7a0b0162c49aea864ceea62a3defd130f36660b (diff)
ifxetex update (12sep10)
git-svn-id: svn://tug.org/texlive/trunk@19685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/ifxetex/README4
-rw-r--r--Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdfbin70044 -> 165358 bytes
-rw-r--r--Master/texmf-dist/source/generic/ifxetex/ifxetex.tex22
-rw-r--r--Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty14
4 files changed, 20 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/generic/ifxetex/README b/Master/texmf-dist/doc/generic/ifxetex/README
index aa1e9dd5140..7e85628a589 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.5
+THE IFXETEX PACKAGE v0.6
This very simple package, for both Plain TeX and LaTeX,
defines the \ifxetex boolean for testing whether XeTeX
@@ -14,4 +14,4 @@ compiles the documentation and generates this README.
-------------------
Will Robertson
-Copyright 2006-2009
+Copyright 2006-2010
diff --git a/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf b/Master/texmf-dist/doc/generic/ifxetex/ifxetex.pdf
index 7550ee2bee6..6af6cb67bd5 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.tex b/Master/texmf-dist/source/generic/ifxetex/ifxetex.tex
index e64c91fc4df..dbb6b5a9b9a 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.5
+THE IFXETEX PACKAGE v0.6
This very simple package, for both Plain TeX and LaTeX,
defines the \ifxetex boolean for testing whether XeTeX
@@ -16,13 +16,13 @@ compiles the documentation and generates this README.
-------------------
Will Robertson
-Copyright 2006-2009
+Copyright 2006-2010
\end{filecontents*}
%%%%%%%%%1%%%%%%%%%2%%%%%%%%%3%%%%%%%%%4%%%%%%%%%5
\begin{filecontents*}{ifxetex.sty}
% \iffalse
-% Copyright 2006-2009 by Will Robertson <wspr81@gmail.com>
+% Copyright 2006-2010 by Will Robertson <wspr81@gmail.com>
%
% Distributable under the LaTeX Project Public License,
% version 1.3c or higher (your choice). The latest version of
@@ -31,17 +31,18 @@ Copyright 2006-2009
% This work is maintained by Will Robertson.
% \fi
-% Ensure loading a single time only
+% Ensure loading a single time only.
\csname ifxetexloaded\endcsname
\let\ifxetexloaded\endinput
-% Declare ourselves to \LaTeX
+% Declare ourselves to \LaTeX.
+\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{ifxetex}
- [2009/01/23 v0.5 Provides ifxetex conditional]
+ [2010/09/12 v0.6 Provides ifxetex conditional]
\fi
-% For \XeTeX-exclusive packages
+% For \XeTeX-exclusive packages.
\def\RequireXeTeX{%
\ifxetex\else
\begingroup
@@ -62,8 +63,9 @@ Copyright 2006-2009
\expandafter\endinput
\fi
-% Create and set \cmd\ifxetex\ accordingly
+% Create and set \cmd\ifxetex\ accordingly.
\newif\ifxetex
+\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\xetexfalse
\else
@@ -130,10 +132,6 @@ Copyright 2006-2009
\usepackage{amsmath,listings}
\lstset{basicstyle=\ttfamily,columns=fullflexible}
-\usepackage{array,xltxtra}
-\setmainfont{Georgia}
-\setsansfont[Scale=MatchLowercase]{Helvetica}
-\setmonofont[Scale=MatchLowercase]{Monaco}
\frenchspacing
\GetFileInfo{ifxetex.sty}
diff --git a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
index d3707febc03..367d3d2a845 100644
--- a/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+++ b/Master/texmf-dist/tex/generic/ifxetex/ifxetex.sty
@@ -1,5 +1,5 @@
% \iffalse
-% Copyright 2006-2009 by Will Robertson <wspr81@gmail.com>
+% Copyright 2006-2010 by Will Robertson <wspr81@gmail.com>
%
% Distributable under the LaTeX Project Public License,
% version 1.3c or higher (your choice). The latest version of
@@ -8,17 +8,18 @@
% This work is maintained by Will Robertson.
% \fi
-% Ensure loading a single time only
+% Ensure loading a single time only.
\csname ifxetexloaded\endcsname
\let\ifxetexloaded\endinput
-% Declare ourselves to \LaTeX
+% Declare ourselves to \LaTeX.
+\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{ifxetex}
- [2009/01/23 v0.5 Provides ifxetex conditional]
+ [2010/09/12 v0.6 Provides ifxetex conditional]
\fi
-% For \XeTeX-exclusive packages
+% For \XeTeX-exclusive packages.
\def\RequireXeTeX{%
\ifxetex\else
\begingroup
@@ -39,8 +40,9 @@
\expandafter\endinput
\fi
-% Create and set \cmd\ifxetex\ accordingly
+% Create and set \cmd\ifxetex\ accordingly.
\newif\ifxetex
+\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname XeTeXrevision\endcsname\relax
\xetexfalse
\else