diff options
Diffstat (limited to 'macros/latex/contrib/reledmac')
50 files changed, 114 insertions, 45 deletions
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 58941454e4..4e6cef7423 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex f367a69313..4a4492ba6d 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 97d7d22999..edcc2bf125 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex 47ab50100e..87fcfccdb0 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex bb3d9bba37..3b5e5715b7 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex d93476179b..c833b9f6ae 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 68530611ee..382ba54302 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex 73b2037b68..319e83f2ea 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex d624b0e021..a407c54f18 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex a3006e631c..d66bb8eda8 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex 22e4df2e14..c75e366e1a 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex ca44a14887..471a7a233d 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 6812d6357c..0561b50d0d 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex d66cd97cf6..4cdceb5b2e 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex 1419420db7..5fd637fe57 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex c4167e889a..494cc2fa3c 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex f6e6357404..3237be4be1 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 92303f68a8..e7c505a201 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 6ca8890883..65d17ca2e9 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 709761b7b5..62a3ac3b45 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 871639bfac..60abd860ab 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 8b3c00fbcd..113a237956 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex ba12c539f1..ff5d2b97c7 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 4565ff9184..a7fd40a1ea 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex 7be2ba4d63..a963695d7c 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex 2434009585..c47c522bb4 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex f855b81f3c..33b19d76f6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex d86378d280..4b48dcc44c 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex c678e20f35..4883912f88 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex feed6e27ea..6dab47543e 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex d92e07ab7e..08c01a94bf 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex ccdc5625ae..7d1d97c5c1 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 08f0836796..4f5cf3ccf6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex c8f8f491f2..40df495e5a 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex e780168dc8..3bd111bac9 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 5c14beb4be..7c5e7413e5 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 298a355d76..5b42775a42 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 041a6fbfcf..c8b8d81cf9 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 886682aff9..5f21322ee8 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 7dec0ce091..4ac56fd5c9 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex dc46aa0994..f328cc61d3 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 21d81aaa9e..842a706a28 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 7117f720c5..2b2f02ecbb 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 0b26375b32..353ab235fa 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex b022878627..23415e60b4 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 20819048e6..32008aee75 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex 779bd5474a..6800d46fac 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 5fe0382656..dd6a6f39c0 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -580,7 +580,12 @@ % \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.} % \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\cs{Xstanzaonlyfirst}.} % \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\option{parapparatus} option and nested \protect\cs{edtext}.} -% \changes{v2.37.1}{2021/04/04}{Fix bug with \protect\cs{Xgroupbyline} and two or three columns notes.} +% \changes{v2.37.2}{2021/04/04}{Fix bug with \protect\cs{Xgroupbyline} and two or three columns notes.} +% \changes{v2.38.0}{2021/05/30}{Fix indent bugs with stanza and right-to-left typesetting.} +% \changes{v2.38.0}{2021/05/30}{Fix bug with \protect\cs{lemma} and right-to-left typesetting with \protect\XeLaTeX.} +% \changes{v2.38.0}{2021/05/30}{Add hyperlinks between footnote and lemma when using abbreviated line range.} +% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.} +% \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -2394,6 +2399,8 @@ % \paragraph{For critical notes} % \DescribeMacro{\Xtxtbeforenumber} % \cs{Xtxtbeforenumber}\oarg{s}\marg{txt} allows the insertion of \meta{txt} before the line number only when the line number is printed, so taking into account \cs{Xnumberonlyfirstinline} and the like. +% \DescribeMacro{\Xbeforepagenumber} +% \cs{Xbeforepagenumber}\oarg{s}\marg{txt} allows the insertion of \meta{txt} before the page number only when the page number is printed, so when a note spans across two or more pages and the lineation is by page. % \paragraph{For endnotes}\label{pagelineendnotes} % \DescribeMacro{\Xendbeforepagenumber} % \cs{Xendbeforepagenumber}\oarg{s}\marg{text} defines the text before the page number in endnotes. Default value is \verb+p.+ (\enquote{p} followed by a dot). @@ -2457,6 +2464,13 @@ % % \DescribeMacro{\Xendnonumber} \protect\cs{Xendnonumber}\oarg{s} is the same for endnotes. % +% \subsubsection{Disabling page number printing} +% \DescribeMacro{\Xnopagenumberifcurrent}% +% When we use a lineation by page, \macpackage checks if a lemma spans across two page. In this case, it prints the starting end ending page number. +% +% Many times, one of these two page numbers is also the current page number. +% +% In this case, it is possible to disable page number printing, using \cs{Xnopagenumberifcurrent}\oarg{s}. % \subsubsection{Printing pstart number} % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{Xpstart} and \protect\cs{Xonlypstart}} % \changes{v1.18.0}{2015/02/23}{Add \protect\cs{Xpstarteverytime}} @@ -2494,16 +2508,6 @@ % Default value is empty. % % \DescribeMacro{Xstanzaonlyfirst} You can use \cs{Xstanzaonlyfirst}\oarg{s} to print the stanza number only the first time it appears in the apparatus. -% \subsubsection{Disabling line number printing} -% Sometime, we want to print only the stanza or pstart number, but not the line number. -% \DescribeMacro{\Xnolinenumber} -% \DescribeMacro{\Xendnolinenumber} -% The \cs{Xnolinenumber}\oarg{s} macro disables line number printing for critical footnotes. -% -% The \cs{Xendnolinenumber} macro does the same for endnotes. -% -% Note that contrary to \cs{Xnonumber} and \cs{Xnoendnum}, the page/pstartannotation will be printed, if required. -% % \subsubsection{Options for line number annotations}\label{annotation-inapparatus} % \DescribeMacro{\Xlinenumannotationonlyfirst} % By default, the line number annotation (\reff{annotation}) is printed in every note. If you want to print it only the first time for a given annotation @@ -2711,15 +2715,15 @@ % \subsubsection{For all notes} % \DescribeMacro{\Xnotefontsize} % \protect\cs{Xnotefontsize}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \DescribeMacro{\notefontsizeX} % \protect\cs{notefontsizeX}\oarg{s}\marg{command} is used to define the font size of familiar footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \DescribeMacro{\Xendnotefontsize} % \protect\cs{Xendnotefontsize}\oarg{s}\marg{l} is used to define the font size of end critical footnotes of the series. The default value is \protect\cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% The \meta{command} must not be a size in pt, but a \LaTeX\ macro, like \protect\cs{small}. % % \subsection{Wrapping notes} % \subsubsection{Wrapping lemmas} @@ -4471,7 +4475,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/04/04 v2.37.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/05/30 v2.38.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8265,21 +8269,33 @@ % With \XeLaTeX, you must track whether the language reads left to right (English) or right to left (Arabic). \reledmac defines an \cs{if@RTL} boolean test is not already defined. % \begin{macrocode} \if@RTL% + \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {000}% + {}% + {% + \ifnumequal% + {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}% + {}% + {\write@lemma}% + }% \flag@start@RTL% + \IfStrEq{\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {000}% + {}% + {% + \ifnumequal% + {\xabslineref{edtext:start:\csuse{thisedtext@\the\@edtext@level}}}% + {\xabslineref{edtext:end:\csuse{thisedtext@\the\@edtext@level}}}% + {\write@lemma}% + {}% + }% \else% \flag@start% + \write@lemma% \fi% % \end{macrocode} % We write in the numbered file wether the current \protect\cs{edtext} has a \protect\cs{lemma} in the the second argument. -% \begin{macrocode} - \if@lemmacommand@% - \ifledRcol% - \write\linenum@outR{\string\@lemma}% - \else% - \write\linenum@out{\string\@lemma}% - \fi% - \fi% -% \end{macrocode} % Finally, we are ready to admit the first argument into the current % paragraph. % @@ -8458,14 +8474,25 @@ % \end{macro} % % \begin{macro}{\@lemma} +% \begin{macro}{\write@lemma} % The \protect\cs{@lemma} is written in the numbered file to set which \protect\cs{edtext} has an % \protect\cs{lemma} as second argument. % \begin{macrocode} \newcommand{\@lemma}{% \booltrue{lemmacommand@\the\@edtext@level}% }% +\newcommand{\write@lemma}{% + \if@lemmacommand@% + \ifledRcol% + \write\linenum@outR{\string\@lemma}% + \else% + \write\linenum@out{\string\@lemma}% + \fi% + \fi% +}% % \end{macrocode} % \end{macro} +% \end{macro} % \begin{macro}{\if@lemmacommand@} % \changes{v1.15.0}{2015/01/12}{New boolean \protect\cs{iflemmacommand@}.} % This boolean is set to TRUE inside a \protect\cs{edtext} (or \protect\cs{critext}) when a \protect\cs{lemma} command is called. @@ -9572,11 +9599,10 @@ % \begin{macro}{\ledllfill} % \begin{macro}{\ledrlfill} % These macros are called at the left (\protect\cs{ledllfill}) and the right -% (\protect\cs{ledllfill}) of each numbered line. The initial definitions -% correspond to the original code for \protect\cs{do@line}. +% (\protect\cs{ledllfill}) of each numbered line. % \begin{macrocode} -\newcommand*{\ledllfill}{\hfil} -\newcommand*{\ledrlfill}{} +\newcommand*{\ledllfill}{\unless\if@RTL\hfil\fi}% +\newcommand*{\ledrlfill}{\if@RTL\hfil\fi}% % \end{macrocode} % \end{macro} @@ -12669,7 +12695,7 @@ {\numdef{\tmp}{0}}% \istwofollowinglines@false% \ifnumequal{#4-#2}{1}% - {\istwofollowinglines@true}% + {\istwofollowinglines@true}%% {\ifbypage@% \ifnumequal{#3-#1}{1}% {% @@ -12685,6 +12711,7 @@ % \end{macro} % % \begin{macro}{\printlines} +% \begin{macro}{\printlines@count} % \changes{v2.5.0}{2015/11/13}{\protect\cs{printlines} takes an eighth argument: the line flag} % So, we have decided which part of line number sets will be printed depending on these values. % Now we are ready to print them. @@ -12692,7 +12719,9 @@ % \changes{v0.15.0}{2012/06/11}{Line numbering can be reset at each pstart.} % Arguments are 1) start page number 2) start line number 3) start subline number 4) end page number 5) end line number 6) end subline number 7) font specification 8) side flag % \begin{macrocode} +\newcount\printlines@count% \def\printlines#1|#2|#3|#4|#5|#6|#7|#8|{% + \global\advance\printlines@count by 1% \begingroup% % \end{macrocode} % Decide which part of line number components we will print. @@ -12712,11 +12741,28 @@ \ifcsstring{Xlinenumannotationposition@\@currentseries}{before}% {\@annot@start@print}% {}% +% \end{macrocode} +% Sometime, we need to print the page number. +% However, if both the current page is equal to the page number and we use \cs{Xnopagenumberifcurrent}, we do not want to print it. +% To determine the current page, we need to use crossref mechanism. See \url{https://tex.stackexchange.com/a/239457/7712} for explanation. +% \begin{macrocode} \ifl@d@pnum% - \wrap@edcrossref{\@this@crossref@start}{#1}% - \ifl@d@Xlinenumber% - \csuse{Xpagelinesep@\@currentseries}% - \fi% + \iftoggle{Xnopagenumberifcurrent@\@currentseries}{% + \edlabel{printlines@\the\printlines@count}% + }{}% + \ifboolexpr{% + not test{\ifnumequal{\xpageref{printlines@\the\printlines@count}}{#1}}% + or not togl{Xnopagenumberifcurrent@\@currentseries}% + }% + {% + \csuse{Xbeforepagenumber@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{% + #1% + }% + \ifl@d@Xlinenumber% + \csuse{Xpagelinesep@\@currentseries}% + \fi% + }{}% \fi% \ifl@d@Xlinenumber% \wrap@edcrossref{\@this@crossref@start}{% @@ -12744,9 +12790,9 @@ \ifl@d@Xtwolines% \ifl@d@Xlinenumber% \ifl@d@Xmorethantwolines% - \csuse{Xmorethantwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xmorethantwolines@\@currentseries}}% \else% - \csuse{Xtwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xtwolines@\@currentseries}}% \fi% \fi% \else% @@ -12761,8 +12807,16 @@ {\@annot@end@print}% {}% \ifl@d@pnum% - \wrap@edcrossref{\@this@crossref@end}{#4}% - \csuse{Xpagelinesep@\@currentseries}% + \ifboolexpr{% + not test{\ifnumequal{\xpageref{printlines@\the\printlines@count}}{#4}}% + or not togl{Xnopagenumberifcurrent@\@currentseries}% + }{% + \csuse{Xbeforepagenumber@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{% + #4% + }% + \csuse{Xpagelinesep@\@currentseries}% + }{}% \fi% \ifl@d@Xlinenumber% \ifl@d@elin% @@ -12790,6 +12844,7 @@ }% % \end{macrocode} % \end{macro} +% \end{macro} % \subsubsection{Footnote grouped by line} % \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. @@ -14870,9 +14925,9 @@ \ifl@d@Xtwolines% \ifl@d@Xendlinenumber% \ifl@d@Xmorethantwolines% - \csuse{Xendmorethantwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xendmorethantwolines@\@currentseries}}% \else% - \csuse{Xendtwolines@\@currentseries}% + \wrap@edcrossref{\@this@crossref@end}{\csuse{Xendtwolines@\@currentseries}}% \fi% \fi% \else% @@ -15069,6 +15124,8 @@ \newtoggle{Xnolinenumberifannotation@#1}% \csgdef{Xbeforenumber@#1}{0pt}% \csgdef{Xtxtbeforenumber@#1}{}% + \newtoggle{Xnopagenumberifcurrent@#1}% + \csgdef{Xbeforepagenumber@#1}{}% \csgdef{Xafternumber@#1}{0.5em}% \newtoggle{Xnonbreakableafternumber@#1}% \csgdef{Xbeforesymlinenum@#1}{\csuse{Xbeforenumber@#1}}% @@ -15821,6 +15878,8 @@ \newhookcommand@series{Xsymlinenumannotation}% \newhookcommand@series{Xbeforenumber} \newhookcommand@series{Xtxtbeforenumber} + \newhooktoggle@series{Xnopagenumberifcurrent}% + \newhookcommand@series{Xbeforepagenumber}% \newhookcommand@series{Xafternumber} \newhookcommand@series{Xbeforesymlinenum} \newhookcommand@series{Xaftersymlinenum} @@ -19219,10 +19278,14 @@ }% }% }% -\xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock - \hangindent\expandafter - \noexpand\csname sza@0@\endcsname\stanzaindentbase - \hangafter\@ne} + +\def\stanza@hang{% + \leavevmode\startlock% + \hangindent\if@RTL-\fi\expandafter% + \csname sza@0@\endcsname\stanzaindentbase% + \hangafter\@ne% +}% + \def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname \ifnum\count@>\@M\advance\count@-\@M\penalty-\else \penalty\fi\count@} @@ -19273,8 +19336,14 @@ \def\noexpand\stanza@hang{\unexpanded{\leavevmode\null}}% \let\noexpand\endlock\relax% \noexpand\else% - \interlinepenalty% - \@M\rightskip\z@ plus 1fil\relax% + \interlinepenalty\@M% + \unexpanded{% + \ifboolexpr{bool {@RTL} and bool{xetex}}{% + \leftskip\z@ plus 1fil\relax% + }{% + \rightskip\z@ plus 1fil\relax% + }% + }% \noexpand\fi% \noexpand\ifnum\expandafter\noexpand\csname szp@0@\endcsname=\z@% \let\noexpand\sza@penalty% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex 60151a3fbc..0e3ba600ed 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex cee0c73ade..ed94a2657e 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf |