diff options
Diffstat (limited to 'Master')
56 files changed, 93 insertions, 74 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx index e2351b65577..9110e4a009f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx +++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx @@ -179,7 +179,7 @@ % This version changes the default setting of \cs{Xpstart}. % Henceforth, pstart numbers will be printed in footnotes within the section of text where you have called \cs{numberpstarttrue}. -% We do not see any reason to print them in the other sections. However, if you want to print the pstart numbers in all of the footnotes, whatever the section, without having to use \cs{numberpstarttrue}, you can use +% We do not see any reason to print them in the other sections. However, if you want to print the \cs{pstart} numbers in every footnote, whatever the section, without having to use \cs{numberpstarttrue}, you can use % \cs{Xpstarteverytime}. % \subsection{Migration to eledmac 1.21.0} % \subsubsection{\cs{Xledsetnormalparstuff}\ and \cs{ledsetnormalparstuffX}} @@ -348,7 +348,7 @@ % \cs{lineref} & \cs{edlineref} \\ % \end{longtable} % \subsubsection{Endnotes} -% With \reledmac, there is now one auxiliary file for every endnotes set (.Aend, .Bend, .Cend etc.). If you have overriden \cs{doendnotes} (which you would not have done) you must adapt your code. +% With \reledmac, there is now one auxiliary file for each endnotes set (.Aend, .Bend, .Cend etc.). If you have overridden \cs{doendnotes} (which you should not have done) you must adapt your code. % \subsubsection{Z Series} % The `Z' series of notes has been removed. Only five series are provided now by default: A, B, C, D, E. % \subsubsection{Internal commands} @@ -366,14 +366,14 @@ % You must include it manually. % So instead of \cs{Xbhooknote}\arg{content}, use \cs{Xbhooknote}\arg{content\ }. % \item Indent is no longer automatically added before the content of the \cs{Xbhooknote}/\cs{bhooknoteX} argument. -% If you want to keep it, add \cs{indent} in the argument of \cs{Xbhooknote}/\cs{bhooknoteX}. +% If you want to keep it, add \cs{indent} to the argument of \cs{Xbhooknote}/\cs{bhooknoteX}. % \end{enumerate} % \subsection{Migration to \reledmac~2.1.3} % \Reledmac~2.1.3 fix an historical bug, (style in \ledmac~0.7!) which doubled the space before the rules of paragraphed familiar footnotes. % Consequently, if you use paragraphed familiar footnotes, you should maybe adapt it, playing with \cs{beforenotesX}. % \subsection{Migration to \reledmac~2.3.0}\label{mac2.3.0migration} % Before \reledmac~2.3.0, for typesetting verse, any empty line was considered a paragraph inside verses. Counting empty lines this created breaking verse, hanging verses, and also added spurious vertical spaces. -% Version 2.3.0 disables paragraph in stanza. If you want vertical space, use optional argument of \cs{stanza} or \cs{endverse}. +% Version 2.3.0 disables paragraph in stanza. If you want vertical space, use the optional argument of \cs{stanza} or \cs{endverse}. % \subsection{Migration to \reledmac~2.4.0} % It is not mandatory, but strongly recommended, to change any \cs{renewcommand}\arg{\textbackslash endashchar}\marg{…} to the use of \cs{Xlinerangeseparator} or / and \cs{Xendlinerangeseparator} (\reff{linerangeseparator}). % \subsection{Migration to \reledmac~2.5.0} @@ -425,7 +425,7 @@ % \subsection{Migration to \reledmac 2.26.0} % You must delete your \verb+.aux+ file after having upgraded to this new version of \reledmac. % \subsection{Migration to \reledmac 2.27.1} -This release fix spurious space in \cs{hidenumbering}. +This release fixes spurious space in \cs{hidenumbering}. %If you considered this spurious space as normal, you must insert it manually using. \begin{verbatim} xx\hidenumbering\ xx @@ -433,11 +433,11 @@ xx\hidenumbering\ xx %To get the space after \verb+xx+. +\subsection{Migration to \reledmac 2.30.0} + +If you have multiple annotations for the same line, these are now separated with a comma in the margin. You can use \cs{setlinenumannotationsep} to change the separator. + % \subsection{Migration to \reledmac 2.31.1} %If you use \cs{Xgroupbyline}, the indentation of the notes has been deleted, in order to have the same behavior as for normal critical notes. % %Use \cs{Xparindent} to restore indentation. - -\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. diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx index 320a1c9adab..655354503cd 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx +++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx @@ -23,7 +23,7 @@ % A very long verse should sometimes be hanging. And we can see that a hanging verse is flush right.\& % \endnumbering % \subsection{Migration from \eledpar to \reledpar} -% As for migration from \eledmac to \reledmac: +% As for migration from \eledmac to \reledmac: % \begin{itemize} % \item One option has been removed because it is deprecated. % \item Some of the customizations previously made by \cs{renewcommand} have been replaced with commands. @@ -59,7 +59,7 @@ % The \env{astanza} can take now an option argument. % Consequently, if the first line of verse in a \env{astanza} environment starts with brackets \verb+[]+, you must precede them with a \cs{relax}. If you do not do it, the content of the brackets will be considered as an optional argument of the \env{astanza} environment. % \subsection{Migration to \reledpar~2.3.0} -% The line number style (alphabetic, numeric, etc.) for the notes of the right side are now defined by the value you set to \cs{linenumberstyleR} or \cs{linenumberstyle*}, and not by the value you set to \cs{linenumberstyle} which is kept for left side. +% The line number style (alphabetic, numeric, etc.) for notes on the right-hand side are now defined by the value you set to \cs{linenumberstyleR} or \cs{linenumberstyle*}, and not by the value you set to \cs{linenumberstyle}, which is kept for left side. % % The same is true for sub-line number styles and \cs{sublinenumberstyleR} or \cs{sublinenumberstyle*}, which are distinct from \cs{sublinenumberstyle}. % diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 558f80980ef..bb110ac931c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf Binary files differindex 48a0570b64f..70e4114726a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex 87804d61c9d..2a6da899cf6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex f7064fde1fe..a06aed60da6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf Binary files differindex bdc61104d1a..16ca6e0cff3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex 4a0232d1783..cd8a112726f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex efaaddc5502..c6190a3e012 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf Binary files differindex 73f74d8115e..14c82c2e6ca 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf Binary files differindex a46f645fdaf..437e71de8cf 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf Binary files differindex 324d020531d..a9bba3a86c0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf Binary files differindex ec1863e17d8..429639e18b0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 9232135eacd..ec7a3e89efa 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 295c7813891..10c765a9ecb 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf Binary files differindex 3d52dc5a8a9..d2f482444c1 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex 02ce4bfea08..59910d235db 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf Binary files differindex e2aea3db966..c230596db9e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex dee81f8846c..d6e738fb93a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex index fff31653b14..f2d68669017 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex @@ -61,7 +61,7 @@ We use \verb+\seriesatend+ to ensure that a \verb+pstart+ series between two pag \pstart \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \lipsum[2]\edtext{on otherpage}{\mynote{on otherpage}} \pend \pstart diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex 2568b1a7dd7..bf9fd7f76f7 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 9e6b4beb406..4e816b2b873 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex b30a7b63083..e0648e39c74 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 1d2929c6b1b..178c0156dc9 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 342712c0138..7bb4de2f412 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex b4f9cfa0157..bf9c9e1b222 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex 2b475e8dba7..ad12e4afb6b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex d9bd219b87c..0dce06c2d75 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 8c99736adb4..d29e4a1291a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex f6ee2fd47bd..a03ea3cc60c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 852279e6d88..9fdfa16ac18 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 9850bd92dba..42a9582d63e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 4193dd001ca..6dae3f03b0d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex fe52d6a74e8..75f977c2802 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex d7c2a6dfafb..d387406de62 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 2fffb8f8138..8c779b8a88e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex 530bc9d6400..d55e4d860c0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 84c6a545157..f793100f739 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 8ec2f69633e..b2b00294f84 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 23400503819..f5216a03272 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex fcdbdebac4c..85f3d1c03c3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 661d26f6b5d..e83959fbb62 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex index 4b53d8fa888..1a65b8a9453 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex @@ -23,13 +23,13 @@ \ifnumequal{\arabic{mynotelevelR}}{11}{%No more than J series (10) \setcounter{mynotelevelR}{6}% If more than J => restart to F (6) }{}% - \global\letcs{\mynote}{\themynotelevelR footnote}% And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which is called by reledmac + \global\letcs{\mynote}{\themynotelevelR footnote}% And let mynote be equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which is called by reledmac \else% If it's a left page \addtocounter{mynotelevel}{1}%Step counter \ifnumequal{\arabic{mynotelevel}}{6}{%No more than E series (5) \setcounter{mynotelevel}{1}%If more than J => restart to A (1) }{}% - \global\letcs{\mynote}{\themynotelevel footnote}%And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which called by reledmac + \global\letcs{\mynote}{\themynotelevel footnote}%And let mynote be equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which called by reledmac \fi% } % This code is called when beginnings of each pstart are printed @@ -111,7 +111,7 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \pstart \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \lipsum[2]\edtext{on otherpage}{\mynote{on otherpage}} \pend \pstart @@ -147,7 +147,7 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \pstart \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \lipsum[2]\edtext{on otherpage}{\mynote{on otherpage}} \pend \pstart @@ -189,7 +189,7 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \pstart \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \lipsum[2]\edtext{on otherpage}{\mynote{on otherpage}} \pend \pstart sss\themynotelevelR @@ -224,7 +224,7 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \pstart \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \lipsum[2]\edtext{on otherpage}{\mynote{on otherpage}} \pend \pstart sss\themynotelevelR diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex d608c4838f6..f26e1e1c138 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 64004df44dc..0a1f5f3e2dc 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 8c887ce59e8..f144cf66905 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 079833dc40c..27205560348 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex 827f68d19ad..a910ad9ba59 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 67bf96b611f..b53ac7d8033 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 5414582ac32..b68a6e06e46 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 681ea0a9503..1157dd0c6e3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 0af430cb96c..43b438072b2 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/migration.dtx b/Master/texmf-dist/source/latex/reledmac/migration.dtx index 0a8c221d37b..d8897568e8b 100644 --- a/Master/texmf-dist/source/latex/reledmac/migration.dtx +++ b/Master/texmf-dist/source/latex/reledmac/migration.dtx @@ -103,9 +103,9 @@ % % \begin{abstract} % -% This file contains the description of migration's process from one version of \macpackage to an other version. +% This file describes how to migrate between versions of \macpackage. % -% If no description about migration from one version to an other is written, that means user has nothing to do to migrate. +% Omitted versions should require no action by the user. % \end{abstract} % % \renewcommand{\numberline}[1]{#1~} diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index bae73f9fe41..f80d38a2f5b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -518,20 +518,21 @@ % \changes{v2.27.1}{2018/10/12}{Fix spurious space in \protect\cs{hidenumbering}.} % \changes{v2.28.0}{2018/11/30}{Familiar footnotes can take an optional argument to manually define the footnote mark.} % \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}{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}{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}} % \changes{v2.31.0}{2019/02/22}{Add \protect\option{noprefix} and \protect\option{prefixmore} to \protect\cs{appref} and \protect\cs{SEref}.} -% \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xgroupbyline}, which could produce spurious blank line} -% \changes{v2.31.1}{2019/03/03}{Fix bug with multiple footnote layer and \protect\cs{Xgroupbyline}} -% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and \protect\package{hyperref} package} -% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and optional argument of critical footnotes} -% \changes{v2.31.1}{2019/03/03}{Fix bug in vertical spacing with \protect\cs{Xgroupbyline}} -% \changes{v2.31.1}{2019/03/03}{Fix bug with indentation with \protect\cs{Xgroupbyline}} +% \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xgroupbyline}, which could produce spurious blank lines.} +% \changes{v2.31.1}{2019/03/03}{Fix bug with multiple footnote layer and \protect\cs{Xgroupbyline}.} +% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and \protect\package{hyperref} package.} +% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and optional argument of critical footnotes.} +% \changes{v2.31.1}{2019/03/03}{Fix bug in vertical spacing with \protect\cs{Xgroupbyline}.} +% \changes{v2.31.1}{2019/03/03}{Fix bug with indentation with \protect\cs{Xgroupbyline}.} % \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xhangindent} and \protect\cs{hangindentX} for right-to-left texts.} +% \changes{v2.31.2}{2019/04/03}{Fix bug with familiar footnote containing not default font (introduced with v.~2.20.0).} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -604,7 +605,7 @@ % % Any suggestions for new features are welcome. % -% This manual contains a general description of how to use \macpackage followed by +% This manual contains a general description of how to use \macpackage, followed by % the complete source code and its extensive documentation (in sections~\ref{overview} and following, enumerated with Roman numerals). % It ends with a list of actions to do when migrating from one version to other, a change history and an index to the % source code. @@ -959,7 +960,7 @@ % % \subsubsection{Content before specific \protect\cs{pstart} and after specific \protect\cs{pend}}\label{pstart:optionalarg} % \changes{v1.12.0}{2014/08/05}{Optional arguments for \protect\cs{pstart} and \protect\cs{pend}.} -% Both \protect\cs{pstart} and \protect\cs{pend} can take a optional argument in brackets. +% Both \protect\cs{pstart} and \protect\cs{pend} can take an optional argument in brackets. % Its content will be printed before the beginning of \protect\cs{pstart} / after the end of \protect\cs{pend} instead of the argument of \protect\cs{AtEveryPstart} / \protect\cs{AtEveryPend}. % % Note that a \cs{noindent} will be automatically added before this argument, and, consequently, a \cs{parskip} will be inserted. @@ -1003,10 +1004,10 @@ % \setcounter{pstart}{value} % \end{verbatim} % On each \protect\cs{beginnumbering} the numbering restarts. -% \changes{v0.15.0}{2012/06/11}{Possibility to print \protect\cs{pstart} number in the sides of the text.} +% \changes{v0.15.0}{2012/06/11}{Possibility to print \protect\cs{pstart} number at the sides of the text.} % % \DescribeMacro{\sidepstartnumtrue} -% With the \protect\cs{sidepstartnumtrue} command, the number of \protect\cs{pstart} will be printed in the sides of the text. +% With the \protect\cs{sidepstartnumtrue} command, the number of \protect\cs{pstart} will be printed at the sides of the text. % In this case, the line number will be not printed. % % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{labelpstarttrue}.} @@ -1074,14 +1075,30 @@ % \DescribeMacro{\numberlinefalse} \DescribeMacro{\numberlinetrue} % Line numbering can be disabled with \protect\cs{numberlinefalse}. It can be enabled again with \protect\cs{numberlinetrue}. % +% \textbf{This feature must be used with caution.} +% \begin{itemize} +% \item It should not be use if you have critical footnotes after \cs{numberlinefalse}. +% \item It could be used in the following cases: +% \begin{itemize} +% \item You want only familiar footnotes, not critical footnotes; +% \item You want only parallel typesetting (using \parpackage) but no critical footnotes. +% \item You disable, for a portion of text, line numbering +% \end{itemize} +% \item It must not be used if: +% \begin{itemize} +% \item You just not want to have the line number in the margins, but want to use critical footnote. In this case, set \label{firstlinenum} to a big value, such as 100,000 (\reff{firstlinenum}). +% \item You want to freeze the line numbering for some line, but still keep critical footnotes. In this case, use \cs{startlock} (\reff{startlock}). +% \end{itemize} +% \end{itemize} +% A successor to \reledmac\ may disable this feature. % \subsubsection{Setting lineation start and step} -% \DescribeMacro{\firstlinenum} +% \DescribeMacro{\firstlinenum}\label{firstlinenum} % \DescribeMacro{\linenumincrement} % By default, \macpackage numbers every 5th line. There are two counters that control this behaviour: % \verb?firstlinenum? and \verb?linenumincrement?. They can be changed using \protect\cs{firstlinenum}\marg{num} and % \protect\cs{linenumincrement}\marg{num}. \protect\cs{firstlinenum} specifies the first % line that will have a printed number, and \protect\cs{linenumincrement} is -% the difference between succesive numbered lines. For example, to start printing numbers at the first line +% the difference between successive numbered lines. For example, to start printing numbers at the first line % and to have every other line numbered: \\ % \verb?\firstlinenum{1} \linenumincrement{2}? % @@ -1128,7 +1145,7 @@ % The package's default setting is \\ % \verb"\linenummargin{left}" \\ % to typeset the numbers in the left hand margin. -% You can change this whenever you're not in the middle of +% You can change this whenever you're not in the middle of % making a paragraph. % % More precisely, the value of @@ -1178,7 +1195,7 @@ % \DescribeMacro{Xsublinesep} % \DescribeMacro{Xsublinesepside} % You can change the separator between the line number and the subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. In the second case, it will change the separator only for line numbers in the margins, not in the footnotes. -% \subsubsection{Locking lineation} +% \subsubsection{Locking lineation}\label{startlock} % \DescribeMacro{\startlock} % \DescribeMacro{\endlock} % The \protect\cs{startlock} command, used in running text, locks the @@ -1263,7 +1280,7 @@ % You may want to have two or more numbers associated with a line of text. % Consider, for example, the following cases: % \begin{itemize} -% \item You want to split a line of verse into two parts depending upon some stylistic / rythmic / linguistic convention. +% \item You want to split a line of verse into two parts depending upon some stylistic / rhythmic / linguistic convention. % \item You want to add the line number used by a previous edition of the work. % \item You want to typeset biblical text, and use division in verse. % \end{itemize} @@ -1278,7 +1295,7 @@ % The annotation can contain any textual value (whether number, text, or other) such as the line number from the older edition. % Here are some characteristics of line number annotation: % \begin{itemize} -% \item An annotation is associated with a line of text. It is reset with each new line of text, except if you use \option{noresetlinenumannotation} option of \macpackage. +% \item An annotation is associated with a line of text. It is reset with each new line of text, unless you use the \option{noresetlinenumannotation} option of \macpackage. % \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}. @@ -1306,7 +1323,7 @@ % % 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. -% It takes one argument, containing the beginnning and ending annotations separated by a pipe (\verb+|+). +% It takes one argument, containing the beginning and ending annotations separated by a pipe (\verb+|+). % As with \cs{linenum}, if one wishes to change some specific part of the annotation, one can use % \begin{verbatim} % \lineannot{|b}% to change the ending annotation @@ -1403,7 +1420,7 @@ % \section{Apparatus commands} % % \subsection{Terminology} -% We call ``critical notes'' notes which refer to both a lemma, that is a part of text and a line number. +% We call ``critical notes'' notes which refer to both a lemma, that is a part of text, and a line number. % Critical notes are subdivided in critical footnotes and critical endnotes. % % We call ``familiar notes'' notes which refer to a footnote mark in the main text. @@ -1436,7 +1453,7 @@ % For example: % \egstart % \begin{verbatim} -% I am happy : +% I am happy: % I saw my friend \edtext{Smith}{ % \Afootnote{Jones C, D.}} % on Tuesday. @@ -1446,7 +1463,7 @@ % \firstlinenum{1} % \linenumincrement{1} % \pstart -% I am happy : I saw my friend \edtext{Smith}{ +% I am happy: I saw my friend \edtext{Smith}{ % \Afootnote{Jones C, D.}} % on Tuesday. % \pend @@ -4267,7 +4284,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/03/03 v2.31.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/04/03 v2.31.2 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -11563,7 +11580,7 @@ % \subsection{Footnote hanging indent} % \begin{macro}{\Xsethangindent} % \begin{macro}{\sethangindentX} -% \cs{Xsethangindent} set the hangindent for a critical footnote, while \cs{sethangindentX} does it for a familiar footnote. +% \cs{Xsethangindent} sets the hangindent for a critical footnote, while \cs{sethangindentX} does it for a familiar footnote. % \begin{macrocode} \newcommand{\Xsethangindent}[1]{% \if@RTL% @@ -11694,7 +11711,7 @@ % \begin{macro}{\Xstorelineinfo} % The \cs{Xstorelineinfo} macro is used to store some data about line number of the current critical footnote, data which will be reused later for the \cs{Xnumberonlyfirstinline} and related setting. % -% \#1 footnote specification for the current footnote ; +% \#1 footnote specification for the current footnote; % \#2 footnote series. % \begin{macrocode} \newcommand{\Xstorelineinfo}[2]{% @@ -12099,7 +12116,7 @@ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number \l@d@dashfalse% \fi% \fi% @@ -12259,8 +12276,8 @@ % \begin{macro}{\prepare@Xgroupbyline} % \cs{prepare@Xgroupbyline} is a macro called on the \cs{meta{XXX}vfootnote} if \cs{Xgroupbyline} is set to true, instead of calling \cs{insert} directly. % \#1 The series\\ -% \#2 The content of the footnote, that is also the line number indication\\ -% \#3 This macro which prepare the content of the insertion \\ +% \#2 The content of the footnote, which is also the line number indication\\ +% \#3 This macro, which prepares the contents of the insertion \\ % \begin{macrocode} \newcommand{\prepare@Xgroupbyline}[3]{% \iftoggle{Xgroupbylineseparetwolines@#1}{% @@ -12603,7 +12620,8 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% \beforeinsertion@X{#1}% \insert\@nameuse{footins#1}\bgroup - \reset@font% + \fontseries{\seriesdefault}% + \fontshape{\shapedefault}% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% @@ -12814,7 +12832,7 @@ % \end{macro} % \begin{macro}{\vbfnoteX} % This command calls the correct footnote-inserting commands. -% \#1 footnote serie, \#2 footnote content, \#3 footnote counter, \#4 manuel footnote mark +% \#1 footnote series, \#2 footnote content, \#3 footnote counter, \#4 manual footnote mark % \begin{macrocode} \newcommand{\vbfnoteX}[4]{% \get@fnmarkX{#1}{#3}{#4}\relax% @@ -12825,7 +12843,7 @@ % % \begin{macro}{\get@fnmarkX} % This command gets the correct footnote number when typesetting parallel texts. -% \#1 footnote series, \#2 footnote counter, \#3 manuel footnote number +% \#1 footnote series, \#2 footnote counter, \#3 manual footnote number % \begin{macrocode} \newcommand{\get@fnmarkX}[3]{% \ifstrempty{#3}{% @@ -14126,7 +14144,7 @@ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number \l@d@dashfalse% \fi% \fi% @@ -14618,7 +14636,7 @@ \prepare@prenotesX{#1}% \newcommand{\content}{##2}% % \end{macrocode} -% If we use the \cs{csquotes} package, we reset the quotation level. +% If we are using the \cs{csquotes} package, we reset the quotation level. % \begin{macrocode} \ifdefined\csq@qlevel% \csq@qlevel=0\relax% @@ -14626,7 +14644,7 @@ % \end{macrocode} % If we are preparing parallel typesetting, we cannot just increase the footnote counter. % Read \parpackage's handbook about that (\reff{reledpar-familiarfootnotenumber}). -% If we have manual footnote mark, use it. +% If we have a manual footnote mark, use it. % \begin{macrocode} \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne% \ifstrempty{##1}{% @@ -14689,7 +14707,7 @@ % \begin{macrocode} \expandafter\gappto\expandafter\no@expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}% % \end{macrocode} -% And now, define \cs{footnoteXmark} and \cs{footnoteXtext}, equivalent to classical\cs{footnotemark} and \cs{footnotetext}. +% And now, define \cs{footnoteXmark} and \cs{footnoteXtext}, equivalent to classical \cs{footnotemark} and \cs{footnotetext}. % \begin{macrocode} \expandafter\newcommand\csname footnote#1mark\endcsname{% \begingroup% @@ -14923,7 +14941,7 @@ % \end{macro} % \subsection{Test series order} % \begin{macro}{\ifseriesbefore} -% \protect\cs{ifseriesbefore}\marg{seriesA}\marg{seriesB}\marg{true}\marg{false} expands \meta{true} if \meta{seriesA} is printed before \meta{seriesB}, expands \meta{false} otherwise. +% \protect\cs{ifseriesbefore}\marg{seriesA}\marg{seriesB}\marg{true}\marg{false} expands to \meta{true} if \meta{seriesA} is printed before \meta{seriesB}, or to \meta{false} otherwise. % \begin{macrocode} \newcommand{\ifseriesbefore}[4]{% \StrPosition{\@series}{#1}[\@first]% @@ -15001,7 +15019,7 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\setcommand@series} -% \protect\cs{setcommand@series}\marg{series}\marg{command}\marg{value} is a generic command to store hook's value into commands specific to some series. +% \protect\cs{setcommand@series}\marg{series}\marg{command}\marg{value} is a generic command to store a hook's value into commands specific to some series. % The arguments are: % \begin{itemize} % \item \verb+#1+ (mandatory): the series for which the hooks should be set. If empty, all the series will be affected. @@ -15323,7 +15341,7 @@ % \begin{macro}{\add@hooktoggle@specific@to@cs} % The \cs{add@hooktoggle@specific@to@cs} macro stores to a macro % all the current values of hook toggle specific to a command. -% It is useful for \cs{Xgroupbyline} option, which does not add immediately notes to the inserts list. +% It is useful for the \cs{Xgroupbyline} option, which does not immediately add notes to the inserts list. % It uses the \cs{hooktoggle@specific} list. % \begin{macrocode} \def\hooktoggle@specific{}% @@ -15417,7 +15435,7 @@ % \subsection{Extra footnotes output} % % With luck we might only have to change \protect\cs{@makecol} and -% \protect\cs{@reinserts} of the \LaTeX's kernel. +% \protect\cs{@reinserts} of \LaTeX's kernel. % Since \reledmac, we use \protect\package{etoolbox}'s patching commands instead of overriding. % It should provides better compatibility with other package which modify these commands @@ -15523,7 +15541,7 @@ % % % \begin{macro}{\l@ddodoreinxtrafeet} -% \protect\cs{l@ddodoreinxtrafeet} is the code for catering for the extra footnotes +% \protect\cs{l@ddodoreinxtrafeet} is the code catering for the extra footnotes % within \protect\cs{@reinserts}. % We use the same category and ordering as in \protect\cs{l@ddoxtrafeet}. % \changes{v0.2.1}{203/09/13}{Renamed \protect\cs{dodoreinxtrafeet} to \protect\cs{l@ddodoreinxtrafeet}} @@ -15584,7 +15602,7 @@ \csuse{footgroup#1}{#1}% }% % \end{macrocode} -% We print all the series of notes by looping on them. +% We print all the series of notes by looping over them. % We check before printing them that they are not voided. % \begin{macrocode} \newcommand*{\do@feetX}{% @@ -15644,7 +15662,7 @@ % \end{macrocode} % \protect\ltxclass{memoir} has not been loaded, so patch \protect\cs{@makecol} and % \protect\cs{@reinserts}. -% If the \package{fancyhdr} package $<$ version 3.8 has been loaded, we patch the \cs{latex@makecol} command, because this package redefines the standard \cs{@makecol} in the preamble, to call \cs{latex@makecol} which have been \cs{let} to \cs{@makecol}. +% If the \package{fancyhdr} package $<$ version 3.8 has been loaded, we patch the \cs{latex@makecol} command, because this package redefines the standard \cs{@makecol} in the preamble to call \cs{latex@makecol}, which has been \cs{let} to \cs{@makecol}. % If this package is not loaded, we directly patch \cs{@makecol}. % If the \package{fancyhdr} package $\geq$ version 3.8, we also directly patch \cs{@makecol}, because \package{fancyhdr} does its own patch \cs{AtBeginDocument}. % \begin{macrocode} @@ -15692,7 +15710,7 @@ % \begin{macrocode} \@ifclassloaded{memoir}{% % \end{macrocode} -% If the \protect\ltxclass{memoir} class is loaded we hook into its modified +% If the \protect\ltxclass{memoir} class is loaded, we hook into its modified % \verb?\@doclearpage?. % \begin{macro}{\@mem@extranofeet} % \begin{macrocode} @@ -15993,7 +16011,7 @@ % \changes{v1.4.1}{2012/11/16}{Fix a bug with \protect\cs{edlabel}.} %In cases where \protect\cs{edlabel} is the first element in a paragraph, we have a problem with line counts, because line counts change only at the first horizontal box of the paragraph. %Hence, we need to test \protect\cs{edlabel} if it occurs at the start of a paragraph. To do so, we use \protect\cs{ifvmode}. If the test is true, we must advance by one unit the amount of text we write into the \verb].aux] file. -% We do so using \protect\cs{advancelabel@refs} command. +% We do so with the \protect\cs{advancelabel@refs} command. % \begin{macrocode} \newcounter{line}% \newcounter{subline}% @@ -16114,7 +16132,7 @@ \expandafter\l@dp@rsefootspec\l@d@nums|% \expandafter\parse@annot\l@current@annot|% % \end{macrocode} -% Use the \LaTeX\ standard hack for label. +% Use the \LaTeX\ standard hack for label. % \begin{macrocode} \@bsphack% % \end{macrocode} @@ -21248,15 +21266,15 @@ % \section{Things to do when changing versions} % \input{doc-include/migrate-mac.dtx} % \section{Auxiliary softwares} -% This appendix list some softwares and tools related to \package{reledmac} at that may be useful. +% This appendix lists some software and tools related to \package{reledmac} that may be useful. % \subsection{\emph{samewords}} -% The \emph{samewords} software (Michael Stenskjær Christensen) automatically add \cs{sameword} commands (\reff{sameword}) into a \verb+.tex+ file. \\ +% The \emph{samewords} program (Michael Stenskjær Christensen) automatically adds \cs{sameword} commands (\reff{sameword}) into a \verb+.tex+ file. \\ % \url{https://samewords.readthedocs.io/en/latest/} % \subsection{critical-keys for \emph{Emacs}} % The \emph{Emacs} editor has a package to help inserting \macpackage's commands (Juan Manuel Macías Chaín).\\ % \url{https://gitlab.com/maciaschain/critical-keys} % \subsection{Import from TEI} -% There is multiple tools to convert from XML-TEI to \emph{reledmac}. Here a non exhaustive-list: +% There are multiple tools to convert from XML-TEI to \emph{reledmac}. Here is a non exhaustive-list: % \begin{itemize} % \item \url{http://ciham-digital.huma-num.fr/teicat/} % \item \url{https://github.com/fizzbucket/tei_transformer} @@ -21264,7 +21282,7 @@ % \item \url{http://lombardpress.org/print/} % \item \url{https://github.com/Jean-Baptiste-Camps/TEItoLaTeX} % \end{itemize} -% Please, tell us if you know any other tool. +% Please, tell us if you know of other tools. % \clearpage % \bibliographystyle{alpha} % \phantomsection diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 3fc339e156f..7c0cfbf941f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -1106,9 +1106,9 @@ % Another usual case is when you have text in parallel columns and want to get line numbers only on the outer margin. % In this case, you need to get line numbers on the left side of the left column on left pages and on the right side of the right column on the right pages. % -% Reciprocally, if you want to get line numbers only on the inner margin, you need to get line number on the right side of the right column on left pages and on the left side of the left column on the right pages. +% Reciprocally, if you want line numbers only in the inner margin, you need to get line numbers on the right side of the right column on left pages and on the left side of the left column on the right pages. % -% In the two cases, you need, for one column, to have line numbers only on one page of a double pages. +% In both cases, you need, for one column, to have line numbers only on one page of a double page. % % You can use \cs{linenumOnlyPagesForColumns} and \cs{linenumOnlyPagesForColumnsR} to get this result: % \begin{verbatim} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 4aa20e12ee1..e4500f4c4b8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/03/03 v2.31.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/04/03 v2.31.2 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -3632,7 +3632,7 @@ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number \l@d@dashfalse% \fi% \fi% @@ -3924,7 +3924,8 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% \beforeinsertion@X{#1}% \insert\@nameuse{footins#1}\bgroup - \reset@font% + \fontseries{\seriesdefault}% + \fontshape{\shapedefault}% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% @@ -4921,7 +4922,7 @@ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Dont print the dash if we don't print the line number + \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number \l@d@dashfalse% \fi% \fi% |