From cd62c624e149e4c29e0e7aa29c016ae8b45cf086 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Apr 2011 23:36:31 +0000 Subject: oberdiek (22apr11) git-svn-id: svn://tug.org/texlive/trunk@22162 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 6 +- .../generic/oberdiek/hologo-test-spacefactor.tex | 94 -------------- .../tex/generic/oberdiek/hologo-test1.tex | 138 --------------------- Master/texmf-dist/tex/generic/oberdiek/hologo.sty | 4 +- .../texmf-dist/tex/generic/oberdiek/pdftexcmds.sty | 8 +- 5 files changed, 9 insertions(+), 241 deletions(-) delete mode 100644 Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex delete mode 100644 Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index a8beaaa9b3d..6263e7cdda1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -4571,7 +4571,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4945,7 +4945,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax require("oberdiek.pdftexcmds")% } \begingroup -\def\x{2011/04/16 v0.15}% +\def\x{2011/04/22 v0.16}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5092,7 +5092,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\ifnum\luatexversion<70 % +\ifnum\luatexversion<68 % \else \def\pdf@shellescape{% \directlua0{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex deleted file mode 100644 index eeba78be973..00000000000 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex +++ /dev/null @@ -1,94 +0,0 @@ -%% -%% 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. -%% -%% Project: hologo -%% Version: 2011/03/25 v1.4 -%% -%% Copyright (C) 2010, 2011 by -%% Heiko Oberdiek -%% -%% 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}[2011/03/25] -\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,% - iniTeX,% - LaTeX,% - LaTeX2e,% - LaTeX3,% - LaTeXe,% - LuaLaTeX,% - LuaTeX,% - pdfTeX,% - pdfLaTeX,% - plainTeX=,% - plainTeX={variant=space},% - plainTeX={variant=hyphen},% - plainTeX={variant=runtogether},% - TeX,% - virTeX,% - 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 deleted file mode 100644 index 7b5b5714c3f..00000000000 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex +++ /dev/null @@ -1,138 +0,0 @@ -%% -%% This is file `hologo-test1.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% hologo.dtx (with options: `test1') -%% -%% This is a generated file. -%% -%% Project: hologo -%% Version: 2011/03/25 v1.4 -%% -%% Copyright (C) 2010, 2011 by -%% Heiko Oberdiek -%% -%% 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. -%% -\catcode`\{=1 % -\catcode`\}=2 % -\catcode`\#=6 % -\catcode`\@=11 % -\expandafter\ifx\csname count@\endcsname\relax - \countdef\count@=255 % -\fi -\expandafter\ifx\csname @gobble\endcsname\relax - \long\def\@gobble#1{}% -\fi -\expandafter\ifx\csname @firstofone\endcsname\relax - \long\def\@firstofone#1{#1}% -\fi -\expandafter\ifx\csname loop\endcsname\relax - \expandafter\@firstofone -\else - \expandafter\@gobble -\fi -{% - \def\loop#1\repeat{% - \def\body{#1}% - \iterate - }% - \def\iterate{% - \body - \let\next\iterate - \else - \let\next\relax - \fi - \next - }% - \let\repeat=\fi -}% -\def\RestoreCatcodes{} -\count@=0 % -\loop - \edef\RestoreCatcodes{% - \RestoreCatcodes - \catcode\the\count@=\the\catcode\count@\relax - }% -\ifnum\count@<255 % - \advance\count@ 1 % -\repeat - -\def\RangeCatcodeInvalid#1#2{% - \count@=#1\relax - \loop - \catcode\count@=15 % - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\RangeCatcodeCheck#1#2#3{% - \count@=#1\relax - \loop - \ifnum#3=\catcode\count@ - \else - \errmessage{% - Character \the\count@\space - with wrong catcode \the\catcode\count@\space - instead of \number#3% - }% - \fi - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\space{ } -\expandafter\ifx\csname LoadCommand\endcsname\relax - \def\LoadCommand{\input hologo.sty\relax}% -\fi -\def\Test{% - \RangeCatcodeInvalid{0}{47}% - \RangeCatcodeInvalid{58}{64}% - \RangeCatcodeInvalid{91}{96}% - \RangeCatcodeInvalid{123}{255}% - \catcode`\@=12 % - \catcode`\\=0 % - \catcode`\%=14 % - \LoadCommand - \RangeCatcodeCheck{0}{36}{15}% - \RangeCatcodeCheck{37}{37}{14}% - \RangeCatcodeCheck{38}{47}{15}% - \RangeCatcodeCheck{48}{57}{12}% - \RangeCatcodeCheck{58}{63}{15}% - \RangeCatcodeCheck{64}{64}{12}% - \RangeCatcodeCheck{65}{90}{11}% - \RangeCatcodeCheck{91}{91}{15}% - \RangeCatcodeCheck{92}{92}{0}% - \RangeCatcodeCheck{93}{96}{15}% - \RangeCatcodeCheck{97}{122}{11}% - \RangeCatcodeCheck{123}{255}{15}% - \RestoreCatcodes -} -\Test -\csname @@end\endcsname -\end -\endinput -%% -%% End of file `hologo-test1.tex'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index c17673c2368..e582816df51 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hologo -%% Version: 2011/03/25 v1.4 +%% Version: 2011/04/21 v1.5 %% %% Copyright (C) 2010, 2011 by %% Heiko Oberdiek @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2011/03/25 v1.4 Logo collection (HO)]% + [2011/04/21 v1.5 Logo collection (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 00653ad9a94..8d9895d56c7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdftexcmds -%% Version: 2011/04/16 v0.15 +%% Version: 2011/04/22 v0.16 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -478,7 +478,7 @@ require("oberdiek.pdftexcmds")% } \begingroup - \def\x{2011/04/16 v0.15}% + \def\x{2011/04/22 v0.16}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -625,7 +625,7 @@ oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\ifnum\luatexversion<70 % +\ifnum\luatexversion<68 % \else \def\pdf@shellescape{% \directlua0{% -- cgit v1.2.3