From 010c2f7beeabd7ee027bda0b20ade470bbec1a14 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 May 2020 21:12:25 +0000 Subject: reledmac (25may20) git-svn-id: svn://tug.org/texlive/trunk@55273 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reledmac/README | 135 --------------------- Master/texmf-dist/doc/latex/reledmac/README.md | 106 ++++++++++++++++ .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40839 -> 40842 bytes .../latex/reledmac/examples/1-criticalendnotes.pdf | Bin 177475 -> 177475 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 121597 -> 121597 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 145283 -> 145283 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 189792 -> 189792 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 123178 -> 123178 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 123463 -> 123463 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 122256 -> 122256 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 126016 -> 126016 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 18323 -> 18321 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 187631 -> 187631 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 124324 -> 124324 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 144492 -> 144492 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 138405 -> 138405 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 158108 -> 158108 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 129005 -> 129005 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 140523 -> 140523 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 135414 -> 135414 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31756 -> 31749 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 215012 -> 215012 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 190222 -> 190222 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 175170 -> 175170 bytes .../3-reledpar_columns_different_languages.pdf | Bin 24477 -> 24475 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 93475 -> 93475 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 37801 -> 37801 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 138222 -> 138222 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190161 -> 190161 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189362 -> 189362 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168099 -> 168099 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189915 -> 189915 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188836 -> 188836 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188745 -> 188745 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188865 -> 188865 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 189690 -> 189690 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 134815 -> 134815 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 190204 -> 190204 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 201833 -> 201833 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 123601 -> 123601 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 215182 -> 215182 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 239560 -> 239560 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 125082 -> 125082 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 123151 -> 123151 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 263410 -> 263410 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 183782 -> 183782 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 118947 -> 118947 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 356785 -> 356785 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1986367 -> 1988159 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 988622 -> 988622 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 53 +++++--- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 42 +++++-- 52 files changed, 172 insertions(+), 164 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/reledmac/README create mode 100644 Master/texmf-dist/doc/latex/reledmac/README.md diff --git a/Master/texmf-dist/doc/latex/reledmac/README b/Master/texmf-dist/doc/latex/reledmac/README deleted file mode 100644 index 19491b5d3ed..00000000000 --- a/Master/texmf-dist/doc/latex/reledmac/README +++ /dev/null @@ -1,135 +0,0 @@ -Overview -======== - -The reledmac package is for typesetting critical editions. The reledpar -package is an extension of reledmac enabling parallel typesetting in -columns or on facing pages. - -Reledmac and reledpar are successors of eledmac and eledpar, which were -successor of ledmac and ledpar. Ledmac was a LaTeX port, and extension, -of the plain TeX EDMAC, TABMAC and EDSTANZA macros. - -The package is available on [CTAN](http://www.ctan.org/pkg/reledmac). - -Copyright and Licence -===================== - -Authors -------- - -- Peter Wilson (Herries Press) herries dot press at earthlink dot net, -- Maïeul Rouquette (new maintainer since june 2011) - -Copyright ---------- - -- Copyright 2003 --- 2005 Peter R. Wilson -- Copyright 2011 --- .. Maïeul Rouquette - -Licence -------- - -This work may be distributed and/or modified under the conditions of the -LaTeX Project Public License, either version 1.3 of this license or (at -your option) any later version. - -The latest version of the license is in - and version 1.3 or later is part -of all distributions of LaTeX version 2003/06/01 or later. - -This work has the LPPL maintenance status "maintained". - -This work consists of the files: - -- README (this file), -- reledmac.dtx, -- reledmac.ins, -- reledpar.dtx, -- reledpar.ins, - -and the derived files: - -- reledmac.sty, -- reledpar.sty, -- reledmac.pdf, (200+ pages) -- reledpar.pdf, (100+ pages) - -The distribution consists of the following files: - -- README (this file) -- reledmac.dtx -- reledmac.ins -- reledmac.pdf -- reledpar.dtx -- reledpar.ins -- reledpar.pdf -- makefile -- latexmrc -- examples/ - - \*.tex - - \*.pdf - - makefile - -Installation -============ - -- run: `latex reledmac.ins` (which will generate `reledmac.sty`) and - `latex reledpar.ins` (which will generate `reledmac.sty`) -- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX - will find it (for more information on this see the FAQ). - -To generate a second copy of the manual (which is already supplied as a -PDF file): - -- run: `make reledmac.pdf && make reledpar.pdf` - -Help -==== - -- [Users list](http://geekographie.maieul.net/146) -- [StackExchange](https://tex.stackexchange.com/questions/tagged/reledmac), - see also the older tags - (https://tex.stackexchange.com/questions/tagged/eledmac) and - (https://tex.stackexchange.com/questions/tagged/ledmac) - -Debug and feature requests -========================== - -Suggestions and bug reports are welcome. - -Maïeul Rouquette is the only one maintainer. To help him in his work, -please follow these rules: - -- Go to the [issues page](https://github.com/maieul/ledmac/issues). -- Open *one issue for each problem*, even if problems are similar. -- You can write in English, or better in French if it is your native - language. -- Add a [minimal working - example](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minxampl). -- If your report is really a bug, Maïeul Rouquette will open a - "branch" to solve your problem. This branch will be called - "issueXXX", where "XXX" is the issue number. -- Once the problem has a possible solution, Maïeul Rouquette will ask - you to test the new branch: - - Download the zip file of the branch (or, if you know Git, go to - the branch there): - - Go to [the project page](https://github.com/maieul/ledmac/). - - Choose the correct branch in the "branch" menu. - - Choose "Download zip" in the "Clone or download" menu, on - the right side. - - Unzip the file - - Run the `.ins` files with pdflatex, to obtain the `.sty` files. - - Put the `.sty` files with your test files (in the same folder). - - Look on file issueXXX.tex get a MWE of the new feature. - - Make your report. - -Bibliography -============ - -We maintain two collaborative bibliographies: - -- [Critical Editions Typeset with EDMAC, LEDMAC and - eLEDMAC](https://www.zotero.org/groups/209265/) -- [Articles and books about - (r)(e)(l)edmac](https://www.zotero.org/groups/1024519/) - diff --git a/Master/texmf-dist/doc/latex/reledmac/README.md b/Master/texmf-dist/doc/latex/reledmac/README.md new file mode 100644 index 00000000000..4abb2fcf125 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/README.md @@ -0,0 +1,106 @@ +# Overview + +The reledmac package is for typesetting critical editions. The reledpar package is an extension of reledmac enabling parallel typesetting in columns or on facing pages. + +Reledmac and reledpar are successors of eledmac and eledpar, which were successor of ledmac and ledpar. +Ledmac was a LaTeX port, and extension, of the plain TeX EDMAC, TABMAC and EDSTANZA macros. + +The package is available on [CTAN](http://www.ctan.org/pkg/reledmac). + +# Copyright and Licence + +## Authors +- Peter Wilson (Herries Press) herries dot press at earthlink dot net, +- Maïeul Rouquette (new maintainer since june 2011) + +## Copyright +- Copyright 2003 --- 2005 Peter R. Wilson +- Copyright 2011 --- .. Maïeul Rouquette + +## Licence +This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. + +The latest version of the license is in [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt) and version 1.3 or later is part of all distributions of LaTeX version 2003/06/01 or later. + +This work has the LPPL maintenance status "maintained". + +This work consists of the files: + +- README (this file), +- reledmac.dtx, +- reledmac.ins, +- reledpar.dtx, +- reledpar.ins, + +and the derived files: + +- reledmac.sty, +- reledpar.sty, +- reledmac.pdf, (200+ pages) +- reledpar.pdf, (100+ pages) + + +The distribution consists of the following files: + +- README (this file) +- reledmac.dtx +- reledmac.ins +- reledmac.pdf +- reledpar.dtx +- reledpar.ins +- reledpar.pdf +- makefile +- latexmrc +- examples/ + - *.tex + - *.pdf + - makefile + +# Installation + +- run: `latex reledmac.ins` (which will generate `reledmac.sty`) and `latex reledpar.ins` (which will generate `reledmac.sty`) +- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ). + +To generate a second copy of the manual (which is already supplied as a PDF file): + +- run: `make reledmac.pdf && make reledpar.pdf` + +# Help + +- [Users list](http://geekographie.maieul.net/146) +- [StackExchange](https://tex.stackexchange.com/questions/tagged/reledmac), see also the older tags + (https://tex.stackexchange.com/questions/tagged/eledmac) and (https://tex.stackexchange.com/questions/tagged/ledmac) + +# Debug and feature requests + +Suggestions and bug reports are welcome. + +Maïeul Rouquette is the only one maintainer. To help him in his work, please follow these rules: + +- Go to the [issues page](https://github.com/maieul/ledmac/issues). +- Open *one issue for each problem*, even if problems are similar. +- You can write in English, or better in French if it is your native language. +- Add a [minimal working example](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minxampl). +- If your report is really a bug, Maïeul Rouquette will open a "branch" to solve your problem. This branch will be called "issueXXX", where "XXX" is the issue number. +- Once the problem has a possible solution, Maïeul Rouquette will ask you to test the new branch: + - Download the zip file of the branch (or, if you know Git, go to the branch there): + - Go to [the project page](https://github.com/maieul/ledmac/). + - Choose the correct branch in the "branch" menu. + - Choose "Download zip" in the "Clone or download" menu, on the right side. + - Unzip the file + - Run the `.ins` files with pdflatex, to obtain the `.sty` files. + - Put the `.sty` files with your test files (in the same folder). + - Look on file issueXXX.tex get a MWE of the new feature. + - Make your report. + +# Bibliography + +We maintain two collaborative bibliographies: + +- [Critical Editions Typeset with EDMAC, LEDMAC and eLEDMAC](https://www.zotero.org/groups/209265/) +- [Articles and books about (r)(e)(l)edmac](https://www.zotero.org/groups/1024519/) + + + + + 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 index be0c0a4c511..dc6a51a5d90 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf index cc14357519d..f9771ae072d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf index f426e465193..d12c397b826 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index 2f406ad2f96..b2e0bb46275 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index 005cbb4063d..37aa73b06b5 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf index e78280ae2f5..ebe04af48fa 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index cba4149a9a1..8cc2ada7918 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ 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 index 43a4d38655f..f59f0bca02a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ 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 index 57964276e4a..50391654ab9 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index 402216df1dd..1e3445c3bdf 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index ffee0f5dbfd..4981b5163be 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ 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 index 6fe99c3c6a9..74c679e41c8 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ 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 index c37aae78d2f..2b1f403e27d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index 5d0cdcaff5f..295c8884bbd 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ 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 index 625d4803355..11c2f93e6c1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf differ 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 index ccff976090c..924ef53ac77 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ 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 index 544fc8a7d2d..f6d8bb17b2e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index fe8af3ddffb..3b4b87a531b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ 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 index 5b2096deb07..6bfceadfac1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf index 284a8a1e5a3..de365b35134 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf differ 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 index 95bd7622cb2..939a78313ed 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ 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 index 0d3e6f7e167..3a0c908903a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ 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 index 323628e30ba..7d312490b88 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ 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 index f014ed15ad0..dc4a7f0d62d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ 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 index 16c3b737662..17fababeee2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ 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 index a011c87b871..b2acab194b2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ 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 index 29a52ebe6e8..d974063be65 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ 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 index 53fdf089eec..ac531298a10 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ 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 index b357f9b7728..8e0223489af 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ 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 index 6f10f9af492..b9fbe0622d6 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ 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 index 31e950a05ce..2eb0b827a49 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ 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 index 2c405eff8f6..d6576fa6592 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ 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 index 71b8e778e56..bc787da6d06 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ 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 index db4d5edd864..266d7a5518a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ 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 index 6cfb526f37b..79355f46ad7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ 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 index 93045f49020..d2965b46d86 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ 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 index 884850350c8..db408ff1c3f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ 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 index f8e2e7a2858..3ae61cfab23 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ 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 index c8759eeb8e3..33ec708a956 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ 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 index 77417feb1cf..99f8dcd0d49 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ 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 index 2ced3bbfe3d..6c271d9f0ad 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ 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 index f9270fdcbb0..e5dd10e1d40 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ 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 index dc6cd965b9e..11a42f9f202 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ 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 index 51ce6a016e5..31525237b54 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ 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 index 2717b023b5d..e78443b39c2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index 2e3b0409733..f94e8e176d9 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index f9d28cda8f1..a0576ab271d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index 9853b3fdadf..be9208735d4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index c7275b5af6b..1596d4231ef 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -551,6 +551,7 @@ % \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{parafootsepX}.} % \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{lineation}\arg{pstart} and \protect\cs{edtext} in the very first line of a \protect\cs{pstart}.} % \changes{v2.32.7}{2020/05/03}{Fix spurious spaces at the very first line of \protect\env{edtabular} environnments.} +% \changes{v2.32.8}{2020/05/24}{Add subline number in manuscript apparatus.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -1211,8 +1212,8 @@ % or sub-line depending on what it started out as, even if it % changes in the middle. % -% \DescribeMacro{Xsublinesep} -% \DescribeMacro{Xsublinesepside} +% \DescribeMacro{\Xsublinesep} +% \DescribeMacro{\Xsublinesepside} % You can change the separator between the line number and the subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. In the second case, it will change the separator only for line numbers in the margins, not in the footnotes. % \subsubsection{Locking lineation}\label{startlock} % \DescribeMacro{\startlock} @@ -1619,8 +1620,8 @@ % start with the page number where they are called. % % \paragraph{Code between endnotes} -% \DescribeMacro{toendnotes} -% \DescribeMacro{Xtoendnotes} +% \DescribeMacro{\toendnotes} +% \DescribeMacro{\Xtoendnotes} % Sometimes, it is useful to insert content between endnotes of the same series: for example to separate endnotes of different sections of the same text. % In this case, you could use \emph{inside % numbered text} the command:\\ @@ -2302,7 +2303,7 @@ % % \subsubsection{Print line number annotation only the first time}\label{annotation-inapparatus} % \DescribeMacro{\Xlinenumannotationonlyfirst} -% By default, the line number annotation (\reff{annotion} is printed in every note. If you want to print it only the first time for a given annotation +% By default, the line number annotation (\reff{annotation}) is printed in every note. If you want to print it only the first time for a given annotation % you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}. % % Note the two following points: @@ -4334,7 +4335,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/05/03 v2.32.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -6330,9 +6331,11 @@ \unless\ifledRcol%Get the last line of the last page \csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}% \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% + \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}% \else% \csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}% \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% + \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}% \fi% \endgroup % \end{macrocode} @@ -6577,6 +6580,7 @@ \else \csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}% \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% + \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}% \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \ifboolexpr{% @@ -6603,6 +6607,7 @@ \else \csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}% \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% + \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}% \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \line@num \z@% @@ -18658,12 +18663,16 @@ \unexpanded{\newdimen\parindent@beforestanza% \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne - \noexpand\ifnum\expandafter\noexpand - \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax - \let\noexpand\endlock\relax\noexpand\else\interlinepenalty - \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum - \expandafter\noexpand\csname szp@0@\endcsname=\z@ - \let\noexpand\sza@penalty\relax\noexpand\fi% + \noexpand\ifnum\expandafter\noexpand\csname sza@0@\endcsname=\z@% + \let\noexpand\stanza@hang\relax% + \let\noexpand\endlock\relax% + \noexpand\else% + \interlinepenalty% + \@M\rightskip\z@ plus 1fil\relax% + \noexpand\fi% + \noexpand\ifnum\expandafter\noexpand\csname szp@0@\endcsname=\z@% + \let\noexpand\sza@penalty% + \relax\noexpand\fi% \def\noexpand&{% \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% @@ -18911,6 +18920,7 @@ \global\numdef{\@msd@c}{\@msd@c+\@ne}% \csgdef{@msdata@\@msd@c @data}{#1}% \csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}% + \csxdef{@msdata@\@msd@c @sublinenumber}{\the\subline@num}% \csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}% \xright@appenditem{\the\absline@num}\to\actionlines@list% \xright@appenditem{-1010}\to\actions@list% @@ -18918,6 +18928,7 @@ \global\numdef{\@msd@cR}{\@msd@cR+\@ne}% \csgdef{@msdata@\@msd@cR @dataR}{#1}% \csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}% + \csxdef{@msdata@\@msd@cR @sublinenumberR}{\the\subline@numR}% \csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}% \xright@appenditem{\the\absline@numR}\to\actionlines@listR% \xright@appenditem{-1010}\to\actions@listR% @@ -18933,11 +18944,13 @@ \ifcsundef{@msdata@\@msd@c @stoplinenumber}{% \csxdef{@msdata@\@msd@c @stopabslinenumber}{\the\absline@num}% \csxdef{@msdata@\@msd@c @stoplinenumber}{\the\line@num}% + \csxdef{@msdata@\@msd@c @stopsublinenumber}{\the\subline@num}% }{}% \else% \ifcsundef{@msdata@\@msd@cR @stoplinenumberR}{% \csxdef{@msdata@\@msd@cR @stopabslinenumberR}{\the\absline@numR}% \csxdef{@msdata@\@msd@cR @stoplinenumberR}{\the\line@numR}% + \csxdef{@msdata@\@msd@cR @stopsublinenumberR}{\the\subline@numR}% }% {}% \fi% @@ -18960,13 +18973,16 @@ \edef\l@d@nums{% 000|% Start page = we don't print it \csuse{@msdata@\add@msd@c @linenumber}|% Start line number - 000|% Start subline number, for now, not used + \csuse{@msdata@\add@msd@c @sublinenumber}|% Start subline number 000|% End page number, we don't print it \ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}% {\csuse{@msdata@\add@msd@c @stoplinenumber}}%End line number if in the same page - {\csuse{@lastline@forpage@\the\page@num}}%Otherwiser, last number of the page + {\csuse{@lastline@forpage@\the\page@num}}%Otherwise, last number of the page + |% + \ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}% + {\csuse{@msdata@\add@msd@c @stopsublinenumber}}%End subline number if in the same page + {\csuse{@lastsubline@forpage@\the\page@num}}%Otherwise, last subnumber of the page |% - 000|% End sub line number, for now, not used \edfont@info%Font }% \@msd@options@fullpagefalse% @@ -19009,12 +19025,15 @@ \edef\l@d@nums{% 000|% Start page = we don't print it \csuse{@msdata@\add@msd@cR @linenumberR}|% Start line number - 000|% Start subline number, for now, not used + \csuse{@msdata@\add@msd@cR @sublinenumberR}|% Start subline number, for now, not used 000|% End page number, we don't print it \ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}% {\csuse{@msdata@\add@msd@cR @stoplinenumberR}}%End line number if in the same page - {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwiser, last number of the page + {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwise, last number of the page |% + \ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}% + {\csuse{@msdata@\add@msd@cR @stopsublinenumberR}}%End subline number if in the same page + {\csuse{@lastsubline@forpageR@\the\page@numR}}%Otherwise, last number of the page 000|% End sub line number, for now, not used \edfont@info%Font }% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 15d34014512..981bd7d23ba 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}[2020/05/03 v2.32.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -814,9 +814,11 @@ \unless\ifledRcol%Get the last line of the last page \csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}% \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% + \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}% \else% \csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}% \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% + \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}% \fi% \endgroup \ifledRcol @@ -934,6 +936,7 @@ \else \csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}% \csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}% + \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}% \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \ifboolexpr{% @@ -960,6 +963,7 @@ \else \csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}% \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% + \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}% \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \line@num \z@% @@ -7711,12 +7715,16 @@ \unexpanded{\newdimen\parindent@beforestanza% \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne - \noexpand\ifnum\expandafter\noexpand - \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax - \let\noexpand\endlock\relax\noexpand\else\interlinepenalty - \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum - \expandafter\noexpand\csname szp@0@\endcsname=\z@ - \let\noexpand\sza@penalty\relax\noexpand\fi% + \noexpand\ifnum\expandafter\noexpand\csname sza@0@\endcsname=\z@% + \let\noexpand\stanza@hang\relax% + \let\noexpand\endlock\relax% + \noexpand\else% + \interlinepenalty% + \@M\rightskip\z@ plus 1fil\relax% + \noexpand\fi% + \noexpand\ifnum\expandafter\noexpand\csname szp@0@\endcsname=\z@% + \let\noexpand\sza@penalty% + \relax\noexpand\fi% \def\noexpand&{% \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% @@ -7868,6 +7876,7 @@ \global\numdef{\@msd@c}{\@msd@c+\@ne}% \csgdef{@msdata@\@msd@c @data}{#1}% \csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}% + \csxdef{@msdata@\@msd@c @sublinenumber}{\the\subline@num}% \csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}% \xright@appenditem{\the\absline@num}\to\actionlines@list% \xright@appenditem{-1010}\to\actions@list% @@ -7875,6 +7884,7 @@ \global\numdef{\@msd@cR}{\@msd@cR+\@ne}% \csgdef{@msdata@\@msd@cR @dataR}{#1}% \csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}% + \csxdef{@msdata@\@msd@cR @sublinenumberR}{\the\subline@numR}% \csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}% \xright@appenditem{\the\absline@numR}\to\actionlines@listR% \xright@appenditem{-1010}\to\actions@listR% @@ -7885,11 +7895,13 @@ \ifcsundef{@msdata@\@msd@c @stoplinenumber}{% \csxdef{@msdata@\@msd@c @stopabslinenumber}{\the\absline@num}% \csxdef{@msdata@\@msd@c @stoplinenumber}{\the\line@num}% + \csxdef{@msdata@\@msd@c @stopsublinenumber}{\the\subline@num}% }{}% \else% \ifcsundef{@msdata@\@msd@cR @stoplinenumberR}{% \csxdef{@msdata@\@msd@cR @stopabslinenumberR}{\the\absline@numR}% \csxdef{@msdata@\@msd@cR @stoplinenumberR}{\the\line@numR}% + \csxdef{@msdata@\@msd@cR @stopsublinenumberR}{\the\subline@numR}% }% {}% \fi% @@ -7904,13 +7916,16 @@ \edef\l@d@nums{% 000|% Start page = we don't print it \csuse{@msdata@\add@msd@c @linenumber}|% Start line number - 000|% Start subline number, for now, not used + \csuse{@msdata@\add@msd@c @sublinenumber}|% Start subline number 000|% End page number, we don't print it \ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}% {\csuse{@msdata@\add@msd@c @stoplinenumber}}%End line number if in the same page - {\csuse{@lastline@forpage@\the\page@num}}%Otherwiser, last number of the page + {\csuse{@lastline@forpage@\the\page@num}}%Otherwise, last number of the page + |% + \ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}% + {\csuse{@msdata@\add@msd@c @stopsublinenumber}}%End subline number if in the same page + {\csuse{@lastsubline@forpage@\the\page@num}}%Otherwise, last subnumber of the page |% - 000|% End sub line number, for now, not used \edfont@info%Font }% \@msd@options@fullpagefalse% @@ -7953,12 +7968,15 @@ \edef\l@d@nums{% 000|% Start page = we don't print it \csuse{@msdata@\add@msd@cR @linenumberR}|% Start line number - 000|% Start subline number, for now, not used + \csuse{@msdata@\add@msd@cR @sublinenumberR}|% Start subline number, for now, not used 000|% End page number, we don't print it \ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}% {\csuse{@msdata@\add@msd@cR @stoplinenumberR}}%End line number if in the same page - {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwiser, last number of the page + {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwise, last number of the page |% + \ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}% + {\csuse{@msdata@\add@msd@cR @stopsublinenumberR}}%End subline number if in the same page + {\csuse{@lastsubline@forpageR@\the\page@numR}}%Otherwise, last number of the page 000|% End sub line number, for now, not used \edfont@info%Font }% -- cgit v1.2.3