diff options
| author | Karl Berry <karl@freefriends.org> | 2017-09-02 21:44:34 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-09-02 21:44:34 +0000 |
| commit | a7f7f3b04a2de49df22e775296655dc13bfe53bc (patch) | |
| tree | 138cb34a518ba5fc6d2a6b7fcd02e9037d7fb71d /Master | |
| parent | 61fbab0a750d1a8e32eacd11f3421b7c84820fe7 (diff) | |
reledmac (1sep17)
git-svn-id: svn://tug.org/texlive/trunk@45201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
51 files changed, 380 insertions, 213 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 f45493307a0..9361b13e75e 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-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex a880a489ba7..90f13c00d7f 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 7bac2be31ee..fe3323adbd3 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 337f960b0ac..01a82657368 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 51b2c78455a..48eea48f928 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 9d9b8890b12..ce85af31280 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 5f64f9b6775..916cb359656 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 0beea47c437..d8f0151fa9a 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 37c512cfa5e..5f9eee9d00e 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 9f74088d113..3a06a59dc5d 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 c4222255d5c..9f5bf749e0a 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 2b7b3377192..8c5f5bad9bc 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 4410cc4f8d0..7e83d1dc6e3 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 45702e19819..1a284211996 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 811f69bb2fc..3137501509f 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 67e75a8c090..3e21220a395 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 e49b6e8fe65..01b447bc3eb 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 27e45701570..f094320506f 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 91a3dd7b19a..02809725c63 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 a94dbcc437a..32af272e7f3 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 7401e8dfa21..17762cd9fb1 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 fdef594644a..dda3805276c 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 edba204cba4..f550622a08b 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 028decc952d..77b49fde7d1 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 15dec03febd..6ec073944f5 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 ec57bf06ade..36b21b3eaea 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 2e5753978d4..3761f407944 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 0593029aa0f..2abfa18fe22 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 469590eb0e4..9d33973fd71 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 1885cfeca36..4c7ff730b1b 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 f38b673dc6b..2334763380e 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 f944e1bd287..67fa8e5c3e2 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 @@ -104,6 +104,88 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolo \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 +\endnumbering + +\section{Section A} + +\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 \pausenumbering -\end{document} +\begin{pairs} +\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 +\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 +\endnumbering +\end{Rightside} +\end{pairs} +\Columns + +\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 +\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 +\end{Leftside} + +\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 +\endnumbering +\end{Rightside} +\end{pairs} +\Columns + +\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 + +\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 +\end{Leftside} + +\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 +\endnumbering +\end{Rightside} +\end{pairs} +\Columns + +\end{document}
\ No newline at end of file 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 36212039dd2..b5311230466 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 334c66e59ab..53e2135d64e 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 09fa088e000..ff60abdb855 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 2e75cd257b4..2c3bb1a9f62 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 1ddb19fed52..4e932a59b5f 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 987e4cc6bf5..d066ff7044a 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 423ded9eb39..6d6d4020287 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 b12a2241a36..511ec26c39c 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 fc426c4ab26..c1be21f9b6c 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 5f103ea9b1f..eda57785b0e 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 432623c8134..ec76820003e 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/examples/makefile b/Master/texmf-dist/doc/latex/reledmac/examples/makefile index 7bebbcb0f43..3a8c9638f40 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/makefile +++ b/Master/texmf-dist/doc/latex/reledmac/examples/makefile @@ -8,7 +8,8 @@ all:$(OBJ) PDF:$(OBJ) -%.test: %.pdf +%.test: %.pdf + latexmk $*.tex python3 check-example.py --filename=$< %.pdf: %.tex diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 6a8345250bc..7dea86c10fd 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 b7276fc7845..2b8020014c1 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 be7c77b65d5..bceb1852dde 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 f92506cd050..de88625b0c0 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -295,7 +295,7 @@ % \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.} % \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.} % \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.} -% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}…\protect\cs{endnumbering} without \protect\cs{pstart}.} +% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.} % \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.} % \changes{v1.23.0}{2015/05/18}{Fix a bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.} % \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).} @@ -449,8 +449,8 @@ % \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.} % \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} % \changes{v2.16.6}{2016/11/14}{Fix a bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.} -% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.} -% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.} +% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.} +% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.} % \changes{v2.16.8}{2016/12/16}{Fix a bug with \protect\cs{edindex} in footnotes in parallel typesetting.} % \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.} % \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.} @@ -488,6 +488,7 @@ % \changes{v2.24.0}{2017/08/17}{Fix a bug with \protect\cs{edlabel} at the beginning of a \protect\cs{pstart}.} % \changes{v2.24.0}{2017/08/17}{Add \protect\cs{swnoexpands} macro to avoid problems with not fully expandable macro inside \protect\cs{sameword}.} % \changes{v2.24.0}{2017/08/17}{Fix spurious space with \protect\cs{labelpstarttrue}} +% \changes{v2.24.1}{2017/08/31}{Compatibility with \protect\parpackage 2.20.2} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -1828,7 +1829,7 @@ % […] % amet\stopmsdata{} \msdata{ABCD}sic transit […] % \end{verbatim} -% Which means that the part of text containing \enquote{Lorem ipsum dolor … amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D. +% Which means that the part of text containing \enquote{Lorem ipsum dolor […] amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D. % % \cs{stopmsdata} is also automatically inserted by \cs{msdata}. % @@ -4060,7 +4061,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/08/17 v2.24.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4322,7 +4323,7 @@ % \begin{macro}{\led@err@edtextoutsidepstart} % \begin{macrocode} \newcommand*{\led@err@edtextoutsidepstart}{% - \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}% + \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}% % \end{macrocode} % \end{macro} % \begin{macro}{\led@mess@NotesChanged} @@ -4420,7 +4421,7 @@ \newcommand*{\led@err@PstartNotNumbered}{% \reledmac@error{\string\pstart\space must be used within a numbered section % - (\string\beginnumbering…\string\endnumbering)}{\@ehc}}% + (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}% \newcommand*{\led@err@PstartInPstart}{% \reledmac@error{\string\pstart\space encountered while another \string\pstart\space was in effect}{\@ehc}} @@ -4568,7 +4569,7 @@ % \begin{macro}{\led@err@toendnotes@outsidenumbering} % \begin{macrocode} \newcommand{\led@err@toendnotes@outsidenumbering}{% - \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}% + \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -4639,7 +4640,7 @@ % \begin{macro}{\led@warn@edinde@outsidenumbering} % \begin{macrocode} \newcommand{\led@warn@edinde@outsidenumbering}{% - \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}% + \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}% }% % \end{macrocode} % \end{macro} @@ -4739,7 +4740,7 @@ % In preparation for the \parpackage package, these are related to % the `right' text of parallel texts (when \protect\cs{ifl@dpairing} is TRUE). -% They are explained in the \protect\package{eledpar} +% They are explained in the \protect\parpackage % manual. % \changes{v0.7.0}{2005/02/24}{Added \protect\cs{l@dnumpstartsL}, \protect\cs{ifl@dpairing} % and \protect\cs{ifpst@rted} for/from eledpar} @@ -4776,6 +4777,12 @@ % \begin{macrocode} \newif\ifnumberingR % \end{macrocode} +% \begin{macro}{\ifafterendnumberingR} +% The \cs{ifafterendnumberingR} boolean is set to TRUE at \cs{endnumberingR} and to FALSE at next \cs{beginnumberingR} or real \cs{beginnumbering} (not \cs{resumenumbering}). It is mainly used for the \option{continuousnumberingwithcolumns}, to avoid incrementing right column line counters after a \cs{endnumberingR}. +% \begin{macrocode} +\newif\ifafterendnumberingR% +% \end{macrocode} +% \end{macro} % The \cs{ifXnote@} macro is set to true when we are typesetting a critical footnote. % \begin{macrocode} \newif\ifXnote@% @@ -4876,10 +4883,22 @@ \endnumbering \fi \global\numberingtrue + \global\afterendnumberingRfalse% \global\advance\section@num \@ne \initnumbering@reg \message{Section \the\section@num }% \line@list@stuff{\jobname.\extensionchars\the\section@num}% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \unless\ifl@dpairing% + \ledRcoltrue% + \global\advance\section@numR \@ne% + \message{Section \the\section@numR R (continuoousnumbering)}% + \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% + \ledRcolfalse% + \fi% + \fi% + \fi% \l@dend@stuff \setcounter{pstart}{1} \ifl@dpairing @@ -5028,6 +5047,17 @@ \led@mess@SectionContinued{\the\section@num}% \set@continuousnumberingforL% \line@list@stuff{\jobname.\extensionchars\the\section@num}% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \unless\ifl@dpairing% + \ledRcoltrue% + \global\advance\section@numR \@ne% + \message{Section \the\section@numR R (continuoousnumbering)}% + \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% + \ledRcolfalse% + \fi% + \fi% + \fi% \l@dend@stuff \ifl@dpairing\else% \begingroup% @@ -5050,20 +5080,10 @@ % \end{macro} % \end{macro} % \begin{macro}{\set@continuousnumberingforL} -% \cs{set@continuousnumberingforl} sets the left line numbers and pstart counters at a \cs{beginnumbering} or a \cs{resumenumbering} in order to have continuous numbering with single column text. +% \cs{set@continuousnumberingforl} sets pstart counters at a \cs{beginnumbering} or a \cs{resumenumbering} in order to have continuous numbering with single column text. % \begin{macrocode} \newcommand{\set@continuousnumberingforL}{% \ifcontinuousnumberingwithcolumns% - \ifdefined\line@numR% - \ifnum\line@numR>\line@num% - \global\appto\next@line@list@stuff{% - \expandafter\setlinenum\expandafter{\the\line@numR}% - }% - \fi% - \ifnum\last@page@numR>\last@page@num% - \global\last@page@num=\last@page@numR% - \fi% - \fi% \ifl@dpairing% \unless\ifl@dpaging% \global\c@pstartL=\c@pstart% @@ -6198,7 +6218,16 @@ \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum - \line@numR \z@ \subline@numR \z@% + \ifboolexpr{% + bool{resumenumberingR@start}% + and test {\ifnumequal{\last@page@numR}{-10000}}% + }% + {}% + {% + \line@numR \z@% + \subline@numR \z@% + \global\csdef{reset@lineR\the\numexpr\absline@numR+1\relax @\the\section@numR}{}% + }% \fi% \fi \global\page@numR=#1% @@ -6213,6 +6242,7 @@ \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \line@num \z@ \subline@num \z@% + \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}% \fi% \fi \global\page@num=#1% @@ -6853,6 +6883,11 @@ {\global\toggletrue{notfirstrun@#1}}% {\global\togglefalse{notfirstrun@#1}}% % \end{macrocode} +% A internal hook (not used yet). +% \begin{macrocode} + \next@line@list@stuff% + \global\let\next@line@list@stuff\relax% +% \end{macrocode} % Use the commands of the previous section to interpret the % line-list file from the last run. % \begin{macrocode} @@ -6891,8 +6926,6 @@ \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% \fi% - \next@line@list@stuff% - \global\let\next@line@list@stuff\relax% }% % \end{macrocode} @@ -8329,7 +8362,7 @@ }% % \end{macrocode} % Restore standard \enquote{nobreak} and \enquote{autopar} settings. -% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. +% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ …\ \cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. % \begin{macrocode} \@nobreakfalse% \ifautopar% @@ -8567,29 +8600,41 @@ % \end{macrocode} % Boxes the line, writes information about new line in the numbered file. % \begin{macrocode} - {\ledllfill\hb@xt@ \wd\one@line{\new@line% + {\ledllfill\hb@xt@ \wd\one@line{% + \new@line% % \end{macrocode} -% If we use \LuaLaTeX\, then restore the direction. +% If we use the \option{continuousnumberingwithcolumns}, we increase right line number. % \begin{macrocode} - \ifluatex% - \textdir\l@luatextextdir@L% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \new@lineR% + \xappto\next@line@list@stuffR{% + \unexpanded{\global\line@numR=}\the\line@num% + }% + \fi% \fi% % \end{macrocode} +% If we use \LuaLaTeX\, then restore the direction. +% \begin{macrocode} + \ifluatex% + \textdir\l@luatextextdir@L% + \fi% +% \end{macrocode} % Insert, if needed, the hanging symbol. % \begin{macrocode} - \inserthangingsymbol% + \inserthangingsymbol% % \end{macrocode} % And so, print the line. % \begin{macrocode} - \l@dunhbox@line{\one@line}}% + \l@dunhbox@line{\one@line}}% % \end{macrocode} % Right line number % \begin{macrocode} - \ledrlfill\l@drd@ta% + \ledrlfill\l@drd@ta% % \end{macrocode} % Print right notes. % \begin{macrocode} - \l@drsn@te + \l@drsn@te% }}% % \end{macrocode} % And reinsert penalties (for page breaking)... @@ -8836,21 +8881,18 @@ \global\resumenumbering@startfalse% \fi% \fi% - \unless\ifresumenumbering@start% - \global\@firstlineofpagetrue% - \fi% - \ifbypage@ - \ifcsdef{l@dchset@num@\the\absline@num}% - {% - \global\csundef{l@dchset@num@\the\absline@num}% - }% - {% - \unless\ifresumenumbering@start% - \global\line@num=\z@ \global\subline@num=\z@% - \resetprevline@% - \fi% - }% - \fi + \ifboolexpr{% + bool{resumenumbering@start}% + and test {\ifdimgreater{\pagedepth}{\z@}}% + }% + {}% + {\global\@firstlineofpagetrue}% + \ifcsdef{reset@line\the\absline@num @\the\section@num}% + {% + \global\line@num=\z@ \global\subline@num=\z@% + \resetprevline@% + }% + {}% \global\resumenumbering@startfalse% \add@msdata@firstlineofpage% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index a238bc265ea..b6330367cac 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -225,7 +225,7 @@ % \changes{v1.15.0}{2015/04/13}{Fix vertical spurious space before right \protect\cs{eledchapter} (bug added in v1.13.0).} % \changes{v1.15.0}{2015/04/13}{Prevent vertical space when using \protect\cs{AtEveryPstart} or \protect\cs{AtEveryPend} with a command which prints nothing} % \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.} -% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}…\protect\cs{endnumbering} without \protect\cs{pstart}.} +% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.} % \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.} % \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.} % \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.} @@ -293,7 +293,7 @@ % \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} % \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.} % \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.} -% \changes{v.2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} +% \changes{v.2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}} % \changes{v2.15.0}{2016/12/12}{Fix a bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).} % \changes{v2.15.0}{2016/12/12}{Fix a bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).} % \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}} @@ -317,11 +317,11 @@ % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.} % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.} % \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).} -% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}…\protect\cs{endnumbering}.} +% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.} % \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.} % \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.} -% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\cs{continuousnumberingwithcolumns} when left column and right column have not the same size.} - +% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.} +% \changes{v2.20.2}{2017/08/31}{Fix bugs with \protect\option{continuousnumberingwithcolumns} when going to a new page} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -602,17 +602,47 @@ % In most cases, you should use \protect\cs{widthliketwocolumns} in combination with \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{notesXwidthliketwocolumns} to align the critical/familiar footnotes with the two colums. % See \macpackage's handbook for more details. % -% \label{continuousnumberingwithcolumns}If you want to have continuous line numbers between multiple columns and single columns, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage. -% You will need to use \cs{pausenumbering}\ldots\cs{resumenumbering} instead of \cs{endnumbering}\ldots{endnumbering} (see \reff{reledmac-pause}). -% -% The first time you start \textbf{a left column or a single column}, use \cs{beginnumbering}, then use \cs{resumenumbering}. When you stop a left or a single column, use \cs{pausenumbering}, except the last time, where you must use \cs{endnumbering}. -% -% The first time you start \textbf{a right column}, use \cs{beginnumbering}, then use \cs{resumenumbering}. When you stop a right column, use \cs{pausenumbering}, except the last time, where you must use \cs{endnumbering}. -% % \subsubsection{Schemas of column typesetting} % Domenico Cufalo wrote a schema of the parallel column typesetting parameters, with explanations. % You can read the file \href{run:doc-more/page-typesetting-columns.pdf}{doc-more/page-typesetting-columns.pdf}. % +% \subsubsection{Continuous numbering between single and double column texts} +% \label{continuousnumberingwithcolumns}If you want to have continuous line +% numbers between multiple columns and single columns, use the +% \option{continuousnumberingwithcolumns} option when loading \macpackage +% or \parpackage. +% You will need to use \cs{pausenumbering}~…\ +% \cs{resumenumbering} in addition to \cs{beginnumbering}~…\ +% \cs{endnumbering} (see \reff{reledmac-pause}). +% +% The best way to understand the behaviour of \cs{pausenumbering} and +% \cs{resumenumbering} is to think of the left-column text as a continuation of +% single-column text (or, vice versa, to think of single-column text as +% left-column text), and of the right-column as independent text, which needs to be +% synchronised with the left one manually. The numbering commands in a +% right column are interconnected with each other, and not with the respective +% left-column commands. +% +% This means that you must switch between single-column and left-column +% text using \cs{beginnumbering}~…\ \cs{pausenumbering}~…\ +% \cs{resumenumbering}~…\ \cs{pausenumbering}~…\ +% \cs{resumenumbering}~…\ \cs{endnumbering}. +% +% On the other side, the first right column must always begin with +% \cs{beginnumbering}, no matter if the corresponding left-column started +% with \cs{resumenumbering} or not; this is because numbering in the right +% column has not been started yet. Then, for consecutive chunks of +% right-column text you should use \cs{pausenumbering}~…\ +% \cs{resumenumbering}. The important thing to remember is that you have +% to use \cs{endnumbering} in a right column before every +% \cs{endnumbering} in single-column text or in parallel with +% \cs{endnumbering} in a left-column text (the latter is the case when a +% document or a section ends in a two-columns mode). Without this, you will +% get wrong numbering when a right column reappears next time. +% +% The file +% \file{examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex} +% covers all these cases. % \subsection{Note about \cs{AtEveryPstart*} and \cs{AtEveryPend*}} % The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, respecting the left / right side. % @@ -1047,9 +1077,9 @@ % \DescribeMacro{\linenummarginColumns} % \DescribeMacro{\linenummarginColumnsR} % \DescribeMacro{\linenummarginColumns*} -% Suppose you typeset parallel texts both in parallel pages and in parallel columns. -% In this case, your setting of line margin in parallel pages could be different from your setting of line margin in parallel columns. -% For example, you could want to have line numbers on the right when your are in parallel pages, but when you are in parallel columns, to have them on the left for the left column and on the right for the right column. +% Suppose you typeset texts both in parallel pages (or in normal typesetting) and in parallel columns. +% In this case, your setting of line margin in parallel pages (or in normal typesetting) could be different from your setting of line margin in parallel columns. +% For example, you could want to have line numbers on the right when your are in parallel pages (or in normal typesetting), but when you are in parallel columns, to have them on the left for the left column and on the right for the right column. % % In this case, you can use \cs{linenummarginColumns}, which overrides the default setting for the left column, \cs{linenummarginColumnsR} which overrides the default setting for the right column, and \cs{linenummarginColumns*}, which overrides the default for both left and right columns. % @@ -1336,7 +1366,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1658,7 +1688,7 @@ % \begin{macro}{\led@error@missing@numbering} % \begin{macrocode} \newcommand{\led@error@missing@numbering}[1]{% - \reledpar@error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}% + \reledpar@error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -1774,6 +1804,7 @@ \global\l@dnumpstartsR \z@ \global\pst@rtedRfalse \global\numberingRtrue + \global\afterendnumberingRfalse% \global\advance\section@numR \@ne \global\absline@numR \z@ \gdef\normal@page@breakR{} @@ -1790,6 +1821,9 @@ \global\let\@msdata@list\relax% \global\csundef{@msdata@\add@msd@cR @dataR}% \ifcontinuousnumberingwithcolumns% + \ifnumbering% + \global\resumenumberingR@starttrue% + \fi% \ifnumberpstart% \addtocounter{pstartR}{1}% \fi% @@ -1797,7 +1831,6 @@ \setcounter{pstartR}{1}% \fi% \message{Section \the\section@numR R }% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup @@ -1829,6 +1862,7 @@ \def\endnumberingR{% \ifnumberingR \global\numberingRfalse + \global\afterendnumberingRtrue% \normal@pars \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% @@ -1918,7 +1952,10 @@ \else% \global\pausenumbering@page@numR=\next@page@numR% \fi% - \endnumberingR\global\numberingRtrue} + \endnumberingR% + \global\numberingRtrue% + \global\afterendnumberingRfalse% +}% \newif\ifresumenumberingR@start% \newcommand*{\resumenumberingR}{% \ifnumberingR @@ -1926,7 +1963,6 @@ \global\advance\section@numR \@ne \global\resumenumberingR@starttrue% \led@mess@SectionContinued{\the\section@numR R}% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup% @@ -2029,23 +2065,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\set@continuousnumberingforR} -% \cs{set@continuousnumberingforR} set the right line number and the pstart counters at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with single column text. -% \begin{macrocode} -\newcommand{\set@continuousnumberingforR}{% - \ifcontinuousnumberingwithcolumns% - \ifnum\line@numR<\line@num% - \global\appto\next@line@list@stuffR{% - \expandafter\setlinenum\expandafter{\the\line@num}% - }% - \fi% - \ifnum\last@page@num>\last@page@numR% - \global\last@page@numR=\last@page@num% - \fi% - \fi% -} -% \end{macrocode} -% \end{macro} % \begin{macro}{\lineation*} % \changes{v1.8.2}{2014/08/15}{Add \protect\cs{lineation*}} % \protect\cs{lineation*} change the lineation system for both sides. @@ -2908,6 +2927,8 @@ \IfFileExists{\l@auxdir#1}% {\global\toggletrue{notfirstrun@#1}}% {\global\togglefalse{notfirstrun@#1}}% + \next@line@list@stuffR% + \global\let\next@line@list@stuffR\relax% \read@linelist{#1}% \iffirst@linenum@out@R \global\first@linenum@out@Rfalse @@ -2923,8 +2944,6 @@ \closeout\linenum@outR% \openout\linenum@outR=\l@auxdir#1% \fi% - \next@line@list@stuffR% - \global\let\next@line@list@stuffR\relax% }% % \end{macrocode} @@ -3913,21 +3932,23 @@ \global\advance\@donetotallinesL\@ne% \else% \iflinenumberLevenifblank - \new@lineL% - \l@demptyd@ta% - \getline@numL% - \affixline@num% \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \new@lineL% + \l@demptyd@ta% + \getline@numL% + \affixline@num% \l@dld@ta% \hspace*{\Lcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineL% - \getline@numL% - \fi% - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineL% + \getline@numL% + \fi% + \hspace*{\Lcolwidth}% + }% \fi% \global\advance\@donetotallinesL\@ne% \fi% @@ -4101,21 +4122,23 @@ \global\advance\@donetotallinesR\@ne% \else% \iflinenumberRevenifblank% - \new@lineR - \l@demptyd@ta% - \getline@numR% \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \new@lineR% + \l@demptyd@ta% + \getline@numR% \affixline@numR% \l@dld@ta% \hspace*{\Rcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineR% - \getline@numR% - \fi% - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineR% + \getline@numR% + \fi% + \hspace*{\Rcolwidth}% + }% \fi% \global\advance\@donetotallinesR\@ne% \fi% @@ -4329,22 +4352,18 @@ \@l@dtempcntb=\absline@numR \ifnum\@l@dtempcntb<\next@actionlineR\else \ifnum\next@actionR>-1001\relax - \unless\ifresumenumberingR@start% - \@firstlineofpageRtrue% - \fi% + \ifboolexpr{% + bool{resumenumberingR@start}% + and test {\ifdimgreater{\pagedepth}{\z@}}% + }% + {}% + {\@firstlineofpageRtrue}% \global\page@numR=\next@actionR - \ifbypage@R - \ifcsdef{l@dchset@num@R\the\absline@numR}% - {% - \global\csundef{l@dchset@num@R\the\absline@numR}% - }% - {% - \unless\ifresumenumberingR@start% - \global\line@numR \z@% - \global\subline@numR \z@% - \fi% - }% - \fi + \ifcsdef{reset@lineR\the\absline@numR @\the\section@numR}% + {% + \global\line@numR=\z@ \global\subline@numR=\z@% + }% + {}% \global\resumenumberingR@startfalse% \add@msdata@firstlineofpage% \else diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 5e12a48f12f..dae1ca5172a 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}[2017/08/17 v2.24.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -160,7 +160,7 @@ \newcommand*{\led@err@NumberingShouldHaveStarted}{% \reledmac@error{Numbering should already have been started}{\@ehc}} \newcommand*{\led@err@edtextoutsidepstart}{% - \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}% + \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}% \newcommand*{\led@mess@NotesChanged}{% \typeout{reledmac reminder: }% \typeout{ The number of the footnotes in this section @@ -199,7 +199,7 @@ \newcommand*{\led@err@PstartNotNumbered}{% \reledmac@error{\string\pstart\space must be used within a numbered section % - (\string\beginnumbering…\string\endnumbering)}{\@ehc}}% + (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}% \newcommand*{\led@err@PstartInPstart}{% \reledmac@error{\string\pstart\space encountered while another \string\pstart\space was in effect}{\@ehc}} @@ -277,7 +277,7 @@ \newcommand*{\led@err@ReverseColumns}{% \reledmac@error{Start column is greater than end column}{\@ehc}} \newcommand{\led@err@toendnotes@outsidenumbering}{% - \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}% + \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}% }% \newcommand{\led@err@EdtextWithoutFootnote}{% \reledmac@error{edtext without Xfootnote. Check syntaxis}{\@ehc}% @@ -307,7 +307,7 @@ \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}% }% \newcommand{\led@warn@edinde@outsidenumbering}{% - \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}% + \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}% }% \newcommand{\led@warning@hsizeX@deprecated}{% \reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}% @@ -343,6 +343,7 @@ \newif\ifledRcol \newif\ifledRcol@ \newif\ifnumberingR +\newif\ifafterendnumberingR% \newif\ifXnote@% \providebool{indtl@innote}% \providebool{indtl@notenumber}% @@ -357,10 +358,22 @@ \endnumbering \fi \global\numberingtrue + \global\afterendnumberingRfalse% \global\advance\section@num \@ne \initnumbering@reg \message{Section \the\section@num }% \line@list@stuff{\jobname.\extensionchars\the\section@num}% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \unless\ifl@dpairing% + \ledRcoltrue% + \global\advance\section@numR \@ne% + \message{Section \the\section@numR R (continuoousnumbering)}% + \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% + \ledRcolfalse% + \fi% + \fi% + \fi% \l@dend@stuff \setcounter{pstart}{1} \ifl@dpairing @@ -463,6 +476,17 @@ \led@mess@SectionContinued{\the\section@num}% \set@continuousnumberingforL% \line@list@stuff{\jobname.\extensionchars\the\section@num}% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \unless\ifl@dpairing% + \ledRcoltrue% + \global\advance\section@numR \@ne% + \message{Section \the\section@numR R (continuoousnumbering)}% + \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% + \ledRcolfalse% + \fi% + \fi% + \fi% \l@dend@stuff \ifl@dpairing\else% \begingroup% @@ -480,16 +504,6 @@ \newcommand{\set@continuousnumberingforL}{% \ifcontinuousnumberingwithcolumns% - \ifdefined\line@numR% - \ifnum\line@numR>\line@num% - \global\appto\next@line@list@stuff{% - \expandafter\setlinenum\expandafter{\the\line@numR}% - }% - \fi% - \ifnum\last@page@numR>\last@page@num% - \global\last@page@num=\last@page@numR% - \fi% - \fi% \ifl@dpairing% \unless\ifl@dpaging% \global\c@pstartL=\c@pstart% @@ -871,7 +885,16 @@ \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum - \line@numR \z@ \subline@numR \z@% + \ifboolexpr{% + bool{resumenumberingR@start}% + and test {\ifnumequal{\last@page@numR}{-10000}}% + }% + {}% + {% + \line@numR \z@% + \subline@numR \z@% + \global\csdef{reset@lineR\the\numexpr\absline@numR+1\relax @\the\section@numR}{}% + }% \fi% \fi \global\page@numR=#1% @@ -886,6 +909,7 @@ \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \line@num \z@ \subline@num \z@% + \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}% \fi% \fi \global\page@num=#1% @@ -1236,6 +1260,8 @@ \IfFileExists{\l@auxdir#1}% {\global\toggletrue{notfirstrun@#1}}% {\global\togglefalse{notfirstrun@#1}}% + \next@line@list@stuff% + \global\let\next@line@list@stuff\relax% \read@linelist{#1}% \iffirst@linenum@out@ \global\first@linenum@out@false% @@ -1255,8 +1281,6 @@ \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% \fi% \fi% - \next@line@list@stuff% - \global\let\next@line@list@stuff\relax% }% \newcommand*{\new@line}{% @@ -1942,14 +1966,23 @@ }% \affixside@note% \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@line{\new@line% - \ifluatex% - \textdir\l@luatextextdir@L% + {\ledllfill\hb@xt@ \wd\one@line{% + \new@line% + \ifcontinuousnumberingwithcolumns% + \unless\ifafterendnumberingR% + \new@lineR% + \xappto\next@line@list@stuffR{% + \unexpanded{\global\line@numR=}\the\line@num% + }% + \fi% \fi% - \inserthangingsymbol% - \l@dunhbox@line{\one@line}}% - \ledrlfill\l@drd@ta% - \l@drsn@te + \ifluatex% + \textdir\l@luatextextdir@L% + \fi% + \inserthangingsymbol% + \l@dunhbox@line{\one@line}}% + \ledrlfill\l@drd@ta% + \l@drsn@te% }}% \add@penalties% } @@ -2062,21 +2095,18 @@ \global\resumenumbering@startfalse% \fi% \fi% - \unless\ifresumenumbering@start% - \global\@firstlineofpagetrue% - \fi% - \ifbypage@ - \ifcsdef{l@dchset@num@\the\absline@num}% - {% - \global\csundef{l@dchset@num@\the\absline@num}% - }% - {% - \unless\ifresumenumbering@start% - \global\line@num=\z@ \global\subline@num=\z@% - \resetprevline@% - \fi% - }% - \fi + \ifboolexpr{% + bool{resumenumbering@start}% + and test {\ifdimgreater{\pagedepth}{\z@}}% + }% + {}% + {\global\@firstlineofpagetrue}% + \ifcsdef{reset@line\the\absline@num @\the\section@num}% + {% + \global\line@num=\z@ \global\subline@num=\z@% + \resetprevline@% + }% + {}% \global\resumenumbering@startfalse% \add@msdata@firstlineofpage% \else diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 482b50f5f48..0e7a22478e9 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -27,9 +27,8 @@ - \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -149,7 +148,7 @@ Use instead #1R or #1* in your preamble.}% } \newcommand{\led@error@missing@numbering}[1]{% - \reledpar@error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}% + \reledpar@error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}% }% \providecommand*{\newnamebox}[1]{% \expandafter\newbox\csname #1\endcsname} @@ -193,6 +192,7 @@ \global\l@dnumpstartsR \z@ \global\pst@rtedRfalse \global\numberingRtrue + \global\afterendnumberingRfalse% \global\advance\section@numR \@ne \global\absline@numR \z@ \gdef\normal@page@breakR{} @@ -209,6 +209,9 @@ \global\let\@msdata@list\relax% \global\csundef{@msdata@\add@msd@cR @dataR}% \ifcontinuousnumberingwithcolumns% + \ifnumbering% + \global\resumenumberingR@starttrue% + \fi% \ifnumberpstart% \addtocounter{pstartR}{1}% \fi% @@ -216,7 +219,6 @@ \setcounter{pstartR}{1}% \fi% \message{Section \the\section@numR R }% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup @@ -235,6 +237,7 @@ \def\endnumberingR{% \ifnumberingR \global\numberingRfalse + \global\afterendnumberingRtrue% \normal@pars \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% @@ -300,7 +303,10 @@ \else% \global\pausenumbering@page@numR=\next@page@numR% \fi% - \endnumberingR\global\numberingRtrue} + \endnumberingR% + \global\numberingRtrue% + \global\afterendnumberingRfalse% +}% \newif\ifresumenumberingR@start% \newcommand*{\resumenumberingR}{% \ifnumberingR @@ -308,7 +314,6 @@ \global\advance\section@numR \@ne \global\resumenumberingR@starttrue% \led@mess@SectionContinued{\the\section@numR R}% - \set@continuousnumberingforR% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff \begingroup% @@ -372,18 +377,6 @@ \fi \fi \fi}} -\newcommand{\set@continuousnumberingforR}{% - \ifcontinuousnumberingwithcolumns% - \ifnum\line@numR<\line@num% - \global\appto\next@line@list@stuffR{% - \expandafter\setlinenum\expandafter{\the\line@num}% - }% - \fi% - \ifnum\last@page@num>\last@page@numR% - \global\last@page@numR=\last@page@num% - \fi% - \fi% -} \WithSuffix\newcommand\lineation*[1]{% \lineation{#1}% \lineationR{#1}% @@ -734,6 +727,8 @@ \IfFileExists{\l@auxdir#1}% {\global\toggletrue{notfirstrun@#1}}% {\global\togglefalse{notfirstrun@#1}}% + \next@line@list@stuffR% + \global\let\next@line@list@stuffR\relax% \read@linelist{#1}% \iffirst@linenum@out@R \global\first@linenum@out@Rfalse @@ -749,8 +744,6 @@ \closeout\linenum@outR% \openout\linenum@outR=\l@auxdir#1% \fi% - \next@line@list@stuffR% - \global\let\next@line@list@stuffR\relax% }% \newcommand*{\new@lineL}{% @@ -1232,21 +1225,23 @@ \global\advance\@donetotallinesL\@ne% \else% \iflinenumberLevenifblank - \new@lineL% - \l@demptyd@ta% - \getline@numL% - \affixline@num% \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \new@lineL% + \l@demptyd@ta% + \getline@numL% + \affixline@num% \l@dld@ta% \hspace*{\Lcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineL% - \getline@numL% - \fi% - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineL% + \getline@numL% + \fi% + \hspace*{\Lcolwidth}% + }% \fi% \global\advance\@donetotallinesL\@ne% \fi% @@ -1366,21 +1361,23 @@ \global\advance\@donetotallinesR\@ne% \else% \iflinenumberRevenifblank% - \new@lineR - \l@demptyd@ta% - \getline@numR% \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \new@lineR% + \l@demptyd@ta% + \getline@numR% \affixline@numR% \l@dld@ta% \hspace*{\Rcolwidth}% \ledrlfill\l@drd@ta% }% \else% - \ifcontinuousnumberingwithcolumns% - \new@lineR% - \getline@numR% - \fi% - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \ifcontinuousnumberingwithcolumns% + \new@lineR% + \getline@numR% + \fi% + \hspace*{\Rcolwidth}% + }% \fi% \global\advance\@donetotallinesR\@ne% \fi% @@ -1541,22 +1538,18 @@ \@l@dtempcntb=\absline@numR \ifnum\@l@dtempcntb<\next@actionlineR\else \ifnum\next@actionR>-1001\relax - \unless\ifresumenumberingR@start% - \@firstlineofpageRtrue% - \fi% + \ifboolexpr{% + bool{resumenumberingR@start}% + and test {\ifdimgreater{\pagedepth}{\z@}}% + }% + {}% + {\@firstlineofpageRtrue}% \global\page@numR=\next@actionR - \ifbypage@R - \ifcsdef{l@dchset@num@R\the\absline@numR}% - {% - \global\csundef{l@dchset@num@R\the\absline@numR}% - }% - {% - \unless\ifresumenumberingR@start% - \global\line@numR \z@% - \global\subline@numR \z@% - \fi% - }% - \fi + \ifcsdef{reset@lineR\the\absline@numR @\the\section@numR}% + {% + \global\line@numR=\z@ \global\subline@numR=\z@% + }% + {}% \global\resumenumberingR@startfalse% \add@msdata@firstlineofpage% \else |