xltxtra 0.5 (4sep09)

git-svn-id: svn://tug.org/texlive/trunk@15102 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 194 insertions, 257 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xltxtra/README b/Master/texmf-dist/doc/xelatex/xltxtra/README
index 27e32a6d1f9..7f117196930 100644
--- a/Master/texmf-dist/doc/xelatex/xltxtra/README
+++ b/Master/texmf-dist/doc/xelatex/xltxtra/README
@@ -1,8 +1,8 @@
--------------------------
-THE XLTXTRA PACKAGE v0.4
+________________________
+THE XLTXTRA PACKAGE v0.5
 
-This package provides an ever increasing number of
-small features that are useful for XeLaTeX.
+This package provides a number of small features
+that are useful for XeLaTeX.
 
 It loads the fixltx2e and etex packages and
 patches a couple of other LaTeX commands:
@@ -17,19 +17,20 @@ patches a couple of other LaTeX commands:
   \verb*: now displays visible spaces correctly
   \begin{verbatim*}: ditto
 
-The following packages are patched to correctly
-display visible space within various verbatims:
-  verbatim, moreverb, fancyvrb, listings
+The following packages are patched (if necessary)
+to correctly display visible space within various
+verbatims: verbatim, moreverb, fancyvrb, listings
 
-Defines logos \XeTeX and \XeLaTeX.
+Defines logos \XeTeX and \XeLaTeX via
+Andrew Moschou's metalogo package.
 
 Defines the dubiously useful commands
  \vfrac - for vulgar fractions with fontspec
  \namedglyph - to access font glyphs by name
 
-For more info see the documentation xltxtra.pdf.
+For more information see the documentation xltxtra.pdf.
 
---------------
+______________
 Will Robertson
-2006-2008
-Distributed under the LaTeX Project Public License
+2006-2009
+Released under the LaTeX Project Public License
diff --git a/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf b/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf
index 6c76f774834..682d0f6c10f 100644
--- a/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf
+++ b/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf
diff --git a/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx
index 0b5955fc801..6d4fea541b3 100644
--- a/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx
+++ b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx
@@ -3,11 +3,11 @@
 \iffalse
 %</internal>
 %<*readme>
--------------------------
-THE XLTXTRA PACKAGE v0.4
+________________________
+THE XLTXTRA PACKAGE v0.5
 
-This package provides an ever increasing number of
-small features that are useful for XeLaTeX.
+This package provides a number of small features
+that are useful for XeLaTeX.
 
 It loads the fixltx2e and etex packages and
 patches a couple of other LaTeX commands: 
@@ -22,22 +22,23 @@ patches a couple of other LaTeX commands:
   \verb*: now displays visible spaces correctly
   \begin{verbatim*}: ditto
 
-The following packages are patched to correctly 
-display visible space within various verbatims:
-  verbatim, moreverb, fancyvrb, listings
+The following packages are patched (if necessary)
+to correctly display visible space within various
+verbatims: verbatim, moreverb, fancyvrb, listings
 
-Defines logos \XeTeX and \XeLaTeX.
+Defines logos \XeTeX and \XeLaTeX via 
+Andrew Moschou's metalogo package.
 
 Defines the dubiously useful commands
  \vfrac - for vulgar fractions with fontspec
  \namedglyph - to access font glyphs by name
  
-For more info see the documentation xltxtra.pdf.
+For more information see the documentation xltxtra.pdf.
 
---------------
+______________
 Will Robertson
-2006-2008
-Distributed under the LaTeX Project Public License
+2006-2009
+Released under the LaTeX Project Public License
 %</readme>
 %<*internal>
 \fi
@@ -50,17 +51,15 @@ Distributed under the LaTeX Project Public License
 \input docstrip.tex
 \keepsilent
 \preamble
-
   ____________________________
-  The xltxtra package         
-  (C) 2006-2008  Will Robertson    
+  The XLTXTRA package         
+  (C) 2006-2009 Will Robertson
   License information appended
 
-
 \endpreamble
 \postamble
 
-Copyright (C) 2006-2008 by Will Robertson <wspr81@gmail.com>
+Copyright (C) 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
@@ -90,7 +89,7 @@ This work consists of the file  xltxtra.dtx
 %</internal>
 %
 %<*driver>
