From 57fa39e8e43c41db225cdcca3e3a5e809e75219a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 May 2018 21:06:33 +0000 Subject: reledmac (3may18) git-svn-id: svn://tug.org/texlive/trunk@47602 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 108 +++++++++++---------- .../texmf-dist/source/latex/reledmac/reledmac.ins | 1 + .../texmf-dist/source/latex/reledmac/reledpar.dtx | 25 +++-- .../texmf-dist/source/latex/reledmac/reledpar.ins | 1 + 4 files changed, 77 insertions(+), 58 deletions(-) (limited to 'Master/texmf-dist/source/latex/reledmac') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index f3c65c9ec31..a0d7c036ace 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -506,6 +506,10 @@ % \changes{v2.26.5}{2018/01/28}{Fix bug with \protect\option{continuousnumberingwithcolumns}} % \changes{v2.26.6}{2018/02/28}{Fix bug with \protect\cs{lineation} by page and nexted \protect\cs{edtext} between two pages (added in v.~2.24.0)} % \changes{v2.26.7}{2018/04/07}{Fix page number in footnote and endnotes when using \protect\option{sameparallelpagenumber} option of \protect\parpackage and typesetting critical text in single mode after critical text in double page mode} +% \changes{v2.26.8}{2018/04/30}{Fix bug in some specific cases, introduced by v.2.27.7} +% \changes{v2.26.9}{2018/05/02}{Fix bug with critical footnotes line number when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.} +% \changes{v2.26.9}{2018/05/02}{Fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)} +% \changes{v2.26.9}{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} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -737,10 +741,10 @@ % % \subsection{Bibliography} % A collaborative list of works edited with (r)(e)(ledmac is available at -% \url{https://www.zotero.org/groups/critical_editions_typeset_with_edmac_ledmac_and_eledmac/items}. +% \url{https://www.zotero.org/groups/209265/critical_editions_typeset_with_edmac_ledmac_eledmac_and_reledmac/}. % Please add your own edition made with (r)(e)ledmac. % -% If you write book or article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/articles_and_books_about_reledmac/items}. +% If you write book or article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/1024519/}. % \section{How the package works --- the problem of the number of \LaTeX\ runs}\label{howto} % The \macpackage package is a three-pass package like \LaTeX\ itself. % Although your textual apparatus and line @@ -2956,7 +2960,7 @@ % \item It is printed alongside the line number in the margin. % \item It is printed following the line number in critical footnotes and endnotes. % \item And of particular interest: the annotation is printed in the critical note \emph{only} when the \cs{edtext} is issued after the \cs{linenumannotation}. -% \item If two or more annotations are called before na \cs{edtext}, the last one is used in associated notes. +% \item If two or more annotations are called before an \cs{edtext}, the last one is used in associated notes. % \item If an annotation is called within an \cs{edtext}, it is printed as an annotation for the end of the lemma. % \end{itemize} % Here is an example, supposing we are on line 1: @@ -4184,7 +4188,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/04/07 v2.26.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/05/02 v2.26.9 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5132,8 +5136,8 @@ \led@err@NumberingWithoutPstart% \fi% % \end{macrocode} -% For the continuousnumberingwithcolumn options, we need to store some value globally, for the next \cs{endnumbering}. -% We didn't modify this counter globally, because that creates problem for nested \cs{edtext}. +% For the continuousnumberingwithcolumn options, we need to store a global value for the next \cs{endnumbering}. +% We don't modify this counter globally, because that creates problem for nested \cs{edtext}. % \begin{macrocode} \global\page@num=\this@section@page@num% \global\last@page@num=\this@section@last@page@num% @@ -6023,7 +6027,7 @@ % \end{macro} % \end{macro} % \begin{macro}{\this@section@page@num} -% The \cs{this@section@page@num} stores the page number of the on which a numbering section finish. +% The \cs{this@section@page@num} stores the page number on which a numbering section ends. % \begin{macrocode} \newcount\this@section@page@num% % \end{macrocode} @@ -7138,47 +7142,49 @@ % \label{new@line@pagecounting} % It writes the two forms of the page number: % \begin{itemize} -% \item Raw form (\cs{the}\cs{c@page}, which can be used to make numeric test. +% \item Raw form (\cs{the}\cs{c@page}, which can be used for numeric tests. % \item Formatted form (for example, in Roman). % \end{itemize} -% Actually, only the first form is effectivly used by \cs{@nl}. +% Actually, only the first form is used by \cs{@nl}. % If we use the \cs{sameparallelpagenumber} option of \parpackage, we must write not the real page number (i.e. \verb+page+ counter, defined in standard \LaTeX) but the printed page number (i.e \verb+par@page+ counter, defined only on \macpackage). % \begin{itemize} -% \item For the raw form, we use \cs{the}\cs{c@page@page} macro, because the \verb+{par@page}+ couter is increased at each page. +% \item For the raw form, we use \cs{the}\cs{c@page@page} macro, because the \verb+{par@page}+ counter is increased for each page. % \item For the formatted version, \cs{thepage} is patched through \cs{par@patch@thepage}. So we have nothing to change. % \end{itemize} % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers} % \begin{macrocode} \newcommand*{\new@line}{% - \IfStrEq{\led@pb@setting}{after}% - {\xifinlist{\the\absline@num}{\l@prev@nopb}% - {\xifinlist{\the\absline@num}{\normal@page@break}% - {\numgdef{\@next@page}{\c@par@page+\@ne}% - \write\linenum@out{\string\@nl[\@next@page][\@next@page]}% - }% - {\write\linenum@out{\string\@nl[\the\@c@par@page][\thepage]}}% - }% - {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}% - {}% - \IfStrEq{\led@pb@setting}{before}% - {\numdef{\next@absline}{\the\absline@num+\@ne}% - \xifinlist{\next@absline}{\l@prev@nopb}% - {\xifinlist{\the\absline@num}{\normal@page@break}% - {\numgdef{\nc@page}{\c@par@page+\@ne}% - \write\linenum@out{\string\@nl[\nc@page][\nc@page]}% + \ifnumberline% + \IfStrEq{\led@pb@setting}{after}% + {\xifinlist{\the\absline@num}{\l@prev@nopb}% + {\xifinlist{\the\absline@num}{\normal@page@break}% + {\numgdef{\@next@page}{\c@par@page+\@ne}% + \write\linenum@out{\string\@nl[\@next@page][\@next@page]}% }% - {\write\linenum@out{\string\@nl[\the\@c@par@page][\thepage]}}% + {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}% }% - {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}% - }% + {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}% {}% - \IfStrEqCase{\led@pb@setting}% - {% - {before}{\relax}% - {after}{\relax}% - }[% - \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}% - ]% + \IfStrEq{\led@pb@setting}{before}% + {\numdef{\next@absline}{\the\absline@num+\@ne}% + \xifinlist{\next@absline}{\l@prev@nopb}% + {\xifinlist{\the\absline@num}{\normal@page@break}% + {\numgdef{\nc@page}{\c@par@page+\@ne}% + \write\linenum@out{\string\@nl[\nc@page][\nc@page]}% + }% + {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}% + }% + {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}% + }% + {}% + \IfStrEqCase{\led@pb@setting}% + {% + {before}{\relax}% + {after}{\relax}% + }[% + \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}% + ]% + \fi% } \newcommand{\l@the@c@page}{% @@ -8437,7 +8443,7 @@ % \begin{macro}{\pstarts@typeset@L} % \begin{macro}{\pstarts@read@L} % The \cs{pstarts@typeset@L} counts the number of LEFT \cs{pstart} typeset. -% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}). +% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}). % In the first case, its value is increased at every \cs{pstart} command. % In the second case, its value is increased in \cs{Columns} or \cs{Pages} when we prepare to typeset a left \cs{pstart}. % The \cs{pstarts@readL} counts the number of LEFT \cs{pstart} read. @@ -8748,7 +8754,7 @@ % \protect\cs{pstart}, restoring the indentation that we saved, and % locally change \protect\cs{par} so that it will do our \protect\cs{pend} for us. % -% The boolean \cs{ifautopar} is set to TRUE while \cs{autopar} is enabled, and the \cs{ifby@autopar} is set to TRUE at each \cs{pstart} automatically called by \cs{autopar} feature. A manually \cs{pstart} will have a \cs{ifby@autopar} set to false. +% The boolean \cs{ifautopar} is set to TRUE while \cs{autopar} is enabled, and the \cs{ifby@autopar} is set to TRUE at each \cs{pstart} automatically called by the \cs{autopar} feature. A manual \cs{pstart} will have a \cs{ifby@autopar} set to FALSE. % % \begin{macrocode} \newif\ifautopar @@ -8809,7 +8815,7 @@ % do all the processing for a single line of text. % \changes{v1.6.1}{2013/10/27}{Move the call to \protect\cs{inserthangingsymbol} to allow use \protect\cs{hfill} inside.} % \changes{v1.12.2}{2014/08/07}{Fix a bug with critical notes at the tops of pages (added by v12.0.0)} -% The \cs{l@dunhbox@line} macro only \cs{unhbox} one lines, but some package as \cs{microtype} can override it for custom needs. +% The \cs{l@dunhbox@line} macro only \cs{unhbox}es one line, but packages like \cs{microtype} can override it as required. % % \begin{macrocode} \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} @@ -9294,8 +9300,8 @@ % \subsection{Continuous line numbering between parallel typesetting and normal typesetting} % \begin{macro}{\continuousnumberingwithcolumns@sync@linenumber@singletext} % The \option{continuousnumberingwithcolumns} -% option allows to alternate between single text and two parallels texts, keeping same line numbers when switching from one layout to the other one. -% The lines counter for the text in a single column and for the text in the text in the left column in parallel typesetting is the same. +% option allows to alternate between single text and two parallel texts, keeping the same line numbers when switching from one layout to the other. +% The lines counter for the text in a single column and for the text in the left column in parallel typesetting is the same. % But the lines counter for the text in the same column is the not the same. % % When typesetting single column text, if the option is enabled, we need to \enquote{simulate} typesetting right line, in order to keep the two counters synchronized. @@ -15106,8 +15112,8 @@ % It should provides better compatibility with other package which modify these commands % -% \begin{macro}{\doxtrafeet} -% \protect\cs{doxtrafeet} is the code extending \protect\cs{@makecol} to cater for +% \begin{macro}{\l@ddoxtrafeet} +% \protect\cs{l@ddoxtrafeet} is the code extending \protect\cs{@makecol} to cater for % the extra \macpackage\ feet. We have two categories of extra footnotes. % By default, we order the footnote inserts so that the regular footnotes of \LaTeX\ are first, % then familiar familiar footnotes and finally @@ -15438,16 +15444,16 @@ % \end{macro} % % \section{Page numbering in parallel typsetting} -% The \parpackage\ package has two options which change the way the page numbering works. -% We need to implement these options on \macpackage and not on \parpackage because they have some consequences on the \macpackage auxiliaries files (numbered file see~\reff{new@line@pagecounting}). -% The \verb+sameparallelpagenumber+ option allows the same page number on both left and right side +% The \parpackage\ package has two options which change the way page numbering works. +% We need to implement these options on \macpackage and not on \parpackage because they have some consequences for the \macpackage auxiliary files (numbered file; see~\reff{new@line@pagecounting}). +% The \verb+sameparallelpagenumber+ option allows the same page number on both left and right side % The \verb+prevpgnotnumbered+ option allows an empty (not numbered) right-side page before \cs{Pages}. % % -% We cannot implement these two options by changing the value of the \verb|page| counter, since its value is used by many \LaTeX\ features to determine whether a page is left (even-numbered) or right (odd-numbered). -% Consequently, we have to do it by patching \cs{thepage}, in order to use the value of the \verb+par@page+ counter instead of value of \verb+page+ counter. +% We cannot implement these two options by changing the value of the \verb|page| counter, since its value is used by many \LaTeX\ features to determine whether a page is left (even numbered) or right (odd numbered). +% Consequently, we have to do it by patching \cs{thepage}, in order to use the value of the \verb+par@page+ counter instead of the value of the \verb+page+ counter. % -% This counter will be increased in a patched version of the \LaTeX's \protect\cs{@outputpage} macro, as is the \verb+page+ counter in this macro. However, this increase will take account of the options. +% This counter will be increased in a patched version of \LaTeX's \protect\cs{@outputpage} macro, as is the \verb+page+ counter in this macro. However, this increase will take account of the options. % % @@ -15458,7 +15464,7 @@ % It must be called after any redefinition of \cs{thepage}. % That is why we insert it at the end of the \LaTeX\ macro \cs{pagenumbering}, which is called by some \cs{xxxmatter} commands. % In cases when we are using the \ltxclass{memoir} class, we insert it at the end of \cs{@mempnum}. -% When using \cs{pagenumbering}, we also need to restart \verb+par@page+ counter. Consequently, we have wrapped \cs{par@patch@thepage} and counter restart in \cs{par@patch@pagenumbering} +% When using \cs{pagenumbering}, we also need to reset the \verb+par@page+ counter. Consequently, we put \cs{par@patch@thepage} and counter reset in \cs{par@patch@pagenumbering} % We also call \cs{par@patch@thepage} at the beginning of the document. % \begin{macrocode} @@ -15505,7 +15511,7 @@ % \end{macro} % \end{macro} % \begin{macro}{\@outputpage} -% As its name says, \cs{@outputpage} is a \LaTeX's macro called in the output routine. It is this macro which increases the \verb+page+ counter. +% As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter. % We patch it in order to increase, conditionally, the \verb+par@page+ counter. % \begin{macrocode} \AtBeginDocument{% diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.ins b/Master/texmf-dist/source/latex/reledmac/reledmac.ins index 1e3e9e767ed..58b18de39a0 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.ins +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.ins @@ -25,6 +25,7 @@ %% \def\batchfile{reledmac.ins} \input docstrip.tex +\csname UseRawInputEncoding\endcsname \preamble Author: Author: Peter Wilson ; Herries Press herries dot press at earthlink dot net ; Maïeul Rouquette maieul at maieul dot net diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index d57cbcb22af..b3e22744c7a 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -330,6 +330,9 @@ % \changes{v2.21.5}{2018/02/28}{Compatibility with reledmac v.~2.26.6} % \changes{v2.21.6}{2018/04/06}{Fix page number in footnote and endnotes when using \protect\option{sameparallelpagenumber} option} % \changes{v2.21.7}{2018/04/07}{Compatibility with \protect\macpackage 2.26.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} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1375,7 +1378,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/04/07 v2.21.7 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/05/02 v2.21.8 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1475,7 +1478,7 @@ % \end{macrocode} % \end{macro} % Options related to page numbering. -% The boolean are defined in \macpackage. +% The booleans are defined in \macpackage. % \begin{macrocode} \DeclareOptionX{sameparallelpagenumber}{\sameparallelpagenumbertrue} \DeclareOptionX{prevpgnotnumbered}{\prevpgnotnumberedtrue} @@ -2588,8 +2591,8 @@ % \begin{macro}{\last@page@numR} % \begin{macro}{\this@section@last@page@numR} % \begin{macro}{\fix@page} -% \protect\cs{last@page@numR} store the page number of the last right page. -% \protect\cs{this@section@last@page@numR} store the page number of the last right page of the current section. Is value is modified globally, contrary to \cs{last@page@numR}. +% \protect\cs{last@page@numR} holds the page number of the last right page. +% \protect\cs{this@section@last@page@numR} holds the page number of the last right page of the current section. Its value is modified globally, contrary to \cs{last@page@numR}. % Both are modified by \protect\cs{fix@page}, defined by \reledmac. % % \changes{v2.0.0}{2105/06/28}{\protect\cs{fix@page} is defined only once in \reledmac} @@ -2990,7 +2993,9 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineL}{% - \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}% + \ifnumberline% + \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}% + \fi% }% % \end{macrocode} % \end{macro} @@ -2999,7 +3004,9 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineR}{% - \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}% + \ifnumberline% + \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}% + \fi% }% % \end{macrocode} % \end{macro} @@ -3275,7 +3282,7 @@ % While in \macpackage the footnotes are inserted at the same time as the \protect\cs{pstart}\ldots\protect\cs{pend} are read, in \parpackage they are inserted when the \protect\cs{Columns} or \protect\cs{Pages} commands are called. % Consequently, if we do nothing, the value of the \verb+PstartL+ and \verb+PstartR+ counters are not the same in the main text and in the notes. % To solve this problem, we dump the values in two list (one by side) when processing \protect\cs{pstart} and restore these at each \protect\cs{pstart} when calling \protect\cs{Columns} or \protect\cs{Pages}. -% We also dump and restore the value of the boolean \protect\cs{ifnumberpstart}. +% We also dump and restore the value of the booleans \protect\cs{ifnumberpstart} and \protect\cs{ifnumberline}. % So, first step, creating the lists. % Here, ``pc'' means ``public counters''. @@ -3296,11 +3303,13 @@ \def\dump@pstartL@pc{% \xright@appenditem{\the\c@pstartL}\to\list@pstartL@pc% \global\cslet{numberpstart@L\the\l@dnumpstartsL}{\ifnumberpstart}% + \global\cslet{numberline@L\the\l@dnumpstartsL}{\ifnumberline}% }% \def\dump@pstartR@pc{% \xright@appenditem{\the\c@pstartR}\to\list@pstartR@pc% \global\cslet{numberpstart@R\the\l@dnumpstartsR}{\ifnumberpstart}% + \global\cslet{numberline@R\the\l@dnumpstartsR}{\ifnumberline}% }% % \end{macrocode} @@ -3946,6 +3955,7 @@ % \begin{macrocode} \newcommand*{\do@lineL}{% \letcs{\ifnumberpstart}{numberpstart@L\the\l@dpscL}% + \letcs{\ifnumberline}{numberline@L\the\l@dpscL}% \advance\countLline \@ne% \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% {\vbadness=10000% @@ -4135,6 +4145,7 @@ \let\linenumrep\linenumrepR% \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% + \letcs{\ifnumberline}{numberline@R\the\l@dpscR}% \ledRcol@true% \advance\countRline \@ne% \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.ins b/Master/texmf-dist/source/latex/reledmac/reledpar.ins index f280f1ec0e4..30ed3d33863 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.ins +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.ins @@ -25,6 +25,7 @@ %% \def\batchfile{reledpar.ins} \input docstrip.tex +\csname UseRawInputEncoding\endcsname \preamble Author: Author: Peter Wilson ; Herries Press herries dot press at earthlink dot net ; Maïeul Rouquette maieul at maieul dot net -- cgit v1.2.3