diff options
| author | Karl Berry <karl@freefriends.org> | 2017-07-17 21:28:44 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-07-17 21:28:44 +0000 |
| commit | 801ff06c2ec92b4759f3492f919197803da4f0b8 (patch) | |
| tree | 74093c81860d11503a973d73e51568258fa8dc5c | |
| parent | 531e0c1b7e1882ab23f72329bf77e5f0cf5e3f79 (diff) | |
reledmac (17jul17)
git-svn-id: svn://tug.org/texlive/trunk@44833 c570f23f-e606-0410-a88d-b1316a301751
48 files changed, 148 insertions, 100 deletions
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 78d2cc70abf..590cd6ab404 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 10a769a7c36..52e52ff1ba1 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 f1679af7288..662b250c86a 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.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex 0ab3691bf34..3a82efe6f6d 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 9374de3490a..ef90696e417 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 ebf04483ad5..2e8cc793e3b 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 b7ada467336..9ed35afaf63 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 40666ab3dd2..2e0bcc14d0b 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 03dae3d2c36..bb63cb1d976 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 c2638518410..695e0df89ff 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 34c7683186a..3eefe99cb63 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 ba9127f021a..9da3bf35abb 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 4cf65e6e319..743b3022391 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 af083a4f182..602f426cf0a 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 3d463e8f054..a196e7fa074 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 21b46286d35..a8ae1f639be 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-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 10521d66968..13398dad709 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 c60c2ab3af1..dc854e5d24d 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 f2f98e9a44a..9e8e64fd61e 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 80e1d9cb940..8ce68dcfb43 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 bd60a417232..b65338ddf1d 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 6afe447a01b..0b439e47825 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 5d7da96a3da..e05b9a13a37 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 09749a68549..7b53c051cbe 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 6c694dd4035..ac50ca888fa 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 d52f43508df..9630cd265da 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 dff92f3544d..a172b427f46 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 427fc919c1c..45d88a07fbd 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 f2a2195694f..f0ad71ac518 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 9ebad541c95..b5ba1442224 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 cdebb2d4859..03441e962a6 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 0dd0432dd5a..007ae8a7ba3 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 ffc937c3fb7..d1a880b1f7f 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 02439a5e3fe..e7481027568 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 77c596fa173..3c299d0761e 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 91e55449873..b9f6e66073e 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 e4e3fc3b7a2..35354f05c40 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 0ed879bdc6c..74a580789da 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 2d375dedd7f..d23c3b0826d 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 b3d90166de4..1683fde7bbb 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 89a7b7f019e..662e86bd1ff 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 7e1e4ae7509..7a0b543cb6c 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 7d307537b99..581f843db41 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 a1eecee72fe..72d05803057 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 a267f41969b..feab9ddca38 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -481,6 +481,7 @@ % \changes{v2.22.0}{2017/06/08}{Add \protect\cs{txtbeforenotesonlyonceX} and \protect\cs{Xtxtbeforenotesonlyonce} hooks.} % \changes{v2.22.1}{2017/07/07}{Compatibility with new version of \protect\reledpar.} % \changes{v2.22.1}{2017/07/07}{Fix bug with some commands inside \protect\cs{sameword}.} +% \changes{v2.22.2}{2017/07/17}{Do not print footnotes at the first run.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -6774,8 +6775,11 @@ % \begin{macrocode} \newcommand*{\line@list@stuff}[1]{% % \end{macrocode} -% -% First, use the commands of the previous section to interpret the +% First, define a toggle set to true when we are not in the first run. + \global\newtoggle{notfirstrun@#1}% +% \begin{macrocode} +% \end{macrocode} +% Use the commands of the previous section to interpret the % line-list file from the last run. % \begin{macrocode} \read@linelist{#1}% @@ -6788,13 +6792,13 @@ % \protect\cs{line@list@stuff}} % \changes{v0.7.0}{2005/02/25}{Deleted \protect\cs{page@start} from \protect\cs{line@list@stuff}} % \changes{v1.15.1}{2015/01/16}{Revert modification of 1.5.2 which makes bug with numbering. Leave vertical mode to solve spurious space before minipage.} - % \begin{macrocode} \iffirst@linenum@out@ \immediate\closeout\linenum@out% \global\first@linenum@out@false% \immediate\openout\linenum@out=\l@auxdir#1\relax% \immediate\write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \immediate\write\linenum@out{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \immediate\write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -6810,6 +6814,7 @@ \closeout\linenum@out% \openout\linenum@out=\l@auxdir#1\relax% \write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \protected@write\linenum@out{}{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -9305,14 +9310,21 @@ % of the paragraph. We can hope that is not % too far from the proper location, to which they will move on the next % run. +% First the first run, we don't flush the notes, +% as that means all the notes will be added at the end of numbered section, +% and so, very far of the expected position % \begin{macrocode} \newcommand*{\flush@notes}{% - \@xloop - \ifx\inserts@list\empty \else - \gl@p\inserts@list\to\@insert - \@insert - \global\let\@insert=\undefined - \repeat} + \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@num}{% + \@xloop% + \ifx\inserts@list\empty \else% + \gl@p\inserts@list\to\@insert% + \@insert% + \global\let\@insert=\undefined% + \repeat% + }{}% +}% + % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index a930b94ef78..fb8284ee46e 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -307,6 +307,8 @@ % \changes{v2.19.0}{2017/06/08}{Compatibility with v2.22.0 of \protect\reledmac.} % \changes{v2.19.1}{2017/06/15}{Fix bug with \protect\cs{edtext} in sectioning command with shiftedpstarts mode.} % \changes{v2.19.2}{2017/07/07}{\protect\option{continuousnumberingwithcolumns} works also for pstart number.} +% \changes{v2.19.3}{2017/07/17}{Fix a bug with \protect\option{nopbinverse} when using consecutive \protect\cs{Pages}.} +% \changes{v2.19.3}{2017/07/17}{Do not print footnotes at the first run.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -2804,12 +2806,14 @@ % \changes{v1.10.1}{2015/01/16}{Revert modification of 1.4.2, which makes bugs with numbering. Leave vertical mode to solve spurious space before minipage.} % \begin{macrocode} \newcommand*{\line@list@stuffR}[1]{% + \global\newtoggle{notfirstrun@#1}% \read@linelist{#1}% \iffirst@linenum@out@R \immediate\closeout\linenum@outR \global\first@linenum@out@Rfalse \immediate\openout\linenum@outR=\l@auxdir#1% \immediate\write\linenum@outR{\string\line@list@version{\this@line@list@version}}% + \immediate\write\linenum@outR{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \immediate\write\linenum@outR{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -2819,6 +2823,7 @@ \fi% \closeout\linenum@outR% \openout\linenum@outR=\l@auxdir#1% + \protected@write\linenum@outR{}{\string\global\string\toggletrue{notfirstrun@#1}}% \fi} % \end{macrocode} @@ -4581,12 +4586,16 @@ % and sent on to the vertical list. % \begin{macrocode} \newcommand*{\flush@notesR}{% - \@xloop - \ifx\inserts@listR\empty \else - \gl@p\inserts@listR\to\@insertR - \@insertR - \global\let\@insertR=\undefined - \repeat} + \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@numR R}{% + \@xloop% + \ifx\inserts@listR\empty \else% + \gl@p\inserts@listR\to\@insertR% + \@insertR% + \global\let\@insertR=\undefined% + \repeat% + }{}% +}% + % \end{macrocode} % \end{macro} @@ -5715,16 +5724,16 @@ \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@absline}{\the\absline@num+1}% \numdef{\next@abslineR}{\the\absline@numR+1}% - \xifinlistcs{\next@absline}{l@prev@pb}{\@pbtrue}{}% - \xifinlistcs{\next@abslineR}{l@prev@pbR}{\@pbtrue}{} - \xifinlistcs{\next@absline}{l@prev@nopb}{\@nopbtrue}{}% - \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\@nopbtrue}{} + \xifinlist{\next@absline}{\l@prev@pb}{\@pbtrue}{}% + \xifinlist{\next@abslineR}{\l@prev@pbR}{\@pbtrue}{} + \xifinlist{\next@absline}{\l@prev@nopb}{\@nopbtrue}{}% + \xifinlist{\next@abslineR}{\l@prev@nopbR}{\@nopbtrue}{} }{} \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@num}{l@prev@pb}{\@pbtrue}{}% - \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\@pbtrue}{} - \xifinlistcs{\the\absline@num}{l@prev@nopb}{\@nopbtrue}{}% - \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\@nopbtrue}{} + \xifinlist{\the\absline@num}{\l@prev@pb}{\@pbtrue}{}% + \xifinlist{\the\absline@numR}{\l@prev@pbR}{\@pbtrue}{} + \xifinlist{\the\absline@num}{\l@prev@nopb}{\@nopbtrue}{}% + \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\@nopbtrue}{} }{} \if@nopb\nopagebreak[4]\enlargethispage{\baselineskip}\fi \if@pb\pagebreak[4]\fi @@ -6639,25 +6648,25 @@ % \begin{macrocode} \newcommand{\checkpbL}{ \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@num}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\the\absline@num}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\the\absline@num}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\the\absline@num}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@absline}{\the\absline@num+1} - \xifinlistcs{\next@absline}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\next@absline}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\next@absline}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\next@absline}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} } \newcommand{\checkpbR}{ \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\the\absline@numR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@abslineR}{\the\absline@numR+1} - \xifinlistcs{\next@abslineR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\next@abslineR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\next@abslineR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} } % \end{macrocode} @@ -6668,27 +6677,35 @@ % \protect\cs{checkverseL} and \protect\cs{checkverseR} are called after each line is printed. % They prevent page break inside line of verse. % \begin{macrocode} -\newcommand{\checkverseL}{ -\ifinstanzaL - \iflednopbinverse - \ifinserthangingsymbol - \numgdef{\prev@abslineverse}{\the\absline@num-1} - \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{} - \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesL<3\ledpbnum{\prev@abslineverse}\fi}{} - \fi - \fi -\fi +\newcommand{\checkverseL}{% +\ifinstanzaL% + \iflednopbinverse% + \ifinserthangingsymbol% + \numgdef{\prev@abslineverse}{\the\absline@num-1}% + \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{}% + \IfStrEq{\led@pb@setting}{before}{% + \ifnum\numpagelinesL<3% + \ledpbnum{\prev@abslineverse}% + \fi% + }{}% + \fi% + \fi% +\fi% } -\newcommand{\checkverseR}{ -\ifinstanzaR - \iflednopbinverse - \ifinserthangingsymbolR - \numgdef{\prev@abslineverse}{\the\absline@numR-1} - \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{} - \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesR<3\ledpbnumR{\prev@abslineverse}\fi}{} - \fi - \fi -\fi +\newcommand{\checkverseR}{% +\ifinstanzaR% + \iflednopbinverse% + \ifinserthangingsymbolR% + \numgdef{\prev@abslineverse}{\the\absline@numR-1}% + \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{}% + \IfStrEq{\led@pb@setting}{before}{% + \ifnum\numpagelinesR<3% + \ledpbnumR{\prev@abslineverse}% + \fi% + }{}% + \fi% + \fi% +\fi% } % \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 3b9ec62d8d3..90b7a28245a 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -1211,13 +1211,14 @@ \first@linenum@out@true \newcommand{\this@line@list@version}{6}% \newcommand*{\line@list@stuff}[1]{% + \global\newtoggle{notfirstrun@#1}% \read@linelist{#1}% - \iffirst@linenum@out@ \immediate\closeout\linenum@out% \global\first@linenum@out@false% \immediate\openout\linenum@out=\l@auxdir#1\relax% \immediate\write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \immediate\write\linenum@out{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \immediate\write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -1228,6 +1229,7 @@ \closeout\linenum@out% \openout\linenum@out=\l@auxdir#1\relax% \write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \protected@write\linenum@out{}{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -2299,12 +2301,15 @@ \fi} \newcommand*{\flush@notes}{% - \@xloop - \ifx\inserts@list\empty \else - \gl@p\inserts@list\to\@insert - \@insert - \global\let\@insert=\undefined - \repeat} + \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@num}{% + \@xloop% + \ifx\inserts@list\empty \else% + \gl@p\inserts@list\to\@insert% + \@insert% + \global\let\@insert=\undefined% + \repeat% + }{}% +}% \def\@xloop#1\repeat{% \def\body{#1\expandafter\body\fi}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 007908d4171..8c478361bbf 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -701,12 +701,14 @@ \newif\iffirst@linenum@out@R \first@linenum@out@Rtrue \newcommand*{\line@list@stuffR}[1]{% + \global\newtoggle{notfirstrun@#1}% \read@linelist{#1}% \iffirst@linenum@out@R \immediate\closeout\linenum@outR \global\first@linenum@out@Rfalse \immediate\openout\linenum@outR=\l@auxdir#1% \immediate\write\linenum@outR{\string\line@list@version{\this@line@list@version}}% + \immediate\write\linenum@outR{\string\global\string\toggletrue{notfirstrun@#1}}% \ifl@dpaging% \immediate\write\linenum@outR{\string\@par@sync@option{\@par@this@sync@option}}% \fi% @@ -716,6 +718,7 @@ \fi% \closeout\linenum@outR% \openout\linenum@outR=\l@auxdir#1% + \protected@write\linenum@outR{}{\string\global\string\toggletrue{notfirstrun@#1}}% \fi} \newcommand*{\new@lineL}{% @@ -1734,12 +1737,15 @@ \newcommand*{\add@penaltiesR}{} \newcommand*{\flush@notesR}{% - \@xloop - \ifx\inserts@listR\empty \else - \gl@p\inserts@listR\to\@insertR - \@insertR - \global\let\@insertR=\undefined - \repeat} + \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@numR R}{% + \@xloop% + \ifx\inserts@listR\empty \else% + \gl@p\inserts@listR\to\@insertR% + \@insertR% + \global\let\@insertR=\undefined% + \repeat% + }{}% +}% \newcommand\print@Xnotes@forpages[1]{% @@ -2345,16 +2351,16 @@ \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@absline}{\the\absline@num+1}% \numdef{\next@abslineR}{\the\absline@numR+1}% - \xifinlistcs{\next@absline}{l@prev@pb}{\@pbtrue}{}% - \xifinlistcs{\next@abslineR}{l@prev@pbR}{\@pbtrue}{} - \xifinlistcs{\next@absline}{l@prev@nopb}{\@nopbtrue}{}% - \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\@nopbtrue}{} + \xifinlist{\next@absline}{\l@prev@pb}{\@pbtrue}{}% + \xifinlist{\next@abslineR}{\l@prev@pbR}{\@pbtrue}{} + \xifinlist{\next@absline}{\l@prev@nopb}{\@nopbtrue}{}% + \xifinlist{\next@abslineR}{\l@prev@nopbR}{\@nopbtrue}{} }{} \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@num}{l@prev@pb}{\@pbtrue}{}% - \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\@pbtrue}{} - \xifinlistcs{\the\absline@num}{l@prev@nopb}{\@nopbtrue}{}% - \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\@nopbtrue}{} + \xifinlist{\the\absline@num}{\l@prev@pb}{\@pbtrue}{}% + \xifinlist{\the\absline@numR}{\l@prev@pbR}{\@pbtrue}{} + \xifinlist{\the\absline@num}{\l@prev@nopb}{\@nopbtrue}{}% + \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\@nopbtrue}{} }{} \if@nopb\nopagebreak[4]\enlargethispage{\baselineskip}\fi \if@pb\pagebreak[4]\fi @@ -2879,48 +2885,56 @@ \newcommand{\checkpbL}{ \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@num}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\the\absline@num}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\the\absline@num}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\the\absline@num}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@absline}{\the\absline@num+1} - \xifinlistcs{\next@absline}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\next@absline}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\next@absline}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\next@absline}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} } \newcommand{\checkpbR}{ \IfStrEq{\led@pb@setting}{after}{ - \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\the\absline@numR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} \IfStrEq{\led@pb@setting}{before}{ \numdef{\next@abslineR}{\the\absline@numR+1} - \xifinlistcs{\next@abslineR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} - \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} + \xifinlist{\next@abslineR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{} + \xifinlist{\next@abslineR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{} }{} } -\newcommand{\checkverseL}{ -\ifinstanzaL - \iflednopbinverse - \ifinserthangingsymbol - \numgdef{\prev@abslineverse}{\the\absline@num-1} - \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{} - \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesL<3\ledpbnum{\prev@abslineverse}\fi}{} - \fi - \fi -\fi +\newcommand{\checkverseL}{% +\ifinstanzaL% + \iflednopbinverse% + \ifinserthangingsymbol% + \numgdef{\prev@abslineverse}{\the\absline@num-1}% + \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{}% + \IfStrEq{\led@pb@setting}{before}{% + \ifnum\numpagelinesL<3% + \ledpbnum{\prev@abslineverse}% + \fi% + }{}% + \fi% + \fi% +\fi% } -\newcommand{\checkverseR}{ -\ifinstanzaR - \iflednopbinverse - \ifinserthangingsymbolR - \numgdef{\prev@abslineverse}{\the\absline@numR-1} - \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{} - \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesR<3\ledpbnumR{\prev@abslineverse}\fi}{} - \fi - \fi -\fi +\newcommand{\checkverseR}{% +\ifinstanzaR% + \iflednopbinverse% + \ifinserthangingsymbolR% + \numgdef{\prev@abslineverse}{\the\absline@numR-1}% + \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{}% + \IfStrEq{\led@pb@setting}{before}{% + \ifnum\numpagelinesR<3% + \ledpbnumR{\prev@abslineverse}% + \fi% + }{}% + \fi% + \fi% +\fi% } \newdimen\ledthegoal \ifshiftedpstarts |