From 1687db0c95876f873933171806d34c64cc6aa9fe Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 Mar 2014 01:46:29 +0000 Subject: eledmac (3Mar) git-svn-id: svn://tug.org/texlive/trunk@33080 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 895688 -> 894695 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 494695 -> 494695 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 47 ++++++--------------- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 25 ++++------- 4 files changed, 22 insertions(+), 50 deletions(-) diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index 1e6b76a0d6d..b6b014b4d09 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf index 4545b82d762..a3460e1d2b3 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index ab968d596f0..32c5b4c96e2 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -51,7 +51,7 @@ % % \fi % -% \CheckSum{8900} +% \CheckSum{8888} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -181,6 +181,7 @@ % \changes{v1.8.2}{2014/01/31}{Debug compatibility problem with hebrew option of babel package.} % \changes{v1.8.3}{2014/02/03}{Fixes spurious spaces add by v1.7.0.} % \changes{v1.10.0}{2014/02/27}{Add \cs{pstartref} and \cs{xpstartref} to refer to a pstart number (extension of \cs{edlabel}).} +% \changes{v1.10.1}{2014/02/28}{Compatibility with \textsf{cleveref}.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -2770,7 +2771,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/02/27 v1.10.0 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/02/28 v1.10.1 LaTeX port of EDMAC] % \end{macrocode} % % Generally, these are the modifications to the original. @@ -3840,20 +3841,20 @@ % \end{macro} % % \begin{macro}{\xright@appenditem} -% \begin{macro}{\@toksa} -% \begin{macro}{\@toksb} +% \begin{macro}{\led@toksa} +% \begin{macro}{\led@toksb} % \cs{xright@appenditem} expands an item and appends it to the right % end of a list macro. We want the expansion because we'll often % be using this to store the current value of a counter. % It creates global control sequences, like \cs{xdef}, and uses two % temporary token-list registers, \cs{@toksa} and \cs{@toksb}. % \begin{macrocode} -\newtoks\@toksa \newtoks\@toksb -\global\@toksa={\\} +\newtoks\led@toksa \newtoks\led@toksb +\global\led@toksa={\\} \long\def\xright@appenditem#1\to#2{% - \global\@toksb=\expandafter{#2}% - \xdef#2{\the\@toksb\the\@toksa\expandafter{#1}}% - \global\@toksb={}} + \global\led@toksb=\expandafter{#2}% + \xdef#2{\the\led@toksb\the\led@toksa\expandafter{#1}}% + \global\led@toksb={}} % \end{macrocode} % \end{macro} % \end{macro} @@ -3865,9 +3866,9 @@ % \cs{xright@appenditem}. % \begin{macrocode} \long\def\xleft@appenditem#1\to#2{% - \global\@toksb=\expandafter{#2}% - \xdef#2{\the\@toksa\expandafter{#1}\the\@toksb}% - \global\@toksb={}} + \global\led@toksb=\expandafter{#2}% + \xdef#2{\the\led@toksa\expandafter{#1}\the\led@toksb}% + \global\led@toksb={}} % \end{macrocode} % \end{macro} % @@ -4413,28 +4414,6 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\@page} -% \cs{@page}\marg{num} marks the start of a new output page; its argument is -% the number of that page. -% -% First we reset the visible line numbers, if we're numbering by page, -% and store the page number itself in a count. -% \begin{macrocode} -\newcommand*{\@page}[1]{% - \ifbypage@ - \line@num \z@ \subline@num \z@ - \fi - \page@num=#1\relax -% \end{macrocode} -% -% And we set a flag that tells \cs{@l} that a new page number is -% to be set, because other associated actions shouldn't occur until the -% next line-start occurs. -% \begin{macrocode} - \def\next@page@num{#1}} - -% \end{macrocode} -% \end{macro} % % \begin{macro}{\last@page@num} % \begin{macro}{\fix@page} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 5c9afc4f016..a2e3eba9b58 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/02/27 v1.10.0 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/02/28 v1.10.1 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -463,16 +463,16 @@ \newcommand*{\list@create}[1]{\global\let#1=\empty} \newcommand*{\list@clear}[1]{\global\let#1=\empty} -\newtoks\@toksa \newtoks\@toksb -\global\@toksa={\\} +\newtoks\led@toksa \newtoks\led@toksb +\global\led@toksa={\\} \long\def\xright@appenditem#1\to#2{% - \global\@toksb=\expandafter{#2}% - \xdef#2{\the\@toksb\the\@toksa\expandafter{#1}}% - \global\@toksb={}} + \global\led@toksb=\expandafter{#2}% + \xdef#2{\the\led@toksb\the\led@toksa\expandafter{#1}}% + \global\led@toksb={}} \long\def\xleft@appenditem#1\to#2{% - \global\@toksb=\expandafter{#2}% - \xdef#2{\the\@toksa\expandafter{#1}\the\@toksb}% - \global\@toksb={}} + \global\led@toksb=\expandafter{#2}% + \xdef#2{\the\led@toksa\expandafter{#1}\the\led@toksb}% + \global\led@toksb={}} \def\gl@p#1\to#2{\expandafter\gl@poff#1\gl@poff#1#2} \long\def\gl@poff\\#1#2\gl@poff#3#4{\gdef#4{#1}\gdef#3{#2}} @@ -576,13 +576,6 @@ \fi \fi} -\newcommand*{\@page}[1]{% - \ifbypage@ - \line@num \z@ \subline@num \z@ - \fi - \page@num=#1\relax - \def\next@page@num{#1}} - \newcount\last@page@num \last@page@num=-10000 \newcommand*{\fix@page}[1]{% -- cgit v1.2.3