From fae5e7681cd67f0f98d7755e5065a0e54e15fbd0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Feb 2011 00:26:28 +0000 Subject: enumitem-zref 1.8 (19feb11) git-svn-id: svn://tug.org/texlive/trunk@21472 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/enumitem-zref/enumitem-zexample.tex | 2 +- .../doc/latex/enumitem-zref/enumitem-zref.pdf | Bin 959000 -> 981667 bytes .../source/latex/enumitem-zref/enumitem-zref.drv | 30 ++- .../source/latex/enumitem-zref/enumitem-zref.dtx | 225 ++++++++++++--------- .../source/latex/enumitem-zref/enumitem-zref.ins | 6 +- .../tex/latex/enumitem-zref/enumitem-zref.sty | 4 +- 6 files changed, 151 insertions(+), 116 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zexample.tex b/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zexample.tex index d244c6857bd..3aded121779 100644 --- a/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zexample.tex +++ b/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zexample.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% enumitem-zref : 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2011/02/18 v1.8 - 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 diff --git a/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zref.pdf b/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zref.pdf index 67a467b649d..426cf4bc06a 100644 Binary files a/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zref.pdf and b/Master/texmf-dist/doc/latex/enumitem-zref/enumitem-zref.pdf differ 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 c02f9931c42..7589a018284 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/30 v1.75 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2011/02/18 v1.8 - 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,32 +26,42 @@ %% \edef\thisfile{\jobname} \def\thisinfo{Extended references to items for enumitem package} -\def\thisdate{2010/12/30} -\def\thisversion{1.75} +\def\thisdate{2011/02/18} +\def\thisversion{1.8} \PassOptionsToPackage{svgnames,dvipsnames}{xcolor} \PassOptionsToPackage{hyperfootnotes,verbose}{hyperref} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} \def\CTANhref#1{\href{\CTANbaseurl help/Catalogue/entries/#1.html}{\nolinkurl{CTAN:help/Catalogue/entries/#1.html}}} \let\loadclass \LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} +{\makeatletter{\endlinechar`\^^J\obeyspaces + \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@ + \thisfile-documentation: updates required ! + package #1 must be later than #2 + to compile this documentation.}}}}% + \gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}} +\AtBeginDocument{\CheckDate{interfaces=2011/02/12,tabu=2011/02/17}} \documentclass[a4paper,oneside]{ltxdoc} \AtBeginDocument{\DeleteShortVerb{\|}} \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etoolbox,geometry,lastpage,graphicx,xspace,fancyhdr,xcolor,bbding,pifont,lmodern,amsmath,relsize,moresize,manfnt} -\usepackage{tocloft,titlesec,embedfile,framed,multirow,makecell,enumitem,atveryend,catchfile} +\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,calc} % general tools +\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts +\usepackage[official]{eurosym} % font +\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management +\usepackage{holtxdoc,bookmark,hypbmsec} % hyper-links +\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars +\usepackage{tabu}[2011/02/17]\tracingtabu=2 % tabulars +\usepackage{pifont,engrec,amsmath,wasysym} +\usepackage{embedfile,framed,atveryend,catchfile} \usepackage[expansion=all,protrusion=all,shrink=30]{microtype} -\usepackage{interfaces}[2010/12/27] +\usepackage{interfaces}[2011/02/12] \usetikz{basic,chains} -\usepackage{engrec,calc,marginnote,wasysym} -\usepackage{holtxdoc,bookmark,hypbmsec} \RequirePackage{grffile,eso-pic}% to include the example -\usepackage{tabularx,booktabs} \csname endofdump\endcsname \CodelineNumbered \usepackage[greek]{enumitem-zref} -\usepackage[delarray]{tabu}[2010/12/28]\tracingtabu=2 \usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} \lastlinefit999 \geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=3cm,right=1.2cm} 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 11164aa6a68..992d35712d3 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/30 v1.75 - Extended references for enumitem pkg] +% enumitem-zref : 2011/02/18 v1.8 - 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/30 v1.75 - Extended references to items for enumitem package and hyperref} +\Msg{* Package: 2011/02/18 v1.8 - Extended references to items for enumitem package and hyperref} \Msg{************************************************************************} \keepsilent @@ -49,7 +49,7 @@ This is a generated file. -enumitem-zref : 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref +enumitem-zref : 2011/02/18 v1.8 - 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,32 +102,42 @@ Copyright (C) 2010 by Florent Chervet %<*driver> \edef\thisfile{\jobname} \def\thisinfo{Extended references to items for enumitem package} -\def\thisdate{2010/12/30} -\def\thisversion{1.75} +\def\thisdate{2011/02/18} +\def\thisversion{1.8} \PassOptionsToPackage{svgnames,dvipsnames}{xcolor} \PassOptionsToPackage{hyperfootnotes,verbose}{hyperref} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} \def\CTANhref#1{\href{\CTANbaseurl help/Catalogue/entries/#1.html}{\nolinkurl{CTAN:help/Catalogue/entries/#1.html}}} \let\loadclass \LoadClass \def\LoadClass#1{\loadclass[abstracton]{scrartcl}\let\scrmaketitle\maketitle\AtEndOfClass{\let\maketitle\scrmaketitle}} +{\makeatletter{\endlinechar`\^^J\obeyspaces + \gdef\ErrorUpdate#1=#2,{\@ifpackagelater{#1}{#2}{}{\let\CheckDate\errmessage\toks@\expandafter{\the\toks@ + \thisfile-documentation: updates required ! + package #1 must be later than #2 + to compile this documentation.}}}}% + \gdef\CheckDate#1{{\let\CheckDate\relax\toks@{}\@for\x:=\thisfile=\thisdate,#1\do{\expandafter\ErrorUpdate\x,}\CheckDate\expandafter{\the\toks@}}}} +\AtBeginDocument{\CheckDate{interfaces=2011/02/12,tabu=2011/02/17}} \documentclass[a4paper,oneside]{ltxdoc} \AtBeginDocument{\DeleteShortVerb{\|}} \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etoolbox,geometry,lastpage,graphicx,xspace,fancyhdr,xcolor,bbding,pifont,lmodern,amsmath,relsize,moresize,manfnt} -\usepackage{tocloft,titlesec,embedfile,framed,multirow,makecell,enumitem,atveryend,catchfile} +\usepackage{ltxnew,etoolbox,geometry,graphicx,xcolor,needspace,calc} % general tools +\usepackage{lmodern,bbding,hologo,relsize,moresize,manfnt,pifont,upgreek} % fonts +\usepackage[official]{eurosym} % font +\usepackage{xspace,tocloft,titlesec,fancyhdr,lastpage,enumitem,marginnote} % paragraphs & pages management +\usepackage{holtxdoc,bookmark,hypbmsec} % hyper-links +\usepackage{array,delarray,longtable,colortbl,multirow,makecell,booktabs} % tabulars +\usepackage{tabu}[2011/02/17]\tracingtabu=2 % tabulars +\usepackage{pifont,engrec,amsmath,wasysym} +\usepackage{embedfile,framed,atveryend,catchfile} \usepackage[expansion=all,protrusion=all,shrink=30]{microtype} -\usepackage{interfaces}[2010/12/27] +\usepackage{interfaces}[2011/02/12] \usetikz{basic,chains} -\usepackage{engrec,calc,marginnote,wasysym} -\usepackage{holtxdoc,bookmark,hypbmsec} \RequirePackage{grffile,eso-pic}% to include the example -\usepackage{tabularx,booktabs} \csname endofdump\endcsname \CodelineNumbered \usepackage[greek]{enumitem-zref} -\usepackage[delarray]{tabu}[2010/12/28]\tracingtabu=2 \usepackage{fancyvrb}\fvset{gobble=1,listparameters={\topsep=0pt}} \lastlinefit999 \geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=3cm,right=1.2cm} @@ -216,17 +226,26 @@ Copyright (C) 2010 by Florent Chervet % \newrobustcmd\verbfont{\usefont{T1}{\ttdefault}{\f@series}{n}} \let\vb\verbfont % \newrobustcmd\vbbf{\usefont{T1}{\ttdefault}bn} % \renewrobustcmd\#[1]{{\usefont{T1}{pcr}{bx}{n}\char`\##1}} +% \newrobustcmd*\grabcs{\leavevmode\hbox\bgroup\bgroup\makeatletter\aftergroup\endgrabcs} +% \def\endgrabcs{\egroup\xspaceverb} +% \renewrobustcmd*\cs{\grabcs\cs@} +% \newrobustcmd*\cs@[2][]{\begingroup\escapechar\m@ne\def\x ##1{\endgroup\@maybehyperlink{##1}{\texttt{#1{\@backslashchar##1}}}}\expandafter\x\expandafter{\string#2}\egroup} +% \newcommand*\cs@pdf[1]{\@backslashchar\if\@backslashchar\string#1 \else\string#1\fi} +% \newrobustcmd*\csbf{\cs[\textbf]} +% \newrobustcmd*\csref[2][]{{\escapechar\m@ne\edef\my@tempa{\string#2}\edef\x ##1{\noexpand\hyperref{}{declcs}{\my@tempa}{\noexpand\cs[{##1}]{\my@tempa}}}\expandafter}\x{#1}} +% \newcommand\env{\texorpdfstring \env@ \env@pdf} +% \newcommand*\env@pdf[1]{#1} +% \newrobustcmd*\env@{\@ifstar {\env@starsw[environment]}{\env@starsw[]}} +% \def\env@starsw[#1]#2{\textt{#2}\ifblank{#1}{}{ #1}\Xspace} +% \newrobustcmd*\@maybehyperlink [2]{\ifcsname zen@declcs.\detokenize{#1}\endcsname \hyperref{}{declcs}{#1}{#2}\else #2\fi} % \newrobustcmd\csred[1]{\textcolor{red}{\cs{#1}}} -% \renewrobustcmd\cs[2][]{\mbox{\vb#1\expandafter\@gobble\string\\#2}} % \newrobustcmd\CSbf[1]{\textbf{\CS{#1}}} -% \newrobustcmd\csbf[2][]{\textbf{\cs[{#1}]{#2}}} % \newrobustcmd\texttbf[1]{\textbf{\texttt{#1}}} % \newrobustcmd\textitbf[1]{\textit{\textbf{#1}}} % \renewrobustcmd*\bf{\bfseries}\newcommand\nnn{\normalfont\mdseries\upshape}\newcommand\nbf{\normalfont\bfseries\upshape} % \newrobustcmd*\blue{\color{blue}}\newcommand*\red{\color{dr}}\newcommand*\green{\color{green}}\newcommand\rred{\color{red}} % \newrobustcmd\rrbf{\color{red}\bfseries} % \newrobustcmd*\pdf{\textsc{pdf}} -%\newrobustcmd*\csref[2][\macrocodecolor]{$\leadsto$\hyperref{}{declcs}{#2}{\cs[{#1}]{#2}}} % \definecolor{copper}{rgb}{0.67,0.33,0.00} \newcommand\copper{\color{copper}} % \definecolor{daleif1}{rgb}{.647,.129,.149} % \definecolor{dg}{rgb}{0.02,0.29,0.00} \newcommand\dg{\color{dg}} @@ -238,9 +257,22 @@ Copyright (C) 2010 by Florent Chervet % \newrobustcmd\etc{{\bk\emph{etc.}}} % \newrobustcmd\textt[2][]{\texorpdf\texttt{#1#2}} % \newcommand\cellstrut{}\let\cellstrut\bottopstrut +% \def\M{\@ifstar{\M@i\@firstofone}{\M@i\meta}} +% \def\M@i#1{\@ifnextchar[\M@square +% {\ifx (\@let@token^^A) +% \expandafter\M@paren +% \else\ifx |\@let@token +% \expandafter\expandafter\expandafter\M@bar +% \else \expandafter\expandafter\expandafter\M@brace +% \fi\fi#1}} +% \def\M@square #1[#2]{\M@Bracket[{#1{#2}}]} +% \def\M@paren #1(#2){\M@Bracket({#1{#2}})} +% \def\M@bar #1|#2|{\M@Bracket\textbar{#1{#2}}\textbar} +% \def\M@brace #1#2{\M@Bracket\{{#1{#2}}\}} +% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}} % \newrobustcmd*\thisyear{\begingroup % \def\thisyear##1/##2\@nil{\endgroup -% \oldstylenums{##1\ifnum##1=\year\else\,\textendash\,\the\year\fi}% +% \oldstylenums{\ifnum##1=2010\else 2010\,\textendash\,\fi ##1}^^A % }\expandafter\thisyear\thisdate\@nil % } % \newenvironment{movepage}[2][]{% @@ -251,28 +283,41 @@ Copyright (C) 2010 by Florent Chervet % }{\clearpage} % \DefineVerbatimEnvironment{VerbLines}{Verbatim}{frame=lines,framesep=6pt,fontfamily=\ttdefault,fontseries=m} % \DefineVerbatimEnvironment{VerbLines*}{Verbatim}{frame=lines,framesep=6pt,fontfamily=\ttdefault,fontseries=m,commandchars=$()} -% \DefineVerbatimEnvironment{Verb}{Verbatim}{fontfamily=\ttdefault,fontseries=m} % \DefineVerbatimEnvironment{Verb*}{Verbatim}{fontfamily=\ttdefault,fontseries=m,commandchars=$()} +% +% \newrobustcmd*\csanchor[2][]{^^A +% \immediate\write\@mainaux{\csgdef{zen@declcs.\string\detokenize{#2}}{}}^^A +% \raisedhyperdef[14pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A +% } % \renewrobustcmd\declcs[2][]{^^A -% \par\addvspace\parskip -% \goodbreak -% \noindent\larger\changefont{spread=1}^^A -% \hspace{-\leftmargini}^^A -% \def\*{\unskip\,\texttt{*}}^^A -% \begin{tabular}{|l|}^^A -% \hline +% \if@nobreak \par\nobreak +% \else \par\addvspace\parskip +% \Needspace{.08\textheight}\fi +% \changefont{size+=2.5pt,spread=1,fam=\ttdefault}^^A +% \def\*{\unskip\,\texttt{*}}\noindent +% \hskip-\leftmargini +% \begin{tabu}{|l|}\hline % \expandafter\SpecialUsageIndex\csname #2\endcsname -% \raisedhyperdef[12pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A -% }^^A +% \csanchor[{#1}]{#2}} % \renewcommand\enddeclcs{% -% \crcr \hline -% \end{tabular}% -% \nobreak \par \nobreak -% \noindent +% \crcr \hline \end{tabu}\nobreak +% \par \nobreak \noindent % \ignorespacesafterend % } % \def\declmargin{\hspace*{\dimexpr-\leftmargini+\arrayrulewidth+\tabcolsep}} % \pretocmd\textasteriskcentered{\usefont{OMS}{cmsy}mn}{}{} +% \let\plainllap\llap +% \newrobustcmd\macro@llap[1]{{\global\let\llap\plainllap +% \setbox0=\hbox\bgroup \raisedhyperdef{macro}{\saved@macroname}{#1}\egroup +% \ifdim\wd0>20mm +% \hbox to\z@ \bgroup\hss \hbox to20mm{\unhcopy0\hss}\egroup +% \edef\@tempa{\hskip\dimexpr\the\wd0-20mm}\global\everypar\expandafter{\the\expandafter\everypar +% \@tempa \global\everypar{}}^^A +% \else \llap{\unhbox0}\fi}} +% \AtBeginEnvironment{macro}{\if@nobreak\else\Needspace{2\baselineskip}\fi +% \MacrocodeTopsep\z@skip \MacroTopsep\z@skip \parsep\z@ \topsep\z@ \itemsep\z@ \partopsep\z@ +% \let\llap\macro@llap} +% \AtEndEnvironment{macro}{\goodbreak\vskip.3\parskip} % % \newrobustcmd*\IMPLEMENTATION{% % ^^A\geometry{top=0pt,includeheadfoot,headheight=.6cm,headsep=.6cm,bottom=.6cm,footskip=.5cm,left=3.5cm,right=1.2cm} @@ -330,42 +375,20 @@ Copyright (C) 2010 by Florent Chervet % bookmark={color=RoyalBlue}, % } % -% \newrobustcmd*\M{\@ifstar{\M@i\@firstofone}{\M@i\meta}} -% \def\M@i#1{\@ifnextchar[^^A] -% {\M@square#1} -% {\@ifnextchar(^^A) -% {\M@paren#1} -% {\M@brace#1}}^^A -% } -% \def\M@square#1[#2]{\M@Bracket[{#1{#2}}]} -% \def\M@paren#1(#2){\M@Bracket({#1{#2}})} -% \def\M@brace#1#2{\M@Bracket\{{#1{#2}}\}} -% \def\M@Bracket#1#2#3{{\ttfamily#1#2#3}} -% % \newcommand\macrocodecolor{\color{macrocode}}\definecolor{macrocode}{rgb}{0.05,0.02,0.07} % \newcommand\reflinkcolor{\color{reflink}}\colorlet{reflink}{MidnightBlue} -% \newrobustcmd*\Xspace{\ifnum\catcode`\ =\active\relax\else\expandafter\xspace\fi}^^A not \xspace in verbatim % \let\stf \textasteriskcentered % \newrobustcmd*\stform{\@ifnextchar*{\@stform[]\textasteriskcentered\@gobble}\@stform} % \newrobustcmd*\@stform[2][\string]{\texttbf{\rred#1#2}\Xspace} -% \let\plainllap\llap -% \newrobustcmd\macro@llap[1]{\global\let\llap\plainllap -% \setbox0\hbox{#1}^^A -% \ifdim\wd0>2cm\hbox to\z@{\hss\hbox to2cm{#1\hss}}^^A -% \edef\@tempa{\the\everypar\hskip\dimexpr\the\wd0-2cm\relax\global\everypar{}}% -% \global\everypar\expandafter{\@tempa}^^A -% \else\hbox to\z@{\hss#1}\fi -% \setbox0\box\voidb@x}% -% \pretocmd\macro{\MacrocodeTopsep=\z@skip\MacroTopsep\z@skip\let\llap\macro@llap\parsep=\z@\topsep=\z@\itemsep=\z@\partopsep\z@}{}{} -% \apptocmd\endmacro{\goodbreak\vskip.3\parskip}{}{} -% +% \newrobustcmd*\xspaceverb{\ifnum\catcode`\ =\active\else\expandafter\xspace\fi} +% \let\Xspace\xspaceverb % % \makeatother % -% \title{\vspace*{-32pt}\bfseries\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/enumitem-zref.html}{\HUGE\thispackage}\vspace*{8pt}} +% \title{\vspace*{-36pt}\bfseries\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/enumitem-zref.html}{\HUGE\thispackage}\vspace*{6pt}} % \date{} % \author{\small\thisdate~--~\hyperref[v\thisversion]{version \thisversion}} -% \subtitle{\begin{tabu}{c}\LARGE \thisinfo\\[.3ex]\large The \csref{refitem} command \\[.5ex] \small\FC\end{tabu}\vspace*{-18pt}} +% \subtitle{\begin{tabu}{c}\LARGE \thisinfo\\[.3ex]\large The \cs\refitem command \\[.5ex] \small\FC\end{tabu}\vspace*{-24pt}} % \maketitle % % \deffootnote{1em}{0pt}{\rlap{\thefootnotemark.}\kern1em} @@ -412,13 +435,13 @@ Copyright (C) 2010 by Florent Chervet % subsubsection/pagenumbers=off, % subsubsection/dotsep=, % subsubsection/font=\small, -% title=Contents\quad\leaders\vrule height3.4pt depth-3pt\hfill\null\kern0pt\vskip-6pt, +% title=Contents\quad{\pkgcolor\leaders\vrule height3.4pt depth-3pt\hfill\null}\kern0pt\vskip-6pt, % title/top=6pt plus2pt, -% ^^Aafter=\nobreak\leavevmode\nobreak\hrule, % bookmark={text=Contents,bold}, % columns=2, -% multicols/end=\aftergroup\leavevmode\aftergroup\hrule, +% multicols/beforeend=\aftergroup\tochrule, % } +% \def\tochrule{\leavevmode{\pkgcolor\hrule}} % \begingroup\let\footnoterule\relax % \tableofcontents % \clearpage \endgroup @@ -443,9 +466,9 @@ Copyright (C) 2010 by Florent Chervet % \item [\cs{item}] This is an \emph{automatic} item. % \end{itemize} % -% \marginnote\dbend User items are labelized, hence expanded (with \cs{protect}). +% \marginnote\dbend User items are labelized, hence expanded (with \cs\protect). % -% The \cs{label} command can be put inside the optional argument of \cs{item}:\par +% The \cs\label command can be put inside the optional argument of \cs\item:\par % \centerline{ \cs{item}\M*[ text \cs{label}\M*{label of the item}] }§ % or in the paragraph that follows. % @@ -463,14 +486,16 @@ Copyright (C) 2010 by Florent Chervet % % \node at (0,-4) [anchor=west] (refdesc) {reference with either:} % node [anchor=west] at (refdesc.east) {% -% \begin{tabu}\{{X[-1r]X[-1]}. +% \begin{tabu}spread0pt \{{X[-1r]X[-1]}. % The \hyperref[refitemscheme]{\emph{refitem}} scheme: &\textt{listname\M*{label}\M*{label}\M*{label}...} \\ % The \hyperref[commarefscheme]{\emph{commaref}} scheme:& \textt{listname,index,index,index,...} \\ % The \hyperref[userscheme]{\emph{user}} scheme: &\textt{reference} to a \cs{label} command % \end{tabu}}; % \draw [->,color=reference] (refdesc.north) -- (reference.south); % -% \node at (7,-2) [anchor=west] (propdesc) {\begin{tabu}{X[-1]} Optional text containing properties\\ Default is \M*[\textcolor{properties}{\cs{ref}} ]\end{tabu}}; +% \node at (7,-2) [anchor=west] (propdesc) { +% \begin{tabu}spread0pt {X[-1]} Optional text containing properties\\ +% Default is \M*[\textcolor{properties}{\cs{ref}} ]\end{tabu}}; % % \draw [->,color=properties] (propdesc.north) -- (properties); % @@ -492,7 +517,7 @@ Copyright (C) 2010 by Florent Chervet % \node at ($(grandparents.south)+(0,-1.5)$) (grandparentsref) {\begin{tabu}{c} refers to the\\ second ancestor\\ \itshape Here an\\\itshape empty string\end{tabu}}; % \draw [->] (grandparentsref.north) -- (grandparents.south); % -% \filldraw [MistyRose] (12,-1) rectangle (15,-1.5); +% \filldraw [MistyRose] (12,-1.3) rectangle (15,-1.8); % % \node (list) [on chain,yshift=-1cm,xshift=-1cm] {\begin{tabu}to6cm{X} % \begin{enumerate}[label=\arabic*.,name=tikzex] @@ -508,7 +533,8 @@ Copyright (C) 2010 by Florent Chervet % % \smallskip % -% \tabulinestyle{dotted=on 1pt off2pt,dash=\hbox{$\scriptscriptstyle\mkern2mu\cdotp\mkern2mu$}} +% \newtabulinestyle{dotted=on 1pt off2pt} +% \def\dash{\hbox{$\scriptscriptstyle\mkern2mu\cdotp\mkern2mu$}} % % \AtBeginShipoutNext{\AtBeginShipoutUpperLeft{^^A % \tikz[remember picture,overlay]\draw [<->] (common properties start) -- (common properties end) @@ -517,7 +543,7 @@ Copyright (C) 2010 by Florent Chervet % {\def\arraystretch{1}\def\margintext#1{\noalign{\vtop to0pt{\marginnote{\ttfamily\small #1}[-2.5ex]\vss}}} % \begin{tabu}{>{\leavevmode\color{properties}}X[2.3]X[8]>{\bfseries\sffamily}X[-2c]} \hline \tabucline- % \rowfont[c]{\color{black}\bfseries} -% Property &Description &Examples \\ \tabucline[dash]- +% Property &Description &Examples \\ \tabucline[\dash]- % \tikzlabel[yshift=1ex,xshift=-.3cm]{common properties start} % \cs{label} &The item label: automatic or user defined by \cs{item}\M*[...] &II)\, \textmd{or}\, \textbullet \\ % \cs{label\stform*}&For automatic labels in \textt{enumerate} lists: the label without any text around (useful to ``concatenate'' labels). @@ -525,7 +551,7 @@ Copyright (C) 2010 by Florent Chervet % \cs{ref} &If the \textt{ref} key of \xpackage{enumitem} has been set, the ``evaluation'' of the \textt{ref} key. % Otherwise, the same as \cs{label} &II)\, \textmd{or}\, \textbullet \\ % \tikzlabel[xshift=-.3cm]{common properties end} -% \cs{ref\stform*} &The same as \cs{label\stform*} &II\, \textmd{or}\, \textbullet \\ \tabucline[dash]- +% \cs{ref\stform*} &The same as \cs{label\stform*} &II\, \textmd{or}\, \textbullet \\ \tabucline[\dash]- % \cs{listname} &The name given to the list with the key \textt{name}. \\ % \cs{depth} &The list depth. \\ % \cs{index} &The index of the item in the list. Every item is counted.\\ @@ -535,7 +561,7 @@ Copyright (C) 2010 by Florent Chervet % \cs{currentlabel} &\LaTeX's \cs{@currentlabel} \\ % \cs{anchor} &The name of the anchor set for the item. \\ \margintext{\textsuperscript{hyperref}} % \cs{currentlabelname}&\xpackage{hyperref}'s (or \xpackage{nameref}'s) \cs{@currentlabelname} \\ \margintext{\textsuperscript{hyperref}} -% \cs{refitem} &The list of references with the \hyperref[refitemscheme]{\emph{refitem}} scheme for the item. & \mdseries\csref{zeninfo} \\ +% \textt{\string\refitem} &The list of references with the \hyperref[refitemscheme]{\emph{refitem}} scheme for the item. & \mdseries\csref{zeninfo} \\ % \cs{commaref} &The list of references with the \hyperref[commarefscheme]{\emph{commaref}} scheme for the item. & \mdseries\csref{zeninfo} \\ % \cs{default} &The same as \cs{ref} & \\ \tabucline- % \end{tabu}} @@ -543,8 +569,6 @@ Copyright (C) 2010 by Florent Chervet % % \clearpage % -% -% % \section{Forewords} % % \subsection{Numbered lists, not numbered lists and \texorpdf\xpackage{hyperref}} @@ -773,7 +797,7 @@ Copyright (C) 2010 by Florent Chervet % \end{itemize} % % -% \subsection(Making references: \cs{refitem}){Referencing the items : \csbf[\rred]{refitem}} +% \subsection(Making references: \cs{refitem}){Referencing the items : \csbf{refitem}} % \label{refitem} % % \begin{declcs}{refitem}\M{reference}\M*[text with properties \cs{ref}, \cs{label} \etc.]\textsuperscript{babel}\\ @@ -782,14 +806,12 @@ Copyright (C) 2010 by Florent Chervet % % \thispackage provides \cs{refitem} to reference the items of lists with the following possible syntaxes: % -% \tabulinestyle{dotted=on 1pt off2pt,dash=\hbox{$\scriptscriptstyle\mkern2mu\cdotp\mkern2mu$}} -% % {\tabcolsep=4pt % \begin{tabu}{X[-1]<{\cellstrut}X} \toprule \savetabu{refitem} % \cs{refitem}\M*{\textcolor{reference}{refname}}\M*[\textcolor{properties}{properties}] % & displays a reference to \textt{\dg refname} \par % the text displayed depends on the optional \textcolor{properties}{\textt{properties}} \par -% whose default value is \cs{ref}. \\ \tabucline[dash]- +% whose default value is \cs{ref}. \\ \tabucline[\dash]- % \cs{refitem}\stform*\M*{\textcolor{reference}{refname}}\M*[\textcolor{properties}{properties}] % & can be used when you want a reference but no hyperlink. \\ \bottomrule % \end{tabu}} @@ -904,17 +926,17 @@ Copyright (C) 2010 by Florent Chervet % Package \xpackage{hyperref}'s \textt{[verbose]} option allows to see anchor names in the \xext{log} file. \par % \centering % \begin{tabu}to .8\linewidth{X[2r]@{\hskip1cm}XX} \tabucline- -% \rowfont[c]{\bfseries\ttfamily} & CaSeS = true & CaSeS = false \\ \tabucline[dash]- +% \rowfont[c]{\bfseries\ttfamily} & CaSeS = true & CaSeS = false \\ \tabucline[\dash]- % & -% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip},after=\vspace*{-\baselineskip}] +% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip}] % \item First % \item Second % \end{enumerate} % & -% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip},after=\vspace*{-\baselineskip}] +% \begin{enumerate}[label=\Roman*),before=\vspace*{-\baselineskip}] % \item First % \item Second -% \end{enumerate} \\ \tabucline[dash]- +% \end{enumerate} \\ \tabucline[\dash]- % % \cs{refitem}\M*{myList\M*{I}} &\CheckOK works & \CheckOK works \\ % \cs{refitem}\M*{myList\M*{i}} &\CheckFAIL doesn't work & \CheckOK works \\ @@ -929,13 +951,13 @@ Copyright (C) 2010 by Florent Chervet % \multicolumn4c{\textbf{Types of lists that can be referenced}} \\ % \rowfont{\normalfont\itshape} % \hfill\textup{Package option}\hfill\null &enumerate &itemize &description \\\tabucline- -% [enumerate] &\textbullet & & \\\tabucline[dash]- -% [itemize] &\textbullet &\textbullet & \\\tabucline[dash]- -% [description] &\textbullet & &\textbullet \\\tabucline[dash]- -% [enumerate,itemize] &\textbullet &\textbullet & \\\tabucline[dash]- -% [enumerate,description] &\textbullet & &\textbullet \\\tabucline[dash]- -% [itemize,description] &\textbullet &\textbullet &\textbullet \\\tabucline[dash]- -% [enumerate,itemize,description] &\textbullet &\textbullet &\textbullet \\\tabucline[dash]- +% [enumerate] &\textbullet & & \\\tabucline[\dash]- +% [itemize] &\textbullet &\textbullet & \\\tabucline[\dash]- +% [description] &\textbullet & &\textbullet \\\tabucline[\dash]- +% [enumerate,itemize] &\textbullet &\textbullet & \\\tabucline[\dash]- +% [enumerate,description] &\textbullet & &\textbullet \\\tabucline[\dash]- +% [itemize,description] &\textbullet &\textbullet &\textbullet \\\tabucline[\dash]- +% [enumerate,itemize,description] &\textbullet &\textbullet &\textbullet \\\tabucline[\dash]- % {\normalfont none of the above} &\textbullet &\textbullet &\textbullet \\\tabucline- % \end{tabu}} % @@ -948,7 +970,7 @@ Copyright (C) 2010 by Florent Chervet % is passed.}} % % -% \subsection[{If your are lost \cs{zeninfo} is your friend}]{If your are lost \csbf[\rred]{zeninfo} is your friend} +% \subsection[{If your are lost \cs{zeninfo} is your friend}]{If your are lost \csbf{zeninfo} is your friend} % \label{subsec:ifyouarelost} \label{subsec:zeninfo} % % \begin{declcs}{zeninfo}\M[info-key] @@ -1026,11 +1048,11 @@ Copyright (C) 2010 by Florent Chervet % \node [on chain,font=\bfseries] (beginenv) {\cs{begin}\M*{list environment}} % node [on chain] (H) {} % node [on chain=going right] (enit@@list) {% -% \begin{tabu}{X[-1]} set the standard keys stored into \cs{enit@@list}\\ set the automatic \textt{name} key without argument.\end{tabu}}; +% \begin{tabu}spread0pt {X[-1]} set the standard keys stored into \cs{enit@@list}\\ set the automatic \textt{name} key without argument.\end{tabu}}; % \draw [->] (beginenv) |- (enit@@list); % \node [on chain,join] (zen@autoname) {\cs{zen@autoname} (callback)} % node [on chain=going right,join,node distance=2cm] (zen@autonamedesc) {% -% \begin{tabu}\{{X[-1]}. \rowfont[c]{} saves:\\ \cs{zen@@priorlistname} \\ \cs{zen@@priorcommaref} \\ \cs{zen@@priorrefitem}\\ +% \begin{tabu}spread0pt \{{X[-1]}. \rowfont[c]{} saves:\\ \cs{zen@@priorlistname} \\ \cs{zen@@priorcommaref} \\ \cs{zen@@priorrefitem}\\ % \rowfont[c]{} defines: \\ \cs{zen@@grouplevel} \\ \cs{zen@@depth} \\ % \rowfont[c]{} overloads: \\ \cs{@trivlist} \end{tabu}}; % \node [yshift=-.5cm] (HH) at (zen@autonamedesc.south -| H) {}; @@ -1045,7 +1067,7 @@ Copyright (C) 2010 by Florent Chervet % \node (keyname) at (HH -| zen@autoname) {key \textt{name}}; % \chainin (keyname); % \draw [->] (userkeys) |- (keyname.west); -% \node (keynamecallback) at (keyname -| zen@autonamedesc.west) [anchor=west] {\begin{tabu}\{{X[-1]}. \rowfont[c]{} defines:\\ \cs{zen@@listname}\end{tabu}}; +% \node (keynamecallback) at (keyname -| zen@autonamedesc.west) [anchor=west] {\begin{tabu}spread0pt \{{X[-1]}. \rowfont[c]{} defines:\\ \cs{zen@@listname}\end{tabu}}; % \chainin (keynamecallback); % \draw [->] (keyname) -- (keynamecallback); % @@ -1058,7 +1080,7 @@ Copyright (C) 2010 by Florent Chervet % \node [on chain] (HH) {} node [on chain=going right] (expand zen@setupref) {expand \cs{zen@setupref}}; % \draw [->] (expand @trivlist) |- (expand zen@setupref); % \node [on chain=going right] {} -% node [on chain=going right,join= with expand zen@setupref] (zen@setuprefdesc) {\begin{tabu}\{{X[-1]}. +% node [on chain=going right,join= with expand zen@setupref] (zen@setuprefdesc) {\begin{tabu}spread0pt \{{X[-1]}. % overloads: \cs{makelabel}\\ % defines \cs{zen@refitem@fun}\footnotemark % \end{tabu}}; @@ -1071,7 +1093,7 @@ Copyright (C) 2010 by Florent Chervet % \node [on chain] (HH) {} node [on chain=going right] (zen@makeref) {\cs{zen@makeref}}; % \draw [->] (makelabel) |- (zen@makeref); % \node [on chain=going right,join] (zen@makerefdesc) {% -% \begin{tabu}\{{X[-1]X[-2]}. +% \begin{tabu}spread0pt \{{X[-1]X[-2]}. % \rowfont[c]{} defines: & \\ % \cs{zen@@ref} &\xpackage{zref} property (\cs{ref})\\ % \cs{zen@@starlabel} &\xpackage{zref} property (\cs{label\textasteriskcentered})\\ @@ -1088,7 +1110,7 @@ Copyright (C) 2010 by Florent Chervet % \chainin (HH); % \node [on chain] {} node [on chain=going right] (zen@labelize) {\cs{zen@labelize}}; % \draw [->] (HH) |- (zen@labelize); -% \node [on chain=going right,join] (zen@labelizedesc) {\begin{tabu}\{{X[-1]}. insert anchors\\ write \xpackage{zref} labels. \end{tabu}}; +% \node [on chain=going right,join] (zen@labelizedesc) {\begin{tabu}spread0pt \{{X[-1]}. insert anchors\\ write \xpackage{zref} labels. \end{tabu}}; % \node (HH) at (H |- zen@labelizedesc.south) {}; % \chainin (HH); % \node [on chain,join = with Hitem,font=\bfseries] (endenv) {\cs{end}\M*{list environment}}; @@ -1108,15 +1130,12 @@ Copyright (C) 2010 by Florent Chervet % % \subsection{Identification and requirements} % -% \begin{itemize}[leftmargin=*] -% \item \thispackage is intended to use with \LaTeX{} so we don't check if it is loaded twice. -% \item The package namespace is \texttbf{\db\string\zen@} -% \end{itemize} +% The package namespace is \texttbf{\db\string\zen@} % % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{enumitem-zref}[2010/12/30 v1.75 - Extended references for enumitem pkg] +\ProvidesPackage{enumitem-zref}[2011/02/18 v1.8 - Extended references for enumitem pkg] \RequirePackage{ltxcmds,etoolbox,kvoptions,gettitlestring,enumitem} \RequirePackage{zref}[2010/05/01] \RequirePackage{zref-user,zref-counter} @@ -2151,8 +2170,14 @@ Copyright (C) 2010 by Florent Chervet % \end{thebibliography} % % \setitemize{leftmargin=2em} +% \sectionformat\subsection{font=\normalsize\bfseries\pkgcolor} +% \bottomtitles=-1pt % \begin{History} % +% \begin{Version}{2011/02/18 v1.8}\HistLabel{v1.8} +% \item Documentation recompiled after \Xpackage{tabu} package v2.5 release. +% \end{Version} +% % \begin{Version}{2010/12/30 v1.75}\HistLabel{v1.75} % \item Bug fixed with empty items and nested lists. % \end{Version} @@ -2174,8 +2199,8 @@ Copyright (C) 2010 by Florent Chervet % \end{Version} % % \begin{Version}{2010/12/10 v1.2}\HistLabel{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 !! +% \item Bug encountered in \cs\zen@anchors@: \\ +% \cs\ifx\#1\cs\@nnil is not the same as \cs\ifx\cs\@nnil\#1\quad !! % \end{Version} % % \begin{Version}{2010/12/02 v1.1}\HistLabel{v1.1} @@ -2184,7 +2209,7 @@ Copyright (C) 2010 by Florent Chervet % % \end{History} % -% +% \clearpage % \PrintIndex % % \Finale \ No newline at end of file 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 bc73741341a..b9af4194c46 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/30 v1.75 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2011/02/18 v1.8 - 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/30 v1.75 - Extended references to items for enumitem package and hyperref} +\Msg{* Package: 2011/02/18 v1.8 - Extended references to items for enumitem package and hyperref} \Msg{************************************************************************} \keepsilent @@ -39,7 +39,7 @@ This is a generated file. -enumitem-zref : 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref +enumitem-zref : 2011/02/18 v1.8 - 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 diff --git a/Master/texmf-dist/tex/latex/enumitem-zref/enumitem-zref.sty b/Master/texmf-dist/tex/latex/enumitem-zref/enumitem-zref.sty index 2cf176ea714..bcae2a545c3 100644 --- a/Master/texmf-dist/tex/latex/enumitem-zref/enumitem-zref.sty +++ b/Master/texmf-dist/tex/latex/enumitem-zref/enumitem-zref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% enumitem-zref : 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2011/02/18 v1.8 - 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 @@ -25,7 +25,7 @@ %% Copyright (C) 2010 by Florent Chervet %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{enumitem-zref}[2010/12/30 v1.75 - Extended references for enumitem pkg] +\ProvidesPackage{enumitem-zref}[2011/02/18 v1.8 - Extended references for enumitem pkg] \RequirePackage{ltxcmds,etoolbox,kvoptions,gettitlestring,enumitem} \RequirePackage{zref}[2010/05/01] \RequirePackage{zref-user,zref-counter} -- cgit v1.2.3