From 900d0672938300c3a62139afa31a5325ac964da0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 May 2014 20:27:27 +0000 Subject: eledmac (2may14) git-svn-id: svn://tug.org/texlive/trunk@33795 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 895763 -> 896387 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 496032 -> 495952 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 58 +++++++++++++-------- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 5 +- 4 files changed, 39 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index 4c5eccde12f..c9945b9bc6c 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 da0bb476ee4..c37d691bda5 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 aba29fe5ea9..7b701d83de6 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{8906} +% \CheckSum{8915} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -179,14 +179,15 @@ % \changes{v1.6.1}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.} % \changes{v1.8.0}{2013/12/13}{Compatibility with parledgroup option of eledpar package.} % \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.8.3}{2014/02/03}{Fixes spurious spaces added 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}.} % \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}.} +% \changes{v1.10.6}{2014/05/01}{Debug of interaction between \cs{autopar} and\cs{pausenumbering}.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -282,7 +283,7 @@ % who would prefer % to use LaTeX. The principal functions provided by the package % are marginal line numbering and multiple series of -% footnotes and endnotes keyed to line numbers. +% foot- and endnotes keyed to line numbers. % % In addition to the \edmac, \tabmac{} and \edstanza{} functions the package % also provides for index entries keyed to both page and line numbers. @@ -1370,7 +1371,7 @@ % You can add some space after a note by using \cs{afternote}\oarg{s}\marg{l}. The default value is \verb|1em plus.4em minus.4em|. % % \DescribeMacro{\parafootsep} -% For paragraphed footnotes (see below), you can chooce the separator between each note by \cs{parafootsep}\oarg{s}\marg{l}. A common separator is double pipe (\verb+$||$+), which you can set by \cs{parafootsep}\verb+{$||$}+. +% For paragraphed footnotes (see below), you can chooce the separator between each note by \cs{parafootsep}\oarg{s}\marg{l}. A common separator is a double pipe (\verb+$||$+), which you can set by \cs{parafootsep}\verb+{$||$}+. % %\subsubsection{Options for block of notes} % \changes{v1.1}{2012/09/12}{New options for block of notes.} @@ -1814,9 +1815,9 @@ % An \cs{edlabel} command may appear in the main text, or in the % first argument of \cs{edtext}, but not in the apparatus itself. But % \cs{edpageref}, \cs{lineref}, \cs{sublineref}, \cs{pstartref} commands can also be used in -% the apparatus to refer to \cs{edlabel}'s in the text. +% the apparatus to refer to \cs{edlabel}s in the text. % -% The \cs{edlabel} command works by writing macros to the LaTeX +% The \cs{edlabel} command works by writing macros to LaTeX % \file{.aux} file. You will need to process % your document through LaTeX twice in order for the references to % be resolved. @@ -2019,13 +2020,13 @@ % \subsection{Position of the familiar footnotes} % \DescribeMacro{\fnpos}\DescribeMacro{\mpfnpos} % There is a historical incoherence in \Lpack{(e)ledmac}. The familiar footnotes are -% before the critical footnotes in a normal page, but after in a minipage or in a ledgroup. +% before the critical footnotes in a normal page, but after in a minipage or in a ledgroup. % However, it is possible to change the relative position of both types of footnotes. -% If you want to have familiar footnotes after critical in a normal page, use: +% If you want to have familiar footnotes after critical footnotes in a normal page, use: % \begin{verbatim} % \fnpos{critical-familiar} % \end{verbatim} -% In other way, if you want in a minipage or in a ledgroup to have critical footnotes after familiar, use: +% Or, if you want a minipage or ledgroup to have critical footnotes after familiar footnotes, use: % \begin{verbatim} % \mpfnpos{familiar-critical} % \end{verbatim} @@ -2364,7 +2365,7 @@ % % \changes{v1.8.0}{2013/12/13}{Add \cs{ledsecnolinenumber} option.} % If you use \Lpack{eledpar}, you must use these commands to have parallel sectioning. -% However, if you want not to have lineation for sectioning commands, use the \verb+ledsecnolinenumber+ option when loading eledmac. Or add \cs{ledsecnolinenumbertrue} in your preamble. +% However, if you don't want lineation in sectioning command, use the \verb+ledsecnolinenumber+ option when loading eledmac. Or add \cs{ledsecnolinenumbertrue} in your preamble. % \changes{v1.2}{2012/10/13}{Add \cs{ledsectnotoc} command.} % \DescribeMacro{\ledsectnotoc} % You can create a table of contents that indexes only the titles that appear on the left side of the edition: @@ -2583,16 +2584,16 @@ % \subsection{Parallel typesetting} % % -% Peter Wilson have developed the Ledpar package -% as an adjunct to \Eledmac{} specifically for parallel typesetting +% Peter Wilson has developed the Ledpar package +% as an extension to \Eledmac{} specifically for parallel typesetting % of critical texts. This also cooperates with the \Lpack{babel} -% package for typesetting in multiple languages. The package is called \emph{eledpar} since september 2012. +% package for typesetting in multiple languages. The package has been called \emph{eledpar} since September 2012. % He also developed % the \Lpack{ledarab} package for -% handling parallel arabic text in critical editions. -% Howerer, this package is not maintened by Maïeul Rouquette. -% You should use the possibility of modern TeX processor, like Xe(La)TeX +% handling parallel Arabic text in critical editions. +% However, this package is not maintened by Maïeul Rouquette. +% You should use the capabilities of a modern TeX processor, like Xe(La)TeX % % % @@ -2776,7 +2777,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/04/14 v1.10.5 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/05/01 v1.10.6 LaTeX port of EDMAC] % \end{macrocode} % % Generally, these are the modifications to the original. @@ -3447,6 +3448,7 @@ % behind these macros.} % \begin{macrocode} \newcommand{\pausenumbering}{% + \ifautopar\global\autopar@pausetrue\fi% \endnumbering\global\numberingtrue} % \end{macrocode} % The \cs{resumenumbering} macro is a bit more involved, but not much. @@ -3458,6 +3460,7 @@ % \begin{macrocode} \newcommand*{\resumenumbering}{% \ifnumbering + \ifautopar@pause\autopar\fi \global\pst@rtedLtrue \global\advance\section@num \@ne \led@mess@SectionContinued{\the\section@num}% @@ -3853,7 +3856,7 @@ % \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 +% \cs{xright@appenditem} creates global control sequences, like \cs{xdef}, and uses two % temporary token-list registers, \cs{@toksa} and \cs{@toksb}. % \begin{macrocode} \newtoks\led@toksa \newtoks\led@toksb @@ -5793,6 +5796,15 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\ifautopar@pause} +% We define a boolean test switched to true at the beginning +% of the \cs{pausenumbering} command if the autopar is enabled. +% This boolean will be tested at the begining of \cs{resumenumbering} +% to continue the autopar if neeeded. +% \begin{macrocode} +\newif\ifautopar@pause +% \end{macrocode} +% \end{macro} % \subsection{Processing one line} % % \begin{macro}{\do@line}\label{doline} @@ -7025,7 +7037,7 @@ % \end{macrocode} % One subtlety left here is when to print a period between % numbers. But the only instance in which this is tricky is for the -% ending sub-line number: it could be coming after the starting +% ending sub-line number: it could come after the starting % sub-line number (in which case we want only the dash) or after an % ending line number (in which case we need to insert a period). % \begin{macrocode} @@ -8672,7 +8684,7 @@ % \begin{macro}{\mpfnpos} % \begin{macro}{\@fnpos} % \begin{macro}{\@mpfnpos} -% The \cs{fnpos} and \cs{mpfnpos} just put their arguments in \cs{@fnpos} and \cs{@mpfnpos}, which will be used later in the output routine. +% The \cs{fnpos} and \cs{mpfnpos} simply place their arguments in \cs{@fnpos} and \cs{@mpfnpos}, which will be used later in the output routine. % \begin{macrocode} \def\@fnpos{familiar-critical} \def\@mpfnpos{critical-familiar} @@ -8904,7 +8916,7 @@ % \begin{macro}{\doendnotes} % \cs{doendnotes} is % the command you use to print one series of endnotes; it -% takes one argument, the series letter of the note series you want +% takes one argument: the series letter of the note series you want % to print. % \begin{macrocode} \newcommand*{\doendnotes}[1]{\l@dend@close @@ -8918,7 +8930,7 @@ % % \begin{macro}{\noendnotes} % You can say \cs{noendnotes} before the first -% \cs{beginnumbering} in your file if you aren't going to be using +% \cs{beginnumbering} in your file if if you will not use % any of the endnote commands: this will suppress the creation of % an \file{.end} file. If you do have some lingering endnote % commands in your file, diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 798b4a57a49..1030deafc0c 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/14 v1.10.5 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/05/01 v1.10.6 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -313,9 +313,11 @@ \fi \autoparfalse\ifl@dpairing\else\endgroup\fi} \newcommand{\pausenumbering}{% + \ifautopar\global\autopar@pausetrue\fi% \endnumbering\global\numberingtrue} \newcommand*{\resumenumbering}{% \ifnumbering + \ifautopar@pause\autopar\fi \global\pst@rtedLtrue \global\advance\section@num \@ne \led@mess@SectionContinued{\the\section@num}% @@ -1021,6 +1023,7 @@ \ignorespaces} \newcommand*{\normal@pars}{\everypar{}\let\par\endgraf} +\newif\ifautopar@pause \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} \newcommand*{\do@line}{% {\vbadness=10000 -- cgit v1.2.3