texlive[49792] Master/texmf-dist: reledmac (22jan19)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 22 23:19:50 CET 2019
Revision: 49792
http://tug.org/svn/texlive?view=revision&revision=49792
Author: karl
Date: 2019-01-22 23:19:50 +0100 (Tue, 22 Jan 2019)
Log Message:
-----------
reledmac (22jan19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
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-doublenumbering.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-subdivision-number-in-header.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_inside-outside-columns.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 2019-01-22 22:19:16 UTC (rev 49791)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx 2019-01-22 22:19:50 UTC (rev 49792)
@@ -432,3 +432,7 @@
\end{verbatim}
To get the space after \verb+xx+.
+
+\subsection{Migration to \reledmac 2.30.0}
+
+If you have multiple annotations for the same line, there are now separated with a comma in the margin. You can use \cs{setlinenumannotationsep} to change the separator.
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
===================================================================
(Binary files differ)
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-doublenumbering.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-subdivision-number-in-header.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_inside-outside-columns.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 2019-01-22 22:19:16 UTC (rev 49791)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2019-01-22 22:19:50 UTC (rev 49792)
@@ -520,8 +520,10 @@
% \changes{v2.28.1}{2018/12/22}{Fix bug with the alignment of the columns of two and three columns critical footnotes.}
% \changes{v2.29.0}{2019/01/08}{Fix bug with \protect\cs{linenumannotation} and `nofamiliar` option.}
% \changes{v2.29.0}{2019/01/08}{Really reset line number annotation at each line}
-% \changes{v2.29.0}{2018/01/08}{Add \protect\option{noresetlinenumannotation}}
-% \changes{v2.29.0}{2018/01/08}{Fix little bug with \protect\cs{msdata}}
+% \changes{v2.29.0}{2019/01/08}{Add \protect\option{noresetlinenumannotation}}
+% \changes{v2.29.0}{2019/01/08}{Fix little bug with \protect\cs{msdata}}
+% \changes{v2.30.0}{2019/01/22}{Add \protect\cs{Xnoidenticallinenumannotation} and \protect\cs{Xendnoidenticallinenumannotation} hooks}
+% \changes{v2.30.0}{2019/01/22}{Add separator between line number annotations in margin. Add \protect\cs{setlinenumannotationsep}}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -1249,7 +1251,7 @@
% \DescribeMacro{\hidenumberingonleftpage}
% \cs{hidenumberingonleftpage} is like \protect{hidenumbering}, but is applied only on left page. \cs{hidenumberingonrightpage} is applied on right page.
% They can be useful if the position of the line number is depending of the position of the page, but the position of marginal note is fixed.
-% \subsubsection{Adding annotations to line numbers}\label{annotation}
+% \subsection{Adding annotations to line numbers}\label{annotation}
% You may want to have two or more numbers associated with a line of text.
% Consider, for example, the following cases:
% \begin{itemize}
@@ -1292,7 +1294,7 @@
% \item by \enquote{A-B} for the third lemma, as it starts while annotation A is still in effect and it finishes after annotation B has already taken effect;
% \item by \enquote{B} for the fourth lemma.
% \end{itemize}
-% \paragraph{Modifying annotation associated with a specific note}\label{lineannot}
+% \subsubsection{Modifying annotation associated with a specific note}\label{lineannot}
%
% The \cs{linenum} (\reff{linenum}) macro changes the line number passed to a note.
% \DescribeMacro{\lineannot}The \cs{lineannot} macro does the same for the annotations.
@@ -1304,7 +1306,7 @@
% \lineannot{a|b}% to change both
% \lineannot{\empty|}% to delete the beginning annotation
% \end{verbatim}
-% \paragraph{Changing the position of the annotation}\label{annotationposition}
+% \subsubsection{Changing the position of the annotation}\label{annotationposition}
% By default, annotations are placed after line numbers in both margin and footnote.
%
% \DescribeMacro{\Xlinenumannotationposition}
@@ -1319,7 +1321,7 @@
% \meta{s} for the series of endnotes to which it applies, where \meta{s} may once again be a comma-separated list of series.
% \end{itemize}
% In each of these three commands, \meta{v} can be \option{after} or \option{before} to indicate position with regards to the line number.
-% \paragraph{Changing the macro in which annotations are wrapped}\label{wraplinenumannotation}
+% \subsubsection{Changing the macro in which annotations are wrapped}\label{wraplinenumannotation}
% By default, annotations are wrapped in the \cs{textsuperscript} macro.
% You can modify this using one of the following:
% \begin{itemize}
@@ -1343,6 +1345,20 @@
% \Xwraplinenumannotationside{\@gobble}
% \makeatother
% \end{verbatim}
+% \subsubsection{Not printing the second identical annotations}
+% If you print only line number annotation, you may get in critical notes something like \verb+6-6+,
+% because the starting and ending annotations are the same.
+% \DescribeMacro{\Xnoidenticallinenumannotation}
+% \DescribeMacro{\Xendnoidenticallinenumannotation}
+% You can avoid that using \\
+% \cs{Xnoidenticallinenumannotation}\oarg{s}, for critical footnotes \\
+% or
+% \cs{Xendnoidenticallinenumannotation}\oarg{s}
+% \subsubsection{Separator between annotations}
+% \DescribeMacro{\setlinenumannotationsep}
+% If there an more than one annotation in the same line, there are separated by a comma.
+% If you want to change the separator, you can use \\
+% \cs{setlinenumannotationsep}\marg{sep}
% \subsection{Executing code at each line}\label{linehook}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -3362,6 +3378,7 @@
% \item \cs{Xtwolinesonlyinsamepage}
% \item \cs{Xlinenumannotationposition}
% \item \cs{Xwraplinenumannotation}
+% \item \cs{Xnoidenticallinenumannotation}
% \end{itemize}
%
% If you want to make settings specific to \cs{appref} or \cs{SEref}, just call them with an optional argument containing a comma-separated list of command names (for example \verb+appref,SEref+) or with a suffix equal to the command name (for example \verb+appref+).
@@ -3382,6 +3399,7 @@
% \item\cs{Xendtwolinesonlyinsamepage}
% \item\cs{Xendlinenumannotationposition}
% \item\cs{Xendwraplinenumannotation}
+% \item\cs{Xemdnoidenticallinenumannotation}
% \end{itemize}
% \paragraph{For one specific command}
%
@@ -4228,7 +4246,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/01/08 v2.29.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/01/22 v2.30.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -6048,7 +6066,7 @@
% action codes and the settings they invoke; it does not require an
% entry in the action-code list for every line.
% \item \cs{annot at list} stores line number annotations for the start and the end lines of each \cs{edtext}, as \cs{line at list} does for line numbers.
-% We don't store that in the same list as line numbers as \cs{printlines} already have height arguments, and a \TeX\ macro can take at most nine arguments.
+% We don't store that in the same list as line numbers as \cs{Xprintlines} already have height arguments, and a \TeX\ macro can take at most nine arguments.
% \end{itemize}
% Here are the commands to create these lists:
%
@@ -9458,12 +9476,16 @@
% \end{macro}
% \begin{macro}{\Xwraplinenumannotation at ref}
% \begin{macro}{\Xwraplinenumannotation at side}
-% The \cs{Xwraplinenumannotation at ref} macro is applied to crossrefs made to line annotations. The \cs{Xwraplinenumannotation at side} macro is applied to line annotation in sides.
+% The \cs{Xwraplinenumannotation at ref} macro is applied to line annotations in crossref. The \cs{Xwraplinenumannotation at side} macro is applied to line annotation in sides.
% They must be modified by users using \cs{Xwraplinenumannotation}.
% By default, they call \cs{textsuperscript}.
+%
+% We also define toggle \verb+Xnoidenticallinenumannotation at ref+ and \verb+Xnoidenticallinenumannotation at ref+
% \begin{macrocode}
\def\Xwraplinenumannotation at ref{\textsuperscript}%
\def\Xwraplinenumannotation at side{\textsuperscript}%
+\newtoggle{Xnoidenticallinenumannotation at ref}%
+\newtoggle{Xnoidenticallinenumannotation at side}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -9481,9 +9503,17 @@
}%
\newcommand{\store at annot@to at absline}[1]{%
\ifledRcol%
- \csgappto{annotR@\the\absline at numR @\the\section at numR}{#1}%
+ \ifcsdef{annotR@\the\absline at numR @\the\section at numR}{%
+ \csgappto{annotR@\the\absline at numR @\the\section at numR}{\@linenumannotationsep#1}%
+ }{%
+ \csgdef{annotR@\the\absline at numR @\the\section at numR}{#1}%
+ }%
\else%
- \csgappto{annot@\the\absline at num @\the\section at num}{#1}%
+ \ifcsdef{annot@\the\absline at num @\the\section at num}{%
+ \csgappto{annot@\the\absline at num @\the\section at num}{\@linenumannotationsep#1}%
+ }{%
+ \csgdef{annot@\the\absline at num @\the\section at num}{#1}%
+ }%
\fi%
}%
% \end{macrocode}
@@ -9516,6 +9546,15 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\setlinenumannotationsep}
+% \begin{macro}{\@linenumannotationsep}
+% The separator between the annotations and the way to redefine it.
+% \begin{macrocode}
+\newcommand{\setlinenumannotationsep}[1]{\gdef\@linenumannotationsep{#1}}%
+\def\@linenumannotationsep{, }%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \section{Line number printing}
%
% \begin{macro}{\affixline at num}
@@ -12006,6 +12045,18 @@
}%
\fi%
% \end{macrocode}
+% If the \cs{Xnoidenticallinenumannotation} is set for this series, we check if the ending annotation is identical to the starting.
+% If true, we don't print the ending annotation
+% \begin{macrocode}
+ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{%
+ \ifx\annot at start\annot at end%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number
+ \l at d@dashfalse%
+ \fi%
+ \fi%
+ }{}%
+% \end{macrocode}
% End of \protect\cs{setprintlines}.
% \begin{macrocode}
}%
@@ -14015,6 +14066,18 @@
}%
\fi%
% \end{macrocode}
+% If the \cs{Xendnoidenticallinenumannotation} is set for this series, we check if the ending annotation is identical to the starting.
+% If true, we don't print the ending annotation
+% \begin{macrocode}
+ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{%
+ \ifx\annot at start\annot at end%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number
+ \l at d@dashfalse%
+ \fi%
+ \fi%
+ }{}%
+% \end{macrocode}
% End of \protect\cs{setprintendlines}.
% \begin{macrocode}
}%
@@ -14322,6 +14385,7 @@
\csgdef{Xwidth@#1}{\hsize}%
\csgdef{Xwraplinenumannotation@#1}{\textsuperscript}%
\csgdef{Xlinenumannotationposition@#1}{after}%
+ \newtoggle{Xnoidenticallinenumannotation@#1}%
% \end{macrocode}
% \subsubsection{Create inserts, needed to add notes in foot}
% As regards inserts, see chapter 15 of \thetexbook\ by D. Knuth.
@@ -14750,6 +14814,7 @@
\csgdef{Xendlinenumannotationposition@#1}{after}%
\csgdef{Xendwraplinenumannotation@#1}{\textsuperscript}%
+ \newtoggle{Xendnoidenticallinenumannotation@#1}%
\newtoggle{Xendpagenumberonlyfirst@#1}%
\newtoggle{Xendpagenumberonlyfirstifsingle@#1}%
@@ -15072,6 +15137,7 @@
\newhookcommand at series{Xlinerangeseparator}[appref,SEref]
\newhookcommand at series{Xlinenumannotationposition}[side,appref,SEref]%
\newhookcommand at series{Xwraplinenumannotation}[side,ref,appref,SEref]%
+\newhooktoggle at series{Xnoidenticallinenumannotation}[side,ref,appref,SEref]%
% \end{macrocode}
% \subsubsection{Options for familiar notes}
% Before generating the optional commands for familiar notes, we check the \protect\cs{nofamiliar} option.
@@ -15179,6 +15245,7 @@
\newhookcommand at series{Xendlinenumannotationposition}[apprefwithpage,SErefwithpage]%
\newhookcommand at series{Xendwraplinenumannotation}[apprefwithpage,SErefwithpage]%
+\newhooktoggle at series{Xendnoidenticallinenumannotation}[apprefwithpage,SErefwithpage]%
% \end{macrocode}
% \subsection{Hooks for a particular footnote}
% \begin{macro}{\newhooktoggle at specific}
@@ -16294,6 +16361,8 @@
\def\Xwraplinenumannotation at appref{\textsuperscript}%
\def\Xwraplinenumannotation at SEref{\textsuperscript}%
+\newtoggle{Xnoidenticallinenumannotation at appref}%
+\newtoggle{Xnoidenticallinenumannotation at SEref}%
\def\Xendtwolines at apprefwithpage{}%
\def\Xendtwolines at SErefwithpage{}%
@@ -16338,6 +16407,9 @@
\def\Xendwraplinenumannotation at apprefwithpage{\textsuperscript}%
\def\Xendwraplinenumannotation at SErefwithpage{\textsuperscript}%
+
+\newtoggle{Xendnoidenticallinenumannotation at apprefwithpage}%
+\newtoggle{Xendnoidenticallinenumannotation at SErefwithpage}%
% \end{macrocode}
% Note that some of these hooks are declared but no user command can change their values. Such hooks are not pertinent for \verb+appref+ and \verb+apprefwithpage+ pseudo-series, but their values are nonetheless tested in some macros.
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-01-22 22:19:16 UTC (rev 49791)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-01-22 22:19:50 UTC (rev 49792)
@@ -336,6 +336,7 @@
% \changes{v2.21.9}{2018/07/19}{Fix (little) bug when using \protect\package{calc} package.}
% \changes{v2.22.0}{2018/09/13}{Compatibility with \protect\cs{doinsidethislinehook} macro.}
% \changes{v2.22.1}{2019/01/08}{Really reset line number annotation at each line}
+% \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1384,7 +1385,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2019/01/08 v2.22.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2019/01/22 v2.22.2 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -4836,8 +4837,10 @@
% \subsection{Footnotes output specific to \protect\cs{Pages}}
% \begin{macro}{\print at Xnotes@forpages}
+% \begin{macro}{\restore at Xnotes@settings}
% \begin{macro}{\correct at Xfootins@box}
% \begin{macro}{\print at notesX@forpages}
+% \begin{macro}{\restore at notesX@settings}
% \begin{macro}{\correct at footinsX@box}
% \changes{v1.13.1}{2015/03/12}{Correct \protect\cs{correct at footinsX@box} and \protect\cs{correct at Xfootins@box}}
% \changes{v1.13.1}{2015/03/12}{Call \protect\cs{correct at footinsX@box} and \protect\cs{correct at Xfootins@box} directly in \protect\cs{print at notesX@forpages} and \protect\cs{print at Xnotes@forpages}.}
@@ -4894,19 +4897,10 @@
}%
% \end{macrocode}
% In case we are on a page where notes must NOT be printed.
-% First restore expected rooms for notes on the next page. Also reset expected vertical size allowed to notes.
+% We reset the settings of the notes for one side.
% \begin{macrocode}
{%
- \global\count\csuse{#1footins}=\csuse{default@#1footins}%
- \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
- \bgroup%
- \csuse{Xnotefontsize@#1}%
- \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
- \egroup%
-% \end{macrocode}
-% Then, save the current insert box to a temporary insert box.
-% \begin{macrocode}
- \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
+ \restore at Xnotes@settings{#1}%
}%
% \end{macrocode}
% End of \protect\cs{print at Xnotes@forpages}.
@@ -4914,6 +4908,21 @@
}%
}%
% \end{macrocode}
+% The macro which restore the note settings.
+% \#1 = series
+% \begin{macrocode}
+\newcommand{\restore at Xnotes@settings}[1]{%
+ \unless\ifnocritical@
+ \global\count\csuse{#1footins}=\csuse{default@#1footins}%
+ \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
+ \bgroup%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
+ \egroup%
+ \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
+ \fi
+}%
+% \end{macrocode}
% And now, the same for familiar footnotes.
% \begin{macrocode}
\newcommand\print at notesX@forpages[1]{%
@@ -4933,24 +4942,30 @@
\global\count\csuse{footins#1}=\z@%
\global\skip\csuse{footins#1}=\z@%
\global\dimen\csuse{footins#1}=\maxdimen%
-
}%
{%
- \global\count\csuse{footins#1}=\csuse{default at footins#1}%
- \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
- \bgroup%
- \csuse{Xnotefontsize@#1}%
- \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
- \egroup%
- \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
+ \restore at notesX@settings{#1}%
}%
}%
}%
+\newcommand{\restore at notesX@settings}[1]{%
+ \unless\ifnofamiliar@
+ \global\count\csuse{footins#1}=\csuse{default at footins#1}%
+ \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
+ \bgroup%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
+ \egroup%
+ \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
+ \fi
+}%
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\insert at notes@for at onlyside}
% \cs{insert at notes@for at onlyside} is everytime \cs{Pages} go to the next side.
% It just reinsert the notes note printed on the previous side because of \protect{Xonlyside} or \cs{onlysideX} setting.
@@ -4964,6 +4979,7 @@
\unvnamebox{##1footins at kept}%
\egroup%
\fi%
+ \restore at Xnotes@settings{##1}%
\fi%
\unless\ifnofamiliar@%
\ifvoid\csuse{footins##1 at kept}\else%
@@ -4972,6 +4988,7 @@
\unvnamebox{footins##1 at kept}%
\egroup%
\fi%
+ \restore at notesX@settings{##1}%
\fi%
}%
\dolistloop{\@series}%
@@ -6712,6 +6729,11 @@
\global\newnamebox{footins##1}%
\fi
% \end{macrocode}
+% We must also restore the settings for the footnotes in case of using onlyside option.
+% \begin{macrocode}
+ \restore at Xnotes@settings{##1}%
+ \restore at notesX@settings{##1}%
+% \end{macrocode}
% And now, add a \protect\cs{newpage} if there is no more footnote to print.
% \begin{macrocode}
\ifvoid\csuse{##1footins}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-01-22 22:19:16 UTC (rev 49791)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-01-22 22:19:50 UTC (rev 49792)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/01/08 v2.29.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/01/22 v2.30.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -2330,6 +2330,8 @@
\def\Xlinenumannotationposition at side{after}%
\def\Xwraplinenumannotation at ref{\textsuperscript}%
\def\Xwraplinenumannotation at side{\textsuperscript}%
+\newtoggle{Xnoidenticallinenumannotation at ref}%
+\newtoggle{Xnoidenticallinenumannotation at side}%
\newcommand{\@annot}[1]{%
\store at annot@to at absline{#1}%
\def\current at annot{#1}%
@@ -2336,9 +2338,17 @@
}%
\newcommand{\store at annot@to at absline}[1]{%
\ifledRcol%
- \csgappto{annotR@\the\absline at numR @\the\section at numR}{#1}%
+ \ifcsdef{annotR@\the\absline at numR @\the\section at numR}{%
+ \csgappto{annotR@\the\absline at numR @\the\section at numR}{\@linenumannotationsep#1}%
+ }{%
+ \csgdef{annotR@\the\absline at numR @\the\section at numR}{#1}%
+ }%
\else%
- \csgappto{annot@\the\absline at num @\the\section at num}{#1}%
+ \ifcsdef{annot@\the\absline at num @\the\section at num}{%
+ \csgappto{annot@\the\absline at num @\the\section at num}{\@linenumannotationsep#1}%
+ }{%
+ \csgdef{annot@\the\absline at num @\the\section at num}{#1}%
+ }%
\fi%
}%
\let\current at annot=\empty%
@@ -2351,6 +2361,8 @@
\gdef\annot at start{#1}%
\gdef\annot at end{#2}%
}%
+\newcommand{\setlinenumannotationsep}[1]{\gdef\@linenumannotationsep{#1}}%
+\def\@linenumannotationsep{, }%
\newcommand*{\affixline at num}{%
\ifledgroupnotesL@\else
\ifnumberline
@@ -3598,6 +3610,14 @@
}%
}%
\fi%
+ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{%
+ \ifx\annot at start\annot at end%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number
+ \l at d@dashfalse%
+ \fi%
+ \fi%
+ }{}%
}%
\newif\ifistwofollowinglines@%
\newcommand{\setistwofollowinglines}[4]{%
@@ -4881,6 +4901,14 @@
}%
}%
\fi%
+ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{%
+ \ifx\annot at start\annot at end%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number
+ \l at d@dashfalse%
+ \fi%
+ \fi%
+ }{}%
}%
\def\printendlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup
@@ -5096,6 +5124,7 @@
\csgdef{Xwidth@#1}{\hsize}%
\csgdef{Xwraplinenumannotation@#1}{\textsuperscript}%
\csgdef{Xlinenumannotationposition@#1}{after}%
+ \newtoggle{Xnoidenticallinenumannotation@#1}%
\expandafter\newinsert\csname #1footins\endcsname%
\unless\ifnoledgroup@%
\expandafter\newinsert\csname mp#1footins\endcsname%
@@ -5401,6 +5430,7 @@
\csgdef{Xendlinenumannotationposition@#1}{after}%
\csgdef{Xendwraplinenumannotation@#1}{\textsuperscript}%
+ \newtoggle{Xendnoidenticallinenumannotation@#1}%
\newtoggle{Xendpagenumberonlyfirst@#1}%
\newtoggle{Xendpagenumberonlyfirstifsingle@#1}%
@@ -5593,6 +5623,7 @@
\newhookcommand at series{Xlinerangeseparator}[appref,SEref]
\newhookcommand at series{Xlinenumannotationposition}[side,appref,SEref]%
\newhookcommand at series{Xwraplinenumannotation}[side,ref,appref,SEref]%
+\newhooktoggle at series{Xnoidenticallinenumannotation}[side,ref,appref,SEref]%
\unless\ifnofamiliar@
\newhookcommand at series{wrapcontentX}%
\newhookcommand at series{beforeinsertingX}%
@@ -5692,6 +5723,7 @@
\newhookcommand at series{Xendlinenumannotationposition}[apprefwithpage,SErefwithpage]%
\newhookcommand at series{Xendwraplinenumannotation}[apprefwithpage,SErefwithpage]%
+\newhooktoggle at series{Xendnoidenticallinenumannotation}[apprefwithpage,SErefwithpage]%
\newcommand{\newhooktoggle at specific}[1]{%
\newtoggle{#1@}%
\define at key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option
@@ -6275,6 +6307,8 @@
\def\Xwraplinenumannotation at appref{\textsuperscript}%
\def\Xwraplinenumannotation at SEref{\textsuperscript}%
+\newtoggle{Xnoidenticallinenumannotation at appref}%
+\newtoggle{Xnoidenticallinenumannotation at SEref}%
\def\Xendtwolines at apprefwithpage{}%
\def\Xendtwolines at SErefwithpage{}%
@@ -6319,6 +6353,9 @@
\def\Xendwraplinenumannotation at apprefwithpage{\textsuperscript}%
\def\Xendwraplinenumannotation at SErefwithpage{\textsuperscript}%
+\newtoggle{Xendnoidenticallinenumannotation at apprefwithpage}%
+\newtoggle{Xendnoidenticallinenumannotation at SErefwithpage}%
+
\gdef\Xboxstartlinenum at appref{0pt}
\gdef\Xboxstartlinenum at SEref{0pt}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-01-22 22:19:16 UTC (rev 49791)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-01-22 22:19:50 UTC (rev 49792)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2019/01/08 v2.22.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2019/01/22 v2.22.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1876,16 +1876,21 @@
\global\dimen\csuse{#1footins}=\maxdimen%
}%
{%
- \global\count\csuse{#1footins}=\csuse{default@#1footins}%
- \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
- \bgroup%
- \csuse{Xnotefontsize@#1}%
- \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
- \egroup%
- \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
+ \restore at Xnotes@settings{#1}%
}%
}%
}%
+\newcommand{\restore at Xnotes@settings}[1]{%
+ \unless\ifnocritical@
+ \global\count\csuse{#1footins}=\csuse{default@#1footins}%
+ \global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
+ \bgroup%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
+ \egroup%
+ \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
+ \fi
+}%
\newcommand\print at notesX@forpages[1]{%
\ifcsempty{onlysideX@#1}{%
\csuse{footstart#1}{#1}%
@@ -1903,19 +1908,23 @@
\global\count\csuse{footins#1}=\z@%
\global\skip\csuse{footins#1}=\z@%
\global\dimen\csuse{footins#1}=\maxdimen%
-
}%
{%
- \global\count\csuse{footins#1}=\csuse{default at footins#1}%
- \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
- \bgroup%
- \csuse{Xnotefontsize@#1}%
- \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
- \egroup%
- \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
+ \restore at notesX@settings{#1}%
}%
}%
}%
+\newcommand{\restore at notesX@settings}[1]{%
+ \unless\ifnofamiliar@
+ \global\count\csuse{footins#1}=\csuse{default at footins#1}%
+ \global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
+ \bgroup%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
+ \egroup%
+ \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
+ \fi
+}%
\newcommand{\insert at notes@for at onlyside}{%
\def\do##1{%
\unless\ifnocritical@%
@@ -1925,6 +1934,7 @@
\unvnamebox{##1footins at kept}%
\egroup%
\fi%
+ \restore at Xnotes@settings{##1}%
\fi%
\unless\ifnofamiliar@%
\ifvoid\csuse{footins##1 at kept}\else%
@@ -1933,6 +1943,7 @@
\unvnamebox{footins##1 at kept}%
\egroup%
\fi%
+ \restore at notesX@settings{##1}%
\fi%
}%
\dolistloop{\@series}%
@@ -2918,6 +2929,8 @@
\ifnofamiliar@%
\global\newnamebox{footins##1}%
\fi
+ \restore at Xnotes@settings{##1}%
+ \restore at notesX@settings{##1}%
\ifvoid\csuse{##1footins}%
\ifvoid\csuse{footins##1}\else%
\newpage\null%
More information about the tex-live-commits
mailing list