diff options
author | Karl Berry <karl@freefriends.org> | 2018-12-22 21:55:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-12-22 21:55:07 +0000 |
commit | 83047e390e782f619cc98f9e1df8ca57fd5f9cb9 (patch) | |
tree | f5af856c3e42ddd73cb051dd2a9373a669c051b9 /Master | |
parent | 9ce87495da8b3b9e6adbccb41c78d1554af1d71a (diff) |
reledmac (22dec18)
git-svn-id: svn://tug.org/texlive/trunk@49481 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
54 files changed, 265 insertions, 243 deletions
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 7b6e5a090d8..4c8270ccd08 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf Binary files differindex 51d3ac22df3..2c437940d1d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex 0372cefa58b..62d673bca66 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 79734d4e235..592146763f7 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 2f79ef1944b..c70811cdac1 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 a57ecc77366..828a48d3e97 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 62257fa24ab..68023458526 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf Binary files differindex d811e92fff1..bf2e1c42daf 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 02746e808c2..4c82f4493ec 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 a6a40865126..c123cb52f84 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 dbf4bf5b0fb..bf028be6ad9 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 31eb4fc2332..aa5f5f7eccc 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 17330dd793e..1de233c5544 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 e3b13e64380..bf58cc75e5a 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-linespacing.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex index 899e58ec2b4..e28afbe1495 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex @@ -8,13 +8,14 @@ \usepackage{setspace} \AtBeginDocument{\doublespacing} \usepackage{lipsum} +\SetLipsumParListEnd{\par} \usepackage[series={A,B},noend,noeledsec,nofamiliar,noledgroup]{reledmac} \Xarrangement[A]{paragraph} \Xarrangement[B]{twocol} \makeatletter \Xbhooknote{\setstretch {\setspace@singlespace}} \Xbhookgroup{\setstretch {\setspace@singlespace}} -\makeatother +\makeatother \begin{document} @@ -35,8 +36,8 @@ We use \verb`\AtBeginDocument{\doublespacing}` to start doublespacing at the beg \beginnumbering \pstart \lipsum*[1]\edtext{Lipsum}{ - \Afootnote{\lipsum*[3]} - \Bfootnote{\lipsum*[4]}} + \Afootnote{\lipsum*[3]} + \Bfootnote{\lipsum*[4]}} \lipsum*[6-7] \pend \endnumbering 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 428109d6e6e..5917da4c11e 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 2287f848534..7fd95c750c3 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 a62a7a06051..cd7f4463ca5 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex index 0eb96733e96..fff31653b14 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex @@ -1,6 +1,7 @@ \documentclass{article} -\usepackage[series={A,B,C,D,E},noend,noeledsec,nofamiliar,noledgroup]{reledmac} +\usepackage[series={A,B,C,D,E},noend,noeledsec,nofamiliar,noledgroup]{reledmac} \usepackage{lipsum,polyglossia} +\SetLipsumParListEnd{\par} \setmainlanguage{english} \usepackage{libertine} @@ -35,95 +36,95 @@ We use \verb+\seriesatend+ to ensure that a \verb+pstart+ series between two pag \beginnumbering \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: \lipsum[1] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - - + + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - - + + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - - + + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - - + + \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \endnumbering 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 b8bd0d6d1bb..6bd1810073e 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 33f091d0f24..dc193452b72 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 ee83dafcc45..77a3d7e9225 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 befac2dec6a..e7ba4c5b90a 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 91238593fd6..a925fe68669 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 d45de80bda5..ec34d2a51b5 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 e7686c29a67..3d7ca1982b2 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 ead1a78c91d..3f375f9ef69 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 6a078e00569..19fe6dce6d6 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 31400c0a0d2..f8d9aaa2711 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 8ba0abd508b..3fb064c8384 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 1c917d68807..7c44fbaf8e6 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 4bfd7f4dcb0..d647445f39f 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 d3d3183bd38..6643d8ee992 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 7a3c83ca7bd..3eda27ff30d 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 a2a51c44458..3274d7dbf4d 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 4614b9618cd..ef06f876a74 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-continuous-numbering.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex index 61f6cad0c86..6cf947540c9 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex @@ -12,7 +12,6 @@ \setlength{\aftercolumnseparator}{0.03\textwidth} \AtBeginPairs{\sloppy} -\usepackage{lipsum} \firstlinenum*{1} \linenumincrement*{1} \begin{document} @@ -24,165 +23,165 @@ In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and typesetting in a single column, getting continuous line numbering between them. \end{abstract} \end{english} -\begin{pairs} -\begin{Leftside} -\beginnumbering -\pstart -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. -\pend +\begin{pairs} +\begin{Leftside} +\beginnumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. +\pend \pausenumbering -\end{Leftside} +\end{Leftside} -\begin{Rightside} -\beginnumbering -\pstart +\begin{Rightside} +\beginnumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \pausenumbering -\end{Rightside} +\end{Rightside} -\end{pairs} +\end{pairs} \Columns \resumenumbering -\pstart +\pstart Lorem \edtext{ipsum}{\Afootnote{ipsam}} dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \pausenumbering -\begin{pairs} - +\begin{pairs} + -\begin{Leftside} -\resumenumbering -\pstart +\begin{Leftside} +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend -\pausenumbering +\pend +\pausenumbering \end{Leftside} -\begin{Rightside} -\resumenumbering -\pstart -\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. -\pend +\begin{Rightside} +\resumenumbering +\pstart +\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. +\pend \pausenumbering -\end{Rightside} -\end{pairs} +\end{Rightside} +\end{pairs} \Columns -\resumenumbering -\pstart +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \pausenumbering -\begin{pairs} - +\begin{pairs} + -\begin{Leftside} -\resumenumbering -\pstart +\begin{Leftside} +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend -\pausenumbering +\pend +\pausenumbering \end{Leftside} -\begin{Rightside} -\resumenumbering -\pstart +\begin{Rightside} +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering -\end{Rightside} -\end{pairs} +\end{Rightside} +\end{pairs} \Columns -\resumenumbering -\pstart +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering \section{Section A} -\beginnumbering -\pstart +\beginnumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \pausenumbering \begin{pairs} -\begin{Leftside} -\resumenumbering -\pstart +\begin{Leftside} +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend -\pausenumbering +\pend +\pausenumbering \end{Leftside} -\begin{Rightside} -\beginnumbering -\pstart -\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. -\pend +\begin{Rightside} +\beginnumbering +\pstart +\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. +\pend \endnumbering -\end{Rightside} -\end{pairs} +\end{Rightside} +\end{pairs} \Columns -\resumenumbering -\pstart +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering \section{Section B} \begin{pairs} -\begin{Leftside} -\beginnumbering -\pstart -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. -\pend -\pausenumbering +\begin{Leftside} +\beginnumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. +\pend +\pausenumbering \end{Leftside} -\begin{Rightside} -\beginnumbering -\pstart +\begin{Rightside} +\beginnumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering -\end{Rightside} -\end{pairs} +\end{Rightside} +\end{pairs} \Columns -\resumenumbering -\pstart +\resumenumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering \section{Section C} \begin{pairs} -\begin{Leftside} -\beginnumbering -\pstart -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. -\pend -\endnumbering +\begin{Leftside} +\beginnumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. +\pend +\endnumbering \end{Leftside} -\begin{Rightside} -\beginnumbering -\pstart +\begin{Rightside} +\beginnumbering +\pstart Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. -\pend +\pend \endnumbering \end{Rightside} \end{pairs} 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 ac9ef375be7..ee8922f8520 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 64e22c57566..dfac99f99df 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 0e5f10e14de..2369fdc5ee3 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 b89e575803b..ba3e0e8a38e 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 db4f487edca..5b0cd48e924 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex index db869748d84..4b53d8fa888 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex @@ -1,12 +1,12 @@ -\documentclass{article} +\documentclass{article} \usepackage{lipsum} +\SetLipsumParListEnd{\par} \usepackage[series={A,B,C,D,E,F,G,H,I,J},noend,nofamiliar,noledgroup,noeledsec]{reledmac}%Declare series to be used \usepackage{reledpar} \usepackage{polyglossia} \setmainlanguage{english} \usepackage{libertine} - % Here is the loop system: \makeatletter% We need to use command with @ % Two counters: one for left and one for right @@ -23,13 +23,13 @@ \ifnumequal{\arabic{mynotelevelR}}{11}{%No more than J series (10) \setcounter{mynotelevelR}{6}% If more than J => restart to F (6) }{}% - \global\letcs{\mynote}{\themynotelevelR footnote}% And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which is called by reledmac + \global\letcs{\mynote}{\themynotelevelR footnote}% And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which is called by reledmac \else% If it's a left page \addtocounter{mynotelevel}{1}%Step counter \ifnumequal{\arabic{mynotelevel}}{6}{%No more than E series (5) \setcounter{mynotelevel}{1}%If more than J => restart to A (1) }{}% - \global\letcs{\mynote}{\themynotelevel footnote}%And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which called by reledmac + \global\letcs{\mynote}{\themynotelevel footnote}%And let mynote equal to <X>footnote, where <X> is the current level \letcs is defined by etoolbox which called by reledmac \fi% } % This code is called when beginnings of each pstart are printed @@ -86,76 +86,76 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: \lipsum[1] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel first}{\mynote{Second footnote in \themynotelevel.}} paragraph: \lipsum[1] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} \pend \pstart - \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the - \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: - \lipsum[2] + \edtext{\themynotelevel Here}{\mynote{First footnote in \themynotelevel}} is the + \edtext{\themynotelevel second}{\mynote{Second footnote in \themynotelevel.}} paragraph: + \lipsum[2] \pend - % Many more \pstart ... \pend to follow. + % Many more \pstart ... \pend to follow. \endnumbering \end{Leftside} @@ -164,76 +164,76 @@ However, we need to do this when the \verb+pstart+s are printed, not when they a \beginnumbering \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR first}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR first}{\mynote{Second footnote in \themynotelevelR.}} paragraph: \lipsum[1] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} \pend \pstart sss\themynotelevelR - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR first}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR first}{\mynote{Second footnote in \themynotelevelR.}} paragraph: \lipsum[1] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend \pstart - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2]\edtext{on therpage}{\mynote{on otherpage}} \pend \pstart sss\themynotelevelR - \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the - \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: - \lipsum[2] + \edtext{\themynotelevelR Here}{\mynote{First footnote in \themynotelevelR}} is the + \edtext{\themynotelevelR second}{\mynote{Second footnote in \themynotelevelR.}} paragraph: + \lipsum[2] \pend - % Many more \pstart ... \pend to follow. + % Many more \pstart ... \pend to follow. \endnumbering \end{Rightside} 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 81bf4d7c139..503e64e9610 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 557ea3bb913..f27d4a6128b 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 6c10e2414ec..cc02903df6b 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 1b944da8156..276a0ac8c9d 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 33a727f134f..d0d9cb45bf1 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 7dc9abc7969..352bf34a136 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 d23240f121c..016afe0359e 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 ae1fb909e91..2581f0d8108 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 d394f723315..b61b34a9c13 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 d4650a858ab..064186d6e59 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -517,6 +517,7 @@ % \changes{v2.27.0}{2018/09/13}{Add \protect\cs{doinsidethislinehook}.} % \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.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4221,7 +4222,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/11/30 v2.28.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/12/22 v2.28.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -11296,10 +11297,15 @@ % \protect\cs{rigidbalance} directly, without any re-boxing. % \begin{macrocode} \newcommand*{\threecolfootgroup}[1]{% - \csuse{Xbhookgroup@#1}\par% - \splittopskip=\ht\strutbox - \expandafter - \Xrigidbalance\csname #1footins\endcsname \thr@@ \splittopskip} + \begingroup% + \csuse{Xbhookgroup@#1}% + \csuse{Xnotefontsize@#1}% + \par% + \splittopskip=\ht\strutbox% + \expandafter% + \Xrigidbalance\csname #1footins\endcsname \thr@@ \splittopskip% + \endgroup% +}% % \end{macrocode} % \end{macro} % @@ -11424,10 +11430,15 @@ }% \newcommand*{\twocolfootgroup}[1]{% - \csuse{Xbhookgroup@#1}\par% - \splittopskip=\ht\strutbox - \expandafter - \Xrigidbalance\csname #1footins\endcsname \tw@ \splittopskip} + \begingroup% + \csuse{Xbhookgroup@#1}% + \csuse{Xnotefontsize@#1}% + \par% + \splittopskip=\ht\strutbox% + \expandafter% + \Xrigidbalance\csname #1footins\endcsname \tw@ \splittopskip% + \endgroup% +}% % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index aa8fe5e2b36..aec2031bc62 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/11/30 v2.28.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/12/22 v2.28.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -3174,10 +3174,15 @@ \strut% }% \newcommand*{\threecolfootgroup}[1]{% - \csuse{Xbhookgroup@#1}\par% - \splittopskip=\ht\strutbox - \expandafter - \Xrigidbalance\csname #1footins\endcsname \thr@@ \splittopskip} + \begingroup% + \csuse{Xbhookgroup@#1}% + \csuse{Xnotefontsize@#1}% + \par% + \splittopskip=\ht\strutbox% + \expandafter% + \Xrigidbalance\csname #1footins\endcsname \thr@@ \splittopskip% + \endgroup% +}% \newcommand*{\mpthreecolfootgroup}[1]{{% \vskip\skip\@nameuse{mp#1footins} \ifl@dpairing\ifparledgroup% @@ -3266,10 +3271,15 @@ }% \newcommand*{\twocolfootgroup}[1]{% - \csuse{Xbhookgroup@#1}\par% - \splittopskip=\ht\strutbox - \expandafter - \Xrigidbalance\csname #1footins\endcsname \tw@ \splittopskip} + \begingroup% + \csuse{Xbhookgroup@#1}% + \csuse{Xnotefontsize@#1}% + \par% + \splittopskip=\ht\strutbox% + \expandafter% + \Xrigidbalance\csname #1footins\endcsname \tw@ \splittopskip% + \endgroup% +}% \newcommand*{\mptwocolfootsetup}[1]{% \count\csname mp#1footins\endcsname 500 |