summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-12-15 00:23:34 +0000
committerKarl Berry <karl@freefriends.org>2007-12-15 00:23:34 +0000
commit116405a01899ba783a14653896d02888e298fbb1 (patch)
treea18817a449117e864d52b1cf21f5be0eac3ed7cb /Master/texmf-dist/tex/latex/oberdiek
parent61cc3ba9dfd27cde051a486dad06940dfff0e699 (diff)
oberdiek: luacolor1.0 luatex1.0 ... (14dec07)
git-svn-id: svn://tug.org/texlive/trunk@5785 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty3
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/luacolor.sty153
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty341
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-base.sty2
4 files changed, 358 insertions, 141 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index b8acb55ee3e..0d0869190f3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -28,7 +28,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{holtxdoc}%
- [2007/11/11 v0.9 Private additional ltxdoc support (HO)]
+ [2007/12/12 v0.10 Private additional ltxdoc support (HO)]
\RequirePackage[numbered]{hypdoc}
\RequirePackage{array}
\def\hld@info#1{%
@@ -161,6 +161,7 @@
\providecommand*{\MakeIndex}{\textsl{MakeIndex}}
\providecommand*{\docstrip}{\textsf{docstrip}}
\providecommand*{\plainTeX}{\mbox{plain-\TeX}}
+\providecommand*{\iniTeX}{\mbox{ini-\TeX}}
\providecommand*{\VTeX}{V\TeX}
\CodelineIndex
\EnableCrossrefs
diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
new file mode 100644
index 00000000000..8054ff37dbb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
@@ -0,0 +1,153 @@
+%%
+%% This is file `luacolor.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% luacolor.dtx (with options: `package')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. 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.
+%%
+%% This work consists of the main source file luacolor.dtx
+%% and the derived files
+%% luacolor.sty, luacolor.pdf, luacolor.ins, luacolor.drv,
+%% luacolor-test1.tex, luacolor-test2.tex, luacolor-test3.tex,
+%% oberdiek.luacolor.lua, luacolor.lua.
+%%
+\begingroup
+ \catcode123 1 % {
+ \catcode125 2 % }
+ \def\x{\endgroup
+ \expandafter\edef\csname LuaCol@AtEnd\endcsname{%
+ \catcode35 \the\catcode35\relax
+ \catcode64 \the\catcode64\relax
+ \catcode123 \the\catcode123\relax
+ \catcode125 \the\catcode125\relax
+ }%
+ }%
+\x
+\catcode35 6 % #
+\catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
+\def\TMP@EnsureCode#1#2{%
+ \edef\LuaCol@AtEnd{%
+ \LuaCol@AtEnd
+ \catcode#1 \the\catcode#1\relax
+ }%
+ \catcode#1 #2\relax
+}
+\TMP@EnsureCode{34}{12}% "
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{95}{12}% _ (other!)
+\TMP@EnsureCode{96}{12}% `
+\edef\LuaCol@AtEnd{%
+ \LuaCol@AtEnd
+ \noexpand\endinput
+}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{luacolor}%
+ [2007/12/12 v1.0 Coloring based on LuaTeX's node attributes (HO)]
+\RequirePackage{infwarerr}[2007/09/09]%
+\RequirePackage{ifluatex}[2007/12/12]%
+\RequirePackage{color}
+\ifluatex
+ \RequirePackage{luatex}[2007/12/12]%
+\else
+ \@PackageError{luacolor}{%
+ This package may only be run using LuaTeX%
+ }\@ehc
+ \expandafter\LuaCol@AtEnd
+\fi
+\ifcolors@
+\else
+ \@PackageWarningNoLine{luacolor}{%
+ Colors are disabled by option `monochrome'%
+ }%
+ \expandafter\LuaCol@AtEnd
+\fi
+\directlua0{%
+ require("oberdiek.luacolor")%
+}
+\RequirePackage{ifpdf}[2007/09/09]
+\ifpdf
+\else
+ \begingroup
+ \def\current@color{}%
+ \def\reset@color{}%
+ \setbox\z@=\hbox{%
+ \begingroup
+ \set@color
+ \endgroup
+ }%
+ \edef\reserved@a{%
+ \directlua0{%
+ oberdiek.luacolor.dvidetect()%
+ }%
+ }%
+ \ifx\reserved@a\@empty
+ \@PackageError{luacolor}{%
+ DVI driver detection failed because of\MessageBreak
+ unrecognized color \string\special
+ }\@ehc
+ \endgroup
+ \expandafter\expandafter\expandafter\LuaCol@AtEnd
+ \else
+ \@PackageInfoNoLine{luacolor}{%
+ Type of color \string\special: \reserved@a
+ }%
+ \fi
+ \endgroup
+\fi
+\newattribute\LuaCol@Attribute
+\directlua0{%
+ oberdiek.luacolor.setattribute(\number\allocationnumber)%
+}
+\protected\def\set@color{%
+ \setattribute\LuaCol@Attribute{%
+ \directlua0{%
+ oberdiek.luacolor.get("\luaescapestring{\current@color}")%
+ }%
+ }%
+}
+\def\reset@color{}
+\def\luacolorProcessBox#1{%
+ \directlua0{%
+ oberdiek.luacolor.process(\number#1)%
+ }%
+}
+\RequirePackage{atbegshi}[2007/09/09]
+\AtBeginShipout{%
+ \luacolorProcessBox\AtBeginShipoutBox
+}
+\set@color
+\LuaCol@AtEnd
+\endinput
+%%
+%% End of file `luacolor.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
index 78816fe980a..6ec6d181f7e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/pdfcolparallel.sty
@@ -29,33 +29,46 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pdfcolparallel}%
- [2007/09/09 v1.0 Color stacks support for parallel (HO)]%
+ [2007/12/12 v1.1 Fixed parallel with color stacks support (HO)]%
\DeclareOption*{%
\PassoptionsToPackage{\CurrentOption}{parallel}%
}
\ProcessOptions\relax
\RequirePackage{parallel}[2003/04/13]
-\RequirePackage{pdfcol}[2007/09/09]
-\ifpdfcolAvailable
+\RequirePackage{infwarerr}[2007/09/09]
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname currentgrouplevel\endcsname\relax
+ \def\pcp@ColorPatch{}%
\else
- \PackageInfo{pdfcolparallel}{%
- Loading aborted, because color stacks are not available%
+ \def\pcp@ColorPatch{%
+ \@ifundefined{set@color}{%
+ \gdef\pcp@ColorPatch{}%
+ }{%
+ \gdef\pcp@ColorPatch{%
+ \gdef\pcp@ColorResets{}%
+ \bgroup
+ \aftergroup\pcp@ColorResets
+ \aftergroup\egroup
+ \let\pcp@OrgSetColor\set@color
+ \let\set@color\pcp@SetColor
+ \edef\pcp@GroupLevel{\the\currentgrouplevel}%
+ }%
+ }%
+ \pcp@ColorPatch
+ }%
+ \def\pcp@SetColor{%
+ \ifnum\pcp@GroupLevel=\currentgrouplevel
+ \let\pcp@OrgAfterGroup\aftergroup
+ \def\aftergroup{%
+ \g@addto@macro\pcp@ColorResets
+ }%
+ \pcp@OrgSetColor
+ \let\aftergroup\pcp@OrgAfterGroup
+ \else
+ \pcp@OrgSetColor
+ \fi
}%
- \expandafter\endinput
\fi
-\RequirePackage{infwarerr}[2007/09/09]
-\pdfcolInitStack{pcp@Left}
-\pdfcolInitStack{pcp@Right}
-\def\pcp@SwitchStack#1{%
- \pdfcolSwitchStack{pcp@#1}%
-}
-\def\pcp@SetCurrent#1{%
- \ifx\\#1\\%
- \pdfcolSetCurrent{}%
- \else
- \pdfcolSetCurrent{pcp@#1}%
- \fi
-}
\def\pcp@CmdCheckRedef#1{%
\begingroup
\def\pcp@cmd{#1}%
@@ -77,6 +90,8 @@
\expandafter\endgroup
\expandafter\def\pcp@cmd
}
+\def\pcp@SwitchStack#1#2{}
+\def\pcp@SetCurrent#1{}
\pcp@CmdCheckRedef\ParallelLText{%
\everypar{}%
\@restorepar
@@ -93,14 +108,17 @@
}{%
\everypar{}%
\@restorepar
+ \@nobreakfalse
\begingroup
\hbadness=3000 %
\let\footnote=\ParallelLFootnote
\ParallelWhichBox=0 %
\global\setbox\ParallelLBox=\vbox\bgroup
\hsize=\ParallelLWidth
- \pcp@SwitchStack{Left}%
+ \linewidth=\ParallelLWidth
+ \pcp@SwitchStack{Left}\ParallelLBox
\aftergroup\ParallelAfterText
+ \pcp@ColorPatch
\begingroup
\afterassignment\ParallelCheckOpenBrace
\let\x=%
@@ -125,6 +143,7 @@
}{%
\everypar{}%
\@restorepar
+ \@nobreakfalse
\begingroup
\hbadness=3000 %
\ifnum\ParallelFNMode=\@ne
@@ -135,12 +154,174 @@
\ParallelWhichBox=\@ne
\global\setbox\ParallelRBox=\vbox\bgroup
\hsize=\ParallelRWidth
- \pcp@SwitchStack{Right}%
+ \linewidth=\ParallelRWidth
+ \pcp@SwitchStack{Right}\ParallelRBox
\aftergroup\ParallelAfterText
+ \pcp@ColorPatch
\begingroup
\afterassignment\ParallelCheckOpenBrace
\let\x=%
}
+\pcp@CmdCheckRedef\ParallelParTwoPages{%
+ \ifnum\ParallelBoolVar=\@ne
+ \par
+ \begingroup
+ \global\ParallelWhichBox=\@ne
+ \newpage
+ \vbadness=10000 %
+ \vfuzz=3ex %
+ \splittopskip=\z@skip
+ \loop%
+ \ifnum\ParallelBoolVar=\@ne%
+ \ifnum\ParallelWhichBox=\@ne
+ \ifvoid\ParallelLBox
+ \mbox{} %
+ \newpage
+ \else
+ \global\ParallelWhichBox=\z@
+ \fi
+ \else
+ \ifvoid\ParallelRBox
+ \mbox{} %
+ \newpage
+ \else
+ \global\ParallelWhichBox=\@ne
+ \fi
+ \fi
+ \ifnum\ParallelWhichBox=\z@
+ \ifodd\thepage
+ \mbox{} %
+ \newpage
+ \fi
+ \hbox to\textwidth{%
+ \vbox{\vsplit\ParallelLBox to.98\textheight}%
+ }%
+ \else
+ \ifodd\thepage\relax
+ \else
+ \mbox{} %
+ \newpage
+ \fi
+ \hbox to\textwidth{%
+ \vbox{\vsplit\ParallelRBox to.98\textheight}%
+ }%
+ \fi
+ \vspace*{\fill}%
+ \newpage
+ \fi
+ \ifvoid\ParallelLBox
+ \ifvoid\ParallelRBox
+ \global\ParallelBoolVar=\z@
+ \fi
+ \fi
+ \ifnum\ParallelBoolVar=\@ne
+ \repeat
+ \par
+ \endgroup
+ \fi
+}{%
+ \ifnum\ParallelBoolVar=\@ne
+ \par
+ \begingroup
+ \global\ParallelWhichBox=\@ne
+ \newpage
+ \vbadness=10000 %
+ \vfuzz=3ex %
+ \splittopskip=\z@skip
+ \loop%
+ \ifnum\ParallelBoolVar=\@ne%
+ \ifnum\ParallelWhichBox=\@ne
+ \ifvoid\ParallelLBox
+ \mbox{}%
+ \newpage
+ \else
+ \global\ParallelWhichBox=\z@
+ \fi
+ \else
+ \ifvoid\ParallelRBox
+ \null
+ \newpage
+ \else
+ \global\ParallelWhichBox=\@ne
+ \fi
+ \fi
+ \ifnum\ParallelWhichBox=\z@
+ \ifodd\value{page}%
+ \null
+ \newpage
+ \fi
+ \hbox to\textwidth{%
+ \pcp@SetCurrent{Left}%
+ \setbox\z@=\vsplit\ParallelLBox to.98\textheight
+ \vbox to.98\textheight{%
+ \@texttop
+ \unvbox\z@
+ \@textbottom
+ }%
+ }%
+ \else
+ \ifodd\value{page}%
+ \else
+ \mbox{}%
+ \newpage
+ \fi
+ \hbox to\textwidth{%
+ \pcp@SetCurrent{Right}%
+ \setbox\z@=\vsplit\ParallelRBox to.98\textheight
+ \vbox to.98\textheight{%
+ \@texttop
+ \unvbox\z@
+ \@textbottom
+ }%
+ }%
+ \fi
+ \vspace*{\fill}%
+ \newpage
+ \fi
+ \ifvoid\ParallelLBox
+ \ifvoid\ParallelRBox
+ \global\ParallelBoolVar=\z@
+ \fi
+ \fi
+ \ifnum\ParallelBoolVar=\@ne
+ \repeat
+ \par
+ \endgroup
+ \pcp@SetCurrent{}%
+ \fi
+}
+\RequirePackage{pdfcol}[2007/12/12]
+\ifpdfcolAvailable
+\else
+ \PackageInfo{pdfcolparallel}{%
+ Loading aborted, because color stacks are not available%
+ }%
+ \expandafter\endinput
+\fi
+\pdfcolInitStack{pcp@Left}
+\pdfcolInitStack{pcp@Right}
+\newbox\pcp@Box
+\def\pcp@SwitchStack#1#2{%
+ \pdfcolSwitchStack{pcp@#1}%
+ \global\setbox\pcp@Box=\vbox to 0pt{%
+ \pdfcolSetCurrentColor
+ }%
+ \aftergroup\pcp@FixBox
+ \aftergroup#2%
+}
+\def\pcp@FixBox#1{%
+ \global\setbox#1=\vbox{%
+ \unvbox\pcp@Box
+ \unvbox#1%
+ }%
+}
+\def\pcp@SetCurrent#1{%
+ \ifx\\#1\\%
+ \pdfcolSetCurrent{}%
+ \else
+ \pdfcolSetCurrent{pcp@#1}%
+ \fi
+}
\pcp@CmdCheckRedef\ParallelParOnePage{%
\ifnum\ParallelBoolVar=\@ne
\par
@@ -263,124 +444,6 @@
\pcp@SetCurrent{}%
\fi
}
-\pcp@CmdCheckRedef\ParallelParTwoPages{%
- \ifnum\ParallelBoolVar=\@ne
- \par
- \begingroup
- \global\ParallelWhichBox=\@ne
- \newpage
- \vbadness=10000 %
- \vfuzz=3ex %
- \splittopskip=\z@skip
- \loop%
- \ifnum\ParallelBoolVar=\@ne%
- \ifnum\ParallelWhichBox=\@ne
- \ifvoid\ParallelLBox
- \mbox{} %
- \newpage
- \else
- \global\ParallelWhichBox=\z@
- \fi
- \else
- \ifvoid\ParallelRBox
- \mbox{} %
- \newpage
- \else
- \global\ParallelWhichBox=\@ne
- \fi
- \fi
- \ifnum\ParallelWhichBox=\z@
- \ifodd\thepage
- \mbox{} %
- \newpage
- \fi
- \hbox to\textwidth{%
- \vbox{\vsplit\ParallelLBox to.98\textheight}%
- }%
- \else
- \ifodd\thepage\relax
- \else
- \mbox{} %
- \newpage
- \fi
- \hbox to\textwidth{%
- \vbox{\vsplit\ParallelRBox to.98\textheight}%
- }%
- \fi
- \vspace*{\fill}%
- \newpage
- \fi
- \ifvoid\ParallelLBox
- \ifvoid\ParallelRBox
- \global\ParallelBoolVar=\z@
- \fi
- \fi
- \ifnum\ParallelBoolVar=\@ne
- \repeat
- \par
- \endgroup
- \fi
-}{%
- \ifnum\ParallelBoolVar=\@ne
- \par
- \begingroup
- \global\ParallelWhichBox=\@ne
- \newpage
- \vbadness=10000 %
- \vfuzz=3ex %
- \splittopskip=\z@skip
- \loop%
- \ifnum\ParallelBoolVar=\@ne%
- \ifnum\ParallelWhichBox=\@ne
- \ifvoid\ParallelLBox
- \mbox{}%
- \newpage
- \else
- \global\ParallelWhichBox=\z@
- \fi
- \else
- \ifvoid\ParallelRBox
- \mbox{}%
- \newpage
- \else
- \global\ParallelWhichBox=\@ne
- \fi
- \fi
- \ifnum\ParallelWhichBox=\z@
- \ifodd\value{page}%
- \mbox{}%
- \newpage
- \fi
- \hbox to\textwidth{%
- \pcp@SetCurrent{Left}%
- \vbox{\vsplit\ParallelLBox to.98\textheight}%
- }%
- \else
- \ifodd\value{page}%
- \else
- \mbox{}%
- \newpage
- \fi
- \hbox to\textwidth{%
- \pcp@SetCurrent{Right}%
- \vbox{\vsplit\ParallelRBox to.98\textheight}%
- }%
- \fi
- \vspace*{\fill}%
- \newpage
- \fi
- \ifvoid\ParallelLBox
- \ifvoid\ParallelRBox
- \global\ParallelBoolVar=\z@
- \fi
- \fi
- \ifnum\ParallelBoolVar=\@ne
- \repeat
- \par
- \endgroup
- \pcp@SetCurrent{}%
- \fi
-}
\endinput
%%
%% End of file `pdfcolparallel.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index 6716c6b8f7d..25ab2ff28ec 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -64,7 +64,7 @@
\endinput
}{}%
\endgroup
-\RequirePackage{etexcmds}
+\RequirePackage{etexcmds}[2007/09/09]
\ifetex@unexpanded
\else
\ZREF@ErrorNoLine{%