From 465138e07db1c80868bf80c3347004e12daedbc6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Dec 2010 23:40:57 +0000 Subject: enumitem-zref (30dec10) git-svn-id: svn://tug.org/texlive/trunk@20884 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/enumitem-zref/enumitem-zref.drv | 12 +-- .../source/latex/enumitem-zref/enumitem-zref.dtx | 110 ++++++++++++++++----- .../source/latex/enumitem-zref/enumitem-zref.ins | 6 +- 3 files changed, 94 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source/latex/enumitem-zref') 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 89d7bbfb90f..c02f9931c42 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/17 v1.5 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2010/12/30 v1.75 - 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/17} -\def\thisversion{1.5} +\def\thisdate{2010/12/30} +\def\thisversion{1.75} \PassOptionsToPackage{svgnames,dvipsnames}{xcolor} \PassOptionsToPackage{hyperfootnotes,verbose}{hyperref} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} @@ -39,10 +39,10 @@ \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etoolbox,geometry,lastpage,graphicx,xspace,fancyhdr,xcolor,bbding,lmodern,amsmath,relsize,manfnt} +\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[expansion=all,protrusion=all,shrink=30]{microtype} -\usepackage{interfaces}[2010/12/07] +\usepackage{interfaces}[2010/12/27] \usetikz{basic,chains} \usepackage{engrec,calc,marginnote,wasysym} \usepackage{holtxdoc,bookmark,hypbmsec} @@ -51,7 +51,7 @@ \csname endofdump\endcsname \CodelineNumbered \usepackage[greek]{enumitem-zref} -\usepackage[delarray]{tabu}[2010/12/07]\tracingtabu +\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 aec26a660cc..11164aa6a68 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/17 v1.5 - Extended references for enumitem pkg] +% enumitem-zref : 2010/12/30 v1.75 - 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/17 v1.5 - Extended references to items for enumitem package and hyperref} +\Msg{* Package: 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref} \Msg{************************************************************************} \keepsilent @@ -49,7 +49,7 @@ This is a generated file. -enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref +enumitem-zref : 2010/12/30 v1.75 - 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 %<*driver> \edef\thisfile{\jobname} \def\thisinfo{Extended references to items for enumitem package} -\def\thisdate{2010/12/17} -\def\thisversion{1.5} +\def\thisdate{2010/12/30} +\def\thisversion{1.75} \PassOptionsToPackage{svgnames,dvipsnames}{xcolor} \PassOptionsToPackage{hyperfootnotes,verbose}{hyperref} \def\CTANbaseurl{http://www.ctan.org/tex-archive/} @@ -115,10 +115,10 @@ Copyright (C) 2010 by Florent Chervet \usepackage[latin1]{inputenc} \usepackage[american]{babel} \usepackage[T1]{fontenc} -\usepackage{etoolbox,geometry,lastpage,graphicx,xspace,fancyhdr,xcolor,bbding,lmodern,amsmath,relsize,manfnt} +\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[expansion=all,protrusion=all,shrink=30]{microtype} -\usepackage{interfaces}[2010/12/07] +\usepackage{interfaces}[2010/12/27] \usetikz{basic,chains} \usepackage{engrec,calc,marginnote,wasysym} \usepackage{holtxdoc,bookmark,hypbmsec} @@ -127,9 +127,9 @@ Copyright (C) 2010 by Florent Chervet \csname endofdump\endcsname \CodelineNumbered \usepackage[greek]{enumitem-zref} -\usepackage[delarray]{tabu}[2010/12/07]\tracingtabu +\usepackage[delarray]{tabu}[2010/12/28]\tracingtabu=2 \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 % % \fi % -% \CheckSum{1700} +% \CheckSum{1718} % % \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 @@ -262,7 +262,7 @@ Copyright (C) 2010 by Florent Chervet % \begin{tabular}{|l|}^^A % \hline % \expandafter\SpecialUsageIndex\csname #2\endcsname -% \raisedhyperdef[8pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A +% \raisedhyperdef[12pt]{declcs}{#2}{\cs[{#1}]{#2}}^^A % }^^A % \renewcommand\enddeclcs{% % \crcr \hline @@ -327,7 +327,7 @@ Copyright (C) 2010 by Florent Chervet % top=.5\smallskipamount, % bottom=.5\smallskipamount, % left=-1cm, -% bookmark=italic, +% bookmark={color=RoyalBlue}, % } % % \newrobustcmd*\M{\@ifstar{\M@i\@firstofone}{\M@i\meta}} @@ -362,14 +362,14 @@ Copyright (C) 2010 by Florent Chervet % % \makeatother % -% \title{\vspace*{-28pt}\bfseries\thispackage\textsuperscript\textasteriskcentered} +% \title{\vspace*{-32pt}\bfseries\href{http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/enumitem-zref.html}{\HUGE\thispackage}\vspace*{8pt}} % \date{} -% \author{\small\thisdate~--~version \thisversion} -% \subtitle{\LARGE \thisinfo\endgraf {\small\FC}} +% \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}} % \maketitle % % \deffootnote{1em}{0pt}{\rlap{\thefootnotemark.}\kern1em} -% {\vspace*{-1cm}\let\quotation\relax\let\endquotation\relax +% {\vspace*{-1.3cm}\let\quotation\relax\let\endquotation\relax % \begin{abstract}\parskip\medskipamount\parindent0pt\lastlinefit0\leftskip.5cm\rightskip\leftskip % % \thispackage, as a companion package for \Xpackage{enumitem}, extends the references mechanism @@ -965,6 +965,50 @@ Copyright (C) 2010 by Florent Chervet % \end{tabu} % % With no argument, \cs{zeninfo} prints all these informations. +% \bigskip +% +% Example with the \xpackage{pifont} package: +% +% \begin{Verb*} +% \newcommand\@Ding[1]{\ding{\number\numexpr#1 + 171}} +% \newcommand\Ding[1]{\@Ding{\value{#1}}} +% \AddEnumerateCounter \Ding \@Ding {} +% +% \begin{enumerate}[label=\Ding*,name=dingList] +% \item One +% \item Two +% \item Three ($rred(\zeninfo)) +% \end{enumerate} +% \end{Verb*} +% +% {\makeatletter +% \newcommand\@Ding[1]{\ding{\number\numexpr#1+171}} +% \newcommand\Ding[1]{\@Ding{\value{#1}}} +% \AddEnumerateCounter\Ding\@Ding{} +% +% \begin{enumerate}[label=\Ding*,name=dingList] +% \item One +% \item Two +% \item Three \textcolor{ForestGreen}\zeninfo +% \end{enumerate} +% +% Now: +% +% {\centering +% \begin{tabu}{X[-1r]X[-1c]X[-1]} +% \cs[\rred]{refitem}\M*{dingList\M*{\cs{@Ding}\M*{3}}} & produces & \refitem{dingList{\@Ding{3}}} +% \end{tabu}\par} +% +% Note that for this purpose: +% \begin{itemize} +% \item \cs{@Ding} could be named differently (without \textt @). +% \item the \hyperref[commarefscheme]{\emph{commaref}} scheme is easier: \cs{refitem}\M*{dingList,3} gives \refitem{dingList,3}. +% \end{itemize} +% +% This example shows the output of \textcolor{ForestGreen}{\cs{zeninfo}}. +% +% } +% % % % @@ -1072,7 +1116,7 @@ Copyright (C) 2010 by Florent Chervet % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e}[2005/12/01] -\ProvidesPackage{enumitem-zref}[2010/12/17 v1.5 - Extended references for enumitem pkg] +\ProvidesPackage{enumitem-zref}[2010/12/30 v1.75 - Extended references for enumitem pkg] \RequirePackage{ltxcmds,etoolbox,kvoptions,gettitlestring,enumitem} \RequirePackage{zref}[2010/05/01] \RequirePackage{zref-user,zref-counter} @@ -1242,7 +1286,7 @@ Copyright (C) 2010 by Florent Chervet % % \begin{macrocode} \def\zen@box{\hfuzz\maxdimen \vfuzz\hfuzz \hbadness\@M \vbadness\hbadness - \tracinglostchars\z@ \setbox\z@=\vbox} + \tracinglostchars\z@ \everypar{}\setbox\z@=\vbox} % \end{macrocode} % \end{macro} % @@ -1307,8 +1351,10 @@ Copyright (C) 2010 by Florent Chervet \expandafter\zen@trailingspaces \GetTitleStringResult{\@nnil}\@nnil \fi \edef\x{\endgroup - \def\noexpand#2{\detokenize\expandafter{\GetTitleStringResult}}% - \def\noexpand\zen@temp {\detokenize\expandafter{\the\toks@}}% + \def\noexpand#2{\expandafter\zen@zap@doublespaces + \detokenize\expandafter{\GetTitleStringResult} \@empty}% + \def\noexpand\zen@temp {\expandafter\zen@zap@doublespaces + \detokenize\expandafter{\the\toks@} \@empty}% }\x }% \zen@Normalize \def\zen@trailingspaces#1#{\toks@{#1}\expandafter\zen@trailingsp@ces} @@ -1328,6 +1374,11 @@ Copyright (C) 2010 by Florent Chervet \let\relax \@empty \csname @safe@activestrue\endcsname }% \zen@NormalizeCommands +\def\zen@zap@doublespaces#1 #2{% + #1% + \ifx#2\@empty\else\space\expandafter\zen@zap@doublespaces\fi + #2% +}% \zen@zap@doublespaces % \end{macrocode} % \end{macro} % @@ -1912,7 +1963,7 @@ Copyright (C) 2010 by Florent Chervet \def\zen@refitemExternal[#1]#2{% \toks@{#1}\zen@Normalize\zen@lowercase\zen@@label {#2}% \edef\zen@ref@{\endgroup - \noexpand\hyperref{\the\toks@}{refitem}{\zen@@label}% + \noexpand\hyperref{\the\toks@}{refitem}{\zen@temp}% }\zen@ref@ }% \zen@Hy@external % \end{macrocode} @@ -2008,7 +2059,7 @@ Copyright (C) 2010 by Florent Chervet % % \begin{macrocode} \def\zen@item@comma{% - \begingroup \c@zenidx \@ne + \begingroup \c@zenidx \@ne %%\loggingall \@whilesw \ifcsname Z@R@zen>\the\c@zenidx\endcsname\fi {\advance\c@zenidx \@ne}% \@whilenum \c@zenidx>\@ne @@ -2102,7 +2153,16 @@ Copyright (C) 2010 by Florent Chervet % \setitemize{leftmargin=2em} % \begin{History} % -% \begin{Version}{2010/12/17 v1.5} +% \begin{Version}{2010/12/30 v1.75}\HistLabel{v1.75} +% \item Bug fixed with empty items and nested lists. +% \end{Version} +% +% \begin{Version}{2010/12/27 v1.7}\HistLabel{v1.7} +% \item Documentation improvement. +% \item No modification in the package file. +% \end{Version} +% +% \begin{Version}{2010/12/17 v1.5}\HistLabel{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 @@ -2113,12 +2173,12 @@ Copyright (C) 2010 by Florent Chervet % are automatically loaded \cs{AtBeginDocument} if the \xpackage{engrec} / \xpackage{greekctr} packages are detected. % \end{Version} % -% \begin{Version}{2010/12/10 v1.2} +% \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 !! % \end{Version} % -% \begin{Version}{2010/12/02 v1.1} +% \begin{Version}{2010/12/02 v1.1}\HistLabel{v1.1} % \item The first version. % \end{Version} % 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 9781459aaf4..bc73741341a 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/17 v1.5 - Extended references to items for enumitem package and hyperref +%% enumitem-zref : 2010/12/30 v1.75 - 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/17 v1.5 - Extended references to items for enumitem package and hyperref} +\Msg{* Package: 2010/12/30 v1.75 - Extended references to items for enumitem package and hyperref} \Msg{************************************************************************} \keepsilent @@ -39,7 +39,7 @@ This is a generated file. -enumitem-zref : 2010/12/17 v1.5 - Extended references to items for enumitem package and hyperref +enumitem-zref : 2010/12/30 v1.75 - 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 -- cgit v1.2.3