summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/enumitem-zref
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-12-16 23:57:32 +0000
committerKarl Berry <karl@freefriends.org>2010-12-16 23:57:32 +0000
commit3d7921d8c3592f86548fb1c0dda79e234a63c223 (patch)
tree90cc3f0351bef071d215004e4f2a63cd2b1f6f4c /Master/texmf-dist/source/latex/enumitem-zref
parented6fcfcd2ce561cfee9ac566ee1945a079dbd27d (diff)
enumitem-zref (16dec10)
git-svn-id: svn://tug.org/texlive/trunk@20767 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/enumitem-zref')
-rw-r--r--Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.drv6
-rw-r--r--Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.dtx102
-rw-r--r--Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.ins6
3 files changed, 81 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.drv b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.drv
index 700ab5a3e87..89d7bbfb90f 100644
--- a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.drv
+++ b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.drv
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% enumitem-zref : 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref
+%% enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,8 +26,8 @@
%%
\edef\thisfile{\jobname}
\def\thisinfo{Extended references to items for enumitem package}
-\def\thisdate{2010/12/10}
-\def\thisversion{1.2}
+\def\thisdate{2010/12/17}
+\def\thisversion{1.5}
\PassOptionsToPackage{svgnames,dvipsnames}{xcolor}
\PassOptionsToPackage{hyperfootnotes,verbose}{hyperref}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/}
diff --git a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.dtx b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.dtx
index 83b413581c3..aec26a660cc 100644
--- a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.dtx
+++ b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.dtx
@@ -1,5 +1,5 @@
% \iffalse meta-comment
-% enumitem-zref : 2010/12/10 v1.2 - Extended references for enumitem pkg]
+% enumitem-zref : 2010/12/17 v1.5 - Extended references for enumitem pkg]
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -38,7 +38,7 @@
\tracingonline=0
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref}
+\Msg{* Package: 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref}
\Msg{************************************************************************}
\keepsilent
@@ -49,7 +49,7 @@
This is a generated file.
-enumitem-zref : 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref
+enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -102,8 +102,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%<*driver>
\edef\thisfile{\jobname}
\def\thisinfo{Extended references to items for enumitem package}
-\def\thisdate{2010/12/10}
-\def\thisversion{1.2}
+\def\thisdate{2010/12/17}
+\def\thisversion{1.5}
\PassOptionsToPackage{svgnames,dvipsnames}{xcolor}
\PassOptionsToPackage{hyperfootnotes,verbose}{hyperref}
\def\CTANbaseurl{http://www.ctan.org/tex-archive/}
@@ -129,7 +129,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\usepackage[greek]{enumitem-zref}
\usepackage[delarray]{tabu}[2010/12/07]\tracingtabu
\usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}}
-\lastlinefit999
+\lastlinefit999
\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=3cm,right=1.2cm}
\hypersetup{%
pdftitle={The enumitem-zref package},
@@ -146,7 +146,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%</driver>
% \fi
%
-% \CheckSum{1594}
+% \CheckSum{1700}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -388,8 +388,8 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \hyperref[refitem]{\cs{refitem}}, its options and eventually arbitrary text.
%
% Additionnally, \thispackage* allows to typeset greek-enumerated lists with the
-% \refitem{package options{greek}}[\textt{greek}] package option,
-% which uses code from packages \Xpackage{alphalph} and \Xpackage{engrec}.
+% \refitem{package options{greek}}[\textt{greek}] or \refitem{package options{greekctr}}[\textt{greekctr}]
+% package options, which use code from packages \Xpackage{alphalph} and \Xpackage{engrec} or \Xpackage{greekctr}.
%
% References to items in external documents compiled with \xpackage{enumitem-zref} is also possible
% with \hologo{pdfTeX}\footnote{This is not \xpackage{xr} but ``pure'' \pdf.}.
@@ -885,15 +885,16 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \AtBeginShipoutNext{\AtBeginShipoutUpperLeft{\tikz[remember picture,overlay]
% \draw [<->] (package options start) -- (package options end)
% node [midway,above,rotate=90] {\lsstyle\scriptsize\ttfamily defaults};}}
-% \enlargethispage\baselineskip
+% \enlargethispage{1.5\baselineskip}
% \begin{itemize}[font=\ttfamily,labelwidth=2cm,leftmargin=\widthof{description\hbox to1em{}},labelsep=6pt,align=left,name=package options]
% \item[enumerate] disables the references for \textt{itemize} and \textt{description} lists: \marginnote{\tikzlabel[xshift=-.2cm,yshift=.2cm]{package options start}\scriptsize\textt{true}}
% only enumerated lists can be referenced.
% \item [itemize] enables/disables the references for \textt{itemize} lists. \marginnote{\scriptsize\textt{true}}
% \item [description] enables/disables the references for \textt{description} lists. \marginnote{\scriptsize\textt{true}}
% \item [greek] Defines \cs{engrec} (lowercase) and \cs{EnGrec} (uppercase) to make enumerate \marginnote{\scriptsize\textt{false}}
-% lists of items with the greek alphabet as the label (package\xpackage{engrec}).\\
+% lists of items with the greek alphabet as the label (package \xpackage{engrec}).\\
% \cs{engrec} and \cs{EnGrec} can be used in place of \cs{arabic} (f.ex. \textt{label=\cs{engrec}*}).
+% \item [greekctr] Defines \cs{greek} and \cs{Greek} (like \textt{greek} option but with package \Xpackage{greekctr}). \marginnote{\scriptsize\textt{false}}
% \item [CaSeS] Activate this option to get CaSeS sEnSiTiV references in the \marginnote{\tikzlabel[xshift=-.2cm,yshift=-.5cm]{package options end}\scriptsize\textt{false}}
% \hyperref[refitemscheme]{\emph{refitem}} scheme. This option applies only
% to the \hyperref[refitemscheme]{refitem} scheme.
@@ -905,12 +906,12 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{tabu}to .8\linewidth{X[2r]@{\hskip1cm}XX} \tabucline-
% \rowfont[c]{\bfseries\ttfamily} & CaSeS = true & CaSeS = false \\ \tabucline[dash]-
% &
-% \begin{enumerate}[label=\Roman*),topsep=0pt]
+% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip},after=\vspace*{-\baselineskip}]
% \item First
% \item Second
% \end{enumerate}
% &
-% \begin{enumerate}[label=\Roman*),topsep=0pt]
+% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip},after=\vspace*{-\baselineskip}]
% \item First
% \item Second
% \end{enumerate} \\ \tabucline[dash]-
@@ -1071,7 +1072,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{enumitem-zref}[2010/12/10 v1.2 - Extended references for enumitem pkg]
+\ProvidesPackage{enumitem-zref}[2010/12/17 v1.5 - Extended references for enumitem pkg]
\RequirePackage{ltxcmds,etoolbox,kvoptions,gettitlestring,enumitem}
\RequirePackage{zref}[2010/05/01]
\RequirePackage{zref-user,zref-counter}
@@ -1103,19 +1104,34 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\DeclareBoolOption{itemize}
\DeclareBoolOption{description}
\DeclareBoolOption{enumerate}
-\DeclareVoidOption{greek}{%
- \AtEndOfPackage{%
- \RequirePackage{engrec,alphalph}
- \let\zen@grecORI\@grec \let\zen@GrecORI\@Grec
- \let\@grec\relax \let\@Grec\relax
- \newalphalph\@grec[wrap]\zen@grecORI{24}
- \newalphalph\@Grec[wrap]\zen@GrecORI{24}
- \AddEnumerateCounter\engrec\@grec{\@grec{23}}% widest is \psi
- \AddEnumerateCounter\EnGrec\@Grec{\@Grec{12}}% widest is M
- }%
-}
+\DeclareVoidOption{greek}{\AtEndOfPackage\zen@option@greek}
+\def\zen@option@greek{%
+ \RequirePackage{engrec,alphalph}
+ \let\zen@grecORI \@grec \let\zen@GrecORI \@Grec
+ \let\@grec \relax \let\@Grec \relax
+ \newalphalph\@grec[wrap]\zen@grecORI{24}
+ \newalphalph\@Grec[wrap]\zen@GrecORI{24}
+ \AddEnumerateCounter\engrec\@grec{\@grec{23}}% widest is \psi
+ \AddEnumerateCounter\EnGrec\@Grec{\@Grec{12}}% widest is M
+ \let\zen@option@greek \relax
+}% \zen@option@greek
+\DeclareVoidOption{greekctr}{\AtEndOfPackage\zen@option@greekctr}
+\def\zen@option@greekctr{%
+ \RequirePackage{greekctr,alphalph}
+ \let\zen@greekORI \@greek \let\zen@GreekORI \@Greek
+ \let\@greek \relax \let\@Greek \relax
+ \newalphalph\@greek[wrap]\zen@greekORI{24}%
+ \newalphalph\@Greek[wrap]\zen@GreekORI{24}%
+ \AddEnumerateCounter\greek\@greek{\@greek{23}}% widest is \psi
+ \AddEnumerateCounter\Greek\@Greek{\@Greek{12}}% widest is M
+ \let\zen@option@greekctr \relax
+}% \zen@option@greekctr
\DeclareVoidOption{external}{\catcode`\Ë 14\relax}% Ë = comment
\DeclareDefaultOption{\@unknownoptionerror}
+\AtBeginDocument{%
+ \@ifpackageloaded{greekctr} \zen@option@greekctr \relax
+ \@ifpackageloaded{engrec} \zen@option@greek \relax
+}
\ProcessLocalKeyvalOptions{zen}
\ifzen@enumerate\else
\ifzen@itemize \zen@enumeratetrue\else
@@ -1226,7 +1242,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
%
% \begin{macrocode}
\def\zen@box{\hfuzz\maxdimen \vfuzz\hfuzz \hbadness\@M \vbadness\hbadness
- \setbox\z@=\vbox}
+ \tracinglostchars\z@ \setbox\z@=\vbox}
% \end{macrocode}
% \end{macro}
%
@@ -1395,10 +1411,23 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\ifnum \zen@@depth>\@ne \edef\zen@@parents{{\the\c@zenItem}\zen@@parents}%
\else \let\zen@@parents \@empty \fi
\let\zen@refitem@fun \@undefined
+ \ifcase \zen@@type \zen@prepare@resume \fi % (enumerate only: key resume)
\c@zenidx \z@
\let\zen@trivlistORI \@trivlist
\let\@trivlist \zen@trivlist
}% \zen@name@list
+\def\zen@prepare@resume{\expandafter\def\expandafter\enit@endenumerate
+ \expandafter{\enit@endenumerate \zen@endenumerate}%
+}% \zen@prepare@resume
+\def\zen@endenumerate{% saves the value of \c@zenidx at the exit of enum envir
+ \zen@toks\expandafter{\enit@afterlist}%
+ \xdef\enit@afterlist{\the\zen@toks
+ \def\expandafter\noexpand
+ \csname enit@resume@\@currenvir\endcsname{%
+ \csname c@\@listctr\endcsname
+ \the\csname c@\@listctr\endcsname
+ \c@zenidx \the\c@zenidx\relax}}%
+}% \zen@prepare@resume
% \end{macrocode}
% \end{macro}
%
@@ -1462,6 +1491,9 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\let \makelabel \zen@makelabel \fi
\fi
\let\zeninfo \zen@info
+ \ifcase \zen@@type % enumerate only (key start)
+ \ifnum \c@zenidx=\z@ \c@zenidx\value\@enumctr\relax \fi
+ \fi
\zen@refitem@implicit
}% \zen@setuprefs
\def\zen@makelabel#1{\zen@makeref{#1}\zen@makelabelORI{#1}\zen@labelize}
@@ -1486,7 +1518,7 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
\fi
\let\zen@refitem@fun \zen@gtemp
}% \zen@refitem@implicit
-\def\zen@refitemfromlabel#1{\def#1##1{%
+\def\zen@refitemfromlabel#1{\def#1##1{0%
\def\zen@temp{##1}\ifx \zen@temp\@enumctr
\gdef\zen@gtemp{{#1{##1}}}\fi}%
}% \zen@refitemfromlabel
@@ -2060,11 +2092,27 @@ Copyright (C) 2010 by Florent Chervet <florent.chervet@free.fr>
% 2009/12/18 v1.3 -- Cleanup title references\\
% \CTANhref{gettitlestring}
%
+% \bibitem{engrec}
+% \textit{The \xpackage{engrec} package}; Yvon Henel \\
+% 2008/05/07 v1.1 -- Greek letters from counters\\
+% \CTANhref{engrec}
+%
% \end{thebibliography}
%
% \setitemize{leftmargin=2em}
% \begin{History}
%
+% \begin{Version}{2010/12/17 v1.5}
+% \item \thispackage now works with the keys: \textt{start=},\, \textt{resume},\, and\, \textt{resume\stf}\,
+% of \xpackage{enumitem} package.
+% \item Package option: \refitem{package options{greekctr}}[\textt{greekctr}] added as an alternative to the
+% \refitem{package options{greek}}[\textt{greek}] package option: \textt{greekctr} is based on the
+% \Xpackage{greekctr} package while \textt{greek} is based on \Xpackage{engrec}.
+% Both uses code of \Xpackage{alphalph} in order to make the counters \textsl{wrap} around the greek alphabet. \\
+% Options \refitem{package options{greek}}[\textt{greek}] and/or \refitem{package options{greekctr}}[\textt{greekctr}]
+% are automatically loaded \cs{AtBeginDocument} if the \xpackage{engrec} / \xpackage{greekctr} packages are detected.
+% \end{Version}
+%
% \begin{Version}{2010/12/10 v1.2}
% \item Bug encountered in \cs{zen@anchors@}: \\
% \cs{ifx}\#1\cs{@nnil} is not the same as \cs{ifx}\cs{@nnil}\#1\quad !!
diff --git a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.ins b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.ins
index 92e3a97aaf8..9781459aaf4 100644
--- a/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.ins
+++ b/Master/texmf-dist/source/latex/enumitem-zref/enumitem-zref.ins
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% enumitem-zref : 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref
+%% enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -28,7 +28,7 @@
\tracingonline=0
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref}
+\Msg{* Package: 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref}
\Msg{************************************************************************}
\keepsilent
@@ -39,7 +39,7 @@
This is a generated file.
-enumitem-zref : 2010/12/10 v1.2 - Extended references to items for enumitem package and hyperref
+enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either