texlive[41599] Master/texmf-dist: reledmac (1jul16)
commits+karl at tug.org
commits+karl at tug.org
Sat Jul 2 00:05:01 CEST 2016
Revision: 41599
http://tug.org/svn/texlive?view=revision&revision=41599
Author: karl
Date: 2016-07-02 00:05:01 +0200 (Sat, 02 Jul 2016)
Log Message:
-----------
reledmac (1jul16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx 2016-07-01 22:04:36 UTC (rev 41598)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx 2016-07-01 22:05:01 UTC (rev 41599)
@@ -399,7 +399,7 @@
% \subsection{Migration to \reledmac~2.8.0}
% \Reledmac~2.8.0 fix spurious indents for paragraphed critical and familiar footnotes in \env{ledgroup} and \ledgroup{minipage}. You can re-establish the indent with \cs{Xparinden} and \cs{parindentX}.
% \subsection{Migration to \reledmac~2.13.1}
-% \Reledmac~2.5.0 added a bug, which makes the right flag be printed in right side critical footnotes, even if not explicitly asked by using \cs{Xlineflag}.
+% \Reledmac~2.5.0 added a bug, which makes the right flag to be printed on the right side of critical footnotes, even if not explicitly requested by using \cs{Xlineflag}.
%
-% The version 2.13.1 solves this issue. Please use \cs{Xlineflag} if you want to add the right flag.
+% Version 2.13.1 solves this issue. Please use \cs{Xlineflag} if you want to add the right flag.
%
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-07-01 22:04:36 UTC (rev 41598)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-07-01 22:05:01 UTC (rev 41599)
@@ -415,10 +415,12 @@
% \changes{v2.12.0}{2016/06/16}{More accurate message to control the position of \protect\cs{Xfootnote} and \protect\cs{applabel} in the \protect\LaTeX\ code}
% \changes{v2.12.0}{2016/06/16}{Fix bug in critical and familiar footnotes when using uppercase letters with accent mark}
% \changes{v2.12.0}{2016/06/16}{Make endnote compatible with \protect\cs{sameword} mechanism}
-% \changes{v2.13.0}{2016/06/18}{The version 2.13.0 never existed.}
-% \changes{v2.13.1}{2016/06/18}{In critical footnotes, the right side flag is printed only if asked explicitly with \protect\cs{Xlineflag} (bug added in v.~2.5.0).}
-% \changes{v2.13.2}{2016/06/24}{Fix bug added in v.~11.2 which makes parallel typesetting could not work.}
+% \changes{v2.13.0}{2016/06/18}{Version 2.13.0 never existed.}
+% \changes{v2.13.1}{2016/06/18}{In critical footnotes, the right side flag is printed only if requested explicitly with \protect\cs{Xlineflag} (bug added in v.~2.5.0).}
+% \changes{v2.13.2}{2016/06/24}{Fix bug added in v.~11.2 which could make parallel typesetting not work.}
% \changes{v2.13.3}{2016/06/28}{Makes \protect\cs{Xendafterpagenumbe} affecting \protect\cs{SErefwithpage}}
+% \changes{v2.14.0}{2016/07/01}{Hyperref with the line number inside critical footnotes is correct when using \protect\cs{xxref}}
+% \changes{v2.14.0}{2016/07/01}{Some internal changes for new features of \protect\reledpar.}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -2706,7 +2708,9 @@
% The \protect\cs{xxref}\marg{lab1}\marg{lab2} command generates a reference to a sequence of
% lines, for use in the second argument of \protect\cs{edtext}.
% It takes two arguments, both of which are
-% labels: e.g., \verb"\xxref{mouse}{elephant}". It calls \protect\cs{linenum}
+% labels: e.g., \verb"\xxref{mouse}{elephant}".
+%
+% It automatically calls \protect\cs{linenum}
% (q.v., \reff{linenum} above) and sets the beginning page,
% line and subline numbers to those of the place where
% \verb"\edlabel{mouse}" was placed, and the ending numbers to those where
@@ -3679,7 +3683,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/06/28 v2.13.3 typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/07/01 v2.14.0 typeset critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4791,17 +4795,17 @@
\else
\def\@tempb{section}
\ifx\@tempa\@tempb
- \global\bypage at false
- \global\bypstart at false
- \unless\ifnocritical@%
- \Xpstart[][false]%
- \fi%
+ \global\bypage at false
+ \global\bypstart at false
+ \unless\ifnocritical@%
+ \Xpstart[][false]%
+ \fi%
% \end{macrocode}
% In other case, it is an error.
% \begin{macrocode}
- \else
+ \else
\led at warn@BadLineation
- \fi
+ \fi
\fi
\fi
\fi}}
@@ -6264,10 +6268,24 @@
\the\endpage at num|\the\endline at num|%
\ifsublines@ \the\endsubline at num \else 0\fi}\to\line at list
% \end{macrocode}
-% Create a list which stores every second argument of each \protect\cs{@sw}
+% And now, call \cs{@ref at reg@parsearg}, which can be also called by \cs{@ref at later}
+% \begin{macrocode}
+ \@ref at reg@parse{#2}%
+% \end{macrocode}
+% Decrease edtext level counter.
+% \begin{macrocode}
+ \global\advance\@edtext at level by -1%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@ref at reg@parse}%
+% The \cs{@ref at reg@parsearg} command parses the second argument of a \cs{@ref} or the unique argument of \cs{@ref at later} written in the auxiliary fill.
+%
+% First, create a list which stores every second argument of each \protect\cs{@sw}
% in this lemma, at this level.
% Also set the boolean about the use of lemma in this edtext level to false.
% \begin{macrocode}
+\newcommand{\@ref at reg@parse}[1]{%
\expandafter\list at create\expandafter{\csname sw at list@edtext at tmp@\the\@edtext at level\endcsname}%
\providebool{lemmacommand@\the\@edtext at level}%
\boolfalse{lemmacommand@\the\@edtext at level}%
@@ -6275,7 +6293,7 @@
% Execute the second argument of \protect\cs{@ref} again,
% to perform for real all the commands within it.
% \begin{macrocode}
- #2%
+ #1%
% \end{macrocode}
% Now, we store the list of \protect\cs{@sw} of this current \protect\cs{edtext} as an element of
% the global list of list of \protect\cs{@sw} for a \protect\cs{edtext} depth.
@@ -6289,11 +6307,7 @@
\global\cslet{sw at list@edtext@\the\@edtext at level}{\@tmp}%
\fi%
% \end{macrocode}
-% Decrease edtext level counter.
% \begin{macrocode}
- \global\advance\@edtext at level by -1%
-% \end{macrocode}
-% \begin{macrocode}
}
% \end{macrocode}
@@ -6300,7 +6314,21 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \begin{macro}{\ref at reg@later}
+% This macro is stored in the auxiliary file when using \cs{edtextlater}.
+% It is used only to get the correct value for the \cs{sameword} tools.
+% \begin{macrocode}
+\newcommand{\@ref at later}[1]{%
+ \global\advance\@edtext at level by \@ne%
+ \ifledRcol%
+ \@ref at reg@parseR{#1}%
+ \else%
+ \@ref at reg@parse{#1}%
+ \fi%
+ \global\advance\@edtext at level by -\@ne%
+}%
+% \end{macrocode}
+% \end{macro}
% \subsection{Writing to the line-list file}
%
% We have now defined all the counters, lists, and commands involved in
@@ -6475,11 +6503,40 @@
\fi%
\fi}%
+\newcommand*{\flag at end}{%
+ \ifledRcol%
+ \write\linenum at outR{]}%
+ \else%
+ \write\linenum at out{]}%
+ \fi}%
+
+
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \begin{macro}{\flag at start@later}
+% \begin{macro}{\flag at end@later}
+% \protect\cs{flag at start@later} and \protect\cs{flag at end@later}: these send the\cs{@ref at later} to the line-list file
+% command to the line-list file
+% \begin{macrocode}
+\newcommand*{\flag at start@later}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\@ref at later[}%
+ \else%
+ \write\linenum at out{\string\@ref at later[}%
+ \fi%
+}%
+\newcommand{\flag at end@later}{%
+ \ifledRcol%
+ \write\linenum at outR{]}%
+ \else%
+ \write\linenum at out{]}%
+ \fi%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\startsub}
% \begin{macro}{\endsub}
% \changes{v1.15.0}{2015/01/12}{Restore subline feature (disabled by mistake in v1.8.0).}
@@ -7031,8 +7088,12 @@
\global\advance\@edtext at level by -1%
\global\@lemmacommand at false%
% \end{macrocode}
+% We also reset \cs{@beforeinsertofthisedtext}
+% \begin{macrocode}
+ \global\let\@beforeinsertofthisedtext\relax%
+% \end{macrocode}
% If we are outside of a numbered paragraph,
-% we send error message and print the first argument.
+% we send an error message and print the first argument.
% \begin{macrocode}
\else%
\showlemma{#1} (\textbf{\textsc{Edtext outside numbered paragraph}})\led at err@edtextoutsidepstart%
@@ -7039,17 +7100,18 @@
\fi%
}%
-\newcommand*{\flag at end}{%
- \ifledRcol%
- \write\linenum at outR{]}%
- \else%
- \write\linenum at out{]}%
- \fi}%
% \end{macrocode}
% \end{macro}
%
-%
+%
+% \begin{macro}{\@beforeinsertofthisedtext}
+% \cs{@beforeinsertofthisedtext} is an internal macro. \macpackage or \parpackage can add in this macro any content required to be executed before doing any \cs{insert} related to a \cs{edtext}.
+% Its content is \cs{let} equal to \cs{relax} at the end of every \cs{edtext}.
+% \begin{macrocode}
+\let\@beforeinsertofthisedtext\relax
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ifnumberline}
% The \protect\cs{ifnumberline} option can be set to FALSE to disable line numbering.
% \begin{macrocode}
@@ -7206,7 +7268,7 @@
% The general mechanism is the following:
% \begin{itemize}
% \item \textbf{At the first run}, each \protect\cs{sameword} command increments an \protect\package{etoolbox} counter the name of which contains the argument of the \protect\cs{sameword} commands.
-% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored, with the \protect\cs{@sw} command, in the auxiliary file of the current \protect\package{eledmac} section (the \verb+.1+, \verb+.2+… file).
+% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage section (the \verb+.1+, \verb+.2+… file).
% \item \textbf{When this auxiliary file is read at the second run}, different operations are achieved:
% \begin{enumerate}
% \item Get the rank of each \protect\cs{sameword} in a line (relative rank) from the rank of each \protect\cs{sameword} in all the numbered section (absolute rank):
@@ -12502,6 +12564,7 @@
\noexpand\setcounter{stanzaR}{\the\c at stanzaR}%Save stanzaR counter for footnote
\unexpanded{\def\@this at crossref@start}{\theedtext:start}%
\unexpanded{\def\@this at crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}% Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}{#1}%
{{\l at d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote at false%
@@ -12534,12 +12597,13 @@
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
- \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
+ \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\ifl at dpairing%
\noexpand\setcounter{stanzaL}{\the\c at stanzaL}%Save stanzaR counter for footnote
\fi%
\unexpanded{\def\@this at crossref@start}{\theedtext:start}%
\unexpanded{\def\@this at crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}%Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}%
{#1}%
{{\l at d@nums}{\expandonce\@tag}{\expandonce\content}}%
@@ -12566,7 +12630,7 @@
\ignorespaces%
}
% \end{macrocode}
-% Create counter used to determiner in which page was called the previous note.
+% Create counter used to determine on which page the previous note was called.
% \begin{macrocode}
\expandafter\newcount\csname #1prevpage at num\endcsname%
\expandafter\newcount\csname #1prevpage at numR\endcsname%
@@ -12673,7 +12737,7 @@
}
% \end{macrocode}
% Then define the counters.
-% The \LaTeX\ counter \verb+footnoteX+ is the only one manipulated by the user. This is this the one which is printed.
+% The \LaTeX\ counter \verb+footnoteX+ is the only one manipulated by the user. This is the one which is printed.
% The \TeX\ counter \cs{footnoteX at reading} is increased at each footnote. It is used for hyperlinks, for using \package{hyperlink} package, and for getting the correct footnote number when using parallel typesetting (\reff{reledpar-familiarfootnotenumber}).
% \begin{macrocode}
\newcounter{footnote#1}
@@ -12680,12 +12744,12 @@
\global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}}
\expandafter\newcount\csname footnote#1 at reading\endcsname%
% \end{macrocode}
-% Create counter used to determiner in which page was called the previous note.
+% Create counter used to determine on which page the previous note was called.
% \begin{macrocode}
\expandafter\newcount\csname prevpage#1 at num\endcsname%
\expandafter\newcount\csname prevpage#1 at numR\endcsname%
% \end{macrocode}
-% Do not forget to initialize series
+% Do not forget to initialize the series
% \begin{macrocode}
\arrangementX at normal{#1}%
\fi
@@ -14064,6 +14128,8 @@
\fi%
\letcs{\@tempa}{the@@label#1}%
\letcs{\@tempb}{the@@label#2}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this at crossref@start{#1}}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this at crossref@end{#2}}%
\linenum{\@tempa|%
\@tempb}}}%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-07-01 22:04:36 UTC (rev 41598)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-07-01 22:05:01 UTC (rev 41599)
@@ -275,6 +275,9 @@
% \changes{v2.9.1}{2016/05/25}{Prevent \protect\cs{Xtxtbeforenotes} hook from causing notes to go beyond the bottom margin}
% \changes{v2.10.0}{2016/06/02}{Add new tools to make apparatuses of manuscripts}
% \changes{v2.11.0}{2016/06/16}{Compatibility with \protect\reledmac's \protect\option{auxdir} option.}
+% \changes{v2.12.0}{2016/07/01}{Add \protect\cs{edtextlater} and \protect\cs{edtextnow}.}
+% \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{lineationR}.}
+% \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{AtBeginPairs}.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -800,6 +803,22 @@
% \endnumbering
% \end{Rightside}
% \end{verbatim}
+% \subsection{Critical notes called on leftside but printed on right side}
+% Sometimes, you need to print the critical notes on the right side, despite the fact that they refer to the lemmas on the left side.
+% In this case, you must use \cs{edtextlater} and \cs{edtextnow}.
+% \DescribeMacro{\edtextlater}
+% The \cs{edtextlater}\marg{lemma}\marg{footnote command} command must be called on the same side as the lemma.
+% It is similar to the standard \cs{edtext} command, but does not add the footnote immediately on the page, keeping it for later.
+% \DescribeMacro{\edtextnow}
+% \cs{edtextnow} must be called on the side on which you want to print the lemma, approximately at the point corresponding to the equivalent \cs{edtextlater} command.
+% It will add the notes stored by the equivalent \cs{edtextlater} command.
+%
+% The relationship between the \cs{edtextlater} and \cs{edtextnow} commands is determined by the order of calling: the first \cs{edtextnow} corresponds to the first \cs{edtextlater}, the second \cs{edtextnow} corresponds to the second \cs{edtextlater} etc.
+%
+%
+% \cs{edtextnow} is a parameterless macro, so it gobbles the following space.
+% If you want to keep it, add \verb+{}+ or backslash followed by a space.
+%
% \subsection{Using line flag}
% \DescribeMacro{\Xlineflag}
% \DescribeMacro{\Xendlineflag}
@@ -1178,7 +1197,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/06/16 v2.11.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/07/01 v2.12.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1435,10 +1454,17 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at error@edtext at later@now}
+% \begin{macrocode}
+\newcommand{\led at error@edtext at later@now}{%
+ \reledpar at error{You call \the\edtext at later\space \string\edtextlater\space commands, but \the\edtext at now\space \string\edtextnow\space commands}{\@ehc}% (did I follow your intent correctly here?)
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at warn@ChangeSyncOption}
% \begin{macrocode}
\newcommand*{\led at warn@ChangeSyncOption}[1]{%
- \reledpar at warning{You have changed synchronization's options since last run. We have not read line-list file #1. Please run LaTeX again.}%
+ \reledpar at warning{You have changed synchronization's options since the last run. We have not read line-list file #1. Please run LaTeX again.}%
}%
% \end{macrocode}
% \end{macro}
@@ -1763,7 +1789,7 @@
\Xpstart%
\fi%
\else
- \def at tempb{section}
+ \def\@tempb{section}
\ifx\@tempa\@tempb
\global\bypage at Rfalse%
\global\bypstart at Rfalse%
@@ -2449,6 +2475,22 @@
% \begin{macrocode}
\expandafter\list at create\expandafter{\csname sw at list@edtext at tmp@\the\@edtext at level\endcsname}%
% \end{macrocode}
+% And now, call \cs{@ref at reg@parseargR}, which can be also called by \cs{@ref at later}
+% \begin{macrocode}
+ \@ref at reg@parseR{#2}%
+% \end{macrocode}
+% Decrease edtext level counter.
+% \begin{macrocode}
+ \global\advance\@edtext at level by -1%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\@ref at reg@parseR}
+% \begin{macrocode}
+\newcommand{\@ref at reg@parseR}[1]{%
+% \end{macrocode}
% Declare and init boolean for lemma in this level.
% \begin{macrocode}
\providebool{lemmacommand@\the\@edtext at level}%
@@ -2457,7 +2499,7 @@
% Execute the second argument of \protect\cs{@ref} again,
% to perform for real all the commands within it.
% \begin{macrocode}
- #2
+ #1%
% Now, we store the list of \protect\cs{@sw} of this current \protect\cs{edtext} as an element of
% the global list of list of \protect\cs{@sw} for a \protect\cs{edtext} depth.
% \begin{macrocode}
@@ -2469,15 +2511,10 @@
\xright at appenditem{\expandonce\@tmpp}\to\@tmp%
\global\cslet{sw at list@edtextR@\the\@edtext at level}{\@tmp}%
\fi%
+}%
% \end{macrocode}
-% Decrease edtext level counter.
-% \begin{macrocode}
- \global\advance\@edtext at level by -1%
-}
-% \end{macrocode}
+
% \end{macro}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\@pend}
% \begin{macro}{\@pendR}
% \protect\cs{@pend}\marg{num} adds its argument to the \protect\cs{linesinpar at listL}
@@ -2728,11 +2765,11 @@
\newnamebox{#1footins at kept}%
\fi%
% \end{macrocode}
-% \subsection{Tools specific to familiar footnotes}
+% \subsubsection{Tools specific to familiar footnotes}
% \begin{macrocode}
\unless\ifnofamiliar@%
% \end{macrocode}
-% \subsubsection{Managing correct number}\label{familiarfootnotenumber}
+% \paragraph{Managing correct number}\label{familiarfootnotenumber}
% One problem with using familiar footnotes in parallel typesetting is the fact that the order of reading notes is not the same as the order they are typset, because \LaTeX\ reads first all the notes on one side, then all the notes on the other side.
% Then, however, \LaTeX\ alternates between typesetting left-side note and right-side notes.
% Consequently, if we do nothing special, the note numbers are sorted in the reading order, not in the typesetting order.
@@ -2754,7 +2791,7 @@
\newcounter{footnote#1 at typeset}%
% \end{macrocode}
%
-% \subsubsection{Familiar footnotes without marks}
+% \paragraph{Familiar footnotes without marks}
% The \protect\cs{footnoteXnomk} commands are for notes which are printed on the left side, while they are called in the right side.
% Basically, they set first toggle \protect\cs{nomark@} to true, then call the \protect\cs{footnoteX}.
% and finally add the footnote counter in the footnote counter list.
@@ -2963,7 +3000,7 @@
% \begin{macro}{\AtBeginPairs}
% The \protect\cs{AtBeginPairs} macro just define a \protect\cs{at at begin@pairs} macro, called at the beginning of each \verb+pairs+ environments.
% \begin{macrocode}
-\newcommand{\AtBeginPairs}[1]{\xdef\at at begin@pairs{#1}}%
+\newcommand{\AtBeginPairs}[1]{\gdef\at at begin@pairs{#1}}%
\def\at at begin@pairs{}%
% \end{macrocode}
@@ -4389,6 +4426,105 @@
}%
% \end{macrocode}
% \end{macro}
+% \subsection{Critical footnote printed in right side}
+% \changes{v2.12.0}{2016/07/01}{Add \protect\cs{edtextlater} and \protect\cs{edtextnow}.}
+% \begin{macro}{\edtext at later}
+% \begin{macro}{\edtext at now}
+% \begin{macro}{\edtextlater}
+% \begin{macro}{\edtextnow}
+% \cs{edtextlater} and \cs{edtextnow} are used to print critical footnotes on the right side, while refering to the text on the left side.
+% First, we create two counters, one for \cs{edtextlater} and the other for \cs{edtextnow}.
+% \begin{macrocode}
+\newcount\edtext at now%
+\newcount\edtext at later%
+% \end{macrocode}
+% \begin{macrocode}
+\newcommand{\edtextlater}[2]{%#1 lemma, #2 critical notes
+% \end{macrocode}
+% First, increase the \cs{edtext at later} counter.
+% \begin{macrocode}
+ \global\advance\edtext at later by \@ne%
+% \end{macrocode}
+% \begin{macrocode}
+% As we are in a pseudo-\cs{edtext}, we now need to get the \cs{sameword} data stored in the auxiliary file for this \cs{edtextlater}.
+ \advance\@edtext at level by \@ne%
+ \ifcsvoid{sw at list@edtext@\the\@edtext at level}%
+ {\global\let\sw at inthisedtext\empty}%
+ {\expandafter\gl at p\csname sw at list@edtext@\the\@edtext at level\endcsname\to\sw at inthisedtext}%
+% \end{macrocode}
+% The main feature of \cs{edtextlater} is to create a macro which will be called on the equivalent \cs{edtextnow}.
+% \begin{macrocode}
+%
+ \csxdef{edtext at later@\the\edtext at later}{%
+% \end{macrocode}
+% \cs{edtextnow} will insert a empty \cs{edtext}.
+% \begin{macrocode}
+ \noexpand\edtext{%
+ }%
+% \end{macrocode}
+% With a \cs{lemma} and \cs{linenum} defined by the current \cs{edtextlater}.
+% Also with \cs{sameword} data gotten from the current \cs{edtextlater}
+% \begin{macrocode}
+ {%
+ \unexpanded{%
+ \lemma{\no at expands #1}%
+ \xxref{start:edtext:later:\the\edtext at later}{end:edtext:later:\the\edtext at later}%
+ }%
+ \noexpand\linenum{||||||\edfont at info}%
+ \unexpanded{\def\sw at inthisedtext}{\expandonce{\sw at inthisedtext}}%
+% \end{macrocode}
+% As the \cs{edtextnow} is generally called on the other side than the corresponding \cs{edtextlater}, we need to store the side for a proper formatting of the footnote.
+% \begin{macrocode}
+ \ifledRcol%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol at true}}%
+ \else%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol at false}}%
+ \fi%
+% \end{macrocode}
+% And the footnote command of this \cs{edtextlater}.
+% \begin{macrocode}
+ \unexpanded{#2}%
+ }%
+ }%
+% \end{macrocode}
+% And now, we print the current lemma data.
+% But we save the beginning and the starting line using the crossref mechanism.
+% We also store information in the auxiliary file about the existence of a \cs{edtextlater} and, if required, about the use of a \cs{lemma}
+% \begin{macrocode}
+ \edlabel{start:edtext:later:\the\edtext at later}%
+ \flag at start@later%
+ \bgroup%
+ \def\lemma##1{%
+ \ifledRcol%
+ \write\linenum at outR{\string\@lemma}%
+ \else%
+ \write\linenum at out{\string\@lemma}%
+ \fi%
+ }%
+ \renewcommand{\do}[1]{\expandafter\renewcommandx\csname ##1footnote\endcsname[2][1,usedefault]{}}%
+ \dolistloop{\@series}%
+ #2%
+ \egroup%
+ \showlemma{#1}%
+ \edlabel{end:edtext:later:\the\edtext at later}%
+ \flag at end@later%
+% \end{macrocode}
+% We decrease the counter increased at the beginning.
+% \begin{macrocode}
+ \advance\@edtext at level by -\@ne%
+}%
+% \end{macrocode}
+% \cs{edtextnow} just calls the command defined as is, reading the \cs{edtext at later} list.
+% \begin{macrocode}
+\newcommand{\edtextnow}[0]{%
+ \global\advance\edtext at now by \@ne
+ \csuse{edtext at later@\the\edtext at now}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
% \section{Cross referencing}
% \label{xref}
%
@@ -4522,28 +4658,6 @@
% \end{macro}
%
%
-% \section{Familiar footnotes}
-%
-%
-% \begin{macro}{\l at dbfnote}
-% \protect\cs{l at dbfnote} adds the footnote to the insert list, and
-% \protect\cs{vl at dbfnote} calls the original \protect\cs{@footnotetext}.
-% \changes{v1.3.1}{2012/11/16}{Compatibility of standard footnotes with eledmac when theses footnotes contain any commands.}
-% \changes{v1.3.3}{2012/11/19}{Spurious space with footnote in right column.}
-% There are both defined in \macpackage.
-% \changes{v2.0.0}{2015/07/19}{\protect\cs{l at dbfnote} defined only in \reledmac.}
-% \end{macro}
-%
-%
-% \begin{macro}{\normalbfnoteX}
-% \changes{v0.3.0}{2005/02/04}{Removed extraneous spaces from \protect\cs{normalbfnoteX}}
-% \changes{v1.3.5}{2013/07/10}{Allows one to redefine \protect\cs{thefootnoteX} with \c{alph} when some packages are loaded.}
-% \changes{v1.4.1}{2013/08/16}{Fix bug with normal familiar footnotes when mixing RTL and LTR text.}
-% \changes{v2.0.0}{2015/07/19}{\protect\cs{normalbfnoteX} defined only in \reledmac.}
-% \end{macro}
-%
-%
-
% \section{Verse}
%\changes{v0.11.0}{2012/06/11}{New management of hangingsymbol insertion, preventing undesirable insertions.}
%\changes{v0.12.0}{2012/08/03}{New management of hangingsymbol insertion, preventing undesirable insertions.}
@@ -5780,7 +5894,19 @@
\global\instanzaLfalse%
\global\instanzaRfalse%
\global\l at dprintingpagesfalse%
- \finish at Pages@notes%Needed to prevent final notes overlap line number
+% \end{macrocode}
+% Check the consistency of \cs{edtext at later} and \cs{edtext at now}
+% \begin{macrocode}
+ \ifnum\edtext at later=\edtext at now%
+ \else%
+ \led at error@edtext at later@now%
+ \fi%
+ \global\edtext at later=\z@%
+ \global\edtext at now=\z@%
+% \end{macrocode}
+% Prevent final notes from overlapping the line number
+% \begin{macrocode}
+ \finish at Pages@notes%
\ignorespaces\fi}
@@ -5787,9 +5913,9 @@
% \end{macrocode}
% \end{macro}
%
-% \subsection{Ensure all notes be printed at the end of parallel pages}
+% \subsection{Ensure all notes are printed at the end of parallel pages}
% \begin{macro}{\finish at Pages@notes}
-% This macro ensures that all long notes are printed at the end of \protect\cs{Pages} typesetting, and that there is no more long notes left for the next pages.
+% This macro ensures that all long notes are printed at the end of \protect\cs{Pages} typesetting, and that there are no more long notes left for the next pages.
% \begin{macrocode}
\newcommand{\finish at Pages@notes}{%
\def\do##1{%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-07-01 22:04:36 UTC (rev 41598)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-07-01 22:05:01 UTC (rev 41599)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/06/28 v2.13.3 typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/07/01 v2.14.0 typeset critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -494,14 +494,14 @@
\else
\def\@tempb{section}
\ifx\@tempa\@tempb
- \global\bypage at false
- \global\bypstart at false
- \unless\ifnocritical@%
- \Xpstart[][false]%
- \fi%
- \else
+ \global\bypage at false
+ \global\bypstart at false
+ \unless\ifnocritical@%
+ \Xpstart[][false]%
+ \fi%
+ \else
\led at warn@BadLineation
- \fi
+ \fi
\fi
\fi
\fi}}
@@ -1150,10 +1150,14 @@
\ifsublines@ \the\subline at num \else 0\fi|%
\the\endpage at num|\the\endline at num|%
\ifsublines@ \the\endsubline at num \else 0\fi}\to\line at list
+ \@ref at reg@parse{#2}%
+ \global\advance\@edtext at level by -1%
+}
+\newcommand{\@ref at reg@parse}[1]{%
\expandafter\list at create\expandafter{\csname sw at list@edtext at tmp@\the\@edtext at level\endcsname}%
\providebool{lemmacommand@\the\@edtext at level}%
\boolfalse{lemmacommand@\the\@edtext at level}%
- #2%
+ #1%
\ifnum\@edtext at level>0%
\def\create at this@edtext at level{\expandafter\list at create\expandafter{\csname sw at list@edtext@\the\@edtext at level\endcsname}}%
\ifcsundef{sw at list@edtext@\the\@edtext at level}{\create at this@edtext at level}{}%
@@ -1162,9 +1166,17 @@
\xright at appenditem{\expandonce\@tmpp}\to\@tmp%
\global\cslet{sw at list@edtext@\the\@edtext at level}{\@tmp}%
\fi%
- \global\advance\@edtext at level by -1%
}
+\newcommand{\@ref at later}[1]{%
+ \global\advance\@edtext at level by \@ne%
+ \ifledRcol%
+ \@ref at reg@parseR{#1}%
+ \else%
+ \@ref at reg@parse{#1}%
+ \fi%
+ \global\advance\@edtext at level by -\@ne%
+}%
\newwrite\linenum at out
\newif\iffirst at linenum@out@
\first at linenum@out at true
@@ -1240,7 +1252,28 @@
\fi%
\fi}%
+\newcommand*{\flag at end}{%
+ \ifledRcol%
+ \write\linenum at outR{]}%
+ \else%
+ \write\linenum at out{]}%
+ \fi}%
+\newcommand*{\flag at start@later}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\@ref at later[}%
+ \else%
+ \write\linenum at out{\string\@ref at later[}%
+ \fi%
+}%
+\newcommand{\flag at end@later}{%
+ \ifledRcol%
+ \write\linenum at outR{]}%
+ \else%
+ \write\linenum at out{]}%
+ \fi%
+}
+
\newcommand*{\startsub}{\dimen0\lastskip
\ifdim\dimen0>0pt \unskip \fi
\ifledRcol \write\linenum at outR{\string\sub at on}%
@@ -1388,18 +1421,13 @@
\global\@noneed at Footnotefalse%
\global\advance\@edtext at level by -1%
\global\@lemmacommand at false%
+ \global\let\@beforeinsertofthisedtext\relax%
\else%
\showlemma{#1} (\textbf{\textsc{Edtext outside numbered paragraph}})\led at err@edtextoutsidepstart%
\fi%
}%
-\newcommand*{\flag at end}{%
- \ifledRcol%
- \write\linenum at outR{]}%
- \else%
- \write\linenum at out{]}%
- \fi}%
-
+\let\@beforeinsertofthisedtext\relax
\newif\ifnumberline
\numberlinetrue
\newcommand*{\set at line}{%
@@ -4232,6 +4260,7 @@
\noexpand\setcounter{stanzaR}{\the\c at stanzaR}%Save stanzaR counter for footnote
\unexpanded{\def\@this at crossref@start}{\theedtext:start}%
\unexpanded{\def\@this at crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}% Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}{#1}%
{{\l at d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote at false%
@@ -4264,12 +4293,13 @@
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
- \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
+ \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\ifl at dpairing%
\noexpand\setcounter{stanzaL}{\the\c at stanzaL}%Save stanzaR counter for footnote
\fi%
\unexpanded{\def\@this at crossref@start}{\theedtext:start}%
\unexpanded{\def\@this at crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}%Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}%
{#1}%
{{\l at d@nums}{\expandonce\@tag}{\expandonce\content}}%
@@ -5105,6 +5135,8 @@
\fi%
\letcs{\@tempa}{the@@label#1}%
\letcs{\@tempb}{the@@label#2}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this at crossref@start{#1}}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this at crossref@end{#2}}%
\linenum{\@tempa|%
\@tempb}}}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-07-01 22:04:36 UTC (rev 41598)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-07-01 22:05:01 UTC (rev 41599)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/06/16 v2.11.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/07/01 v2.12.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -120,8 +120,11 @@
\newcommand{\led at error@fail at patch@@outputpage}{%
\reledpar at error{Fail to patch \string\@outputpage\space command.}{\@ehc}%
}%
+\newcommand{\led at error@edtext at later@now}{%
+ \reledpar at error{You call \the\edtext at later\space \string\edtextlater\space commands, but \the\edtext at now\space \string\edtextnow\space commands}{\@ehc}% (did I follow your intent correctly here?)
+}%
\newcommand*{\led at warn@ChangeSyncOption}[1]{%
- \reledpar at warning{You have changed synchronization's options since last run. We have not read line-list file #1. Please run LaTeX again.}%
+ \reledpar at warning{You have changed synchronization's options since the last run. We have not read line-list file #1. Please run LaTeX again.}%
}%
\newcommand{\led at warn@setting at in@rightside}[1]{%
\reledpar at warning{You use #1 inside rightside environment.\MessageBreak%
@@ -304,7 +307,7 @@
\Xpstart%
\fi%
\else
- \def at tempb{section}
+ \def\@tempb{section}
\ifx\@tempa\@tempb
\global\bypage at Rfalse%
\global\bypstart at Rfalse%
@@ -577,9 +580,13 @@
\the\endpage at num|\the\endline at num|%
\ifsublines@ \the\endsubline at num \else 0\fi}\to\line at listR
\expandafter\list at create\expandafter{\csname sw at list@edtext at tmp@\the\@edtext at level\endcsname}%
+ \@ref at reg@parseR{#2}%
+ \global\advance\@edtext at level by -1%
+}
+\newcommand{\@ref at reg@parseR}[1]{%
\providebool{lemmacommand@\the\@edtext at level}%
\boolfalse{lemmacommand@\the\@edtext at level}%
- #2
+ #1%
\ifnum\@edtext at level>0%
\def\create at this@edtext at level{\expandafter\list at create\expandafter{\csname sw at list@edtextR@\the\@edtext at level\endcsname}}%
\ifcsundef{sw at list@edtextR@\the\@edtext at level}{\create at this@edtext at level}{}%
@@ -588,8 +595,8 @@
\xright at appenditem{\expandonce\@tmpp}\to\@tmp%
\global\cslet{sw at list@edtextR@\the\@edtext at level}{\@tmp}%
\fi%
- \global\advance\@edtext at level by -1%
-}
+}%
+
\renewcommand*{\@pend}[1]{%
\ifbypstart@\global\line at num=0\fi%
\xright at appenditem{#1}\to\linesinpar at listL}
@@ -749,7 +756,7 @@
\l at dpairingfalse
}
-\newcommand{\AtBeginPairs}[1]{\xdef\at at begin@pairs{#1}}%
+\newcommand{\AtBeginPairs}[1]{\gdef\at at begin@pairs{#1}}%
\def\at at begin@pairs{}%
\newenvironment{pages}{%
@@ -1634,6 +1641,55 @@
}%
\dolistloop{\@series}%
}%
+\newcount\edtext at now%
+\newcount\edtext at later%
+\newcommand{\edtextlater}[2]{%#1 lemma, #2 critical notes
+ \global\advance\edtext at later by \@ne%
+ \advance\@edtext at level by \@ne%
+ \ifcsvoid{sw at list@edtext@\the\@edtext at level}%
+ {\global\let\sw at inthisedtext\empty}%
+ {\expandafter\gl at p\csname sw at list@edtext@\the\@edtext at level\endcsname\to\sw at inthisedtext}%
+ \csxdef{edtext at later@\the\edtext at later}{%
+ \noexpand\edtext{%
+ }%
+ {%
+ \unexpanded{%
+ \lemma{\no at expands #1}%
+ \xxref{start:edtext:later:\the\edtext at later}{end:edtext:later:\the\edtext at later}%
+ }%
+ \noexpand\linenum{||||||\edfont at info}%
+ \unexpanded{\def\sw at inthisedtext}{\expandonce{\sw at inthisedtext}}%
+ \ifledRcol%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol at true}}%
+ \else%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol at false}}%
+ \fi%
+ \unexpanded{#2}%
+ }%
+ }%
+ \edlabel{start:edtext:later:\the\edtext at later}%
+ \flag at start@later%
+ \bgroup%
+ \def\lemma##1{%
+ \ifledRcol%
+ \write\linenum at outR{\string\@lemma}%
+ \else%
+ \write\linenum at out{\string\@lemma}%
+ \fi%
+ }%
+ \renewcommand{\do}[1]{\expandafter\renewcommandx\csname ##1footnote\endcsname[2][1,usedefault]{}}%
+ \dolistloop{\@series}%
+ #2%
+ \egroup%
+ \showlemma{#1}%
+ \edlabel{end:edtext:later:\the\edtext at later}%
+ \flag at end@later%
+ \advance\@edtext at level by -\@ne%
+}%
+\newcommand{\edtextnow}[0]{%
+ \global\advance\edtext at now by \@ne
+ \csuse{edtext at later@\the\edtext at now}%
+}%
\list at create{\labelref at listR}
\def\l at dmake@labelsR#1|#2|#3|#4|#5{%
@@ -1701,7 +1757,6 @@
\fi%
}
-
\newif\ifinserthangingsymbolR
\newcommand{\inserthangingsymbolL}{%
\ifinserthangingsymbol%
@@ -2375,7 +2430,13 @@
\global\instanzaLfalse%
\global\instanzaRfalse%
\global\l at dprintingpagesfalse%
- \finish at Pages@notes%Needed to prevent final notes overlap line number
+ \ifnum\edtext at later=\edtext at now%
+ \else%
+ \led at error@edtext at later@now%
+ \fi%
+ \global\edtext at later=\z@%
+ \global\edtext at now=\z@%
+ \finish at Pages@notes%
\ignorespaces\fi}
\newcommand{\finish at Pages@notes}{%
More information about the tex-live-commits
mailing list