From 0c1ba913d0dff2b33371147e4035ef26ef6beb76 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Sep 2009 22:51:14 +0000 Subject: xltxtra 0.5 (4sep09) git-svn-id: svn://tug.org/texlive/trunk@15102 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty | 127 +++++++--------------- 1 file changed, 41 insertions(+), 86 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex') 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 +%% Copyright (C) 2006-2009 by Will Robertson %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of -- cgit v1.2.3