diff options
author | Karl Berry <karl@freefriends.org> | 2010-05-04 17:35:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-05-04 17:35:01 +0000 |
commit | 3cd7d680d047db2f439ccba96948f1ceaa6d973f (patch) | |
tree | 99414f003d20290deb6c11806bde6685c1eb9b25 /Master/texmf-dist/tex/generic | |
parent | 67c3a09c0f5d7fcf6bff5cfbc686a0c247d0e744 (diff) |
oberdiek update (3may10)
git-svn-id: svn://tug.org/texlive/trunk@18100 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
5 files changed, 196 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty index 4706c3f9349..e98547785c6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty @@ -94,7 +94,7 @@ \fi \expandafter\x\csname ver@catchfile.sty\endcsname \ProvidesPackage{catchfile}% - [2010/04/08 v1.4 Catches the contents of a file (HO)] + [2010/04/28 v1.5 Catches the contents of a file (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -128,8 +128,10 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input infwarerr.sty\relax + \input ltxcmds.sty\relax \else \RequirePackage{infwarerr}[2007/09/09]% + \RequirePackage{ltxcmds}[2010/03/09]% \fi \begingroup \escapechar=92\relax @@ -219,6 +221,11 @@ File `#2' not found% }\@ehc } +\ltx@IfUndefined{RequirePackage}{% + \input etexcmds.sty\relax +}{% + \RequirePackage{etexcmds}[2010/01/28]% +} \long\def\CatchFileEdef#1#2#3{% \CatchFile@CheckFileExists{#2}% \ifx\CatchFile@File\relax @@ -240,12 +247,30 @@ \begingroup \everyeof\expandafter{% \CatchFile@EOF + \expandafter\CatchFile@Finish \noexpand }% - \expandafter\long\expandafter\def\expandafter\CatchFile@Do - \expandafter##\expandafter1\CatchFile@EOF{% - \endgroup - \def#1{##1}% + \ltx@ifundefined{etex@unexpanded}{% + \expandafter\long\expandafter\def\expandafter\CatchFile@Do + \expandafter##\expandafter1\CatchFile@EOF{% + \toks\ltx@zero{##1}% + \xdef\CatchFile@gtemp{\the\toks\ltx@zero}% + \def\CatchFile@Finish{% + \endgroup + \let#1\CatchFile@gtemp + \global\let\CatchFile@gtemp\ltx@undefined + }% + }% + }{% + \expandafter\long\expandafter\def\expandafter\CatchFile@Do + \expandafter##\expandafter1\CatchFile@EOF{% + \edef\CatchFile@Finish{% + \endgroup + \etex@unexpanded{% + \edef#1{\etex@unexpanded{##1}}% + }% + }% + }% }% #3% \expandafter\expandafter\expandafter\CatchFile@Do diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex new file mode 100644 index 00000000000..78e23862846 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex @@ -0,0 +1,89 @@ +%% +%% This is file `hologo-test-spacefactor.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% hologo.dtx (with options: `test-spacefactor') +%% +%% This is a generated file. +%% +%% Copyright (C) 2010 by +%% Heiko Oberdiek <heiko.oberdiek at googlemail.com> +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% This Current Maintainer of this work is Heiko Oberdiek. +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file hologo.dtx +%% and the derived files +%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, +%% hologo-test-spacefactor.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\documentclass{article} +\usepackage{hologo}[2010/04/24] +\usepackage{kvsetkeys} +\usepackage{qstest} +\IncludeTests{*} +\LogTests{log}{*}{*} +\begin{document} +\begin{qstest}{spacefactor}{spacefactor} +\newcommand*{\Test}[1]{% + \sbox0{% + \hologo{#1}% + \Expect*{1000 (#1)}*{\the\spacefactor\space(#1)}% + }% +}% +\makeatletter +\kv@parse@normalized{% + AmSLaTeX,% + AmSTeX,% + eTeX,% + LaTeX,% + LaTeX2e,% + LaTeX3,% + LaTeXe,% + LuaLaTeX,% + LuaTeX,% + pdfTeX,% + pdfLaTeX,% + plainTeX=,% + plainTeX={variant=space},% + plainTeX={variant=hyphen},% + plainTeX={variant=runtogether},% + TeX,% + VTeX,% + XeLaTeX,% + XeTeX,% +}{% + \begingroup + \let\@logo=\kv@key + \ifx\kv@value\relax + \else + \expandafter\hologoLogoSetup\expandafter\@logo\expandafter{% + \kv@value + }% + \fi + \Test\@logo + \endgroup + \@gobbletwo +} +\end{qstest} +\end{document} +\endinput +%% +%% End of file `hologo-test-spacefactor.tex'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex index c3eeffed29f..9413b288492 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex @@ -30,7 +30,8 @@ %% %% This work consists of the main source file hologo.dtx %% and the derived files -%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex. +%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, +%% hologo-test-spacefactor.tex. %% \catcode`\{=1 % \catcode`\}=2 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index c9b95fa5cf8..00d8dadd553 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -30,7 +30,8 @@ %% %% This work consists of the main source file hologo.dtx %% and the derived files -%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex. +%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, +%% hologo-test-spacefactor.tex. %% \begingroup \catcode44 12 % , @@ -92,7 +93,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2010/04/16 v1.1 Logo collection (HO)] + [2010/04/24 v1.2 Logo collection (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -443,8 +444,11 @@ \setbox\ltx@zero\hbox{#1\kern0pt#2}% \advance\HOLOGO@TempDimen by -\wd\ltx@zero } +\def\HOLOGO@SpaceFactor{% + \spacefactor1000 % +} \def\HoLogo@TeX#1{% - T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 % + T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\HOLOGO@SpaceFactor } \def\HoLogo@plainTeX@space#1{% \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}% @@ -504,6 +508,14 @@ } \expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe \expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe +\expandafter\def\csname HoLogo@LaTeX3\endcsname#1{% + \hologo{LaTeX}% + 3% +} +\expandafter\def\csname HoLogoBkm@LaTeX3\endcsname#1{% + \hologo{LaTeX}% + 3% +} \def\HoLogo@eTeX#1{% \ltx@mbox{% \hbox{% @@ -551,7 +563,6 @@ \kern-.15em\relax \hologo{TeX}% } -\def\HoLogoBkm@XeTeX#1{XeTeX} \def\HoLogo@XeLaTeX#1{% \hologo{Xe}% \hologo{LaTeX}% @@ -566,6 +577,11 @@ #1{p}{P}df\hologo{LaTeX}% }% } +\def\HoLogo@VTeX#1{% + \HOLOGO@mbox{% + V\hologo{TeX}% + }% +} \def\HoLogo@AmS#1{% \begingroup \usefont{OMS}{cmsy}{m}{n}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty index 325a483fbf4..6df197f2554 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty @@ -31,7 +31,7 @@ %% This work consists of the main source file ltxcmds.dtx %% and the derived files %% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv, -%% ltxcmds-test1.tex. +%% ltxcmds-test1.tex, ltxcmds-test-gobble.tex. %% \begingroup \catcode44 12 % , @@ -93,7 +93,7 @@ \fi \expandafter\x\csname ver@ltxcmds.sty\endcsname \ProvidesPackage{ltxcmds}% - [2010/04/16 v1.6 LaTeX kernel commands for general use (HO)] + [2010/04/26 v1.7 LaTeX kernel commands for general use (HO)] \begingroup \catcode123 1 % { \catcode125 2 % } @@ -133,22 +133,65 @@ \chardef\ltx@zero=0 % \chardef\ltx@one=1 % \chardef\ltx@two=2 % +\chardef\ltx@active=13 % \chardef\ltx@cclv=255 % \long\def\ltx@gobble#1{} \long\def\ltx@gobbletwo#1#2{} \long\def\ltx@gobblethree#1#2#3{} \long\def\ltx@gobblefour#1#2#3#4{} +\def\ltx@GobbleNum#1{% + \romannumeral + \csname ltx@zero% + \expandafter\LTXcmds@GobbleNum + \romannumeral\expandafter\ltx@firstofone + \expandafter{\LTXcmds@num#1}000{m\endcsname}% +} +\def\LTXcmds@GobbleNum#1{% + \csname LTXcmds@G#1\LTXcmds@GobbleNum +} +\long\def\LTXcmds@Gm#1{% + \endcsname +} \long\def\ltx@firstofone#1{#1} \long\def\ltx@firstoftwo#1#2{#1} \long\def\ltx@secondoftwo#1#2{#2} \long\def\ltx@car#1#2\@nil{#1} \long\def\ltx@cdr#1#2\@nil{#2} +\long\def\ltx@carzero#1\@nil{}% +\long\def\ltx@cdrzero#1\@nil{#1}% + \long\def\ltx@cartwo#1#2#3\@nil{#1#2} \long\def\ltx@cdrtwo#1#2#3\@nil{#3} \long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3} \long\def\ltx@cdrthree#1#2#3#4\@nil{#4} \long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4} \long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5} +\def\ltx@CarNum#1{% + \romannumeral + \csname LTXcmds@CarNumFinish% + \expandafter\LTXcmds@CarNum + \romannumeral\expandafter\ltx@firstofone + \expandafter{\LTXcmds@num#1}000{x\endcsname}% +} +\def\LTXcmds@CarNum#1{% + \csname LTXcmds@C#1\LTXcmds@CarNum +} +\long\def\LTXcmds@Cm#1#2{% + \endcsname{#1#2}% +} +\def\LTXcmds@Cx#1{% + \endcsname{}% +} +\long\def\LTXcmds@CarNumFinish#1#2\@nil{% + \ltx@zero + #1% +} +\def\ltx@CdrNum#1{% + \romannumeral0% + \expandafter\expandafter\expandafter\LTXcmds@CdrNum + \ltx@GobbleNum{#1}% +} +\long\def\LTXcmds@CdrNum#1\@nil{ #1}% \long\def\ltx@ReturnAfterFi#1\fi{\fi#1} \long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1} \def\ltx@empty{} @@ -163,6 +206,11 @@ \lowercase{\endgroup \def\ltx@backslashchar{0}% } +\begingroup + \lccode`0=`\#\relax +\lowercase{\endgroup + \def\ltx@hashchar{0}% +} \def\ltx@newif#1{% \begingroup \escapechar=-1 % @@ -398,6 +446,11 @@ \ltx@leavevmode \hbox } +\ltx@IfUndefined{numexpr}{% + \let\LTXcmds@num\number +}{% + \let\LTXcmds@num\numexpr +} \LTXcmds@AtEnd \endinput %% |