summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-19 21:12:17 +0000
committerKarl Berry <karl@freefriends.org>2018-07-19 21:12:17 +0000
commit650a28baf6493c8072fcb2773ec4c814ce407982 (patch)
treea8003d7c98def6ba7f51c3549236d7c83c4c3c8c /Master/texmf-dist/source
parent9d62c82177b2936bda55d6f29d8bda256bf08ba7 (diff)
reledmac (19jul18)
git-svn-id: svn://tug.org/texlive/trunk@48229 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx5
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx30
2 files changed, 20 insertions, 15 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 71ae2b71bb0..c831474cc9c 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -513,6 +513,7 @@
% \changes{v2.26.10}{2018/05/05}{Really fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)}
% \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments}
% \changes{v2.26.11}{2018/05/21}{Allow to use \protect\cs{edtext} inside \protect\cs{sameword}}
+% \changes{v2.26.12}{2018/07/19}{Precise minimal version of xparse package required.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4191,7 +4192,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/05/21 v2.26.11 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/07/19 v2.26.12 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4334,7 +4335,7 @@
% Use \protect\package{suffix} to declare commands with a starred version, \protect\package{xstring} to work with strings, \protect\package{ifluatex} and \protect\package{ifxetex} to test if \LuaTeX\ or \XeTeX\ is running, and \protect\package{ragged2e} to manage ragged justification for paragraphed notes.
% \begin{macrocode}
\RequirePackage{xargs}
-\RequirePackage{xparse}%
+\RequirePackage{xparse}[2017/03/07]%
\RequirePackage{etoolbox}
\@ifl@t@r\fmtversion{2015/10/01}
{\ifboolexpr{not test{\@ifl@t@r\fmtversion{2016/03/31}} or (test{\ifdefstring{\fmtversion}{2016/03/31}} and test {\ifnumless{\patch@level}{3}})}%
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index b3e22744c7a..18c80baaeae 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -333,6 +333,7 @@
% \changes{v2.21.8}{2018/05/02}{Fix bug with critical footnotes line number when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.}
% \changes{v2.21.8}{2018/05/02}{Fix bug with marginal line number in parallel typesetting when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.}
% \changes{v2.21.8}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file}
+% \changes{v2.21.9}{2018/07/19}{Fix (little) bug when using \protect\package{calc} package.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -644,11 +645,14 @@
% with \cs{resumenumbering} or not; this is because numbering in the right
% column has not been started yet. Then, for consecutive chunks of
% right-column text you should use \cs{pausenumbering}~…\
-% \cs{resumenumbering}. The important thing to remember is that you have
-% to use \cs{endnumbering} in a right column before every
-% \cs{endnumbering} in single-column text or in parallel with
-% \cs{endnumbering} in a left-column text (the latter is the case when a
-% document or a section ends in a two-columns mode). Without this, you will
+% \cs{resumenumbering}.
+%
+% You must use \cs{endnumbering} in a right column in the following cases:
+% \begin{itemize}
+% \item there is also a \cs{endnumbering} in the left column, because the line numbering ends with a two columns mode (for ex. at the end of a document);
+% \item there will be a \cs{endnumbering} in a text after the columns, in a single column mode, because the ligne numbering finish with single column mode text.
+% \end{itemize}
+% Without this, you will
% get wrong numbering when a right column reappears next time.
%
% The file
@@ -717,7 +721,7 @@
% Synchronization of left and right texts in parallel processing
% requires some `numbered' auxiliary files to be written (namely \verb+.1+,
%\verb+.1R+, \verb+.2+, \verb+.2R+, and so forth), the content of which may change as long
-%as synchronization is not complete. This usually requires LaTeX to be
+%as synchronization is not complete. This usually requires \LaTeX\ to be
%run several times. Therefore, it is advised to use in conjunction
%utilities such as latexmk to ensure that synchronization is complete.
%
@@ -1378,7 +1382,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/05/02 v2.21.8 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/07/19 v2.21.9 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3381,13 +3385,13 @@
\get@familiarfootnote@number%
\fi%
\save@section@number%
- \setlength{\Lcolwidth}{\textwidth}%
- \setlength{\Rcolwidth}{\textwidth}%
+ \Lcolwidth=\textwidth%
+ \Rcolwidth=\textwidth%
}{%
\l@dpairingfalse
\l@dpagingfalse
- \global\setlength{\Lcolwidth@pages}{\Lcolwidth}%
- \global\setlength{\Rcolwidth@pages}{\Rcolwidth}%
+ \global\Lcolwidth@pages=\Lcolwidth%Does not use \setlength, in case of calc package redefiniton (cf. https://github.com/latex3/latex2e/issues/58)
+ \global\Rcolwidth@pages=\Rcolwidth%
}
% \end{macrocode}
@@ -6381,8 +6385,8 @@
% \changes{v2.3.0}{2015/09/05}{Fix a bug when calling \protect\cs{Columns} after a \protect\cs{Pages} (bug added in v1.13.0).}
% \changes{v2.17.2}{2017/04/06}{Fix a bug when changing \protect\cs{Lcolwitdth} and \protect\cs{Rcolwitdth} in \protect\env{pages} environment.}
% \begin{macrocode}
- \setlength{\Lcolwidth}{\Lcolwidth@pages}%
- \setlength{\Rcolwidth}{\Rcolwidth@pages}%
+ \Lcolwidth=\Lcolwidth@pages%
+ \Rcolwidth=\Rcolwidth@pages%
% \end{macrocode}
% \begin{macrocode}
\l@dzeropenalties%