diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | bin | 894857 -> 895763 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | bin | 494695 -> 496032 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 27 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/eledmac/eledpar.dtx | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 22 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 14 | ||||
| -rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
7 files changed, 52 insertions, 30 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex 4cc0d40329e..4c5eccde12f 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf Binary files differindex 6adf5498abc..da0bb476ee4 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index 6aabfc17b44..aba29fe5ea9 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{8889} +% \CheckSum{8906} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -185,6 +185,8 @@ % \changes{v1.10.2}{2014/03/17}{Compatibility of stanza with v1.8a of babel-greek.} % \changes{v1.10.3}{2014/04/07}{Debug of cross-referencing.} % \changes{v1.10.4}{2014/04/09}{Debug of critical notes in edtabular environnment.} +% \changes{v1.10.5}{2014/04/14}{Debug of \cs{xxref}.} +% \changes{v1.10.5}{2014/04/14}{Debug of \cs{pausenumbering}.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -2774,7 +2776,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/04/09 v1.10.4 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/04/14 v1.10.5 LaTeX port of EDMAC] % \end{macrocode} % % Generally, these are the modifications to the original. @@ -3461,12 +3463,14 @@ \led@mess@SectionContinued{\the\section@num}% \line@list@stuff{\jobname.\extensionchars\the\section@num}% \l@dend@stuff + \begingroup \else \led@err@NumberingShouldHaveStarted \endnumbering \beginnumbering \fi} + % \end{macrocode} % \end{macro} % \end{macro} @@ -10139,12 +10143,19 @@ % semi-automatically. % \begin{macrocode} \newcommand*{\xxref}[2]{% - {\expandafter\ifx\csname the@label#1\endcsname - \relax \expandafter\let\csname the@label#1\endcsname\zz@@@\fi - \expandafter\ifx\csname the@label#2\endcsname \relax - \expandafter\let\csname the@label#2\endcsname\zz@@@\fi - \linenum{\csname the@label#1\endcsname|% - \csname the@label#2\endcsname}}} + {% + \expandafter\ifx\csname the@label#1\endcsname \relax% + \expandafter\let\csname the@@label#1\endcsname\zz@@@% + \else% + \expandafter\def\csname the@@label#1\endcsname{\l@dgetref@num{1}{#1}|\l@dgetref@num{2}{#1}|\l@dgetref@num{3}{#1}}% + \fi% + \expandafter\ifx\csname the@label#2\endcsname \relax% + \expandafter\let\csname the@@label#2\endcsname\zz@@@% + \else% + \expandafter\def\csname the@@label#2\endcsname{\l@dgetref@num{1}{#2}|\l@dgetref@num{2}{#2}|\l@dgetref@num{3}{#2}}% + \fi% + \linenum{\csname the@@label#1\endcsname|% + \csname the@@label#2\endcsname}}} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx index f1ab7dd8fbe..cfb74f23010 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx @@ -51,7 +51,7 @@ % % \fi % -% \CheckSum{4479} +% \CheckSum{4483} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -158,6 +158,7 @@ % \changes{v1.3.2}{2012/12/11}{Debug with some classes.} % \changes{v1.4.3}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.} % \changes{v1.5.0}{2013/11/08}{Add, as in eledmac, features to manage page breaks.} +% \changes{v1.7.0}{2014/04/14}{Add, as in eledmac, features to make crossrefs with pstart numbers.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -805,7 +806,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2013/12/13 v1.6.0 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2014/04/14 v1.7.0 eledmac extension for parallel texts] % \end{macrocode} % With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages. @@ -3356,7 +3357,7 @@ \advancelabel@refs \fi \protected@write\@auxout{}% - {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}% + {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}% \else \write\linenum@out{\string\@lab}% \ifx\labelref@list\empty @@ -3368,10 +3369,11 @@ \advancelabel@refs \fi \protected@write\@auxout{}% - {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}% + {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}% \fi \@esphack} + % \end{macrocode} % \end{macro} % @@ -3380,14 +3382,14 @@ % of \cs{Rlineflag}. % % \begin{macrocode} -\def\l@dmake@labelsR#1|#2|#3|#4{% - \expandafter\ifx\csname the@label#4\endcsname \relax\else +\def\l@dmake@labelsR#1|#2|#3|#4|#5{% + \expandafter\ifx\csname the@label#5\endcsname \relax\else \led@warn@DuplicateLabel{#4}% \fi - \expandafter\gdef\csname the@label#4\endcsname{#1|#2\Rlineflag|#3}% + \expandafter\gdef\csname the@label#5\endcsname{#1|#2\Rlineflag|#3|#4}% \ignorespaces} \AtBeginDocument{% - \def\l@dmake@labelsR#1|#2|#3|#4{}% + \def\l@dmake@labelsR#1|#2|#3|#4|#5{}% } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index a55ffe84fb3..798b4a57a49 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/04/09 v1.10.4 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/04/14 v1.10.5 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -321,6 +321,7 @@ \led@mess@SectionContinued{\the\section@num}% \line@list@stuff{\jobname.\extensionchars\the\section@num}% \l@dend@stuff + \begingroup \else \led@err@NumberingShouldHaveStarted \endnumbering @@ -2949,12 +2950,19 @@ \or #4% \fi} \newcommand*{\xxref}[2]{% - {\expandafter\ifx\csname the@label#1\endcsname - \relax \expandafter\let\csname the@label#1\endcsname\zz@@@\fi - \expandafter\ifx\csname the@label#2\endcsname \relax - \expandafter\let\csname the@label#2\endcsname\zz@@@\fi - \linenum{\csname the@label#1\endcsname|% - \csname the@label#2\endcsname}}} + {% + \expandafter\ifx\csname the@label#1\endcsname \relax% + \expandafter\let\csname the@@label#1\endcsname\zz@@@% + \else% + \expandafter\def\csname the@@label#1\endcsname{\l@dgetref@num{1}{#1}|\l@dgetref@num{2}{#1}|\l@dgetref@num{3}{#1}}% + \fi% + \expandafter\ifx\csname the@label#2\endcsname \relax% + \expandafter\let\csname the@@label#2\endcsname\zz@@@% + \else% + \expandafter\def\csname the@@label#2\endcsname{\l@dgetref@num{1}{#2}|\l@dgetref@num{2}{#2}|\l@dgetref@num{3}{#2}}% + \fi% + \linenum{\csname the@@label#1\endcsname|% + \csname the@@label#2\endcsname}}} \newcommand*{\edmakelabel}[2]{\expandafter\xdef\csname the@label#1\endcsname{#2}} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index d8b6334c180..60b80af8ceb 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2013/12/13 v1.6.0 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2014/04/14 v1.7.0 eledmac extension for parallel texts] \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -1379,7 +1379,7 @@ \advancelabel@refs \fi \protected@write\@auxout{}% - {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}% + {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}% \else \write\linenum@out{\string\@lab}% \ifx\labelref@list\empty @@ -1391,18 +1391,18 @@ \advancelabel@refs \fi \protected@write\@auxout{}% - {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}% + {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}% \fi \@esphack} -\def\l@dmake@labelsR#1|#2|#3|#4{% - \expandafter\ifx\csname the@label#4\endcsname \relax\else +\def\l@dmake@labelsR#1|#2|#3|#4|#5{% + \expandafter\ifx\csname the@label#5\endcsname \relax\else \led@warn@DuplicateLabel{#4}% \fi - \expandafter\gdef\csname the@label#4\endcsname{#1|#2\Rlineflag|#3}% + \expandafter\gdef\csname the@label#5\endcsname{#1|#2\Rlineflag|#3|#4}% \ignorespaces} \AtBeginDocument{% - \def\l@dmake@labelsR#1|#2|#3|#4{}% + \def\l@dmake@labelsR#1|#2|#3|#4|#5{}% } \renewcommand*{\@lab}{% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index e241c74ea6a..aca6979ab1a 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -866,6 +866,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'pstrees', "die 'skipping, obsolete (for latex 2.09)'", 'pstricks', "&MAKEpstricks", 'pstricks-add',"&MAKEpst", + 'pstricks-calcnotes', "die 'skipping, use pstricks_calcnotes'", 'ptsans', "die 'skipping, use paratype'", 'ptserif', "die 'skipping, use paratype'", 'punk', "&MAKEflatten", |