diff options
| author | Karl Berry <karl@freefriends.org> | 2020-11-29 21:45:41 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-11-29 21:45:41 +0000 |
| commit | 0600aa7f883f98956cb74d106dc5405613f514e2 (patch) | |
| tree | 01b1ab96510d68e57f19fd5879ff2a0f309a32e9 | |
| parent | 7ba43cd7687f0c63850391b88945e432d8958a84 (diff) | |
reledmac (29nov20)
git-svn-id: svn://tug.org/texlive/trunk@57034 c570f23f-e606-0410-a88d-b1316a301751
56 files changed, 864 insertions, 473 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/README.md b/Master/texmf-dist/doc/latex/reledmac/README.md index 27f3af27584..5512e2afd70 100644 --- a/Master/texmf-dist/doc/latex/reledmac/README.md +++ b/Master/texmf-dist/doc/latex/reledmac/README.md @@ -58,7 +58,7 @@ The distribution consists of the following files: # Installation -This package is included in the two main TeX's distribution : TeXLive (and MacTeX) and MikTeX. However, if you want to install it manually : +This package is included in the two main TeX distributions: TeXLive (and MacTeX) and MikTeX. However, if you want to install it manually: - run: `latex reledmac.ins` (which will generate `reledmac.sty`) and `latex reledpar.ins` (which will generate `reledpar.sty`) - move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ of your distribution). 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 3250a617965..9d1452e2532 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 @@ -87,10 +87,10 @@ % Now, they are aligned to the left. % Please contact us if you need to retain the older behaviour. % \subsection{Migration to \reledpar~v.~2.24.3} -% There was an inconstancy with hanging verses. +% There was an inconsistency with hanging verses. % If you defined indentation of hanging verses as \verb+2+, with \verb+setstanzaindents{2,…}+, the indent was, in reality, typeset as equal to \verb+4+. This happened: % \begin{itemize} % \item only in parallel typesetting; -% \item only with \cs{stanza} macro, not with \env{astanza} environment. +% \item only with the \cs{stanza} macro, not with the \env{astanza} environment. % \end{itemize} % This inconsistency has been corrected. If you want to keep old indentation after upgrading the package, just multiply by two the first argument of \cs{setstanzaindents}. 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 889a2743144..c9d2523cd88 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-criticalendnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 0a3a8f57c72..6d49a78d23e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.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 b94bf4394b3..2eea6f2787e 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 8496b6f8a39..c7cc35c0b2a 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 a9c51f1831f..955fbbdb0d2 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 4c83dbf5b15..f8cd9cddc55 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 405a754008d..87d4aab6796 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-antilabe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf Binary files differindex 418778bbf46..6f3d0470050 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.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 271adc68beb..c200296dbd5 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 88aea5e5c67..65dd1569a72 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 673078080fc..d3d024bface 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 7f1e1f9ab2e..713ecbe130d 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 8c70a05ea28..404da7a58e8 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-lemma_disambigution.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.tex index 02f01b03c98..774cee0a554 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.tex @@ -21,7 +21,7 @@ \begin{abstract} This file provides an example of lemma's disambuigation. -All word which can potentially be twice (or more) in a same line is marked by an \verb+\sameword+. \emph{reledmac} print the word rank only if the word is effectively printed twice (or more) time in the same line. +All word which can potentially be twice (or more) in a same line is marked by an \verb+\sameword+. \emph{reledmac} prints the word rank only if the word is effectively printed twice (or more) time in the same line. For use with \verb+\lemma+, please read the handbook. 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 5d64987a03a..bd9785768ab 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 9e8e550bcba..9bb0d243e61 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 57f9a049509..8f10eeeb33b 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 886d5d86638..1d47e98326c 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 7c3d574163c..3b4bbab2f80 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-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex f54cdd98427..f8f88d5895c 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 f051ce81384..49910a1f3ea 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 019b92d1ad1..3a772ba51e0 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 f3b7a0631e6..16978547635 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 9135244077d..21cae83af1f 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 fa234426a6e..31ca5e79b5f 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 3d2286ab4b8..a0a564da3a2 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 23ecaaa9ee3..6f89ddb971e 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 060a966d0a9..5e5e71eea40 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 04f8aac0747..e83b3370dd9 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 0e1bfaa60c0..b3fc8f6e515 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 32fc320a986..6830faba335 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 87d09cd20ea..0e0a1949110 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 5dc6e3be31b..2ce3db4770a 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 520ce73ad5c..8c46da3d516 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 4d13b9452ec..8994aac2ab5 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 3ed1dcc278f..f3ebbb1c371 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 95e233664ef..6b3dfdebf1f 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 9e3d14194c1..0230f957aef 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 0893ffc29be..07108672f21 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 252dc8f1007..e0f83f099d8 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 7da2f82e648..d485eb3b910 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_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 403ae30a91d..7dbef6237e8 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 da319cfaaf4..edee6291940 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 1ed4c721c1e..736abce041e 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 6b3320340b9..c1a8e94524e 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 2cc17e616f7..6674aa54d4c 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 1a080ebed2c..d33a684a7c6 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 cd6af6144ec..1c3949dc139 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 4964ebe5b06..098ff0373ef 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 d153462f078..f593ec914de 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/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index f3bdfacf3d1..2a1e6ee2edc 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -139,7 +139,7 @@ % % \newcommand{\dtxfilename}{\texttt{reledmac.dtx}} % \GetFileInfo{reledmac.sty} -% ^^A To put the changes in the right order : see http://tex.stackexchange.com/a/74113/7712 +% ^^A To put the changes in the right order: see http://tex.stackexchange.com/a/74113/7712 %\makeatletter % \let\org@changes@\changes@ % \def\my@changes v#1.#2.#3\@nil{% @@ -221,7 +221,7 @@ % \changes{v0.12.0}{2011/10/01}{Possibility to number the pstart with the commands \protect\cs{numberpstarttrue}.} % \changes{v0.12.0}{2011/10/01}{For compatibility with eledpar, possibility to use \protect\cs{autopar} on the right side.} % \changes{v0.12.1}{2011/10/02}{The numbering of \protect\cs{pstarts} restarts on each \protect\cs{beginnumbering}.} -% \changes{v0.12.1}{2011/10/02}{Don't number \protect\cs{pstarts} of stanza.} +% \changes{v0.12.1}{2011/10/02}{Do not number \protect\cs{pstarts} of stanza.} % \changes{v0.13.0}{2011/11/08}{New stanzaindentsrepetition counter: to repeat stanza indents every \emph{n} verses.} % \changes{v0.13.1}{2011/11/18}{\protect\cs{thepstartL} and \protect\cs{thepstartR} use now \protect\cs{bfseries} and not \protect\cs{bf}, which is deprecated and makes conflicts with memoir class.} % \changes{v0.14.0}{2012/04/04}{Tweaked \protect\cs{edlabel} to get correct line number if the command is first element of a paragraph.} @@ -238,7 +238,7 @@ % \changes{v1.4.0}{2012/11/16}{Compatibility with LuaTeX of RTL notes.} % \changes{v1.8.0}{2013/12/13}{Compatibility with parledgroup option of eledpar package.} % \changes{v1.8.2}{2014/01/31}{Debug compatibility problem with hebrew option of babel package.} -% \changes{v1.8.3}{2014/02/03}{Fixes spurious spaces added by v1.7.0.} +% \changes{v1.8.3}{2014/02/03}{Fix spurious spaces added by v1.7.0.} % \changes{v1.10.0}{2014/02/27}{Add \protect\cs{pstartref} and \protect\cs{xpstartref} to refer to a pstart number (extension of \protect\cs{edlabel}).} % \changes{v1.10.1}{2014/02/28}{Compatibility with \textsf{cleveref}.} % \changes{v1.10.2}{2014/03/17}{Compatibility of stanza with v1.8a of babel-greek.} @@ -302,8 +302,8 @@ % \changes{v1.23.1}{2015/05/20}{Fix a bug with \protect\cs{lemma} command in the right side.} % \changes{v1.23.2}{2015/05/29}{Compatibility with \LaTeX's release 2015.} % \changes{v1.24.0}{2015/06/02}{We can reinitialize \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} providing to it an empty argument.} -% \changes{v1.24.1}{2015/06/21}{\protect\cs{lemma} is disabled when using `nocritical` option.} -% \changes{v1.24.2}{2015/06/26}{Fix incompatibility between `nofamiliar` option and `memoir` package.} +% \changes{v1.24.1}{2015/06/21}{\protect\cs{lemma} is disabled when using \protect\option{nocritical} option.} +% \changes{v1.24.2}{2015/06/26}{Fix incompatibility between \protect\option{nofamiliar} option and \protect\package{memoir} package.} % \changes{v1.24.3}{2015/07/07}{Restore marginal numbers and notes with sectioning command (bug introduced in v1.21.0)} % \changes{v1.24.4}{2015/07/19}{Fix spurious space with \protect\cs{edindex} when using xindy+hyperref option.} % \changes{v1.24.5}{2015/07/16}{Fix a bug of indent, when a added in 1.1.0, when a \protect\cs{beginnumbering} immediately follow a sectioning command.} @@ -360,7 +360,7 @@ % \changes{v2.5.0}{2015/11/13}{\protect\cs{apprefwithpage} and \protect\cs{appref} print double quotation mark when the label was not defined.} % \changes{v2.5.0}{2015/11/13}{\protect\cs{apprefwithpage} and \protect\cs{appref} work with right side crossref.} % \changes{v2.5.0}{2015/11/13}{\protect\cs{edlabel} works now in \protect\cs{Xfootnote}.} -% \changes{v2.5.0}{2015/11/13}{Log now states `There were undefined references` when using wrong references in \protect\cs{edlineref} or \protect{edpageref}.} +% \changes{v2.5.0}{2015/11/13}{Log now states \protect\enquote{There were undefined references} when using wrong references in \protect\cs{edlineref} or \protect{edpageref}.} % \changes{v2.5.0}{2015/11/13}{Fix spurious vertical space in \protect\env{astanza} environment (\reledpar)} % \changes{v2.6.0}{2015/11/20}{Adds compatibility with \protect\option{innnote} and \protect\option{notenumber} options of \protect\package{indextools} package.} % \changes{v2.6.0}{2015/11/20}{Fix a bug with footnote counter in \protect\env{ledgroup} (added in v2.5.0).} @@ -392,13 +392,13 @@ % \changes{v2.9.0}{2016/03/23}{Write correct metadata in numbered files when using \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} % \changes{v2.9.0}{2016/03/23}{Fix a bug with three- and two-column footnote setting (added in v.2.4.0).} % \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three-column familiar footnote.} -% \changes{v2.9.1}{2016/04/09}{Fix a bug when notes start with ``plus'' or ``minus''.} -% \changes{v2.9.2}{2016/04/30}{Fix a bug with \protect\package{hyperref} package when a lemma starts with ``plus'' or ``minus'' (bug introduced in v.~2.7.0).} +% \changes{v2.9.1}{2016/04/09}{Fix a bug when notes start with \protect\option{plus} or \protect\option{minus}.} +% \changes{v2.9.2}{2016/04/30}{Fix a bug with \protect\package{hyperref} package when a lemma starts with \protect\option{plus} or \protect\enquote{minus} (bug introduced in v.~2.7.0).} % \changes{v2.9.3}{2016/05/02}{Fix a bug with line number position and reset added by v.~2.9.0} % \changes{v2.10.0}{2016/05/08}{Add \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.} % \changes{v2.10.0}{2016/05/08}{More specific error messages.} % \changes{v2.10.0}{2016/05/08}{Fix a bug in \protect\cs{ledlsnotefontsetup} and \protect\cs{ledrsnotefontsetup} which could not handle \protect\cs{color} command properly.} -% \changes{v2.10.1}{2016/05/18}{Add `nopenalties` option.} +% \changes{v2.10.1}{2016/05/18}{Add \protect\option{nopenalties} option.} % \changes{v2.10.1}{2016/05/18}{Fix a bug introduced in v.~1.4: not paragraphed critical footnotes could prevent marginal line number from being displayed} % \changes{v2.11.0}{2016/06/02}{Prevent \protect\cs{Xtxtbeforenotes} hook from causing notes to go beyond the bottom margin} % \changes{v2.11.0}{2016/06/02}{Make \protect\cs{parafootsepX} work} @@ -423,7 +423,7 @@ % \changes{v2.14.0}{2016/07/01}{Some internal changes for new features of \protect\reledpar.} % \changes{v2.14.1}{2016/07/04}{Fix a bug when using \protect\cs{footnoteX} in the first argument of \protect\cs{edtext}.} % \changes{v2.14.1a}{2016/07/14}{Fix problematic typos in the handbook.} -% \changes{v2.15.0}{2016/07/22}{Add `byline` arrangement.} +% \changes{v2.15.0}{2016/07/22}{Add \enquote{byline} arrangement.} % \changes{v2.15.0}{2016/07/22}{Fix \protect\cs{Xtxtbeforenotes} in ledgroup.} % \changes{v2.15.1}{2016/09/07}{Fix \protect\cs{edindex} in tabular environments.} % \changes{v2.15.2}{2016/09/12}{Fix a bug with \protect\package{fancyhdr} package 3.8 and later.} @@ -435,7 +435,7 @@ % \changes{v2.16.0}{2016/10/02}{Compatibility with new features of \protect\reledpar} % \changes{v2.16.0}{2016/10/02}{Fix a bug with \protect\cs{Xtxtbeforenotes} for notes in three or two columns} % \changes{v2.16.0}{2016/10/02}{Fix a bug with \protect\cs{Xgroupbylines} for notes in two columns} -% \changes{v2.16.0}{2016/10/02}{Fix a bug with `notenumber' option of \protect\package{indextools} package when indexing texts in familiar footnotes.} +% \changes{v2.16.0}{2016/10/02}{Fix a bug with \protect\option{notenumber} option of \protect\package{indextools} package when indexing texts in familiar footnotes.} % \changes{v2.16.0}{2016/10/02}{When indexing texts in familiar footnotes with \protect\cs{edtext}, refer to the line number where the footnote is called.} % \changes{v2.16.0}{2016/10/02}{When indexing texts in sidenotes with \protect\cs{edtext}, refer to the line number where the sidenote is called.} % \changes{v2.16.0}{2016/10/02}{Fix potential bug when using \protect\cs{edindex} in critical footnotes.} @@ -518,7 +518,7 @@ % \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 \protect\option{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}} @@ -558,16 +558,18 @@ % \changes{v2.33.1}{2020/06/06}{Fix a spacing bug when the argument of \protect\cs{antilabe} contains more than one word.} % \changes{v2.34.0}{2020/06/24}{Add \protect\cs{Xpstartonlyfirst} and \protect\cs{Xstanzaonlyfirst}.} % \changes{v2.34.0}{2020/06/24}{Add \protect\cs{Xpstartseparator}.} -% \changes{v2.34.1}{2020/06/30}{Fix bug with page number when using stanazindentsrepetition, bug introduced in v2.33.0} -% \changes{v2.34.2}{2020/07/06}{Fix bug with tabular environment, in some specific use case, added in v2.32.7} +% \changes{v2.34.1}{2020/06/30}{Fix bug with page number when using stanazindentsrepetition, bug introduced in v2.33.0.} +% \changes{v2.34.2}{2020/07/06}{Fix bug with tabular environment, in some specific use case, added in v2.32.7.} % \changes{v2.34.3}{2020/08/19}{Fix bug with \protect\cs{parafootsepX} when the footnotes are called outside of a numbered section.} -% \changes{v2.34.3}{2020/08/19}{Fixes incompatibility between Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} -% \changes{v2.34.3}{2020/08/19}{Makes command like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.} +% \changes{v2.34.3}{2020/08/19}{Fix incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} +% \changes{v2.34.3}{2020/08/19}{Make commands like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.} % \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} % \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.} % \changes{v2.34.5}{2020/09/23}{Fix incompatibility between \protect\cs{apprefwithpage} / \protect\cs{SErefwithpage} and line number annotation mechanism.} % \changes{v2.34.6}{2020/09/23}{Fix incompatibility with \protect\package{calc} package (added with v2.34.4).} -% \changes{v2.34.7}{2020/11/19}{Fix bug with \protect\cs{parafootsepX} in some circumstances (add with v2.34.4).} +% \changes{v2.34.7}{2020/11/19}{Fix bug with \protect\cs{parafootsepX} in some circumstances (added with v2.34.4).} +% \changes{v2.35.0}{2020/11/29}{Add \protect\cs{linenumannotationothersidetrue}.} +% \changes{v2.35.0}{2020/11/29}{Add new hooks: \protect\cs{Xnolinenumber}, \protect\cs{Xendnolinenumber}, \protect\cs{Xnolinenumberifannotation}, \protect\cs{Xendnolinenumberifannotation}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -596,10 +598,10 @@ % % % \Macpackage provides many tools and options. Normally, they are all documented in this file. -% Also provided is a help folder, ``\href{examples/.}{examples}''. The folder contains additional examples (although not for every possible case). -% Examples starting with ``1-'' are for basic uses, those starting with ``2-'' are for advanced uses. +% Also provided is a help folder, \enquote{\href{examples/.}{examples}}. The folder contains additional examples (although not for every possible case). +% Examples starting with \enquote{1-} are for basic uses, those starting with \enquote{2-} are for advanced uses. % -% To report bugs or request a new feature, please go to ledmac GitHub page and click on ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. +% To report bugs or request a new feature, please go to ledmac GitHub page and click on \enquote{New Issue}: \url{https://github.com/maieul/ledmac/issues/}. % You must create an account on github.com to access my page (maieul/ledmac). % GitHub accounts are free for open-source users. You can post messages in English or in French (preferred). % @@ -636,7 +638,7 @@ % of information. % % Apart from \macpackage there are other \LaTeX\ packages for typesetting critical editions. -% However, the aim of \macpackage is to provide an ``all in one'' and flexible tool in the field of critical editions. +% However, the aim of \macpackage is to provide an \enquote{all in one} and flexible tool in the field of critical editions. % % Any suggestions for new features are welcome. % @@ -684,8 +686,8 @@ % the macros was used to format the Sanskrit text in volume I of {\em % Metarules of P\=a\d ninian Grammar\/} by Dominik Wujastyk (Groningen: % Forsten, 1993).} A description by John and Dominik of this version of -% \edmac{} was published as `An overview of \edmac: a \PlainTeX\ -% format for critical editions', \emph{TUGboat} \textit{11} (1990), +% \edmac{} was published as \enquote{An overview of \edmac: a \PlainTeX\ +% format for critical editions}, \emph{TUGboat} \textit{11} (1990), % pp.\,623--643. % % From 1991 through 1994, the macros continued to evolve, and were tested at a @@ -700,8 +702,8 @@ % Sullivan,\index{Sullivan, Wayne} in particular, provided several % important fixes and contributions, including adapting the % Mittelbach\slash -% Sch\"opf\index{Sch\"opf, Rainer}\index{Mittelbach, Frank} `New -% Font Selection Scheme' for use with \PlainTeX\ and \edmac. +% Sch\"opf\index{Sch\"opf, Rainer}\index{Mittelbach, Frank} \enquote{New +% Font Selection Scheme} for use with \PlainTeX\ and \edmac. % Another project Wayne has worked % on is a \verb"DVI" post-processor which works with an \edmac{} % that has been slightly modified to output \protect\cs{special}s. This @@ -728,11 +730,11 @@ % Brey\index{Brey, Gerhard} {\em et al.}, at the same Institute.} a Latin % translation of part II of the Arabic {\em Algebra\/} by Ab\=u K\=amil % Shuj\=a' b.~Aslam,\index{Abu Kamil Shuja' b.~Aslam}\footnote{Richard -% Lorch, `Ab\=u K\=amil on the Pentagon and Decagon' in {\em Vestigia +% Lorch, \enquote{Ab\=u K\=amil on the Pentagon and Decagon} in {\em Vestigia % Mathematica}, ed.\ M. Folkerts and J. P. Hogendijk (Amsterdam, Atlanta: % Rodopi, 1993).} the Latin {\em Rithmachia\/} of Werinher von -% Tegernsee,\footnote{Menso Folkerts, `Die {\em Rithmachia\/} des Werinher -% von Tegernsee', ibid.} a middle-Dutch romance epic on the +% Tegernsee,\footnote{Menso Folkerts, \enquote{Die {\em Rithmachia\/} des Werinher +% von Tegernsee}, ibid.} a middle-Dutch romance epic on the % Crusades,\footnote{Geert H. M. Claassens,\index{Claassens, Geert H. M.} % {\em De Middelnederlandse Kruisvaartromans}, (Amsterdam: Schiphower en % Brinkman, 1993).} a seventeenth-century Hungarian politico-philosophical @@ -788,7 +790,7 @@ % % \eledmac has facilitated the creation of customized critical editions. % However, the changes made to allow such customization were made in a non-systematic way. -% Many deprecated commands were kept and many technical `debts' were accumulated, +% Many deprecated commands were kept and many technical \enquote{debts} were accumulated, % hindering the future evolution of the package. % % For these reasons, Maïeul Rouquette decided on a spring cleaning of the code. @@ -993,8 +995,8 @@ % before the new group is opened, % using \protect\cs{indent}, \protect\cs{noindent}, or \protect\cs{leavevmode}, or using % \protect\cs{pstart} itself.\footnote{For a detailed study of the -% reasons for this restriction, see Barbara Beeton, `Initiation -% rites', \textit{TUGboat} \textbf{12} (1991), +% reasons for this restriction, see Barbara Beeton, \enquote{Initiation +% rites}, \textit{TUGboat} \textbf{12} (1991), % pp.\,257--258.\protect\index{Beeton, Barbara Ann Neuhaus Friend}} % % \subsubsection{Content before specific \protect\cs{pstart} and after specific \protect\cs{pend}}\label{pstart:optionalarg} @@ -1133,7 +1135,7 @@ % \subsubsection{Setting lineation start and step} % \DescribeMacro{\firstlinenum}\label{firstlinenum} % \DescribeMacro{\linenumincrement} -% By default, \macpackage numbers every 5th line. There are two counters that control this behaviour: +% By default, \macpackage numbers every 5th line. There are two counters that control this behavior: % \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 @@ -1293,7 +1295,7 @@ % \item[\texttt{Roman}] Uppercase Roman numerals (I, II, \ldots) % \item[\texttt{roman}] Lowercase Roman numerals (i, ii, \ldots) % \end{description} -% Note that with the \texttt{Alph} or \texttt{alph} styles, `numbers' +% Note that with the \texttt{Alph} or \texttt{alph} styles, \enquote{numbers} % must be between 1 and 26 inclusive. % % Similarly \protect\cs{sublinenumberstyle}\marg{style} can be used to change @@ -1314,7 +1316,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. +% They can be useful if the position of the line number is depending on the position of the page, but the position of the marginal note is fixed. % \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: @@ -1323,7 +1325,7 @@ % \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} -% In such instances, you must add the second number manually, as \macpackage\ can't determine a general pattern for such numbering, which depends too heavily upon the edited text.\footnote{However, you may create your own commands dealing with such patterns which will in turn call \macpackage\ commands.}. +% In such instances, you must add the second number manually, as \macpackage\ can't determine a general pattern for such numbering, which depends too heavily upon the edited text.\footnote{However, you may create your own commands dealing with such patterns which will in turn call \macpackage\ commands.} % % \DescribeMacro{\linenumannotation} % To resolve this issue, \macpackage\ allows you to annotate line numbers using the following command: @@ -1358,6 +1360,18 @@ % \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} +% +% Note that the annotation must be called before the beginning of a \cs{edtext} to be taken into account as a starting annotation. So: +% \begin{verbatim} +% \linenumannotation{A}\edtext{something...\linenumannotation{B}}{\Afootnote{foo}} +% \end{verbatim} +% will use \verb+A+ as starting annotation, while: +% \begin{verbatim} +% \edtext{\linenumannotation{A}something...\linenumannotation{B}}{\Afootnote{foo}} +% \end{verbatim} +% won't. +% \subsubsection{Resetting annotation} +% You can manually reset annotation using \cs{resetlinenumannotation}\verb+{}+. Note that this macro takes no argument, but you should use empty brackets or \textbackslash in order to avoid gobbling spaces.\footnote{As for all \TeX\ macro with no argument.} % \subsubsection{Modifying annotation associated with a specific note}\label{lineannot} % % The \cs{linenum} (\reff{linenum}) macro changes the line number passed to a note. @@ -1374,8 +1388,9 @@ % By default, annotations are placed after line numbers in both margin and footnote. % % \DescribeMacro{\Xlinenumannotationposition} +% \DescribeMacro{\Xlinenumannotationpositionside} % \DescribeMacro{\Xendlinenumannotationposition} -% To change this behaviour, one can use one of the following commands: +% To change this behavior, one can use one of the following commands: % \begin{itemize} % \item \cs{Xlinenumannotationposition}\oarg{s}\marg{v} changes the position in critical footnotes with \meta{s} for the series of footnotes to which it applies, where \meta{s} may be a comma-separated list of series. When \meta{s} is empty, the change applies also to annotations at the sides of the page, alongside the line number. % \item \cs{Xlinenumannotationpositionside}\marg{v} changes the position at the sides of the page, alongside the line numbers. @@ -1385,6 +1400,12 @@ % \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. +% +% \DescribeMacro{\linenumannotationothersidetrue} +% With the \cs{linenumannotationothersidetrue}, the annotation will appear on the margin side opposite to the line number. +% +% You can reset the default behavior with \cs{linenumannotationothersidefalse}. +% % \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: @@ -1461,17 +1482,17 @@ % \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 \enquote{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. +% We call \enquote{familiar notes} notes which refer to a footnote mark in the main text. % % \Macpackage manages many series of notes of each category. % A series of notes is identified by an uppercase letter. % When the series letter is at the \emph{beginning} of a command name, it refers to a critical footnote. % When the series letter is at the \emph{end} of a command name, it refers to a familiar footnote. % -% So : +% So: % \begin{itemize} % \item \protect\cs{Afootnote} is a critical footnote of the series A. % \item \protect\cs{Bendnote} is a critical endnote of the series B. @@ -1524,7 +1545,7 @@ % example: % \egstart % \begin{verbatim} -% I am happy : \edtext{I saw my friend +% I am happy: \edtext{I saw my friend % \edtext{Smith}{\Afootnote{Jones % C, D.}} on Tuesday.}{ % \Bfootnote{The date was @@ -1536,7 +1557,7 @@ % \firstlinenum{1} % \linenumincrement{1} % \pstart -% I am happy : \edtext{I saw my friend +% I am happy: \edtext{I saw my friend % \edtext{Smith}{\Afootnote{Jones % C, D.}} on Tuesday.}{ % \Bfootnote{The date was @@ -1669,7 +1690,7 @@ % % \subsubsection{Paragraph in critical apparatus} % By default, no paragraph can be made in the notes of the critical apparatus. -% You can allow it by adding the options \verb+parapparatus+ when loading the package : +% You can allow it by adding the options \verb+parapparatus+ when loading the package: % \begin{verbatim} % \usepackage[parapparatus]{eledmac} % \end{verbatim} @@ -1686,7 +1707,7 @@ % printed in the notes. For example: % \egstart % \begin{verbatim} -% I am happy : +% I am happy: % \edtext{I saw my friend % \edtext{Smith}{\Afootnote{Jones % C, D.}} on Tuesday.} @@ -1698,7 +1719,7 @@ % \egmid % \beginnumbering % \pstart -% I am happy : +% I am happy: % \edtext{I saw my friend % \edtext{Smith}{\Afootnote{Jones % C, D.}} on Tuesday.} @@ -1735,7 +1756,7 @@ % extremely long, you may run out of memory; here again you can % specify a note with an abbreviated lemma using \protect\cs{lemma} and % \protect\cs{linenum}. The numbers used in \protect\cs{linenum} need not be -% entered manually; you can use the `\texttt{x-}' symbolic cross-referencing +% entered manually; you can use the \enquote{\texttt{x-}} symbolic cross-referencing % commands below (\reff{crossref}) to compute them % automatically. % @@ -1792,7 +1813,7 @@ % If you use UTF-8 processor, like \XeLaTeX\ or \LuaLaTeX, there should not be any glitches. % However, pay attention to how characters are encoded. Similar-looking characters may be represented differently in unicode numbering. % -% For instance, in French, ``é'' has two possible Unicode codepoints: +% For instance, in French, \enquote{é} has two possible Unicode codepoints: % \begin{itemize} % \item LATIN SMALL LETTER E (U+0065) + COMBINING ACUTE ACCENT (U+0301) % \item LATIN SMALL LETTER E WITH ACUTE (U+00E9) @@ -1824,16 +1845,16 @@ % it is all}% % {\lemma{\sameword{sw} \ldots all}\Afootnote{critical note}}.% % \end{verbatim} -% \Macpackage\ cannot know if the ``sw'' in \protect\cs{lemma} refers to the word after ``thing'', after ``other'', or after ``again''. +% \Macpackage\ cannot know if the \enquote{sw} in \protect\cs{lemma} refers to the word after \enquote{thing}, after \enquote{other}, or after \enquote{again}. % % Consequently, you must tell \macpackage to which instance of \protect\cs{sameword} you are referring in the first argument of \protect\cs{edtext}: % \begin{itemize} % \item In the content of \protect\cs{lemma}, use \protect\cs{sameword} with no optional argument. % \item In the first argument of \protect\cs{edtext}, use \protect\cs{sameword} with the optional argument \oarg{X}. \meta{X} is the depth of the \protect\cs{edtext} where the \protect\cs{lemma} is used. % So if the \protect\cs{lemma} is called in a \protect\cs{edtext} inside another \protect\cs{edtext}, \meta{X} is equal to \verb+2+. -% If the \protect\cs{lemma} is called in a \protect\cs{edtext} ``of first level'', \meta{X} is equal to \verb|1|. If the lemma is called in both 1 and 2 \protect\cs{edtext} depth, \meta{X} is \verb+1,2+. If that word is referenced in the lemma of every \protect\cs{edtext} depth, \meta{X} can also be set to \verb+inlemma+. +% If the \protect\cs{lemma} is called in a \protect\cs{edtext} \enquote{of first level}, \meta{X} is equal to \verb|1|. If the lemma is called in both 1 and 2 \protect\cs{edtext} depth, \meta{X} is \verb+1,2+. If that word is referenced in the lemma of every \protect\cs{edtext} depth, \meta{X} can also be set to \verb+inlemma+. % \end{itemize} -% Note that only words that are actually referenced in a \protect\cs{lemma} need the optional argument. Therefore, the first \protect\cs{sameword} in the example above should have ``1'' as its optional argument, to be referenced correctly in the lemma. +% Note that only words that are actually referenced in a \protect\cs{lemma} need the optional argument. Therefore, the first \protect\cs{sameword} in the example above should have \enquote{1} as its optional argument, to be referenced correctly in the lemma. % % Note also that the \meta{X} does not refer to the level where the \protect\cs{sameword} occurs, but to the level of the \protect\cs{lemma} that refers to that \protect\cs{sameword}. For example: % \begin{verbatim} @@ -1844,7 +1865,7 @@ % }{\lemma{some \sameword{word} \ldots all}\Afootnote{critical note}}.% % \end{verbatim} % Here the \protect\cs{sameword} occurs in an \protect\cs{edtext} of level 2, -% but since it is referenced by \protect\cs{lemma} on level 1, it has ``1'' in the optional argument. +% but since it is referenced by \protect\cs{lemma} on level 1, it has \enquote{1} in the optional argument. % % In the following example figure, each framed box represents an \protect\cs{edtext} level. % Each number is an occurrence of \protect\cs{sameword}. After a framed box, @@ -1862,13 +1883,13 @@ % }\textsuperscript{1\ldots5} % % The \protect\cs{sameword} number~3 is called in a \protect\cs{lemma} related to an \protect\cs{edtext} of level~2. -% It must be marked by ``2''. +% It must be marked by \enquote{2}. % -% The \protect\cs{sameword} number~5 is called in a \protect\cs{lemma} related to \protect\cs{edtext} of level~1. It must be marked by ``1''. +% The \protect\cs{sameword} number~5 is called in a \protect\cs{lemma} related to \protect\cs{edtext} of level~1. It must be marked by \enquote{1}. % % The \protect\cs{sameword} number~1 is called in two \protect\cs{lemma}s: one related to a \protect\cs{edtext} of level~1, the other related to \protect\cs{edtext} of level~2. -% It must be marked by ``1,2''. -% However, as \protect\cs{lemma} is called only in level~1 and~2, ``1,2'' could replaced by ``inlemma''. +% It must be marked by \enquote{1,2}. +% However, as \protect\cs{lemma} is called only in level~1 and~2, \enquote{1,2} could replaced by \enquote{inlemma}. % % The \protect\cs{sameword} number~2 is in the first argument of a \protect\cs{edtext} of level~3, but it has no \protect\cs{lemma}-command, so there is no need to mark it. % @@ -2097,7 +2118,7 @@ % If you want the manuscript apparatus to be on the same level of critical footnotes as the other apparatuses, for each line, reledmac will first insert the manuscript apparatus, then the other footnotes. % You can change it using:\\ % \cs{msdataposition}\arg{regular-msdata}\\ -% And restore the default behaviour using +% And restore the default behavior using % \cs{msdataposition}\arg{msdata-regular} % \subsection{Familiar notes} \label{sec:desc:familiar} % @@ -2114,7 +2135,7 @@ % \protect\cs{footnoteE}. These have the familiar marker in the text, and % the marked text at the foot of the page can be formated using % any of the styles described for the critical footnotes. Note that -% the `regular' footnotes have the series letter at the end of the macro +% the \enquote{regular} footnotes have the series letter at the end of the macro % name whereas the critical footnotes have the series letter at the start % of the name. % @@ -2231,21 +2252,22 @@ % % \section{Apparatus customization} % \label{displayoptions} +% \subsection{Introduction} % \changes{v1.0.0}{2012/09/15}{New generic commands to customize footnote display.} % \subsection{Introduction} -% Some commands can be used to change the display of the footnotes.\footnote{In the code of reledmac, these commands are called \enquote{hooks}.} +% Some commands can be used to change the way the footnotes are displayed.\footnote{In the code of \macpackage, these commands are called \enquote{hooks}.} % All can have an optional argument \oarg{s}, which is the letter of the series\,---\,or % a list of letters separated by comma\,---\,depending on which option is applied. % If the optional argument is omitted or empty, the setting will apply to the entire series. % -% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use some relative unit\footnote{Like \verb|em| which is the width of an `m' in a given font.}, it will be relative to font size of the footnote, except for commands concerning the place kept by the notes --- including blank space. +% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use some relative unit\footnote{Like \verb|em| which is the width of an \enquote{m} in a given font.}, it will be relative to font size of the footnote, except for commands concerning the place kept by the notes --- including blank space. % % Some commands are boolean, indicating when an option is enabled. % If you want to disable the option after enabling it, you must use \verb+[false+] as the second optional argument. % For example: % \begin{itemize} -% \item \verb+\XX[A][false]+ to disable the `XX' option for the series A. +% \item \verb+\XX[A][false]+ to disable the \enquote{XX} option for the series A. % \item \verb+\XX[][false]+ to disable it for all series. % % \end{itemize} @@ -2266,7 +2288,7 @@ % % Use \protect\cs{Xarrangement}\oarg{s}\marg{a} to change the arrangement of the \meta{s} series of critical footnotes and \protect\cs{arrangementX}\oarg{s}\marg{a} to change the arrangement of the \meta{s} series of familiar footnotes. % -% The value of \meta{a} can be one of the following +% The value of \meta{a} can be one of the following: % \begin{itemize} % \item \verb+paragraph+ formats % all of the footnotes of a series as a single paragraph; if you use this arrangement, you are strongly encouraged to read \reff{paragraphednotes:advanced}. @@ -2297,7 +2319,7 @@ % change the \protect\cs{hsize} within the document, call % the arrangement macro again afterwards to take account of the new % value. -% \subsection{Control line number printing} +% \subsection{Control number printing} % \subsubsection{Print line number only at first time} % \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline} % \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{Xnumberonlyfirstinline} with lineation by pstart or by page.} @@ -2321,36 +2343,11 @@ % For endnotes, \cs{Xendnumberonlyfirstinline}; \cs{Xendnumberonlyfirstintwolines} and \cs{Xendsymlinenum} are the equivalents of % \\ \cs{Xnumberonlyfirstinline}; \cs{Xnumberonlyfirstintwolines} and \cs{Xsymlinenum}. % -% \subsubsection{Print line number annotation only the first time}\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 -% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}. -% -% Note the two following points: -% \begin{itemize} -% \item If you use the \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number. -% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemmas with the same annotation. That is, if you have for example a lemma with an \verb+A+ annotation, then a lemma with a \verb+B+ annotation, then a lemma with an \verb+A+ annotation, each lemma will have its own annotation in the apparatus. -% \end{itemize} -% -% \DescribeMacro{\Xlinenumannotationonlyfirstintwo} -% Suppose you have a lemma on annotation~1 and a lemma between annotation~1 and annotation~3. -% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to have the same annotation as the first lemma. -% But if you use both \cs{Xlinenumannotationonlyfirst}\oarg{s} and \cs{Xlinenumannotationonlyfirstintwo}\oarg{s}, a distinction is made. -% -% -% \DescribeMacro{\Xsymlinenumannotation} -% To use a particular symbol in place of the line number annotation, you can use \protect\cs{Xsymlinenumannotation}\oarg{s}\marg{symbol} in combination with \protect\cs{Xlinenumannotationonlyfirst}\oarg{s}. From the second lemma with the same line number annotation, the symbol will be used instead of the annotation. Note that any command called in \meta{symbol} must be robust. Use \protect\cs{robustify} to robustify a non-robust command. -% -% \DescribeMacro{\Xendlinenumannotationonlyfirst} -% \DescribeMacro{\Xendlinenumannotationonlyfirstintwo} -% \DescribeMacro{\Xendsymlinenumannotation} -% For endnotes, \cs{Xendlinenumannotationonlyfirst}; \cs{Xendlinenumannotationonlyfirstintwo} and \cs{Xendsymlinenumannotation} are the equivalents of -% \\ \cs{Xlinenumannotationonlyfirst}; \cs{Xlinenumannotationonlyfirstintwo} and \cs{Xsymlinenumannotation}. % % \subsubsection{Print page number only at first time} % For endnotes, \reledmac\ provides a mechanism for printing the page number only the first time it is seen. % However, when a lemma spans over two pages, the line numbers are normally printed in the following pattern: starting page number - starting line number - ending page number - ending line number. -% It follows that what corresponds to the actual `page number' may not be self-evident. So: +% It follows that what corresponds to the actual \enquote{page number} may not be self-evident. So: % \DescribeMacro{\Xendpagenumberonlyfirst} \cs{Xendpagenumberonlyfirst}\oarg{s} can be called to ensure that the starting page number of a lemma be not printed if it is the same as the ending page number of the preceding lemma. % You can use \emph{additionally} one (and only one) of the following commands: % \begin{itemize} @@ -2374,11 +2371,12 @@ % \end{itemize} % % \subsubsection{Arbitrary text before line number} +% \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. % \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.+ (``p'' followed by a dot). +% \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). % % \DescribeMacro{\Xendafterpagenumber} % \cs{Xendafterpagenumber}\oarg{s}\marg{text} defines the text after the page number in endnotes. Default value is \verb+) + (open parenthesis followed by a single space). @@ -2399,7 +2397,7 @@ % \label{Xtwolines} % \DescribeMacro{\Xtwolines}\DescribeMacro{\Xmorethantwolines} % If a lemma is printed on two subsequent lines, \macpackage\ will print the first and the last line numbers. -% Instead of this, it is also possible to print an abbreviation which stands for ``line 1 and subsequent line(s)''. +% Instead of this, it is also possible to print an abbreviation which stands for \enquote{line 1 and subsequent line(s)}. % % To achieve this, use \protect\cs{Xtwolines}\oarg{s}\marg{text} and \protect\cs{Xmorethantwolines}\oarg{s}\marg{text}. % The \meta{text} argument of \protect\cs{Xtwolines} will be printed if the lemma is on two lines, and the \meta{text} argument of \protect\cs{Xmorethantwolines} will be printed if the lemma is on three or more lines. @@ -2408,7 +2406,7 @@ % \Xtwolines{sq.} % \Xmorethantwolines{sqq.} % \end{verbatim} -% will print ``1sq.'' for a lemma which falls on lines 1--2 and ``1sqq.'' for a lemma which falls on lines 1--4. +% will print \enquote{1sq.} for a lemma which falls on lines 1--2 and \enquote{1sqq.} for a lemma which falls on lines 1--4. % % If you use \protect\cs{Xtwolines} without setting \protect\cs{Xmorethantwolines}, the \meta{text} argument % of \protect\cs{Xtwolines} will be used for lemmas which fall on three or more lines. @@ -2424,7 +2422,7 @@ % \protect\cs{Xtwolinesonlyinsamepage}\oarg{series}. % % -% You can disable \protect\cs{Xtwolines} and related for a specific note by using the `[fulllines]` argument in the note macro cf.~\reff{fulllines}. +% You can disable \protect\cs{Xtwolines} and related for a specific note by using the \enquote{[fulllines]} argument in the note macro cf.~\reff{fulllines}. % % \label{Xendtwolines}\changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xendtwolines}, \protect\cs{Xendmorethantwolines}, \protect\cs{Xendtwolinesbutnotmore} and \protect\cs{Xendtwolinesonlyinsamepage}.} % \DescribeMacro{\Xendtwolines}\DescribeMacro{\Xendmorethantwolines}\DescribeMacro{\Xendtwolinesbutnotmore} @@ -2433,10 +2431,11 @@ % \protect\cs{Xendtwolinesonlyinsamepage} instead of \protect\cs{Xtwolines}; \protect\cs{Xmorethantwolines};\\ % \protect\cs{Xtwolinesbutnotmore}; \protect\cs{Xtwolinesonlyinsamepage}. % -% \subsubsection{Disable line number} +% \subsubsection{Disabling line number printing} % \DescribeMacro{\Xnonumber} -% You can use \protect\cs{Xnonumber}\oarg{s} if you do not want to have the line number in a footnote. -% \DescribeMacro{\Xendnonumber} \protect\cs{Xendnonumber}\oarg{s} is the same for endnote. +% You can use \protect\cs{Xnonumber}\oarg{s} if you do not want to have no line/page/pstart number in the footnotes, nor line number annotation. +% +% \DescribeMacro{\Xendnonumber} \protect\cs{Xendnonumber}\oarg{s} is the same for endnotes. % % \subsubsection{Printing pstart number} % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{Xpstart} and \protect\cs{Xonlypstart}} @@ -2444,7 +2443,7 @@ % \changes{v1.18.0}{2015/02/23}{Debug \protect\cs{Xonlypstart} when using \protect\cs{Xnumberonlyfirstinline} and the current line number differs from the previous.} % \DescribeMacro{\Xpstart} % You can use \protect\cs{Xpstart}\oarg{s} if you want to print the pstart number in the footnote, before the line and subline number. -% Note that when you change the lineation system, the option is automatically switched : +% Note that when you change the lineation system, the option is automatically switched: % \begin{itemize} % \item If you use lineation by pstart, the option is enabled. % \item If you use lineation by section or by page, the option is disabled. @@ -2475,6 +2474,49 @@ % 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 +% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}. +% +% Note the two following points: +% \begin{itemize} +% \item If you use the \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number. +% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemmas with the same annotation. That is, if you have for example a lemma with an \verb+A+ annotation, then a lemma with a \verb+B+ annotation, then a lemma with an \verb+A+ annotation, each lemma will have its own annotation in the apparatus. +% \end{itemize} +% +% \DescribeMacro{\Xlinenumannotationonlyfirstintwo} +% Suppose you have a lemma on annotation~1 and a lemma between annotation~1 and annotation~3. +% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to have the same annotation as the first lemma. +% But if you use both \cs{Xlinenumannotationonlyfirst}\oarg{s} and \cs{Xlinenumannotationonlyfirstintwo}\oarg{s}, a distinction is made. +% +% +% \DescribeMacro{\Xsymlinenumannotation} +% To use a particular symbol in place of the line number annotation, you can use \protect\cs{Xsymlinenumannotation}\oarg{s}\marg{symbol} in combination with \protect\cs{Xlinenumannotationonlyfirst}\oarg{s}. From the second lemma with the same line number annotation, the symbol will be used instead of the annotation. Note that any command called in \meta{symbol} must be robust. Use \protect\cs{robustify} to robustify a non-robust command. +% +% \DescribeMacro{\Xendlinenumannotationonlyfirst} +% \DescribeMacro{\Xendlinenumannotationonlyfirstintwo} +% \DescribeMacro{\Xendsymlinenumannotation} +% For endnotes, \cs{Xendlinenumannotationonlyfirst}; \cs{Xendlinenumannotationonlyfirstintwo} and \cs{Xendsymlinenumannotation} are the equivalents of +% \\ \cs{Xlinenumannotationonlyfirst}; \cs{Xlinenumannotationonlyfirstintwo} and \cs{Xsymlinenumannotation}. +% +% +% \DescribeMacro{\Xnolinenumberifannotation} +% \DescribeMacro{\Xendnolinenumberifannotation} +% The \cs{Xnolinenumberifannotation} disable line number printing only for critical notes when there are some annotations to the line number. +% +% The \cs{Xendnolinenumberifannotation} is the same for endnotes. + % \subsubsection{Separator between line and subline numbers}\label{Xsublinesep} % \DescribeMacro{\Xsublinesep} % \cs{Xsublinesep}\oarg{s}\marg{txt} changes the separator between line and subline in footnotes. @@ -2575,22 +2617,6 @@ % \protect\cs{Xendboxlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text}, \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l} are the same as, respectively, \protect\cs{Xboxlinenum} and \protect\cs{Xboxlinenumalign}, \protect\cs{Xboxstartlinenum}, \protect\cs{Xboxendlinenum} except in endnotes. % % -% \subsection{Arbitrary code around line number} -% \DescribeMacro{\Xendbhooklinenumber} -% \cs{Xendbhooklinenumber}\oarg{s}\marg{code} is used to execute code before line numbers in endnotes. The code is executed before the \cs{Xendbeforelinenumber} space and before the \cs{Xendnotenumfont} font setting. -% -% \DescribeMacro{\Xendahooklinenumber} -% \cs{Xendahooklinenumber}\oarg{s}\marg{code} is used to execute code after line number in endnotes. -% The code is executed after the \cs{Xendafternumber} space. -% -% -% -% \DescribeMacro{\Xendbhookinplaceofnumber} -% \cs{Xendbhookinplaceofnumber}\oarg{s}\marg{code} is used to execute code before space or symbol which replace line number in endnotes. The code is executed before the \cs{Xendbeforesymlinenum} space and before the \cs{Xendnotenumfont} font setting. -% -% \DescribeMacro{\Xendahookinplaceofnumber} -% \cs{Xendahookinplaceofnumber}\oarg{s}\marg{code} is used to execute code after space or symbol which replace line number in endnotes. -% The code is executed after the \cs{Xendaftersymlinenum} space. %\subsection{Separator between the lemma and the note} % \subsubsection{For footnotes} % \DescribeMacro{\Xlemmaseparator} @@ -2717,11 +2743,29 @@ % For critical endnotes NOT paragraphed you can define an indentation with \protect\cs{Xendhangindent}\oarg{s}\marg{l}, which will be applied in the second line of notes. It can help to make a distinction between a new note and a break in a note. % % -% \subsection{Arbitrary code at the beginning of notes} +% \subsection{Arbitrary code} + +% \subsubsection{Arbitrary code around line number} +% \DescribeMacro{\Xendbhooklinenumber} +% \cs{Xendbhooklinenumber}\oarg{s}\marg{code} is used to execute code before line numbers in endnotes. The code is executed before the \cs{Xendbeforelinenumber} space and before the \cs{Xendnotenumfont} font setting. +% +% \DescribeMacro{\Xendahooklinenumber} +% \cs{Xendahooklinenumber}\oarg{s}\marg{code} is used to execute code after line number in endnotes. +% The code is executed after the \cs{Xendafternumber} space. +% +% +% +% \DescribeMacro{\Xendbhookinplaceofnumber} +% \cs{Xendbhookinplaceofnumber}\oarg{s}\marg{code} is used to execute code before a space or symbol which replaces line number in endnotes. The code is executed before the \cs{Xendbeforesymlinenum} space and before the \cs{Xendnotenumfont} font setting. +% +% \DescribeMacro{\Xendahookinplaceofnumber} +% \cs{Xendahookinplaceofnumber}\oarg{s}\marg{code} is used to execute code after a space or symbol which replaces line number in endnotes. +% The code is executed after the \cs{Xendaftersymlinenum} space. +% \subsubsection{Arbitrary code at the beginning of notes} % \changes{v1.1.0}{2012/09/25}{New hook to add arbitrary code at the beginning of the notes} % The three next commands add arbitrary code at the beginning of notes. % As the name's space is local to the notes, you can use it to redefine some style inside the notes. -% For example, if you don't want the pstart number to be in bold, use : +% For example, if you don't want the pstart number to be in bold, use: % \begin{verbatim} % \Xbhooknote{\renewcommand{\thepstart}{\arabic{pstart}.}} % \end{verbatim} @@ -2737,7 +2781,7 @@ % \DescribeMacro{\Xendbhooknote} % \protect\cs{Xendbhooknote}\oarg{s}\marg{code} is to be used at the beginning of each endnote. % -% \subsection{Arbitrary code before inserting note} +% \subsubsection{Arbitrary code before inserting note} % \DescribeMacro{\Xbeforeinserting} % \DescribeMacro{beforeinsertingX} % \cs{Xbeforeinserting}\oarg{s}\marg{code} @@ -2889,7 +2933,7 @@ % \DescribeMacro{\Xmaxhnotes} % By default, one series of critical notes can take up to 80\% of \cs{vsize}, before being broken to the next page. % If you want to change the size use \protect\cs{Xmaxhnotes}\oarg{s}\marg{l}. -% Be careful : the length can't be flexible, and is relative to the the current font. +% Be careful: the length must be fixed (no stretch), and is relative to the the current font. % For example, if you want the note to take, at most, 33\% of the text height, do \verb|\Xmaxhnotes{.33\textheight}|. % % \DescribeMacro{\maxhnotesX} @@ -2929,15 +2973,11 @@ % \subsection{Footnotes and the \parpackage columns} % \changes{v1.13.0}{2014/09/16}{Add \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{noteswidthliketwocolumnsX}} % \DescribeMacro{\Xnoteswidthliketwocolumns}\DescribeMacro{\noteswidthliketwocolumnsX} -% If you use \parpackage\ \protect\cs{columns} macro, you can call : +% If you use \parpackage\ \protect\cs{columns} macro, you can call: % \begin{itemize} % \item \protect\cs{Xnoteswidthliketwocolumns}\oarg{s} to create critical notes with a two-column size width. % \item \protect\cs{noteswidthliketwocolumnsX}\oarg{s} to create familiar notes with a two-column size width. % \end{itemize} -% \subsection{Line number annotation} -% The way line number annotations are typeset can be changed using hooks as described in \reff{annotationposition} and -% \reff{wraplinenumannotation}. -% % \subsection{Endnotes in one paragraph} % \changes{v1.12.0}{2015/04/25}{Add \protect\cs{Xendparagraph} and related settings.} % \DescribeMacro{\Xendparagraph} @@ -2977,7 +3017,7 @@ % We will briefly discuss \protect\cs{select@lemmafont} % here because it is important to know about % it now, although it is not one of the macros you would expect to -% change in the course of a simple job. Hence it is `protected' +% change in the course of a simple job. Hence it is \enquote{protected} % by having the @-sign in its name. % % When you use the \protect\cs{edtext} macro to mark a word in your text @@ -3115,7 +3155,7 @@ % 5000 being placed after the first and third lines of the stanza, and a % penalty of ${-100}$ after the second. % -% The first entry ``1'' is a control +% The first entry \enquote{1} is a control % value. If it is zero, then no penalties are passed on to \TeX, % which is the default. Values between 0 and 10000 are penalty % values; values between 10001 and 20000 have 10000 subtracted and the result @@ -3130,7 +3170,7 @@ % between penalties and \emph{glue}, so it may take some adjustment of skips % and penalties to achieve the best results. % \subsection{Hanging symbol} -% It is possible to insert a symbol in each line of hanging verse, as in French typography; for example, the opening bracket `['. To insert it in \macpackage, use macro \DescribeMacro{\sethangingsymbol}\protect\cs{sethangingsymbol}\marg{h} with this code. +% It is possible to insert a symbol in each line of hanging verse, as in French typography; for example, the opening bracket \enquote{[}. To insert it in \macpackage, use macro \DescribeMacro{\sethangingsymbol}\protect\cs{sethangingsymbol}\marg{h} with this code. % In the example of French typography, do % \begin{verbatim} % \sethangingsymbol{[\,} @@ -3209,7 +3249,7 @@ % Thats is called \enquote{antilabe}. % In this case, the typesetting of the second half must start at the horizontal position where the typesetting of the first half stops. % -% \Reledmac\ provides tool for such problematic, but you must enable them with the \option{antilabe} option when loading package, as this option is quite ressource consuming. +% \Reledmac\ provides tools to cope with this problem, but you must enable them with the \option{antilabe} option when loading package, as these tools are quite ressource consuming. % % The \cs{antilabe}\marg{name} must be called at the beginning of the second half of the line of verse. % @@ -3301,8 +3341,8 @@ % \protect\cs{edlabel}\marg{lab}. \meta{lab} can be almost anything you like, including % letters, numbers, punctuation, or a combination---anything but spaces; % you might type \protect\cs{edlabel}\verb+{toves-3}+, for example.\footnote{More precisely, -% you should stick to characters in the \TeX\ categories of ``letter'' -% and ``other''.} +% you should stick to characters in the \TeX\ categories of \enquote{letter} +% and \enquote{other}.} % % \DescribeMacro{\edpageref} % \DescribeMacro{\edlineref} @@ -3373,7 +3413,7 @@ % ones cannot. % \item When \protect\package{hyperref} is loaded, the hyperref link will not be added. (Indeed, % it is not a limitation, but a feature.) -% \item With \parpackage, the \cs{xlineref} does not insert the right side flag, in order to obtain a line number. Use \cs{xflagref} to obtain the side flag, depending of your flag. +% \item With \parpackage, the \cs{xlineref} does not insert the right side flag, in order to obtain a line number. Use \cs{xflagref} to obtain the side flag, depending on your flag. % \end{itemize} % % \subsubsection{Cross-referencing in order to define line number of a critical note} @@ -3410,11 +3450,11 @@ % the page and line desired---for example, if you want to refer to a % page and line number in another volume of your edition. In such % cases, you can use the \protect\cs{edmakelabel}\marg{lab}\marg{numbers} -% macro so that you can `roll your own' label. +% macro so that you can \enquote{roll your own} label. % -% For example, if you type `\verb"\edmakelabel{elephant}{10|25|0}"' +% For example, if you type \verb"\edmakelabel{elephant}{10|25|0}" % you will create a new label, and a later call to \verb"\edpageref{elephant}" would print -% `10' and \verb"\lineref{elephant}" would print `25'. The sub-line +% \enquote{10} and \verb"\lineref{elephant}" would print \enquote{25}. The sub-line % number here is zero. It is usually best to collect your % \protect\cs{edmakelabel} statements near the top of your document, so that % you can see them at a glance. @@ -3557,7 +3597,7 @@ % \item \option{prefixmore} to force the plural version of a prefix. % \end{itemize} % -% For example, a reference to `lines 65--66, 72, and 75' might use \verb|\SEref[prefixmore]{ref1}, \SEref[noprefix]{ref2}, and \SEref[noprefix]{ref3}| to achieve this result. +% For example, a reference to \enquote{lines 65--66, 72, and 75} might use \verb|\SEref[prefixmore]{ref1}, \SEref[noprefix]{ref2}, and \SEref[noprefix]{ref3}| to achieve this result. % % \subsection{Compatibility with \protect\package{xr} package} % The \cs{externaldocument} command of the \cs{xr} package allows making cross-references from an external document, with the standard \LaTeX\ commands \cs{label} and \cs{ref} (and related). @@ -3686,7 +3726,7 @@ % % \DescribeMacro{\Xinnotemark} % \DescribeMacro{\innotemarkX} -% You can redefine the way the reference is made using : +% You can redefine the way the reference is made using: % \begin{itemize} % \item \cs{Xinnotemark}\oarg{series}\marg{definition} for critical notes; % \item \cs{innotemarkX}\oarg{series}\marg{definition} for familiar notes; @@ -3728,7 +3768,7 @@ % \verb+xindy+ can understand \protect\package{eledmac} reference syntax of which the scheme is:\\ % \verb+pagenumber-linenumber+ % -% An example of such a file is provided in the ``\href{examples/.}{examples}'' folder. +% An example of such a file is provided in the \enquote{\href{examples/.}{examples}} folder. % Read the xindy handbook to learn how to use it.\footnote{Or, for people % who read French, read \url{http://geekographie.maieul.net/174}.} % @@ -3738,7 +3778,7 @@ % % In any case, you must load \macpackage\ with the \verb+xindy+ option, % in order to generate a \verb|.xdy| file which is specific to your document. -% This file is needed by the \verb+.xdy+ example file which is in the ``\href{examples/.}{examples}'' folder. +% This file is needed by the \verb+.xdy+ example file which is in the \enquote{\href{examples/.}{examples}} folder. % Its default name is \verb+reledmac-markup-attr.xdy+, % but you can change it by using your own as an argument of the \verb|xindy+hyperref| option. % @@ -3748,7 +3788,7 @@ % \item Use \verb|xindy+hyperref| option when loading the \macpackage\ package. % When you run (Xe/Lua)\LaTeX with this option, a \verb+.xdy+ configuration file will be generated with all the settings needed to allow internal hyperlinking in each index entry which is created by \protect\cs{edindex}. % \item Use \verb+hyperindex=false+ option when loading hyperref. -% \item Uncomment\,---\,by removing the semicolons at the beginning of the relevant lines\,---\,some lines in the <code>.xdy</code> file provided in the ``\href{examples/.}{examples}'' folder in order to restore internal links in the index to be used by the standard \verb+index+ command.\footnote{These are the recommended lines to provide the best possible compatibility between hyperref and xindy, even without using \macpackage.}. +% \item Uncomment\,---\,by removing the semicolons at the beginning of the relevant lines\,---\,some lines in the <code>.xdy</code> file provided in the \enquote{\href{examples/.}{examples}} folder in order to restore internal links in the index to be used by the standard \verb+index+ command.\footnote{These are the recommended lines to provide the best possible compatibility between hyperref and xindy, even without using \macpackage.}. % \end{enumerate} % \subsection{Advanced setting} % \DescribeMacro{\edindexlab} @@ -3895,7 +3935,7 @@ % \DescribeMacro{\edrowfill} % The macro |\edrowfill|\marg{start}\marg{end}\marg{fill} % fills columns number \meta{start} to \meta{end} inclusive with -% \meta{fill}. The \meta{fill} argument can be any horizontal `fill'. +% \meta{fill}. The \meta{fill} argument can be any horizontal \enquote{fill}. % For example, |\hrulefill| or |\upbracefill|. % % Note that every row must have the same number of columns, even if @@ -3927,7 +3967,7 @@ % \end{tabular} % \end{center} % -% You can also define your own `fill'. For example: +% You can also define your own \enquote{fill}. For example: % \begin{verbatim} % \newcommand*{\upbracketfill}{% % \vrule height 4pt depth 0pt\hrulefill\vrule height 4pt depth 0pt} @@ -4146,20 +4186,20 @@ % files called \file{jobname.!1}, \file{jobname.!2}, etc. % % \DescribeMacro{\ifledfinal} -% The package can take options. The option `final', which is the default +% The package can take options. The \option{final} option, which is the default % is for final typesetting; this sets \verb?\ifledfinal? to TRUE. The other -% option, `draft', may be useful during earlier stages and sets +% option, \option{draft}, may be useful during earlier stages and sets % \verb?\ifledfinal? to FALSE. % % \DescribeMacro{\showlemma} % The lemma within the text is printed via \verb?\showlemma{lemma}?. -% Normally, or with the `final' option, the definition of \verb?\showlemma? +% Normally, or with the \option{final} option, the definition of \verb?\showlemma? % is: \\ % \verb?\newcommand*{\showlemma}[1]{#1}? \\ % so it just produces its argument. -% With the `draft' option it is defined as \\ -% \verb?\newcommand*{\showlemma}[1]{\textit{#1}}? \\ -% so that its argument is typeset in an italic font, which may make it +% With the \option{draft} option it is defined as \\ +% \verb?\newcommand*{\showlemma}[1]{\textbf{#1}}? \\ +% so that its argument is bold, which may make it % easier to check that all lemmas have been treated. % % If you would prefer some other style, you could put something like this @@ -4177,7 +4217,7 @@ % % \subsubsection{\package{floatrow} package compatibility} % The \package{floatrow} package must be loaded before the \macpackage. -% \subsubsection{`No room for a new'}\label{noroom} +% \subsubsection{\enquote{No room for a new}}\label{noroom} % Sometimes, especially when using \macpackage\ with other packages, you could obtain warning messages such 'no room for a new count' or 'no room for a new write'. % % In order to prevent such problems, the first thing is to use the options to optimize \macpackage. @@ -4251,7 +4291,7 @@ % \verb?\renewcommand{\footfudgefiddle}{68}?\\ % Note that you must call it \emph{before} \cs{Xarrangement}\arg{paragraph} or \cs{arrangementX}\arg{paragraph}. % -% Any settings to `geometry' must be made before \cs{Xarrangement} / \cs{arrangementX}. +% Any settings to \enquote{geometry} must be made before \cs{Xarrangement} / \cs{arrangementX}. % % Finally, in many cases you should use \cs{Xmaxhnotes} and / or \cs{maxhnotesX} (\reff{Xmaxhnotes}), in order to define the maximum height relative to \cs{textheight} and not to \cs{vsize}, because the \cs{vsize} value is not the same inside and outside of the preamble. % @@ -4275,10 +4315,10 @@ % \end{verbatim} % If you actually try % this\footnote{Reported by Dirk-Jan Dekker\index{Dekker, Dirk-Jan} -% in the CTT thread `Incompatibility -% of ``color'' package' on 2003/08/28.} +% in the CTT thread \enquote{Incompatibility +% of \enquote{color} package} on 2003/08/28.} % you will find \LaTeX\ whinging -% `\texttt{Missing \{ inserted}', and then things start to fall apart. +% \enquote{\texttt{Missing \{ inserted}}, and then things start to fall apart. % The trick in this case is to specify either: % \begin{verbatim} % \newcommand{\morenoexpands}{\let\colorbox=0} @@ -4379,7 +4419,7 @@ % to the workings of \macpackage\ than those made up just of % ordinary letters, just as in \PlainTeX\ (see \thetexbook, % p.\,344). You are meant to be able to make free with -% ordinary macros, but the `@' ones should be treated with more +% ordinary macros, but the \enquote{@} ones should be treated with more % respect, and changed only if you are pretty sure of what you are % doing. % @@ -4409,7 +4449,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/11/19 v2.34.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/11/29 v2.35.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5137,7 +5177,7 @@ \ifledfinal \newcommand*{\showlemma}[1]{#1} \else - \newcommand*{\showlemma}[1]{\underline{#1}} + \newcommand*{\showlemma}[1]{\textbf{#1}}% \fi % \end{macrocode} @@ -5177,7 +5217,7 @@ % \begin{macro}{\l@dnumpstartsL} % In preparation for the \parpackage package, these are related to -% the `right' text of parallel texts (when \protect\cs{ifl@dpairing} is TRUE). +% the \enquote{right} text of parallel texts (when \protect\cs{ifl@dpairing} is TRUE). % They are explained in the \protect\parpackage % manual. % \changes{v0.7.0}{2005/02/24}{Added \protect\cs{l@dnumpstartsL}, \protect\cs{ifl@dpairing} @@ -5263,15 +5303,15 @@ % be used as many times as you like within one document to start % and end multiple, separately line-numbered sections. \LaTeX\ will % maintain and display -% a `section number' as a count named +% a \enquote{section number} as a count named % \protect\cs{section@num} that counts how many % \protect\cs{beginnumbering} and \protect\cs{resumenumbering} % commands have appeared; it need not be % related to the logical divisions of your text. % % \begin{macro}{\extensionchars} -% Each section will read and write an associated `line-list -% file', containing information used to do the numbering; the file +% Each section will read and write an associated \enquote{line-list +% file}, containing information used to do the numbering; the file % will be called \meta{jobname}\file{.nn}, where \file{nn} is the % section number. However, you may direct that % an extra string be added before the @@ -5326,7 +5366,7 @@ % and variables in the two processing steps. % \changes{v0.7.0}{2005/02/24}{Added \protect\cs{initnumbering@reg}} % \changes{v1.12.0}{2014/08/05}{\protect\cs{beginnumbering} is defined only on \protect\package{eledmac}, not on \protect\package{eledpar}.} -% For parallel processing : +% For parallel processing: %\begin{itemize} % \item zero \protect\cs{l@dnumpstartsL} --- the number of chunks to be processed. % \item set \protect\cs{ifpst@rtedL} to FALSE. @@ -5574,7 +5614,7 @@ % They allows to get and delete the first element of a list in one operation. They also expands the items add to the list. % % However, \protect\package{etoolbox}'s lists are more useful to loop on them. -% Consequently, depending of what we need, we use one or either. +% Consequently, depending on what we need, we use one or other. % % It could be nice to unify them to the \LaTeX3 list, however such migration would take quite time with some risk of error, for a gain which will be minor. % @@ -6034,11 +6074,13 @@ \textdir TLT% \fi% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \linenumrep{\line@num}% \ifsublines@ \ifnum\subline@num>0\relax @@ -6047,20 +6089,24 @@ \sublinenumrep{\subline@num}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \egroup% }% \newcommand*{\leftlinenum}{% - \ledlinenum - \kern\linenumsep} + \ledlinenum% + \kern\linenumsep% +}% \newcommand*{\rightlinenum}{% - \kern\linenumsep - \ledlinenum} + \kern\linenumsep% + \ledlinenum% +}% % \end{macrocode} % \end{macro} @@ -6069,6 +6115,25 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\leftlinenumannotation}% +% \begin{macro}{\rightlinenumannotation}% +% The \cs{leftlinenumannotation} and \cs{rightlinenumannotation} prints the line number annotation; when user-defined it must be printed on the side opposite the main line number. +% \begin{macrocode} +\newcommand*{\leftlinenumannotation}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotation}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% +}% +% \end{macrocode} +% \end{macro} +% \end{macro} % \subsection{Line number counters and lists} % % Footnote references using line numbers rather than symbols can't be @@ -6080,7 +6145,7 @@ % want line-per-page numbering rather than line-per-section numbering. % % So we run \LaTeX\ over the text several times, and each time save -% information about page and line numbers in a `line-list file' to +% information about page and line numbers in a \enquote{line-list file} to % be used during the next pass. At the start of each section---whenever % \protect\cs{beginnumbering} is executed---the line-list file % for that section @@ -6149,8 +6214,8 @@ % \end{macrocode} % \end{macro} % -% We will call \protect\cs{absline@num} numbers ``absolute'' numbers, and -% \protect\cs{line@num} and \protect\cs{subline@num} numbers ``visible'' numbers. +% We will call \protect\cs{absline@num} numbers \enquote{absolute} numbers, and +% \protect\cs{line@num} and \protect\cs{subline@num} numbers \enquote{visible} numbers. % % \subsection{Line number locking counter} % \begin{macro}{\@lock} @@ -6508,7 +6573,7 @@ % \end{macro} % % \begin{macro}{\get@linelistfile} -% \Macpackage{} can take advantage of the \LaTeX\ `safe file input' macros +% \Macpackage{} can take advantage of the \LaTeX\ \enquote{safe file input} macros % to get the line-list file. % \changes{v0.7.0}{2005/02/22}{Added \protect\cs{get@linelistfile}} % \begin{macrocode} @@ -7914,8 +7979,8 @@ % likely to see within the lemma and within the notes. % % The first class is font-changing macros. We suppress expansion for -% them by letting them become equal to zero.\footnote{Since `control -% sequences equivalent to characters are not expandable'---\thetexbook, +% them by letting them become equal to zero.\footnote{Since \enquote{control +% sequences equivalent to characters are not expandable}---\thetexbook, % answer to Exercise 20.14.} This is done because we want to % pass into our notes the generic commands to change to roman or % whatever, and not their expansions that will ask for a particular style at @@ -7961,7 +8026,7 @@ % the macros used in the arguments to \protect\cs{edtext}. Since the % category codes are set when the arguments are scanned, macros % that depend on changing them will not work. We have most often -% encountered this with characters that are made `active' within +% encountered this with characters that are made \enquote{active} within % text in some, but not all, of the languages used within the document. % One way around the problem, if it takes this form, % is to ensure that those characters are \emph{always} active. Within @@ -9180,7 +9245,7 @@ % \end{macro} % \end{macro} % -% \subsubsection{Process for ``normal'' line} +% \subsubsection{Process for \enquote{normal} line} % \begin{macro}{\print@line} % \changes{v1.13.1}{2014/09/25}{Coming back of add@penalties, mistakenly deleted in version 0.17!} % \changes{v1.18.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.} @@ -9688,7 +9753,8 @@ % \item to crossref commands which refer to line numbers (to be completed when I will have resolved this issue). % \end{itemize} % \begin{macro}{\linenumannotation} -% First, the user-level command, which only writes commands to the numbered files, storing the annotation. +% \begin{macro}{\resetlinenumannotation} +% First, the user-level commands, which only write commands to the numbered files, storing the annotation. % \begin{macrocode} \newcommand{\linenumannotation}[1]{% \leavevmode%In case it begins with a \pstart, ensure the \@annot is written after \@nl @@ -9698,8 +9764,19 @@ \write\linenum@out{\string\@annot[#1]}% \fi% }% + +\newcommand{\resetlinenumannotation}[0]{% + \leavevmode%In case it begins with a \pstart, ensure the \@resetannot is written after \@nl + \ifledRcol% + \write\linenum@outR{\string\@resetannot}% + \else% + \write\linenum@out{\string\@resetannot}% + \fi% +}% + % \end{macrocode} % \end{macro} +% \end{macro} % \begin{macro}{\Xlinenumannotationposition@side} % The \cs{Xlinenumannotationposition@side} macro, to determine the position of line number annotations in lines printed in the side, relative to the line number position. % The default value is \enquote{after}, but it can be changed to \enquote{before}, using the \cs{Xlinenumannotationposition} macro. @@ -9722,6 +9799,12 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \begin{macro}{\iflinenumannotationotherside} +% The \cs{iflinenumannotationotherside} boolean allows to print the annotation on the side opposite the line number. +% \begin{macrocode} +\newif\iflinenumannotationotherside% +% \end{macrocode} +% \end{macro} % \begin{macro}{\@annot} % \begin{macro}{\store@annot@to@absline} % Then, the numbered files command \cs{@annot}, which @@ -9759,16 +9842,23 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\reset@current@annot} +% \begin{macro}{\@resetannot} % \cs{reset@current@annot} is called at each \cs{@nl} in numbered auxiliary files. % It resets the annotation of line numbers at each line. +% +% The \cs{@resetannot} macro is written in the auxiliary files with \cs{resetlinenumannotation} macro. It resets the annotation. % \begin{macrocode} \newcommand{\reset@current@annot}{% \unless\ifnoresetlinenumannotation@ \let\current@annot\empty% \fi }% +\newcommand{\@resetannot}{% + \let\current@annot\empty% +}% % \end{macrocode} % \end{macro} +% \end{macro} % \begin{macro}{\parse@annot} % In the \cs{annot@list} list, each individual \cs{edtext} is associated with a starting and an ending line number annotation, which is stored this way: \verb+start annotation|end annotation+ % The \cs{parse@annot} reads the format and defines two global macros. @@ -9927,8 +10017,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columns}{\m@ne}}}% @@ -9953,8 +10049,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \fi% }% \fi @@ -10552,7 +10654,7 @@ % page. % % These four macros, and the other macros and parameters shown -% here, are distinguished by the `series letter' +% here, are distinguished by the \enquote{series letter} % that indicates which set of the footnotes % we are dealing with---\texttt{A}, \texttt{B}, \texttt{C}, \texttt{D}, or \texttt{E}. % The series letter always precedes the string \verb"foot" in macro @@ -10560,7 +10662,7 @@ % are called \protect\cs{vAfootnote}, \protect\cs{Afootfmt}, \protect\cs{Afootstart}, % and \protect\cs{Afootgroup}. % -% These macros are changed depending of the footnotes arrangement: ``normal'', ``paragraphed'', ``two columns'' or ``three columns''. +% These macros are changed depending on the footnote arrangement: \enquote{normal}, \enquote{paragraphed}, \enquote{two columns} or \enquote{three columns}. % \subsection{General setup} % \begin{macro}{\footsplitskips} % Some setup code that is common for a variety of the footnotes. @@ -10570,7 +10672,7 @@ % \item \protect\cs{splittopskip} (skip before last part of notes that flow from one page to another). % \item \protect\cs{splitmaxdepth}. % \item \protect\cs{floatingpenalty}, that is penalty values being added when a long note flows from one page to another. -% Here, we let it to 0 when we are processing parallel pages in \protect\package{eledpar}, in order to allow notes to flow from left to right pages and \emph{vice-versa}. +% Here, we let it to 0 when we process parallel pages in \protect\package{eledpar}, in order to allow notes to flow from left to right pages and \emph{vice-versa}. % Otherwise, we let it to \protect\cs{@MM}, which is the standard \LaTeX\ \protect\cs{floatingpenalty}. % \end{itemize} % \changes{v0.7.0}{2005/02/18}{Added \protect\cs{footsplitskips} for use in many @@ -10622,7 +10724,7 @@ % % \begin{macro}{\Xarrangement@normal} % We can now define all the parameters for the series of -% footnotes; initially they use the ``normal'' footnote formatting. +% footnotes; initially they use the \enquote{normal} footnote formatting. % % What we want to do here is to insert something like the following % for each footnote series. (This is an example, not part of the @@ -10687,7 +10789,7 @@ % % % \begin{macro}{\normalvfootnote} -% We now begin a series of commands that do `normal' footnote +% We now begin a series of commands that do \enquote{normal} footnote % formatting: a format much like that implemented % in \PlainTeX{}, in which each footnote % is a separate paragraph. @@ -10788,7 +10890,7 @@ % \end{macro} % \begin{macro}{\normalfootfmt} % \label{normalfootfmt} -% \protect\cs{normalfootfmt} is a `normal' macro +% \protect\cs{normalfootfmt} is a \enquote{normal} macro % to take the footnote line and page % number information (see \reff{linenumbers}), and the % desired text, and output what's to be printed. @@ -11077,8 +11179,8 @@ % hyphenate after an explicit hyphen. This can lead to overfull % \protect\cs{hbox}es when you would not expect to find them, and to the % uninitiated it might be very hard to see why the problem had -% arisen.\footnote{Michael Downes, `Line Breaking in \protect\cs{unhbox}ed -% Text', \textit{TUGboat} \textbf{11} (1990), pp.\,605--612.} +% arisen.\footnote{Michael Downes, \enquote{Line Breaking in \protect\cs{unhbox}ed +% Text}, \textit{TUGboat} \textbf{11} (1990), pp.\,605--612.} % % Wayne Sullivan\index{Sullivan, Wayne} pointed out to us another % subtle problem that arises from the same cause: \TeX\ also leaves @@ -11111,8 +11213,8 @@ % Doing things this way has an important % consequence:\label{nobreaks-detail} as Michael % pointed out, you really can't put an explicit line-break into a -% note built in a \protect\cs{vbox} the way we are doing.\footnote{`Line -% Breaking', p.\,610.} In other words, be very careful not to use +% note built in a \protect\cs{vbox} the way we are doing.\footnote{\enquote{Line +% Breaking}, p.\,610.} In other words, be very careful not to use % \protect\cs{break}, or \verb"\penalty-10000", or any equivalent inside your % para-footnote.\label{nobreak} If you do, most of the note will % probably disappear. You \emph{are} allowed to make strong @@ -11782,7 +11884,7 @@ % \subsection{Footnote paragraph indent} % \begin{macro}{\Xsetparindent} % \begin{macro}{\setparindentX} -% These two commands set the paragraph indentation of the footnotes, depending of the settings of the user. +% These two commands set the paragraph indentation of the footnotes, depending on the settings of the user. % \begin{macrocode} \newcommand{\Xsetparindent}[1]{% \nottoggle{Xparindent@#1}{% @@ -12019,7 +12121,7 @@ % \begin{macro}{\printlinefootnotearea} % This macro prints the space before the line number, changes the font, then prints the line number and the space after it. % It is called by \protect\cs{printlinefootnote} -% depending of the options about repeating line numbers. +% depending on the options about repeating line numbers. % The first argument is line information, the second is the notes series (A, B, C, etc.) % \begin{macrocode} \newcommand{\printlinefootnotearea}[2]{% @@ -12166,11 +12268,15 @@ % \item \protect\cs{ifl@d@esl} for ending sub-line; and % \item \protect\cs{ifl@d@dash} for the dash between the starting and ending groups. % \end{itemize} -% There is no boolean for the line number because it is always printed. +% There was no boolean for the line number because it was always printed. +% +% Maïeul Rouquette has added: +% \begin{itemize} +% \item \protect\cs{ifl@d@Xtwolines} and \protect\cs{ifl@d@Xmorethantwolines} to print a symbol which stands for \enquote{and subsequent} when there are two, three or more lines; +% \item \cs{@annot@start@print} and \cs{@annot@end@print} which define annotations associated with the starting and ending line numbers in critical footnotes; +% \item \cs{ifl@d@Xlinenumber}, which value depends on the configuration of \cs{Xnolinenumber} and \cs{Xnolinenumberifannotation}. +% \end{itemize} % -% Maïeul Rouquette has added \protect\cs{ifl@d@Xtwolines} and \protect\cs{ifl@d@Xmorethantwolines} -% to print a symbol which stands for ``and subsequent`` when there are two, three or more lines. -% Is also defines \cs{@annot@start@print} and \cs{@annot@end@print} which define annotations associated with the starting and ending line numbers in critical footnotes. % \begin{macro}{\ifl@d@pnum} % \begin{macro}{\ifl@d@ssub} % \begin{macro}{\ifl@d@elin} @@ -12178,6 +12284,7 @@ % \begin{macro}{\ifl@d@dash} % \begin{macro}{\ifl@d@Xtwolines} % \begin{macro}{\ifl@d@Xmorethantwolines} +% \begin{macro}{\ifl@d@Xlinenumber} % \begin{macro}{\@annot@start@print} % \begin{macro}{\@annot@end@print} % \begin{macrocode} @@ -12190,6 +12297,7 @@ \newif\ifl@d@Xmorethantwolines% \let\@annot@start@print\relax% \let\@annot@end@print\relax% +\newif\ifl@d@Xlinenumber% % \end{macrocode} % \end{macro} % \end{macro} @@ -12200,6 +12308,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % % \begin{macro}{\l@dparsefootspec} @@ -12265,9 +12374,22 @@ \l@d@dashfalse% \l@d@elinfalse% % \end{macrocode} +% Should we print the line number? It depends on hooks and annotations. +% \begin{macrocode} + \l@d@Xlinenumbertrue% + \ifboolexpr{togl{Xnolinenumber@\@currentseries}% + or (% + togl{Xnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xlinenumberfalse% + }{}% +% \end{macrocode} % We print the page numbers only if\/: 1)~we are doing % the lineation by page, and 2)~the ending page number is different -% from the starting page number.\label{printlines}a +% from the starting page number. % \begin{macrocode} \ifbypage@ \ifnum#4=#1 \else @@ -12277,13 +12399,19 @@ \fi % \end{macrocode} % -% We print the ending line number if\/: (1)~we are printing the ending -% page number, or (2)~the ending line number is different from the starting line number. +% We print the ending line number if: +% \begin{enumerate} +% \item we print the ending page number; +% \item or the ending line number is different from the starting line number and we didn't disable the line number printing +% \end{enumerate} % If either of these conditions is true, we also print the annotation linked to the ending line number annotations. % \begin{macrocode} \ifboolexpr{% bool{l@d@pnum}% - or not test{\ifnumequal{#2}{#5}}% + or (% + not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xlinenumber}% + )% }{% \l@d@elintrue% \l@d@dashtrue% @@ -12294,7 +12422,6 @@ \fi% }{}% % \end{macrocode} -% % We define the starting line number annotation as a merge of the starting annotation and ending annotation if we don't print the ending line number. % Otherwise, it is only the starting annotation. % \begin{macrocode} @@ -12338,7 +12465,6 @@ \l@d@ssubtrue \fi % \end{macrocode} -% % We print the ending sub-line if it is nonzero and: (1)~it is different % from the starting sub-line number, or (2)~the ending line number is % being printed. @@ -12396,9 +12522,12 @@ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% % \end{macrocode} @@ -12421,9 +12550,12 @@ \l@wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -12477,7 +12609,7 @@ % % \begin{macro}{\printlines} % \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 of these value. +% So, we have decided which part of line number sets will be printed depending on these values. % Now we are ready to print them. % If the lineation is by pstart, we print the pstart. % \changes{v0.15.0}{2012/06/11}{Line numbering can be reset at each pstart.} @@ -12505,16 +12637,20 @@ {}% \ifl@d@pnum% \wrap@edcrossref{\@this@crossref@start}{#1}% - \csuse{Xpagelinesep@\@currentseries}% + \ifl@d@Xlinenumber% + \csuse{Xpagelinesep@\@currentseries}% + \fi% + \fi% + \ifl@d@Xlinenumber% + \wrap@edcrossref{\@this@crossref@start}{% + \linenumrep{#2}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \ifl@d@ssub% + \csuse{Xsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% + \fi% \fi% - \wrap@edcrossref{\@this@crossref@start}{% - \linenumrep{#2}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \ifl@d@ssub% - \csuse{Xsublinesep@\@currentseries}% - \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% - \fi \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -12529,10 +12665,12 @@ {\bgroup}% {\hbox to \csuse{Xboxendlinenum@\@currentseries}\bgroup}% \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xmorethantwolines@\@currentseries}% - \else% - \csuse{Xtwolines@\@currentseries}% + \ifl@d@Xlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xmorethantwolines@\@currentseries}% + \else% + \csuse{Xtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -12549,17 +12687,19 @@ \wrap@edcrossref{\@this@crossref@end}{#4}% \csuse{Xpagelinesep@\@currentseries}% \fi% - \ifl@d@elin% - \wrap@edcrossref{\@this@crossref@end}{% - \linenumrep{#5}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \fi% - \ifl@d@esl% - \ifl@d@elin% - \csuse{Xsublinesep@\@currentseries}% - \fi% - \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \ifl@d@Xlinenumber% + \ifl@d@elin% + \wrap@edcrossref{\@this@crossref@end}{% + \linenumrep{#5}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \fi% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xsublinesep@\@currentseries}% + \fi% + \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \fi% \fi% \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -12846,7 +12986,7 @@ % Some of the code for the various formats is remarkably similar to that % in section~\ref{sec:nfootformat}. % -% The following macros generally set things up for the `standard' footnote +% The following macros generally set things up for the \enquote{standard} footnote % format. % % \begin{macro}{\prebodyfootmark} @@ -13751,7 +13891,7 @@ % to get the lines numbered automatically (as set up by % \protect\cs{autopar}, for example). % -% In the case of footnote arranged in a ``normal'' way, we also must set some setting for paragraph indent and text direction when using \LuaLaTeX. +% In the case of footnote arranged in a \enquote{normal} way, we also must set some setting for paragraph indent and text direction when using \LuaLaTeX. % % That why we have defined \protect\cs{ledsetnormalparstuff@common} in order to make this setting for both familiar and critical notes. % This command is called by command to make specific setting to critical or familiar footnote. @@ -14216,7 +14356,7 @@ % % This macro prints the space before the line number, changes the font, then prints the line number and the space after it. % It is called by \protect\cs{endprint} -% depending of the options about repeating line numbers. +% depending on the options about repeating line numbers. % The first argument is line information, the second is the notes series (A, B, C, etc.) % \begin{macrocode} \newcommand{\printlineendnotearea}[2]{% @@ -14326,7 +14466,6 @@ % \begin{macrocode} }% % \end{macrocode} -% \begin{macro}{\setprintendlines} % The \protect\cs{printendlines} macro is similar to \protect\cs{printlines} but is % for printing endnotes rather than footnotes. % @@ -14340,7 +14479,10 @@ % from the starting page number.\label{printendlines} % \changes{v0.7.0}{2005/02/18}{Added \protect\cs{setprintendlines} for use by % \protect\cs{printendlines}} +% \begin{macro}{\setprintendlines} +% \begin{macro}{\ifl@d@Xendlinenumber} % \begin{macrocode} +\newif\ifl@d@Xendlinenumber% \newcommand*{\setprintendlines}[6]{% \let\@annot@start@print\relax% \let\@annot@end@print\relax% @@ -14348,7 +14490,20 @@ \l@d@dashfalse% \l@d@elinfalse% % \end{macrocode} -% First of all, we print the second page number only if +% Should we print the line number? It depends on hooks and annotations. +% \begin{macrocode} + \l@d@Xendlinenumbertrue% + \ifboolexpr{togl{Xendnolinenumber@\@currentseries}% + or (% + togl{Xendnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xendlinenumberfalse% + }{}% +% \end{macrocode} +% We print the second page number only if % the ending page number is different % \begin{macrocode} \ifnum#4=#1 \else @@ -14357,12 +14512,17 @@ \fi % \end{macrocode} % -% We print the ending line number if\/: (1)~we are printing the ending -% page number, or (2)~the ending line is different from the starting line number. +% We print the ending line number if: +% \begin{enumerate} +% \item we print the ending page number; +% \item or the ending line is different from the starting line number and we didn't disable the line number printing. +% \end{enumerate} +% If either of these conditions is true, we also print the annotation linked to the ending line number annotations. % \begin{macrocode} \ifboolexpr{% bool{l@d@pnum}% or not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xendlinenumber}% }{% \l@d@elintrue% \l@d@dashtrue% @@ -14477,9 +14637,12 @@ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% % \end{macrocode} @@ -14502,9 +14665,12 @@ \l@wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -14516,6 +14682,7 @@ }% % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\printendlines} % Now we are ready to print it all. @@ -14579,24 +14746,28 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@start@print}% {}% - \wrap@edcrossref{\@this@crossref@start}{% - \ifledRcol@% - \linenumrepR{#2}% - \else% - \linenumrep{#2}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \ifl@d@ssub% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@Xendlinenumber% \wrap@edcrossref{\@this@crossref@start}{% \ifledRcol@% - \sublinenumrepR{#3}% + \linenumrepR{#2}% \else% - \sublinenumrep{#3}% + \linenumrep{#2}% \fi% }% \fi% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% + \ifl@d@Xendlinenumber% + \ifl@d@ssub% + \csuse{Xendsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{% + \ifledRcol@% + \sublinenumrepR{#3}% + \else% + \sublinenumrep{#3}% + \fi% + }% + \fi% + \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -14614,10 +14785,12 @@ % Print the dash + the ending line number, or the line number range symbol. % \begin{macrocode} \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xendmorethantwolines@\@currentseries}% - \else% - \csuse{Xendtwolines@\@currentseries}% + \ifl@d@Xendlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xendmorethantwolines@\@currentseries}% + \else% + \csuse{Xendtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -14647,28 +14820,30 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@end@print}% {}% - \ifl@d@elin% - \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \linenumrepR{#5}% - \else% - \linenumrep{#5}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \fi% - \ifl@d@esl% + \ifl@d@Xendlinenumber% \ifl@d@elin% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \linenumrepR{#5}% + \else% + \linenumrep{#5}% + \fi% + }% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \sublinenumrepR{#6}% - \else% - \sublinenumrep{#6}% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xendsublinesep@\@currentseries}% \fi% - }% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \sublinenumrepR{#6}% + \else% + \sublinenumrep{#6}% + \fi% + }% + \fi% \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -14805,6 +14980,8 @@ \csgdef{Xsymlinenumannotation@#1}{}% \newtoggle{Xnonumber@#1}% + \newtoggle{Xnolinenumber@#1}% + \newtoggle{Xnolinenumberifannotation@#1}% \csgdef{Xbeforenumber@#1}{0pt}% \csgdef{Xtxtbeforenumber@#1}{}% \csgdef{Xafternumber@#1}{0.5em}% @@ -15023,7 +15200,7 @@ \csq@qlevel=0\relax% \fi% % \end{macrocode} -% If we are preparing parallel typesetting, we cannot just increase the footnote counter. +% If we prepare parallel typesetting, we cannot just increase the footnote counter. % Read \parpackage's handbook about that (\reff{reledpar-familiarfootnotenumber}). % If we have a manual footnote mark, use it. % \begin{macrocode} @@ -15046,7 +15223,7 @@ \ifcsstring{onlysideX@#1}{R}{\led@error@note@called@onleftside{footnote#1}}{}% \fi% % \end{macrocode} -% And now, the feature not depending of wether we are preparing parallel typesetting +% And now, the feature not depending on wether we prepare parallel typesetting % \begin{macrocode} \ifstrempty{##1}% {\protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}% @@ -15240,6 +15417,8 @@ \csgdef{Xendinplaceofnumber@#1}{0pt}% \newtoggle{Xendnonumber@#1}% + \newtoggle{Xendnolinenumber@#1}% + \newtoggle{Xendnolinenumberifannotation@#1}% \csgdef{Xendhangindent@#1}{0pt}% @@ -15357,15 +15536,15 @@ % \changes{v1.0.0}{2012/09/15}{New generic commands to customize footnote display.} % \subsection{Series setting} % \subsubsection{General way of working} -% The setting's command (like \protect\cs{numberonlyfirstinline}), also called ``hooks'' can be divided in two categories: those which require a string values and those which require a boolean value. +% The setting's command (like \protect\cs{numberonlyfirstinline}), also called \enquote{hooks} can be divided in two categories: those which require a string values and those which require a boolean value. % The first category includes those which require a length value, because we store the length's expression send by user and we evaluate it only in the commands which requires to know the setting. % The second category require boolean value only when it is set to FALSE. % Otherwise, we understand the insinuated value is TRUE. % -% For each ``hook'' command, we store the value in commands (first category) or a \protect\package{etoolbox}'s toggle (second category) which names are in the form \protect\cs{<hook>@<series>}. +% For each \enquote{hook} command, we store the value in commands (first category) or a \protect\package{etoolbox}'s toggle (second category) which names are in the form \protect\cs{<hook>@<series>}. % For example, when calling \protect\cs{twolines}\marg{sq.}, we store \verb+sq.+ in commands \protect\cs{twolines@A}, \protect\cs{twolines@B}, \protect\cs{twolines@C}\ldots for each series defined for use with \macpackage, or, if the \oarg{series} optional argument was send, for each series of this argument. % -% These values are tested in some specific places, scattered in all the code, depending of their effects. +% These values are tested in some specific places, scattered throughout the code, depending on their effects. % The default values are defined by the \protect\cs{newseries@} command. % % @@ -15385,7 +15564,7 @@ % \item \verb+#1+ (mandatory): the series for which the hooks should be set. If empty, all the series will be affected. % \item \verb+#2+ (mandatory): the name of the hook. % \item \verb+#3+ (mandatory): the new value of toggle (true or false). -% \item \verb+#4+ (optional): if equal to \verb+reload+, reload the footnote setting (call again \protect\cs{Xarrangement} or \protect\cs{arrangementX} or \ldots\ depending of the footnote display). +% \item \verb+#4+ (optional): if equal to \verb+reload+, reload the footnote setting (call again \protect\cs{Xarrangement} or \protect\cs{arrangementX} or \ldots\ depending on the footnote display). % \item \verb+#5+ (optional): if not empty, and if \verb+#1+ is empty, change the hook setting for pseudo-series, as \verb+appref+. % \end{itemize} % \begin{macrocode} @@ -15422,7 +15601,7 @@ % \item \verb+#1+ (mandatory): the series for which the hooks should be set. If empty, all the series will be affected. % \item \verb+#2+ (mandatory): the name of the hook. % \item \verb+#3+ (mandatory): the new value of the hook/command. -% \item \verb+#4+ (optional): if equal to \verb+reload+, reload the footnote setting (call \protect\cs{footnormal} or \protect\cs{footparagraph} or \ldots\ depending of the footnote display). +% \item \verb+#4+ (optional): if equal to \verb+reload+, reload the footnote setting (call \protect\cs{footnormal} or \protect\cs{footparagraph} or \ldots\ depending on the footnote display). % \item \verb+#5+ (optional): if not empty, and if \verb+#1+ is empty, change the hook setting for pseudo-series, as \verb+appref+. % \item \verb+#6+ (optional): the number of arguments of the hook. % \end{itemize} @@ -15502,7 +15681,7 @@ % \begin{macro}{\newhooktoggle@series@reload} % \changes{v1.13.0}{2014/09/16}{Add \protect\cs{newhookcommand@toggle@reload}} % \protect\cs{newhookcommand@toggle@reload} does the same thing as \protect\cs{newhooktoggle@series} -% but the commands created by this macro also reload the series arrangement, depending of type of notes +% but the commands created by this macro also reload the series arrangement, depending on the type of notes % \begin{macrocode} \newcommand{\newhooktoggle@series@reload}[2]{% \global\expandafter\newcommandx\expandafter*\csname #1\endcsname[2][1,2={true},usedefault]{% @@ -15566,6 +15745,8 @@ \newhooktoggle@series{Xgroupbyline}% \newhooktoggle@series{Xgroupbylineseparetwolines}% \newhooktoggle@series{Xnonumber} + \newhooktoggle@series{Xnolinenumber}% + \newhooktoggle@series{Xnolinenumberifannotation}% \newhooktoggle@series{Xpstart} \newhooktoggle@series{Xpstartonlyfirst}% @@ -15689,6 +15870,8 @@ \newhookcommand@series{Xendinplaceofnumber}% \newhooktoggle@series{Xendnonumber}% + \newhooktoggle@series{Xendnolinenumber}% + \newhooktoggle@series{Xendnolinenumberifannotation}% \newhooktoggle@series{Xendnumberonlyfirstinline}% \newhooktoggle@series{Xendnumberonlyfirstintwolines}% @@ -15887,7 +16070,7 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\do@feet@custom@order} -% \cs{do@feet@custom@order} is called when \cs{@fnpos} is neither `familiar-critical', nor `critical-familiar', that is, when the order is more complex. +% \cs{do@feet@custom@order} is called when \cs{@fnpos} is neither \enquote{familiar-critical}, nor \enquote{critical-familiar}, that is, when the order is more complex. % In this case, people must define the order for all footnote series. % If they don't, \LaTeX\ could perform an infinite run. % \begin{macrocode} @@ -16057,7 +16240,7 @@ % \end{macro} % % \subsection{Patching standard output's commands} -% The \protect\ltxclass{memoir} class does not use the `standard' versions of +% The \protect\ltxclass{memoir} class does not use the \enquote{standard} versions of % \protect\cs{@makecol} and \protect\cs{@reinserts}, due to its sidebar insert. % We had better add that code if \protect\ltxclass{memoir} is used. (It can % be awkward dealing with |\if| code within |\if| code, so don't use @@ -16253,7 +16436,7 @@ % \end{macro} % \begin{macro}{\@outputpage} % As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter. -% We patch it in order to increase, conditionally, the \verb+par@page+ counter, and to set correctly the page number send to the auxiliaries file (\verb+.1+, \verb+.2+, etc.). +% We patch it in order to increase, conditionally, the \verb+par@page+ counter, and to set correctly the page number sent to the auxiliary files (\verb+.1+, \verb+.2+, etc.). % \begin{macrocode} \AtBeginDocument{% \set@this@c@page% @@ -16361,7 +16544,7 @@ % write methods for the \file{.aux} file. % % Jesse Billett\footnote{(\url{jdb43@cam.ac.uk}) via the \texttt{ctt} -% thread `ledmac cross referencing', 25 August 2003.} +% thread \enquote{ledmac cross referencing}, 25 August 2003.} % found that the original code could be off by several pages. This version, % hopefully cures that, and also allows for non-arabic page numbering. % @@ -16801,7 +16984,7 @@ % \begin{macro}{\l@dlabel@parse} % Notice that we slipped another \verb"|" delimiter into the % penultimate line of \protect\cs{l@dgetref@num}, to -% keep the `switch-number' separate from the reference numbers. This +% keep the \enquote{switch-number} separate from the reference numbers. This % \verb"|" is used as another parameter delimiter by \protect\cs{l@dlabel@parse}, % which extracts the appropriate number from its first argument. % The \verb"|"-delimited arguments consist of the expanded label-macro @@ -16927,6 +17110,11 @@ \newtoggle{Xlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintlines \newtoggle{Xlinenumannotationonlyfirst@appref}%Idem +\newtoggle{Xnolinenumber@SEref}%Idem +\newtoggle{Xnolinenumber@appref}%Idem +\newtoggle{Xnolinenumberifannotation@SEref}%Idem +\newtoggle{Xnolinenumberifannotation@appref}%Idem + \def\Xlinenumannotationposition@appref{after}% \def\Xlinenumannotationposition@SEref{after}% @@ -16986,6 +17174,13 @@ \newtoggle{Xendnoidenticallinenumannotation@apprefwithpage}% \newtoggle{Xendnoidenticallinenumannotation@SErefwithpage}% + + +\newtoggle{Xendnolinenumber@SErefwithpage}%Never changed, only for test in \setprintendlines +\newtoggle{Xendnolinenumber@apprefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@SErefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@apprefwithpage}%Idem + % \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} @@ -17187,7 +17382,7 @@ % make your own label. For example, if you insert % \protect\cs{edmakelabel}\verb+{elephant}{10|25|0}+ you will have created a % new label, and a later call to \protect\cs{edpageref}\verb+{elephant}+ would -% print `10' and \protect\cs{lineref}\verb+{elephant}+ would print `25'. +% print \enquote{10} and \protect\cs{lineref}\verb+{elephant}+ would print \enquote{25}. % The sub-line number here is zero. % \protect\cs{edmakelabel} takes a label, followed by a page and a line number(s) % as arguments. @@ -17374,7 +17569,7 @@ % \begin{macro}{\ledsidenote} % \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledinnernote}, \protect\cs{ledouternote} are the % user commands for left, right, inner and outer sidenotes. -% The two last one are just alias for the two first one, depending of the page number. +% The two last ones are just alias for the two first ones, depending on the page number. % \protect\cs{ledsidenote}\marg{text} is the command for a moveable sidenote. % \begin{macrocode} \newcommand*{\ledleftnote}[1]{\edtext{}{\l@dlsnote{#1}}} @@ -17396,7 +17591,7 @@ % \begin{macro}{\l@desnote} % \begin{macro}{\l@disnote} % \changes{v1.12.0}{2014/08/05}{\protect\cs{l@dlsnote},\protect\cs{l@drsnote} and \protect\cs{l@dcsnote} defined only one time, in \eledmac, including needs for eledpar case.}. -% The `footnotes' for left, right, and moveable sidenotes. The whole +% The \enquote{footnotes} for left, right, and moveable sidenotes. The whole % scheme is reminiscent of the critical footnotes code. % \begin{macrocode} \newif\ifrightnoteup @@ -17517,7 +17712,7 @@ % \item \protect\cs{l@dcsnotetext@l} if \protect\cs{ledsidenote} is to be put on right. % \end{itemize} % \end{itemize} -% \cs{vl@disnote} and \cs{vl@dosnote} just call \cs{vl@dlsnote} or \cs{vl@drsnote}, depending of the page. +% \cs{vl@disnote} and \cs{vl@dosnote} just call \cs{vl@dlsnote} or \cs{vl@drsnote}, depending on the page. % \begin{macrocode} \newcommand*{\vl@dlsnote}[1]{% \ifledRcol@% @@ -18428,9 +18623,9 @@ % \end{macro} % \changes{v1.14.0}{2014/10/27}{Delete previous override of \protect\cs{l@d@@wrindexhyp} at the beginning of a document when hyperref is not loaded.} % -% \subsection{`innote' and `notenumber' option of \package{indextols} package} +% \subsection{\enquote{innote} and \enquote{notenumber} option of \package{indextols} package} % \begin{macro}{\led@set@index@fornote} -% The \cs{led@set@index@fornote} is called when a familiar footnote is inserted --- and not when it is read --- and changes the \cs{index} command depending of the option of the \package{indextools} package. +% The \cs{led@set@index@fornote} is called when a familiar footnote is inserted --- and not when it is read --- and changes the \cs{index} command depending on the option of the \package{indextools} package. % Its only argument is the note series. % \begin{macrocode} \newcommand{\led@set@index@fornote}[1]{% @@ -18618,7 +18813,7 @@ % \begin{macro}{\ifinstanza} % The macro \protect\cs{@hangingsymbol} is used to insert a symbol on each hanging of verses. It is set by user level macro \protect\cs{sethangingsymbol}. % -% For example, in French typography, the symbol is `['. We obtain it by means of the following code: +% For example, in French typography, the symbol is \enquote{[}. We obtain it by means of the following code: %\begin{verbatim} %\sethangingsymbol{[\,} %\end{verbatim} @@ -19557,7 +19752,7 @@ % % % The following is borrowed, and renamed, from the \protect\package{amsmath} -% package. See also the CTT thread `eeq and amstex', 1995/08/31, started +% package. See also the CTT thread \enquote{eeq and amstex}, 1995/08/31, started % by Keith Reckdahl and ended definitively by David M. Jones. % % @@ -19608,7 +19803,7 @@ % \begin{macrocode} \newcommand{\l@dcollect@body}[1]{% \ifvmode\else% - \\%Ensure that we don't have spurious indentation at the very first line, caused by some text before. + \\%Ensure that we do not have spurious indentation at the very first line, caused by some text before. \fi% \l@denvbody{\expandafter#1\expandafter{\the\l@denvbody}}% \edef\processl@denvbody{\the\l@denvbody\noexpand\end{\@currenvir}}% @@ -19625,7 +19820,7 @@ % % \begin{macro}{\l@dpush@begins} % When adding a piece of the current environment's contents to \protect\cs{l@denvbody}, -% we scan it to check for additional \protect\cs{begin} tokens, and add a `b' to the +% we scan it to check for additional \protect\cs{begin} tokens, and add a \enquote{b} to the % stack for any that we find. % \begin{macrocode} \def\l@dpush@begins#1\begin#2{% @@ -20926,7 +21121,7 @@ % \begin{environment}{edarrayl} % \begin{environment}{edarrayc} % \begin{environment}{edarrayr} -% The `environment' forms for \protect\cs{ltab}, \protect\cs{ctab} and \protect\cs{rtab}. +% The environment forms for \protect\cs{ltab}, \protect\cs{ctab} and \protect\cs{rtab}. % \begin{macrocode} \newenvironment{edarrayl}{\l@dcollect@body\ltab}{} \newenvironment{edarrayc}{\l@dcollect@body\ctab}{} @@ -20940,7 +21135,7 @@ % \begin{environment}{edtabularl} % \begin{environment}{edtabularc} % \begin{environment}{edtabularr} -% The `environment' forms for \protect\cs{ltabtext}, \protect\cs{ctabtext} and \protect\cs{rtabtext}. +% The environment forms for \protect\cs{ltabtext}, \protect\cs{ctabtext} and \protect\cs{rtabtext}. % \begin{macrocode} \newenvironment{edtabularl}{\l@dcollect@body\ltabtext}{} \newenvironment{edtabularc}{\l@dcollect@body\ctabtext}{} @@ -21395,7 +21590,7 @@ % \begin{macro}{\eledsection*} % \begin{macro}{\eledsubsection*} % \begin{macro}{\eledsubsubsection*} -% And now, the user sectioning commands, which write to the file, and also add content as a ``normal'' line. +% And now, the user sectioning commands, which write to the file, and also add content as a \enquote{normal} line. % \begin{macrocode} \newcommand{\eledchapter}[2][]{% \disable@familiarnotes% @@ -21617,7 +21812,7 @@ % \begin{macrocode} }{} % \end{macrocode} -% \section{Page breaking or no page breaking depending of specific lines} +% \section{Page breaking or no page breaking depending on specific lines} % By default, page breaks are automatic. However, the user can define lines which will force page breaks, or prevent page breaks around one specific line. % On the first run, the line-list file records the line number of where the page break is being changed (either forced, or prevented). % On the next run, page breaks occur either before or after this line, depending on how the user sets the command. The default setting is after the line. @@ -21908,7 +22103,7 @@ % % \bibitem[Bur01]{POEMSCOLTUG} % John Burt. -% \newblock `Typesetting critical editions of poetry'. +% \newblock \enquote{Typesetting critical editions of poetry}. % \newblock \emph{TUGboat}, \textbf{22}, 4, pp 353--361, December 2001. % \newblock (Code available from CTAN in % \texttt{macros/latex/contrib/poemscol}) @@ -21931,15 +22126,15 @@ % % \bibitem[LW90]{EDMACTUG} % John Lavagnino and Dominik Wujastyk. -% \newblock `An overview of \edmac: a \textsc{Plain} TeX format for -% critical editions'. +% \newblock \enquote{An overview of \edmac: a \textsc{Plain} TeX format for +% critical editions}. % \newblock \emph{TUGboat}, \textbf{11}, 4, pp. 623--643, November 1990. % \newblock (Code available from CTAN in % \texttt{macros/plain/contrib/edmac}) % % \bibitem[L\"{u}c03]{EDNOTES} % Uwe L\"{u}ck. -% \newblock `\textsf{ednotes}\,---\,critical edition typesetting with LaTeX'. +% \newblock \enquote{\textsf{ednotes}\,---\,critical edition typesetting with LaTeX}. % \newblock \emph{TUGboat}, \textbf{24}, 2, pp. 224--236, 2003. % \newblock (Code available from CTAN in % \texttt{macros/latex/contrib/ednotes}) diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index a619d76def3..02f99ecd0b0 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -162,7 +162,7 @@ % % \newcommand{\dtxfilename}{\texttt{reledpar.dtx}} % \GetFileInfo{reledpar.sty} -% ^^A Put changes in the right order : see http://tex.stackexchange.com/a/74113/7712 +% ^^A Put changes in the right order: see http://tex.stackexchange.com/a/74113/7712 % \let\org@changes@\changes@ % \def\my@changes v#1.#2.#3\@nil{% % \org@changes@{v#1.\six@digits{#2}.#3=v#1.#2.#3}% @@ -188,17 +188,17 @@ % \changes{v0.4.0}{2011/08/03}{No more ledparpatch. All patches are now in the main file.} % \changes{v0.5.0}{2011/08/21}{Corrections about \protect\cs{section} and other titles in numbered sections} % \changes{v0.6.0}{2011/08/22}{Be able to us \protect\cs{chapter} in parallel pages.} -% \changes{v0.7.0}{2011/08/31}{Option `shiftedverses' which make there is no blank between two parallel verses with inequal length.} +% \changes{v0.7.0}{2011/08/31}{Add \protect\option{shiftedverses} option which makes there is no blank between two parallel verses with inequal length.} % \changes{v0.8.0}{2011/09/16}{Possibility to have a symbol on each hanging of verses, like in the french typography. Redefine the commande \protect\cs{hangingsymbol} to define the character.} % \changes{v0.9.0}{2011/10/01}{Possibilty to number the pstart with the commands \protect\cs{numberpstarttrue}.} % \changes{v0.9.1}{2011/10/02}{The numbering of the pstarts restarts on each \protect\cs{beginnumbering}.} -% \changes{v0.9.2}{2011/11/08}{Debug : with \protect\cs{Columns}, the hanging indentation now runs on the left columns and the hanging symbol is shown only when \protect\cs{stanza} is used.} +% \changes{v0.9.2}{2011/11/08}{Debug: with \protect\cs{Columns}, the hanging indentation now runs on the left columns and the hanging symbol is shown only when \protect\cs{stanza} is used.} % \changes{v0.9.3}{2011/11/18}{\protect\cs{thepstartL} and \protect\cs{thepstartR} use now \protect\cs{bfseries} and not \protect\cs{bf}, which is deprecated and makes conflicts with memoir class.} % \changes{v0.10.0}{2012/04/04}{\protect\cs{edlabel} commands which start a paragraph are now put in the right place.} % \changes{v0.10.0}{2012/04/04}{\protect\cs{edlabel} commands on the right side are now correctly indicated.} % \changes{v1.0.0}{2012/09/14}{Compatibility with eledmac. Change name to eledpar.} % \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{numberonlyfirstinline} with lineation by pstart or by page.} -% \changes{v1.1.0}{2012/09/25}{Shiftedverses becomes shiftedpstarts.} +% \changes{v1.1.0}{2012/09/25}{The \protect\option{shiftedverses} options becomes \protect\option{shiftedpstarts}.} % \changes{v1.2.0}{2012/10/15}{Support for \protect\cs{led}\meta{section} commands in parallel texts.} % \changes{v1.3.2}{2012/12/11}{Debug with some classes.} % \changes{v1.4.3}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.} @@ -227,15 +227,15 @@ % \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.} % \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ldots\protect\cs{endnumbering} without \protect\cs{pstart}.} % \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.} -% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.} +% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside \protect\env{pages} environment and \protect\cs{Columns} inside \protect\env{pairs} environment.} % \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.} % \changes{v1.16.1}{2015/05/20}{Write information about line-list file version in the correct file.} % \changes{v1.16.2}{2015/05/29}{Fix a bug when adding empty lines before a \protect\cs{pend} in combination with some specific penalties setting.} % \changes{v1.17.0}{2015/06/02}{Add compatibility of optional argument of \protect\cs{pstart}/\protect\cs{pend} and \protect\cs{AtEveryPstart}/\protect\cs{AtEveryPend} with two columns mode.} % \changes{v2.0.0}{2015/07/19}{Many code refactored and moved to \reledmac.} % \changes{v2.0.0}{2015/07/19}{Package's name becomes \reledpar.} -% \changes{v2.0.0}{2015/07/19}{Fix some bugs with `sameparallelpagenumber' option.} -% \changes{v2.0.0}{2015/07/19}{Totally new implementation of `sameparallelpagenumber' option.} +% \changes{v2.0.0}{2015/07/19}{Fix some bugs with \protect\option{sameparallelpagenumber} option.} +% \changes{v2.0.0}{2015/07/19}{Totally new implementation of \protect\option{sameparallelpagenumber} option.} % \changes{v2.1.0}{2015/07/27}{Fix a bug with \protect\cs{setparledgroupnotespacing} with the shiftedpstarts option.} % \changes{v2.1.0}{2015/07/27}{Fix incompatibility between optional argument of \protect\cs{pstart} and \protect\cs{numberpstarttrue}} % \changes{v2.1.0}{2015/07/27}{Options to custom empty right page before \protect\cs{Pages}.} @@ -344,9 +344,10 @@ % \changes{v2.24.0}{2020/05/31}{Add startstanzaindentsrepetition feature.} % \changes{v2.24.0}{2020/05/31}{Add antilabe feature.} % \changes{v2.24.1}{2020/08/19}{Makes \protect\cs{numberstantzatrue} working with \protect\env{astanza}.} -% \changes{v2.24.1}{2020/08/19}{Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} +% \changes{v2.24.1}{2020/08/19}{Fix incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} % \changes{v2.24.2}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} % \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.} +% \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}. % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -383,10 +384,10 @@ % % % \Parpackage provides many tools and options. Normally, they are all documented in this file. -% Also provided is a help folder, ``\href{examples/.}{examples}''. The folder contains additional examples (although not for all cases). -% Examples starting by ``3-'' are for basic uses, those starting by ``4-'' are for advanced uses. +% Also provided is a help folder, \enquote{\href{examples/.}{examples}}. The folder contains additional examples (although not for all cases). +% Examples starting by \enquote{3-} are for basic uses, those starting by \enquote{4-} are for advanced uses. % -% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can report bug in English or in French (better). +% To report bugs, please go to ledmac's GitHub page and click \enquote{New Issue}: \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can report bug in English or in French (better). % % You can subscribe to the \macpackage email list in:\\ \url{http://geekographie.maieul.net/146} % \end{abstract} @@ -483,7 +484,7 @@ % % The \parpackage package lets you typeset two \emph{numbered} texts in % parallel\footnote{You can use, anyway, \protect\cs{numberlinefalse} to disable printing of line numbers.}. -% This can be done either as setting the `Leftside' and `Rightside' +% This can be done either as setting the \enquote{Leftside} and \enquote{Rightside} % texts in two columns or on facing pages. % In the paired pages case footnotes are placed at the bottom of the page % on which they are called out --- that is, footnotes belonging to the left @@ -527,7 +528,7 @@ % % If you \protect\cs{maxchunks} is too little %you can get a \parpackage{} error message along the -% lines: ``Too many \protect\cs{pstart} without printing. Some text will be lost.'' +% lines: \enquote{Too many \protect\cs{pstart} without printing. Some text will be lost.} % then you will have to either increase \protect\cs{maxchunks} or use the % parallel printing commands (\protect\cs{Columns} or \protect\cs{Pages}) more frequently. % @@ -582,7 +583,7 @@ % and right columns, respectively. By default, these are: \\ % \verb?\setlength{\Lcolwidth}{0.45\textwidth}? \\ % \verb?\setlength{\Rcolwidth}{0.45\textwidth}? \\ -% They may be adjusted if one text tends to be `bulkier' than the other. +% They may be adjusted if one text tends to be \enquote{bulkier} than the other. % \subsubsection{Column's separator} % \DescribeMacro{\columnrulewidth} % \DescribeMacro{\columnseparator} @@ -732,14 +733,14 @@ % necessary. % \subsubsection[Way of synchronizing]{Way of synchronizing\footnote{There is a French version of this article on \url{http://geekographie.maieul.net/185}.}}\label{syncoption} % Synchronization of left and right texts in parallel processing -% requires some `numbered' auxiliary files to be written (namely \verb+.1+, +% requires some \enquote{numbered} auxiliary files to be written (namely \verb+.1+, %\verb+.1R+, \verb+.2+, \verb+.2R+, and so forth), the content of which may change as long %as synchronization is not complete. This usually requires \LaTeX\ to be %run several times. Therefore, it is advised to use in conjunction %utilities such as latexmk to ensure that synchronization is complete. % %Numbered paragraphs which are contained between the \cs{pstart} and \cs{pend} -%macros are thereafter called `chunks'. +%macros are thereafter called \enquote{chunks}. % %In short, the default setting is designed in such a way that %corresponding chunks of text are always kept in synchronization, even @@ -817,7 +818,7 @@ %the \option{nosyncpstarts} setting. % %Please note that every change of synchronization setting resets the -%content of the `numbered' auxiliary files to make sure that \parpackage +%content of the \enquote{numbered} auxiliary files to make sure that \parpackage %does not try to make the synchronization with wrong calculations. % \subsubsection{Page number}\label{sameparallelpagenumber} % \changes{v1.15.0}{2015/05/18}{Add sameparallelpagenumber option.} @@ -825,7 +826,7 @@ % This means that pages are numbered continuously following printed-book conventions: from left-hand to right-hand side, left-hand pages having even numbers, right-hand pages having odd numbers. % % However, you can use the package option \verb+sameparallelpagenumber+ to have the same page number for both left and right side. -% In this case, this setting will apply only for pages typeset by \protect\cs{Pages}, not for ``normal'' pages. +% In this case, this setting will apply only for pages typeset by \protect\cs{Pages}, not for \enquote{normal} pages. % % Please also read advising in \reff{par@page}. % @@ -864,7 +865,7 @@ % In this case, the content of \cs{Pages} will start on a left side, without any spurious empty page, and the left pages will be odd (and not event like in normal way), the first one being \verb+1+. % % \subsection{Critical and familiar footnotes} -% Of course, in ``Facing pages'', the \macpackage's both critical and familiar footnotes can be used. +% Of course, in \enquote{Facing pages}, the \macpackage's both critical and familiar footnotes can be used. % However, some specific points must be taken into consideration. % \subsubsection{Notes height setting} % Since \protect\package{eledpar} v1.13.0, long notes in facing pages can flow from left to right pages, and \emph{vice-versa}. @@ -990,7 +991,7 @@ % the second section, and so on), and then creates a new version of % this auxiliary file to collect information during this run. % Separate auxiliary files are maintained for right hand texts and -% these are named \meta{jobname}.\file{nnR}, using the `R' to distinguish +% these are named \meta{jobname}.\file{nnR}, using the \enquote{R} to distinguish % them from the left hand and serial (non-parallel) texts. % % \DescribeMacro{\memorydump} @@ -1042,9 +1043,10 @@ % causes the numbering of that particular line to be skipped. This can % useful if you are putting some kind of marker (even if it is only a % blank line) between stanzas. Remember, parallel texts must be numbered -% and this provides a way to slip in an ``unnumbered'' line. -% \DescribeMacro{\hidenumbering} +% and this provides a way to slip in an \enquote{unnumbered} line. +% % \changes{v1.21.0}{2015/04/13}{Add \protect\cs{hidenumbering}} +% \DescribeMacro{\hidenumbering} % When inserted into a numbered line the macro \protect\cs{hidenumbering} causes % the number for that particular line to be hidden; namely, no line number will print. % Note that if you use it in \protect\cs{stanza}, you must call it at the beginning of the verse. @@ -1144,7 +1146,7 @@ % % \subsection{Line flag} % \DescribeMacro{\setRlineflag}\label{Rlineflag} -% A ``R'' is appended to the line numbers of the +% A \enquote{R} is appended to the line numbers of the % right texts. % This may be useful for parallel columns but for parallel pages it might % be more appropriate to redefine it using \protect\cs{setRlineflag}\marg{flag}. @@ -1250,8 +1252,8 @@ % The difference between \env{astanza} and \cs{stanza} is, that the latter syncs % verse by verse, while the environment syncs stanza by stanza. % -% If you get an error message along the lines of `Missing number, -% treated as zero \protect\cs{sza@0@}' it is because you have forgotten to use +% If you get an error message along the lines of \enquote{Missing number, +% treated as zero \protect\cs{sza@0@}} it is because you have forgotten to use % \protect\cs{setstanzaindents} to set the stanza indents. % % As \env{astanza} is a specific type of \cs{pstart}\ldots\cs{pend} structure, you can: @@ -1373,7 +1375,7 @@ % a stream typeset pages. It was not designed for typesetting two texts % in parallel, where it has to alternate from one to the other. Further, % \TeX essentially processes its input one paragraph at a time --- it is -% very difficult to get at the `internals' of a paragraph such as the +% very difficult to get at the \enquote{internals} of a paragraph such as the % individual lines in case you want to number them or put some mark at the % start or end of the lines. % @@ -1402,7 +1404,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/11/08 v2.24.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/11/29 v2.25.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1425,7 +1427,7 @@ \def\@par@this@sync@option{}% % \end{macrocode} % \end{macro} -% With the option `shiftedpstarts' a long pstart on the left side (or on the right side) does not make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shift stops at every end of pages. +% With the \option{shiftedpstarts} option a long pstart on the left side (or on the right side) does not make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shift stops at every end of pages. % \begin{macro}{\ifshiftedpstarts} % \begin{macrocode} \newif\ifshiftedpstarts @@ -1435,7 +1437,7 @@ }% % \end{macrocode} % \end{macro} -% With the option `advancedshiftedpstarts' a long pstart on the left side (or on the right side) does not make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shift stops at every end of pages. +% With the \option{advancedshiftedpstarts} option a long pstart on the left side (or on the right side) does not make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shift stops at every end of pages. % Differing to \option{shiftedpstarts}, the pstart shift are not counted to determine when cutting the page. That could help to avoid page with blank lines at the bottom. % \begin{macro}{\ifshiftedpstarts} % \begin{macrocode} @@ -1520,8 +1522,8 @@ % As noted above, much of the code is a duplication of the original % \macpackage{} code to handle the extra box(es) for the right hand side text, % and sometimes for the left hand side as well. In order to distinguish -% we use `R' or `L' in the names of macros for the right and left code. -% The specifics of `L' and `R' are normally hidden from the user by +% we use \enquote{R} or \enquote{L} in the names of macros for the right and left code. +% The specifics of \enquote{L} and \enquote{R} are normally hidden from the user by % letting the \verb?Leftside? and \verb?Rightside? environments set things % up appropriately. % @@ -1744,8 +1746,8 @@ % \begin{macro}{\unhnamebox} % \begin{macro}{\unvnamebox} % \begin{macro}{\namebox} -% A set of macros for creating and using `named' boxes; the macros are called -% after the regular box macros, but including the string `name'. +% A set of macros for creating and using \enquote{named} boxes; the macros are called +% after the regular box macros, but including the string \enquote{name}. % \begin{macrocode} \providecommand*{\newnamebox}[1]{% \expandafter\newbox\csname #1\endcsname} @@ -1787,7 +1789,7 @@ % % \begin{macro}{\newnamecount} % \begin{macro}{\usenamecount} -% Macros for creating and using `named' counts. +% Macros for creating and using \enquote{named} counts. % \begin{macrocode} \providecommand*{\newnamecount}[1]{% \expandafter\newcount\csname #1\endcsname} @@ -1803,8 +1805,8 @@ % \begin{macro}{\section@numR} % This is the right side equivalent of \protect\cs{section@num}. % -% Each section will read and write an associated `line-list -% file', containing information used to do the numbering. Normally +% Each section will read and write an associated \enquote{line-list +% file}, containing information used to do the numbering. Normally % the file will be called \meta{jobname}\file{.nn}, where \file{nn} is the % section number. However, for right side texts the file is called % \meta{jobname}\file{.nnR}. The \protect\cs{extensionchars} applies to the @@ -2305,7 +2307,7 @@ % \begin{macro}{\linenumincrementR} % \begin{macro}{\firstsublinenumR} % \begin{macro}{\sublinenumincrementR} -% And the `R` suffixed version. +% And the \enquote{R} suffixed version. % \begin{macrocode} \newcommand\firstlinenumR[1]{% \setcounter{firstlinenumR}{#1}% @@ -2396,37 +2398,62 @@ % \protect\cs{rightlinenumR} by introducing \protect\cs{l@dlinenumR}} % \begin{macrocode} \newcommand*{\leftlinenumR}{% - \l@dlinenumR - \kern\linenumsep} + \l@dlinenumR% + \kern\linenumsep% +}% \newcommand*{\rightlinenumR}{% - \kern\linenumsep - \l@dlinenumR} + \kern\linenumsep% + \l@dlinenumR% +}% + + \newcommand*{\l@dlinenumR}{% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% \linenumrepR{\line@numR}\@Rlineflag% \ifsublines@R \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% }% % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} -% -% +% \begin{macro}{\leftlinenumannotationR} +% \begin{macro}{\rightlinenumannotationR} +% \cs{rightlinenumannotationR} and \cs{leftlinenumannotationR} are the same as not suffixed version, but for right side. +% \begin{macrocode} +\newcommand*{\leftlinenumannotationR}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotationR}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% +}% +% \end{macrocode} +% \end{macro} +% \end{macro} % \subsection{Line-number counters and lists} % \subsubsection{Correspond to those in \macpackage for regular or left text} % We need another set of counters and lists for the right text, @@ -3328,7 +3355,7 @@ % We also dump and restore the value of the booleans \protect\cs{ifnumberpstart} and \protect\cs{ifnumberline}. % So, first step, creating the lists. -% Here, ``pc'' means ``public counters''. +% Here, \enquote{pc} means \enquote{public counters}. % \begin{macro}{\list@pstartL@pc} % \begin{macro}{\list@pstartR@pc} % \begin{macrocode} @@ -3347,12 +3374,14 @@ \xright@appenditem{\the\c@pstartL}\to\list@pstartL@pc% \global\cslet{numberpstart@L\the\l@dnumpstartsL}{\ifnumberpstart}% \global\cslet{numberline@L\the\l@dnumpstartsL}{\ifnumberline}% + \global\cslet{linenumannotationotherside@L\the\l@dnumpstartsL}{\iflinenumannotationotherside}% }% \def\dump@pstartR@pc{% \xright@appenditem{\the\c@pstartR}\to\list@pstartR@pc% \global\cslet{numberpstart@R\the\l@dnumpstartsR}{\ifnumberpstart}% \global\cslet{numberline@R\the\l@dnumpstartsR}{\ifnumberline}% + \global\cslet{linenumannotationotherside@R\the\l@dnumpstartsR}{\iflinenumannotationotherside}% }% % \end{macrocode} @@ -3412,7 +3441,7 @@ % \end{macrocode} % \end{macro} % \changes{v2.0.0}{2015/07/19}{Deleting the old system of managing parallel chapter, keep only the new one with \protect\cs{patchcmd}.} -% The \verb?pages? environment additionally sets the `column' widths to the +% The \verb?pages? environment additionally sets the \enquote{column} widths to the % \protect\cs{textwidth} (as known at the time the package is called). In this environment, there are two text in parallel on 2 pages. % \begin{macrocode} \newenvironment{pages}{% @@ -3972,7 +4001,7 @@ % \begin{macro}{\@donetotallinesL} % \begin{macro}{\@donereallinesR} % \begin{macro}{\@donetotallinesR} -% We need to know the number of `real' lines output (i.e., those that +% We need to know the number of \enquote{real} lines output (i.e., those that % have been input by the user), and the total lines output (which includes % any blank lines output for synchronisation). % \begin{macrocode} @@ -4001,6 +4030,7 @@ \newcommand*{\do@lineL}{% \letcs{\ifnumberpstart}{numberpstart@L\the\l@dpscL}% \letcs{\ifnumberline}{numberline@L\the\l@dpscL}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@L\the\l@dpscL}% \advance\countLline \@ne% \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% {\vbadness=10000% @@ -4089,7 +4119,7 @@ % \end{macro} % \begin{macro}{\print@eledsectionL} % \changes{v1.12.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.} -% \changes{v1.12.1}{2015/02/27}{Fixes bug with \LuaLaTeX\ RTL \protect\cs{eledsection}.} +% \changes{v1.12.1}{2015/02/27}{Fix bug with \LuaLaTeX\ RTL \protect\cs{eledsection}.} % \protect\cs{print@eledsectionL} is for line with macro code. % \begin{macrocode} \def\print@eledsectionL{%% @@ -4195,6 +4225,7 @@ \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% \letcs{\ifnumberline}{numberline@R\the\l@dpscR}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@R\the\l@dpscR}% \ledRcol@true% \advance\countRline \@ne% \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% @@ -4613,8 +4644,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columnsR}{\m@ne}}}% @@ -4639,8 +4676,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \fi% }% \fi @@ -4657,7 +4700,7 @@ % \end{macro} % \end{macro} % \subsection{Pstart number printing in side} -% The printing of the pstart number is like in \macpackage, with two differences : +% The printing of the pstart number is like in \macpackage, with two differences: %\begin{itemize} %\item Some commands have versions suffixed by R or L. %\item The \protect\cs{affixpstart@num} and \protect\cs{affixpstart@numR} commands are called in the \protect\cs{Pages} command. Consequently, the \verb|pstartL| and \verb|pstartR| counters must be reset at the beginning of this command. @@ -6209,7 +6252,7 @@ % \end{macro} % \end{macro} % \begin{macro}{\checkpb@columns} -% \protect\cs{checkpb@columns} prevent or make pagebreaking in columns, depending of the use of \protect\cs{ledpb} or \protect\cs{lednopb}. +% \protect\cs{checkpb@columns} prevent or make pagebreaking in columns, depending on the use of \protect\cs{ledpb} or \protect\cs{lednopb}. % \begin{macrocode} \newcommand{\checkpb@columns}{% @@ -7701,8 +7744,8 @@ % \addcontentsline{toc}{section}{References} % \bibitem[LW90]{EDMACTUG} % John Lavagnino and Dominik Wujastyk. -% \newblock `An overview of \edmac: a \textsc{Plain} TeX format for -% critical editions'. +% \newblock \enquote{An overview of \edmac: a \textsc{Plain} TeX format for +% critical editions}. % \newblock \emph{TUGboat}, \textbf{11}, 4, pp. 623--643, November 1990. % \newblock (Code available from CTAN in % \texttt{macros/plain/contrib/edmac}) diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index d53c46769c7..e76658445a8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -32,10 +32,12 @@ + + %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/11/19 v2.34.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/11/29 v2.35.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -374,7 +376,7 @@ \ifledfinal \newcommand*{\showlemma}[1]{#1} \else - \newcommand*{\showlemma}[1]{\underline{#1}} + \newcommand*{\showlemma}[1]{\textbf{#1}}% \fi \let\linenumberlist=\empty @@ -756,11 +758,13 @@ \textdir TLT% \fi% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \linenumrep{\line@num}% \ifsublines@ \ifnum\subline@num>0\relax @@ -769,21 +773,37 @@ \sublinenumrep{\subline@num}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \egroup% }% \newcommand*{\leftlinenum}{% - \ledlinenum - \kern\linenumsep} + \ledlinenum% + \kern\linenumsep% +}% \newcommand*{\rightlinenum}{% - \kern\linenumsep - \ledlinenum} + \kern\linenumsep% + \ledlinenum% +}% +\newcommand*{\leftlinenumannotation}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotation}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% +}% \newcount\line@num \newcount\subline@num \newif\ifsublines@ @@ -2367,11 +2387,22 @@ \write\linenum@out{\string\@annot[#1]}% \fi% }% + +\newcommand{\resetlinenumannotation}[0]{% + \leavevmode%In case it begins with a \pstart, ensure the \@resetannot is written after \@nl + \ifledRcol% + \write\linenum@outR{\string\@resetannot}% + \else% + \write\linenum@out{\string\@resetannot}% + \fi% +}% + \def\Xlinenumannotationposition@side{after}% \def\Xwraplinenumannotation@ref{\textsuperscript}% \def\Xwraplinenumannotation@side{\textsuperscript}% \newtoggle{Xnoidenticallinenumannotation@ref}% \newtoggle{Xnoidenticallinenumannotation@side}% +\newif\iflinenumannotationotherside% \newcommand{\@annot}[1]{% \store@annot@to@absline{#1}% \def\current@annot{#1}% @@ -2397,6 +2428,9 @@ \let\current@annot\empty% \fi }% +\newcommand{\@resetannot}{% + \let\current@annot\empty% +}% \def\parse@annot#1|#2|{% \gdef\annot@start{#1}% \gdef\annot@end{#2}% @@ -2450,8 +2484,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columns}{\m@ne}}}% @@ -2476,8 +2516,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \fi% }% \fi @@ -3616,6 +3662,7 @@ \newif\ifl@d@Xmorethantwolines% \let\@annot@start@print\relax% \let\@annot@end@print\relax% +\newif\ifl@d@Xlinenumber% \newcommand*{\l@dparsefootspec}[3]{\l@dp@rsefootspec#1|} \def\l@dp@rsefootspec#1|#2|#3|#4|#5|#6|#7|{% \gdef\l@dparsedstartpage{#1}% @@ -3638,6 +3685,16 @@ \l@d@pnumfalse% \l@d@dashfalse% \l@d@elinfalse% + \l@d@Xlinenumbertrue% + \ifboolexpr{togl{Xnolinenumber@\@currentseries}% + or (% + togl{Xnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xlinenumberfalse% + }{}% \ifbypage@ \ifnum#4=#1 \else \l@d@pnumtrue @@ -3646,7 +3703,10 @@ \fi \ifboolexpr{% bool{l@d@pnum}% - or not test{\ifnumequal{#2}{#5}}% + or (% + not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xlinenumber}% + )% }{% \l@d@elintrue% \l@d@dashtrue% @@ -3738,9 +3798,12 @@ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{% @@ -3760,9 +3823,12 @@ \l@wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -3799,16 +3865,20 @@ {}% \ifl@d@pnum% \wrap@edcrossref{\@this@crossref@start}{#1}% - \csuse{Xpagelinesep@\@currentseries}% + \ifl@d@Xlinenumber% + \csuse{Xpagelinesep@\@currentseries}% + \fi% + \fi% + \ifl@d@Xlinenumber% + \wrap@edcrossref{\@this@crossref@start}{% + \linenumrep{#2}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \ifl@d@ssub% + \csuse{Xsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% + \fi% \fi% - \wrap@edcrossref{\@this@crossref@start}{% - \linenumrep{#2}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \ifl@d@ssub% - \csuse{Xsublinesep@\@currentseries}% - \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% - \fi \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -3817,10 +3887,12 @@ {\bgroup}% {\hbox to \csuse{Xboxendlinenum@\@currentseries}\bgroup}% \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xmorethantwolines@\@currentseries}% - \else% - \csuse{Xtwolines@\@currentseries}% + \ifl@d@Xlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xmorethantwolines@\@currentseries}% + \else% + \csuse{Xtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -3837,17 +3909,19 @@ \wrap@edcrossref{\@this@crossref@end}{#4}% \csuse{Xpagelinesep@\@currentseries}% \fi% - \ifl@d@elin% - \wrap@edcrossref{\@this@crossref@end}{% - \linenumrep{#5}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \fi% - \ifl@d@esl% - \ifl@d@elin% - \csuse{Xsublinesep@\@currentseries}% - \fi% - \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \ifl@d@Xlinenumber% + \ifl@d@elin% + \wrap@edcrossref{\@this@crossref@end}{% + \linenumrep{#5}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \fi% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xsublinesep@\@currentseries}% + \fi% + \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \fi% \fi% \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -4966,12 +5040,23 @@ \endgroup% }% }% +\newif\ifl@d@Xendlinenumber% \newcommand*{\setprintendlines}[6]{% \let\@annot@start@print\relax% \let\@annot@end@print\relax% \l@d@pnumfalse% \l@d@dashfalse% \l@d@elinfalse% + \l@d@Xendlinenumbertrue% + \ifboolexpr{togl{Xendnolinenumber@\@currentseries}% + or (% + togl{Xendnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xendlinenumberfalse% + }{}% \ifnum#4=#1 \else \l@d@pnumtrue \l@d@dashtrue @@ -4979,6 +5064,7 @@ \ifboolexpr{% bool{l@d@pnum}% or not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xendlinenumber}% }{% \l@d@elintrue% \l@d@dashtrue% @@ -5073,9 +5159,12 @@ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{% @@ -5095,9 +5184,12 @@ \l@wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -5143,24 +5235,28 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@start@print}% {}% - \wrap@edcrossref{\@this@crossref@start}{% - \ifledRcol@% - \linenumrepR{#2}% - \else% - \linenumrep{#2}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \ifl@d@ssub% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@Xendlinenumber% \wrap@edcrossref{\@this@crossref@start}{% \ifledRcol@% - \sublinenumrepR{#3}% + \linenumrepR{#2}% \else% - \sublinenumrep{#3}% + \linenumrep{#2}% \fi% }% \fi% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% + \ifl@d@Xendlinenumber% + \ifl@d@ssub% + \csuse{Xendsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{% + \ifledRcol@% + \sublinenumrepR{#3}% + \else% + \sublinenumrep{#3}% + \fi% + }% + \fi% + \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -5169,10 +5265,12 @@ {\bgroup}% {\hbox to \csuse{Xendboxendlinenum@\@currentseries}\bgroup}% \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xendmorethantwolines@\@currentseries}% - \else% - \csuse{Xendtwolines@\@currentseries}% + \ifl@d@Xendlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xendmorethantwolines@\@currentseries}% + \else% + \csuse{Xendtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -5196,28 +5294,30 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@end@print}% {}% - \ifl@d@elin% - \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \linenumrepR{#5}% - \else% - \linenumrep{#5}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \fi% - \ifl@d@esl% + \ifl@d@Xendlinenumber% \ifl@d@elin% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \linenumrepR{#5}% + \else% + \linenumrep{#5}% + \fi% + }% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \sublinenumrepR{#6}% - \else% - \sublinenumrep{#6}% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xendsublinesep@\@currentseries}% \fi% - }% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \sublinenumrepR{#6}% + \else% + \sublinenumrep{#6}% + \fi% + }% + \fi% \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -5305,6 +5405,8 @@ \csgdef{Xsymlinenumannotation@#1}{}% \newtoggle{Xnonumber@#1}% + \newtoggle{Xnolinenumber@#1}% + \newtoggle{Xnolinenumberifannotation@#1}% \csgdef{Xbeforenumber@#1}{0pt}% \csgdef{Xtxtbeforenumber@#1}{}% \csgdef{Xafternumber@#1}{0.5em}% @@ -5617,6 +5719,8 @@ \csgdef{Xendinplaceofnumber@#1}{0pt}% \newtoggle{Xendnonumber@#1}% + \newtoggle{Xendnolinenumber@#1}% + \newtoggle{Xendnolinenumberifannotation@#1}% \csgdef{Xendhangindent@#1}{0pt}% @@ -5813,6 +5917,8 @@ \newhooktoggle@series{Xgroupbyline}% \newhooktoggle@series{Xgroupbylineseparetwolines}% \newhooktoggle@series{Xnonumber} + \newhooktoggle@series{Xnolinenumber}% + \newhooktoggle@series{Xnolinenumberifannotation}% \newhooktoggle@series{Xpstart} \newhooktoggle@series{Xpstartonlyfirst}% @@ -5925,6 +6031,8 @@ \newhookcommand@series{Xendinplaceofnumber}% \newhooktoggle@series{Xendnonumber}% + \newhooktoggle@series{Xendnolinenumber}% + \newhooktoggle@series{Xendnolinenumberifannotation}% \newhooktoggle@series{Xendnumberonlyfirstinline}% \newhooktoggle@series{Xendnumberonlyfirstintwolines}% @@ -6614,6 +6722,10 @@ \newtoggle{Xlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintlines \newtoggle{Xlinenumannotationonlyfirst@appref}%Idem +\newtoggle{Xnolinenumber@SEref}%Idem +\newtoggle{Xnolinenumber@appref}%Idem +\newtoggle{Xnolinenumberifannotation@SEref}%Idem +\newtoggle{Xnolinenumberifannotation@appref}%Idem \def\Xlinenumannotationposition@appref{after}% \def\Xlinenumannotationposition@SEref{after}% @@ -6672,6 +6784,12 @@ \newtoggle{Xendnoidenticallinenumannotation@apprefwithpage}% \newtoggle{Xendnoidenticallinenumannotation@SErefwithpage}% +\newtoggle{Xendnolinenumber@SErefwithpage}%Never changed, only for test in \setprintendlines +\newtoggle{Xendnolinenumber@apprefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@SErefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@apprefwithpage}%Idem + + \newtoggle{Xendlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintendlines \newtoggle{Xendlinenumannotationonlyfirst@SErefwithpage}%Idem \newtoggle{Xendlinenumannotationonlyfirst@appref}%Idem @@ -8336,7 +8454,7 @@ \newif\if@edtabular% \newcommand{\l@dcollect@body}[1]{% \ifvmode\else% - \\%Ensure that we don't have spurious indentation at the very first line, caused by some text before. + \\%Ensure that we do not have spurious indentation at the very first line, caused by some text before. \fi% \l@denvbody{\expandafter#1\expandafter{\the\l@denvbody}}% \edef\processl@denvbody{\the\l@denvbody\noexpand\end{\@currenvir}}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index b8fba280020..3b1dff67a6d 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/11/08 v2.24.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/11/29 v2.25.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -504,31 +504,50 @@ \newif\iflinenumberLevenifblank \newif\iflinenumberRevenifblank \newcommand*{\leftlinenumR}{% - \l@dlinenumR - \kern\linenumsep} + \l@dlinenumR% + \kern\linenumsep% +}% \newcommand*{\rightlinenumR}{% - \kern\linenumsep - \l@dlinenumR} + \kern\linenumsep% + \l@dlinenumR% +}% + \newcommand*{\l@dlinenumR}{% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% \linenumrepR{\line@numR}\@Rlineflag% \ifsublines@R \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% }% +\newcommand*{\leftlinenumannotationR}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotationR}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% +}% \newcount\line@numR \newcount\subline@numR \newcount\absline@numR @@ -862,12 +881,14 @@ \xright@appenditem{\the\c@pstartL}\to\list@pstartL@pc% \global\cslet{numberpstart@L\the\l@dnumpstartsL}{\ifnumberpstart}% \global\cslet{numberline@L\the\l@dnumpstartsL}{\ifnumberline}% + \global\cslet{linenumannotationotherside@L\the\l@dnumpstartsL}{\iflinenumannotationotherside}% }% \def\dump@pstartR@pc{% \xright@appenditem{\the\c@pstartR}\to\list@pstartR@pc% \global\cslet{numberpstart@R\the\l@dnumpstartsR}{\ifnumberpstart}% \global\cslet{numberline@R\the\l@dnumpstartsR}{\ifnumberline}% + \global\cslet{linenumannotationotherside@R\the\l@dnumpstartsR}{\iflinenumannotationotherside}% }% \def\restore@pstartL@pc{% @@ -1248,6 +1269,7 @@ \newcommand*{\do@lineL}{% \letcs{\ifnumberpstart}{numberpstart@L\the\l@dpscL}% \letcs{\ifnumberline}{numberline@L\the\l@dpscL}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@L\the\l@dpscL}% \advance\countLline \@ne% \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% {\vbadness=10000% @@ -1388,6 +1410,7 @@ \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% \letcs{\ifnumberline}{numberline@R\the\l@dpscR}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@R\the\l@dpscR}% \ledRcol@true% \advance\countRline \@ne% \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% @@ -1734,8 +1757,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columnsR}{\m@ne}}}% @@ -1760,8 +1789,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \fi% }% \fi |