-\documentclass[12pt]{ltxdoc}
+\documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -114,6 +113,8 @@ This work consists of the file  xltxtra.dtx
 %
 % \maketitle
 %
+% \tableofcontents
+%
 % \section{Introduction}
 %
 % This document describes the \pkg{xltxtra} package. 
@@ -211,7 +212,21 @@ This work consists of the file  xltxtra.dtx
 % \subsection{Logos}
 % \seclabel{logos}
 %
-% This part of the package essentially exists to define the \cmd\XeTeX\ and \cmd\XeLaTeX\ logos. Here're some examples. The default:
+% This part of the package essentially exists to define the \cmd\XeTeX\ and \cmd\XeLaTeX\ logos,
+% which need to be tuned according to the font that is used.
+% Andrew Moschou’s |metalogo| package is used to achieve this. Here are some examples. The default:
+% \begingroup
+% \setlogokern{Xe}{default}
+% \setlogokern{eL}{default}
+% \setlogokern{La}{default}
+% \setlogokern{aT}{default}
+% \setlogokern{Te}{default}
+% \setlogokern{eX}{default}
+% \setlogokern{eT}{default}
+% \setlogokern{X2}{default}
+% \setlogodrop{default}
+% \setLaTeXa{default}
+% \setLaTeXee{default}
 % \begin{example}
 %   \TeX\ \XeTeX\ \LaTeX\ \XeLaTeX
 % \end{example}
@@ -220,10 +235,11 @@ This work consists of the file  xltxtra.dtx
 %   \usefont{OT1}{cmr}{m}{n}
 %   \TeX\ \XeTeX\ \LaTeX\ \XeLaTeX
 % \end{example}
+% \endgroup
 %
-% Look in the implementation corresponding to this section to see how to customise the spacings in these logos, but be warned it's fairly crude and may change in the future.
+% Look in the implementation corresponding to this section to see how to customise the spacings in these logos and refer to the documentation for |metalogo| for more information.
 %
-% The \pkgopt{no-logos} will not redefine \cmd\TeX\ or \cmd\LaTeX\ but will still define \cmd\XeTeX\ and \cmd\XeLaTeX. (The only advantage for not doing this is more consistency when customising the spacing, which isn't really recommended anyway\dots)
+% The \pkgopt{no-logos} will not redefine \cmd\TeX\ or \cmd\LaTeX\ but will still define \cmd\XeTeX\ and \cmd\XeLaTeX.
 %
 % If the \pkg{hyperref} package is loaded, these logos will be set up to behave properly in PDF bookmarks and so on.
 % 
@@ -243,7 +259,7 @@ This work consists of the file  xltxtra.dtx
 %   \fontspec{Warnock Pro}
 %   ICU: \vfrac{123}{456}
 % \end{example}
-% \noindent (This can be achieved in regular \LaTeX\ with the \pkg{nicefrac} package, but don't believe its name: these fractions aren't nice!)
+% \noindent (This can also be achieved in regular \LaTeX\ with either the \pkg{nicefrac} or \pkg{xfrac} package.)
 %
 % Only use it when you know it will work; no warnings are given if the font doesn't support the necessary features.
 %
@@ -269,13 +285,13 @@ This work consists of the file  xltxtra.dtx
 %
 %    \begin{macrocode}
 \ProvidesPackage{xltxtra}
-  [2008/07/29 v0.4 Improvements for the "XeLaTeX" format]  
+  [2009/09/02 v0.5 Improvements for the "XeLaTeX" format]  
 %    \end{macrocode}
 %
 % \changes{v0.3}{2007/05/29}{Added proper documentation.}
 % \changes{v0.3}{2007/05/29}{Added \texttt{no-} package options to restrict functionality.}
 % \changes{v0.4}{2008/07/29}{Added support for verbatim \& visible spaces.}
-% \PrintChanges
+% ^^A\PrintChanges
 %
 % \paragraph{Option processing}
 %    \begin{macrocode}
@@ -296,7 +312,6 @@ This work consists of the file  xltxtra.dtx
 %    \begin{macrocode}
 \RequirePackage{ifxetex}
 \RequireXeTeX
-\RequirePackage{graphicx}
 \RequirePackage{fontspec}
 \RequirePackage{xunicode}
 %    \end{macrocode}
@@ -307,139 +322,93 @@ This work consists of the file  xltxtra.dtx
 % \DescribeMacro{\XeTeX}
 % \DescribeMacro{\XeLaTeX}
 % The \TeX-related logos people insist upon using need to be tuned
-% on a per-font  basis. This package will (might!) eventually allow this,
-% but for now, it's baby steps. The \XeTeX\ and \XeLaTeX\ logos
-% are provided.
-%
-% The various \TeX-like logos that extend outside the regular
-% vertical alphabetic bounds of running text have the unfortunate
-% side-effects in \XeTeX\ of often overrunning the \cmd\baselineskip.
-% Putting the logos in zero-height boxes prevents this problem.
-% Actually, this problem doesn't happen anymore.
-%
-% \noindent To do:
-% \begin{itemize}[noitemsep]
-% \item adapt \cmd\LaTeX\ to use small caps if available\dots
-% \item \dots otherwise, need a scaling factor, and maybe a vertical nudge factor
-% \item add other logos
-% \item per-font parameters, with some defaults for common fonts
-% \item add `low contrast' small caps versions, et al.
-% \item probably break out the whole thing into its own package, if it works
-% \end{itemize}
+% on a per-font  basis. This package calls upon Andrew Moschou's package
+% |metalogo| for this purpose. To tune the logos to each font,
+% use the commands \cmd\setlogokern, \cmd\setlogodrop, etc.\ Refer to
+% |mathspec|’s documentation for further details.
 %
-% \begin{macro}{\TeX@logo@spacing}
-% \darg{Kern between T \& eX}
-% \darg{Kern between Te \& X}
-% \darg{Lowering amount for E in TeX}
-% \darg{Kerning between L \& aTeX}
-% \darg{Kerning between La \& TeX}
-% \darg{Kerning between Xe \& LaTeX}
-% This macro defines new \cmd\TeX\ and \cmd\XeTeX\ logos.
-% Parameters must be tuned on a per-font basis:
 % \begin{example}
-%   \TeX@logo@spacing{-0.12em}{-0.12em}%
-%     {0.5ex}{-0.3em}{-0.12em}{-0.1em}
-%   \TeX\ \XeTeX\ \LaTeX\ \XeLaTeX
+%   \setlogokern{Xe}{-0.061em}
+%   \setlogokern{eL}{-0.057em}
+%   \setlogokern{La}{-0.265em}
+%   \setlogokern{aT}{-0.0585em}
+%   \setlogokern{Te}{-0.0575em}
+%   \setlogokern{eX}{-0.072em}
+%   \setlogokern{eT}{-0.056em}
+%   \setlogokern{X2}{0.1667em}
+%   \setlogodrop{0.153em}
+%   \setLaTeXa{\scshape a}
+%   \setLaTeXee{\mbox{\fontspec{Times}\itshape ε}}
+%   \TeX\ \XeTeX\ \LaTeX\ \XeLaTeX\ \LaTeXe
 % \end{example}
 %
-% \emph{Warning!} This macro will {\fontspec{Hoefler Text Black} almost definitely} change in the future.
-% If you care abouts backwards compatibility in your documents, copy+paste
-% the definitions below rather than using \cmd\TeX@logo@spacing.
+%    \begin{macrocode}
+\RequirePackage{metalogo}
+\setlogokern{Te}{-0.15em}
+\setlogokern{eX}{-0.15em}
+\setlogokern{La}{-0.36em}
+\setlogokern{aT}{-0.15em}
+\setlogokern{Xe}{-0.15em}
+\setlogokern{eT}{-0.15em}
+\setlogokern{eL}{-0.1em}
+\setlogokern{X2}{default}
+\setlogodrop{.5ex}
+\setLaTeXa{\scshape a}
+%    \end{macrocode}
+%
+% The \pkgopt{no-logos} might be in effect, in which case \cmd\TeX, \cmd\LaTeX\ and
+% \cmd\LaTeXe\ should keep their original definitions (which were saved by |metalogo|).
 %
 %    \begin{macrocode}
-\newcommand*\TeX@logo@spacing[6]{%
-  \def\xxt@kern@Te{#1}%
-  \def\xxt@kern@eX{#2}%
-  \def\xxt@lower@e{#3}%
-  \def\xxt@kern@La{#4}%
-  \def\xxt@kern@aT{#5}%  
-  \def\xxt@kern@eL{#6}%  
-}
-\unless\if@xxt@nologos@
-\DeclareRobustCommand\TeX{%
-  \leavevmode
-  \smash{%
-    T\kern\xxt@kern@Te
-    \lower\xxt@lower@e\hbox{E}\kern\xxt@kern@eX X}%
-  \spacefactor1000\relax}
-\DeclareRobustCommand{\LaTeX}{%
-  \leavevmode
-  \smash{%
-  L\kern\xxt@kern@La 
-  {\sbox\z@ T% 
-    \vbox to\ht\z@{\hbox{\check@mathfonts 
-      \fontsize\sf@size\z@ 
-      \math@fontsfalse\selectfont 
-      A}% 
-    \vss}% 
-  }% 
-  \kern\xxt@kern@aT
-  \TeX}}  
+\if@xxt@nologos@
+  \let\TeX\original@TeX
+  \let\LaTeX\original@TeX
+  \let\LaTeXe\original@LaTeXe
 \fi
-\DeclareRobustCommand\XeTeX{%
-  \leavevmode
-  \smash{%
-   X\lower\xxt@lower@e
-   \hbox{\kern\xxt@kern@eX
-     \ifnum\XeTeXfonttype\font>0
-       \ifnum\XeTeXcharglyph"018E>0
-         \char"018E\relax
-       \else
-         \ifdim\fontdimen1\font=0pt
-           \reflectbox{E}%
-         \else
-           \XeTeXuseglyphmetrics=1%
-           \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0%
-           \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-         \fi
-       \fi
-     \else
-       \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0%
-       \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-     \fi
-   }\kern\xxt@kern@Te\TeX}}%
-\DeclareRobustCommand\XeLaTeX{%
-   \leavevmode
-   \smash{%
-    X\lower\xxt@lower@e
-    \hbox{\kern\xxt@kern@eX
-      \ifnum\XeTeXfonttype\font>0\relax
-        \ifnum\XeTeXcharglyph"018E>0\relax
-          \char"018E\relax
-        \else
-          \ifdim\fontdimen1\font=0pt\relax
-            \reflectbox{E}%
-          \else
-            \XeTeXuseglyphmetrics=1\relax
-            \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax
-            \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-          \fi
-        \fi
-      \else
-        \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax
-        \raise\dimen0\hbox{\rotatebox{180}{\box0}}%        
-      \fi}\kern\xxt@kern@eL\LaTeX}}
-\TeX@logo@spacing{-0.15em}{-0.15em}{0.5ex}{-0.36em}{-0.15em}{-0.1em}
+%    \end{macrocode}
+% 
+% \begin{macro}{\TeX@logo@spacing}
+% This macro is now deprecated. It is recommended to use the commands
+% from |metalogo|.
+%
+%    \begin{macrocode}
+\newcommand*\TeX@logo@spacing[6]{%
+  \PackageWarning{xltxtra}{%
+    Use of \protect\TeX@logo@spacing\space is deprecated,\MessageBreak
+    recommend to use commands from package `metalogo' instead}
+  \setlogokern{Te}{#1}%
+  \setlogokern{eT}{#1}%
+  \setlogokern{eX}{#2}%
+  \setlogokern{Xe}{#2}%
+  \setlogodrop{#3}%
+  \setlogokern{La}{#4}%
+  \setlogokern{aT}{#5}%  
+  \setlogokern{eL}{#6}}
 %    \end{macrocode}
 % \changes{v0.1}{2006/05/03}{Implemented.}
 % \changes{v0.2}{2006/06/11}{Added \cmd\XeLaTeX\ logo. Thanks Herb!}
 % \changes{v0.2}{2006/06/11}{Added TFM font check.}
 % \changes{v0.2}{2006/08/12}{\cmd\TeX@logo@spacing made ``private'' and added an arg for \cmd\XeLaTeX.}
 % \changes{v0.3a}{2007/06/20}{Changed \cmd\setlength\ to \cmd\def. Silly me.}
+% \changes{v0.5}{2009/09/02}{Deprecated \cmd\TeX@logo@spacing, replaced with \textsf{metalogo} package (AGM).}
 % \end{macro}
 %
 % \textsf{hyperref}-safe versions of the logos:
 %    \begin{macrocode}
-\@ifpackageloaded{hyperref}{%
-  \pdfstringdefDisableCommands{%
-    \def\TeX{TeX}%
-    \def\XeTeX{XeTeX}%
-    \def\LaTeX{LaTeX}%
-    \def\LaTeXe{LaTeX2e}
-    \def\XeLaTeX{XeLaTeX}
-}}{}
+\AtBeginDocument{%
+  \@ifpackageloaded{hyperref}{%
+    \pdfstringdefDisableCommands{%
+      \def\TeX{TeX}%
+      \def\XeTeX{XeTeX}%
+      \def\LaTeX{LaTeX}%
+      \def\LaTeXe{LaTeX2e}%
+      \def\XeLaTeX{XeLaTeX}%
+    }%
+  }{}%
+}
 %    \end{macrocode}
 % \changes{v0.3b}{2007/09/01}{Added hyperref logos. Thanks Ross.}
+% \changes{v0.5}{2009/02/10}{hyperref logos made AtBeginDocument.}
 %
 % \section{\eTeX\ functionality}
 % Because it's just sensible, we load the package that actually
@@ -776,6 +745,7 @@ This work consists of the file  xltxtra.dtx
 %    \end{macrocode}
 %
 % \begin{environment}{verbatim*}
+% With the \pkg{verbatim} package.
 %    \begin{macrocode}
 \def\xxt@patch@verbatim{%
   \@ifpackageloaded{verbatim}{%
@@ -789,7 +759,9 @@ This work consists of the file  xltxtra.dtx
 %    \end{macrocode}
 % \end{environment}
 % 
-% This is for moreverb.
+% \begin{environment}{listingcont*}
+% This is for \pkg{moreverb}. 
+% The main |listing*| environment inherits this definition.
 %    \begin{macrocode}
 \def\xxt@patch@moreverb{%
   \@ifpackageloaded{moreverb}{%
@@ -800,7 +772,9 @@ This work consists of the file  xltxtra.dtx
       \@verbatim\xxt@vprintspaces\verbatim@start}%
   }{}}
 %    \end{macrocode}
+% \end{environment}
 % 
+% \pkg{listings} and \pkg{fancvrb} make things nice and easy:
 %    \begin{macrocode}
 \def\xxt@patch@fancyvrb{%
   \@ifpackageloaded{fancyvrb}{%
@@ -845,16 +819,28 @@ This work consists of the file  xltxtra.dtx
      \def\pfill{\hspace*{\fill}}}
   {\endlist}
 
-\usepackage{array,booktabs,calc,color,enumitem,fancyvrb,graphicx,ifthen,longtable,refstyle,varioref}
-\usepackage{fontspec,xunicode,xltxtra}
-\setromanfont[Mapping=tex-text, BoldFont=Hoefler Text,
-  ItalicFeatures={Contextuals={NoWordFinal,NoLineFinal}}]{Hoefler Text}
-\setsansfont[Scale=MatchLowercase,Mapping=tex-text,BoldFont=Gill Sans]{Gill Sans}
-\setmonofont[Scale=MatchLowercase]{Monaco}
+\usepackage{array,booktabs,calc,color,enumitem,fancyvrb,graphicx,ifthen,longtable,refstyle,varioref,xltxtra}
+\usepackage[rm]{titlesec}
+\setmainfont[Mapping=tex-text]{TeX Gyre Pagella}
+\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{Verdana}
+\setmonofont[Scale=MatchLowercase]{Consolas}
 
 \linespread{1.05}      % A bit more space between lines
 \frenchspacing         % Remove ugly extra space after punctuation
-  
+
+\setlogokern{Xe}{-0.061em}
+\setlogokern{eL}{-0.057em}
+\setlogokern{La}{-0.28em}
+\setlogokern{aT}{-0.10em}
+\setlogokern{Te}{-0.0575em}
+\setlogokern{eX}{-0.072em}
+\setlogokern{eT}{-0.056em}
+\setlogokern{X2}{0.1667em}
+\setlogodrop{0.153em}
+\setLaTeXa{\scshape a}
+\setLaTeXee{\mbox{\fontspec{Times}\itshape ε}}
+\def\eTeX{{\fontspec{Times}\textit{ε}{}}-\TeX} % The eTeX logo is not (yet) covered by metalogo
+
 \definecolor{niceblue}{rgb}{0.2,0.4,0.6}
 \def\theCodelineNo{\textcolor{niceblue}{\sffamily\tiny\arabic{CodelineNo}}}
 
@@ -919,8 +905,6 @@ This work consists of the file  xltxtra.dtx
 \def\ie{\latin{i.e.}}
 \def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
 
-\def\OMEGA{Ω}
-
 \newcounter{argument}
 \g@addto@macro\endmacro{\setcounter{argument}{0}}
 \newcommand*\darg[1]{%
@@ -946,4 +930,4 @@ This work consists of the file  xltxtra.dtx
 % \typeout{*************************************************************}
 %
 \endinput
- 
\ No newline at end of file
+
diff --git a/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins
index 6f3f5c03716..f6d8535ca98 100644
--- a/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins
+++ b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins
@@ -5,26 +5,23 @@
 %% The original source files were:
 %%
 %% xltxtra.dtx  (with options: `batchfile')
-%% 
 %%   ____________________________
-%%   The xltxtra package
-%%   (C) 2006-2008  Will Robertson
+%%   The XLTXTRA package
+%%   (C) 2006-2009 Will Robertson
 %%   License information appended
 %% 
-%% 
 \input docstrip.tex
 \keepsilent
 \preamble
-
   ____________________________
-  The xltxtra package
-  (C) 2006-2008  Will Robertson
+  The XLTXTRA package
+  (C) 2006-2009 Will Robertson
   License information appended
 
 \endpreamble
 \postamble
 
-Copyright (C) 2006-2008 by Will Robertson <wspr81@gmail.com>
+Copyright (C) 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
@@ -43,7 +40,7 @@ This work consists of the file  xltxtra.dtx
 \generate{\file{\jobname.sty}{\from{\jobname.dtx}{package}}}
 \endbatchfile
 %% 
-%% Copyright (C) 2006-2008 by Will Robertson <wspr81@gmail.com>
+%% Copyright (C) 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
diff --git a/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty b/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty
index 8f4c06c1bbe..b785e0887d3 100644
--- a/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty
+++ b/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty
@@ -5,15 +5,13 @@
 %% The original source files were:
 %%
 %% xltxtra.dtx  (with options: `package')
-%% 
 %%   ____________________________
-%%   The xltxtra package
-%%   (C) 2006-2008  Will Robertson
+%%   The XLTXTRA package
+%%   (C) 2006-2009 Will Robertson
 %%   License information appended
 %% 
-%% 
 \ProvidesPackage{xltxtra}
-  [2008/07/29 v0.4 Improvements for the "XeLaTeX" format]
+  [2009/09/02 v0.5 Improvements for the "XeLaTeX" format]
 \newif\if@xxt@nosscript@
 \newif\if@xxt@nologos@
 \newif\if@xxt@nohyphen@
@@ -27,90 +25,47 @@
 \ProcessOptions*
 \RequirePackage{ifxetex}
 \RequireXeTeX
-\RequirePackage{graphicx}
 \RequirePackage{fontspec}
 \RequirePackage{xunicode}
+\RequirePackage{metalogo}
+\setlogokern{Te}{-0.15em}
+\setlogokern{eX}{-0.15em}
+\setlogokern{La}{-0.36em}
+\setlogokern{aT}{-0.15em}
+\setlogokern{Xe}{-0.15em}
+\setlogokern{eT}{-0.15em}
+\setlogokern{eL}{-0.1em}
+\setlogokern{X2}{default}
+\setlogodrop{.5ex}
+\setLaTeXa{\scshape a}
+\if@xxt@nologos@
+  \let\TeX\original@TeX
+  \let\LaTeX\original@TeX
+  \let\LaTeXe\original@LaTeXe
+\fi
 \newcommand*\TeX@logo@spacing[6]{%
-  \def\xxt@kern@Te{#1}%
-  \def\xxt@kern@eX{#2}%
-  \def\xxt@lower@e{#3}%
-  \def\xxt@kern@La{#4}%
-  \def\xxt@kern@aT{#5}%
-  \def\xxt@kern@eL{#6}%
+  \PackageWarning{xltxtra}{%
+    Use of \protect\TeX@logo@spacing\space is deprecated,\MessageBreak
+    recommend to use commands from package `metalogo' instead}
+  \setlogokern{Te}{#1}%
+  \setlogokern{eT}{#1}%
+  \setlogokern{eX}{#2}%
+  \setlogokern{Xe}{#2}%
+  \setlogodrop{#3}%
+  \setlogokern{La}{#4}%
+  \setlogokern{aT}{#5}%
+  \setlogokern{eL}{#6}}
+\AtBeginDocument{%
+  \@ifpackageloaded{hyperref}{%
+    \pdfstringdefDisableCommands{%
+      \def\TeX{TeX}%
+      \def\XeTeX{XeTeX}%
+      \def\LaTeX{LaTeX}%
+      \def\LaTeXe{LaTeX2e}%
+      \def\XeLaTeX{XeLaTeX}%
+    }%
+  }{}%
 }
-\unless\if@xxt@nologos@
-\DeclareRobustCommand\TeX{%
-  \leavevmode
-  \smash{%
-    T\kern\xxt@kern@Te
-    \lower\xxt@lower@e\hbox{E}\kern\xxt@kern@eX X}%
-  \spacefactor1000\relax}
-\DeclareRobustCommand{\LaTeX}{%
-  \leavevmode
-  \smash{%
-  L\kern\xxt@kern@La
-  {\sbox\z@ T%
-    \vbox to\ht\z@{\hbox{\check@mathfonts
-      \fontsize\sf@size\z@
-      \math@fontsfalse\selectfont
-      A}%
-    \vss}%
-  }%
-  \kern\xxt@kern@aT
-  \TeX}}
-\fi
-\DeclareRobustCommand\XeTeX{%
-  \leavevmode
-  \smash{%
-   X\lower\xxt@lower@e
-   \hbox{\kern\xxt@kern@eX
-     \ifnum\XeTeXfonttype\font>0
-       \ifnum\XeTeXcharglyph"018E>0
-         \char"018E\relax
-       \else
-         \ifdim\fontdimen1\font=0pt
-           \reflectbox{E}%
-         \else
-           \XeTeXuseglyphmetrics=1%
-           \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0%
-           \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-         \fi
-       \fi
-     \else
-       \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0%
-       \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-     \fi
-   }\kern\xxt@kern@Te\TeX}}%
-\DeclareRobustCommand\XeLaTeX{%
-   \leavevmode
-   \smash{%
-    X\lower\xxt@lower@e
-    \hbox{\kern\xxt@kern@eX
-      \ifnum\XeTeXfonttype\font>0\relax
-        \ifnum\XeTeXcharglyph"018E>0\relax
-          \char"018E\relax
-        \else
-          \ifdim\fontdimen1\font=0pt\relax
-            \reflectbox{E}%
-          \else
-            \XeTeXuseglyphmetrics=1\relax
-            \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax
-            \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-          \fi
-        \fi
-      \else
-        \setbox0=\hbox{E}\dimen0=\ht0\advance\dimen0by\dp0\relax
-        \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-      \fi}\kern\xxt@kern@eL\LaTeX}}
-\TeX@logo@spacing{-0.15em}{-0.15em}{0.5ex}{-0.36em}{-0.15em}{-0.1em}
-\@ifpackageloaded{hyperref}{%
-  \pdfstringdefDisableCommands{%
-    \def\TeX{TeX}%
-    \def\XeTeX{XeTeX}%
-    \def\LaTeX{LaTeX}%
-    \def\LaTeXe{LaTeX2e}
-    \def\XeLaTeX{XeLaTeX}
-}}{}
 \RequirePackage{etex}
 \RequirePackage{fixltx2e}[2006/03/24]
 \unless\if@xxt@noemph@
@@ -305,7 +260,7 @@
   }{}}
 \fi
 %% 
-%% Copyright (C) 2006-2008 by Will Robertson <wspr81@gmail.com>
+%% Copyright (C) 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