summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-30 00:29:33 +0000
committerKarl Berry <karl@freefriends.org>2018-01-30 00:29:33 +0000
commit750b8a27ec779760cf55f2913236b41ea01987e2 (patch)
treef775a24c111bd215c595acd5d740575d7e7c8126
parent23d86fdfc88da36147892fd0f28e12e9163d239d (diff)
reledmac (28jan18)
git-svn-id: svn://tug.org/texlive/trunk@46483 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdfbin41028 -> 41023 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdfbin17706 -> 17710 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdfbin16741 -> 16744 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdfbin26471 -> 26472 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdfbin20868 -> 20869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdfbin18656 -> 18658 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdfbin18838 -> 18836 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdfbin18600 -> 18602 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdfbin20714 -> 20715 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdfbin21257 -> 21256 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdfbin21745 -> 21743 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdfbin17118 -> 17125 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdfbin31336 -> 31335 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdfbin26110 -> 26111 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdfbin36351 -> 36353 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdfbin24485 -> 24486 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdfbin25879 -> 25877 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdfbin22684 -> 22691 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdfbin34262 -> 34263 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin22822 -> 22826 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdfbin17207 -> 17205 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdfbin27662 -> 27662 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdfbin12233 -> 12235 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin43970 -> 43970 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin22782 -> 22790 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin43583 -> 43585 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin43168 -> 43161 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdfbin41074 -> 41073 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin43365 -> 43363 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin42850 -> 42849 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin42888 -> 42894 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin43155 -> 43154 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin28245 -> 28246 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex2
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin27077 -> 27079 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdfbin21259 -> 21265 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin29534 -> 29535 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin22468 -> 22469 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin36425 -> 36422 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdfbin58568 -> 58566 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin22762 -> 22762 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin18710 -> 18713 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin32466 -> 32470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin22222 -> 22223 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdfbin16265 -> 16266 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/migration.pdfbin91641 -> 91640 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledmac.pdfbin1345413 -> 1350206 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledpar.pdfbin519313 -> 520081 bytes
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx89
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx39
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty50
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty24
52 files changed, 133 insertions, 71 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
index 15a159f275b..411ecad2311 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
index 8a77e1b0a50..a19063c9f26 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
Binary files 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 510f5d32018..dc00da69435 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
Binary files 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 d189bd7c7d0..3a90ebd6fb9 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
Binary files 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 d315690c896..818003dcb8f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
Binary files 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 d8ba3aa4c11..3b669db5218 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
Binary files 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 cd09531cca2..d0f0dd1d636 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
Binary files 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 743f4b9963e..01400288270 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
Binary files 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 01e9b3c5c60..c16e91b4d1b 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
Binary files 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 9436915141c..48266d406c5 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
Binary files 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 8468b27a5ad..326264f2ae0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
Binary files 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 831b019ded2..b8a65aa5564 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
Binary files 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 fd1f55de2b1..6550b95027b 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
Binary files 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 607f5277d1c..45a69441eb1 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
Binary files 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 ecbbdfe7897..4aa33fae9c8 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
Binary files 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 22961b0bb0f..8ae228d193f 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
Binary files 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 c99f9a4e541..ff45f4c6e3c 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
Binary files 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 da5cf8a9eb6..d0e41b391d4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
Binary files 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 e0154b6d535..6b09b9a5466 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
Binary files 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 9f9c5fa5e57..d1e3592c685 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
Binary files 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 8cd85e73a7b..16f6cb0e42f 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
Binary files 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 c618ea5620c..17b6ec00223 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
Binary files 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 dd3988d1aa1..beefc5de67f 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
Binary files 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 607c727659a..9ba2b6e1a54 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
Binary files 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 59c0555e01a..1b0acc4f5ee 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
Binary files 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 e5933f1f7f8..a66008579cc 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
Binary files 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 aa4d9841ff3..cbe92a9a55d 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
Binary files 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 220fa1cce82..bf668970537 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
Binary files 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 1e06d680b92..57069a52bea 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
Binary files 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 3c2de886ac0..ba82cbd4758 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
Binary files 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 718a526dfb7..dadc4565ec4 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
Binary files 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 f891424fbef..81e8155b0b1 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
Binary files 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 3b77e0e8e45..0b3c4294746 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
Binary files differ
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 67fa8e5c3e2..61f6cad0c86 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
@@ -188,4 +188,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolo
\end{pairs}
\Columns
-\end{document} \ No newline at end of file
+\end{document}
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 2494d381a20..7481bdfb3f9 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
Binary files 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 64c81f0da5a..6c93848f1d9 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
Binary files 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 9df351ad98a..4d145e30f22 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
Binary files 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 a66aa3b5a41..dd9a5b54d55 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
Binary files 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 69738e4d79f..503d228484c 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
Binary files 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 be4f6d610da..f724346fc09 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
Binary files 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 43fdca5af8e..e4f330598cf 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
Binary files 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 66b58b1c168..4096aeace7e 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
Binary files 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 e505c2d4521..668b0179572 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
Binary files 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 9d17afd96fd..6dc4bff4bba 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
Binary files 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 1b859033971..60a08eeedfa 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
index a4601af75e0..28c3a566b6b 100644
--- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index 89078efcca9..6ca372eaa08 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
index 4dcb2610630..05ba2cac97e 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index e5a26550096..01d28e59495 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -499,7 +499,11 @@
% \changes{v2.26.2}{2017/12/22}{Fix bug with \protect\cs{Xgroupbyline} and \protect\cs{Xparafootsep}.}
% \changes{v2.26.2}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation} in parallel typesetting}
% \changes{v2.26.3}{2018/01/06}{Fix bug added by v2.26.0 with notes in parallel typesetting}
-% \changes{v2.26.4}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic produced by \protect\cs{autopar}}
+% \changes{v2.26.4}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic \protect\cs{pstart} produced by \protect\cs{autopar}}
+% \changes{v2.26.5}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting}
+% \changes{v2.26.5}{2018/01/28}{Check that users have a enough recent version of \protect\package{xparse}}
+% \changes{v2.26.5}{2018/01/18}{Fix bug when using \protect\cs{eledsection} with the \protect\option{continuousnumberingwithcolumns} of \protect\parpackage}
+% \changes{v2.26.5}{2018/01/28}{Fix bug with \protect\option{continuousnumberingwithcolumns}}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4177,7 +4181,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -8366,6 +8370,23 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\pstarts@typeset@L}
+% \begin{macro}{\pstarts@read@L}
+% The \cs{pstarts@typeset@L} counts the number of LEFT \cs{pstart} typeset.
+% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}).
+% In the first case, its value is increased at every \cs{pstart} command.
+% In the second case, its value is increased in \cs{Columns} or \cs{Pages} when we prepare to typeset a left \cs{pstart}.
+% The \cs{pstarts@readL} counts the number of LEFT \cs{pstart} read.
+% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}).
+% In the first case, its value is increased at every \cs{pstart} command.
+% In the second case, its value is increased at every \cs{pstarL}.
+%
+% \begin{macrocode}
+\newcount\pstarts@typeset@L%
+\newcount\pstarts@read@L%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\pstart}
% \begin{macro}{\AtEveryPstart}
% \begin{macro}{\AtStartEveryPstart}
@@ -8449,6 +8470,8 @@
\global\let\next@insert=\empty%
\begingroup\normal@pars%
\global\advance \l@dnumpstartsL\@ne
+ \global\advance \pstarts@typeset@L\@ne%
+ \global\advance \pstarts@read@L\@ne%
\global\setbox\raw@text=\vbox\bgroup%
\if@nobreak%
\if@afterindent\else%
@@ -8722,6 +8745,8 @@
% do all the processing for a single line of text.
% \changes{v1.6.1}{2013/10/27}{Move the call to \protect\cs{inserthangingsymbol} to allow use \protect\cs{hfill} inside.}
% \changes{v1.12.2}{2014/08/07}{Fix a bug with critical notes at the tops of pages (added by v12.0.0)}
+% The \cs{l@dunhbox@line} macro only \cs{unhbox} one lines, but some package as \cs{microtype} can override it for custom needs.
+%
% \begin{macrocode}
\newcommand*{\l@dunhbox@line}[1]{\unhbox #1}
\newcommand*{\do@line}{%
@@ -8750,7 +8775,7 @@
% Depending weither a sectioning command is called at this pstart or not
% we print sectioning command or normal line,
% \begin{macrocode}
- \xifinlist{\the\l@dnumpstartsL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\print@eledsection}%
{\print@line}%
\IfStrEq{\led@pb@setting}{after}{\led@check@pb\led@check@nopb}{}
@@ -8818,14 +8843,7 @@
% \end{macrocode}
% If we use the \option{continuousnumberingwithcolumns}, we increase right line number.
% \begin{macrocode}
- \ifcontinuousnumberingwithcolumns%
- \unless\ifafterendnumberingR%
- \new@lineR%
- \xappto\next@line@list@stuffR{%
- \unexpanded{\global\line@numR=}\the\line@num%
- }%
- \fi%
- \fi%
+ \continuousnumberingwithcolumns@sync@linenumber@singletext%
% \end{macrocode}
% If we use \LuaLaTeX\, then restore the direction.
% \begin{macrocode}
@@ -8878,12 +8896,12 @@
\insert@msdata%
}%
\affixside@note%
- \numdef{\temp@}{\l@dnumpstartsL-1}%
+ \numdef{\temp@}{\pstarts@typeset@L-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled@sectioningtrue%
- \csuse{eled@sectioning@\the\l@dnumpstartsL}%
+ \csuse{eled@sectioning@\the\pstarts@typeset@L}%
\@eled@sectioningfalse%
- \global\csundef{eled@sectioning@\the\l@dnumpstartsL}%
+ \global\csundef{eled@sectioning@\the\pstarts@typeset@L}%
\if@RTL%
\hspace{-3\paperwidth}%
{\hbox{\l@dunhbox@line{\one@line}} \new@line}%
@@ -8892,6 +8910,7 @@
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip-\baselineskip%
+ \continuousnumberingwithcolumns@sync@linenumber@singletext%
}
% \end{macrocode}
% \end{macro}
@@ -9207,6 +9226,30 @@
% \end{macrocode}
% \end{macro}
+% \subsection{Continuous line numbering between parallel typesetting and normal typesetting}
+% \begin{macro}{\continuousnumberingwithcolumns@sync@linenumber@singletext}
+% The \option{continuousnumberingwithcolumns}
+% option allows to alternate between single text and two parallels texts, keeping same line numbers when switching from one layout to the other one.
+% The lines counter for the text in a single column and for the text in the text in the left column in parallel typesetting is the same.
+% But the lines counter for the text in the same column is the not the same.
+%
+% When typesetting single column text, if the option is enabled, we need to \enquote{simulate} typesetting right line, in order to keep the two counters synchronized.
+% That is the aim of the \\
+% \cs{continuousnumberingwithcolumns@sync@linenumber@singletext}\\
+% macro.
+% \begin{macrocode}
+\newcommand{\continuousnumberingwithcolumns@sync@linenumber@singletext}{%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new@lineR%
+ \xappto\next@line@list@stuffR{%
+ \unexpanded{\global\line@numR=}\the\line@num%
+ }%
+ \fi%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
% \section{Line number annotation}
% The \cs{linenumannotation} allows users to add manual annotations to line numbers, for example to refer to line numbers from an older edition.
%
@@ -19881,7 +19924,7 @@
% \begin{itemize}
% \item The section level.
% \item The section title.
-% \item The side (when \protect\package{eledpar} is used).
+% \item The side (when \parpackage\ is used).
% \item The pstart where the command is called.
% \item If we have starred version or not.
% \end{itemize}
@@ -20240,7 +20283,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -20255,7 +20298,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -20270,7 +20313,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -20284,7 +20327,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -20300,7 +20343,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -20315,7 +20358,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -20330,7 +20373,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -20345,7 +20388,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 6d764788fc0..f3f10c08641 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -325,7 +325,8 @@
% \changes{v2.21.0}{2017/11/11}{Add compatibility with new features of \protect\reledmac 2.26.0}
% \changes{v2.21.1}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation}}
% \changes{v2.21.2}{2018/01/08}{Fix bug with \protect\cs{Xpstart} and \protect\cs{edtextlater}}
-% \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic produced by \protect\cs{autopar}}
+% \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic \protect\cs{pstart} produced by \protect\cs{autopar}}
+% \changes{v2.21.4}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1371,7 +1372,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3575,6 +3576,7 @@
% forthcoming text.
% \begin{macrocode}
\global\advance\l@dnumpstartsL \@ne%
+ \global\advance\pstarts@read@L \@ne%
\ifnum\l@dnumpstartsL>\l@dc@maxchunks%
\led@err@TooManyPstarts%
\global\l@dnumpstartsL=\l@dc@maxchunks%
@@ -3957,7 +3959,7 @@
\else%
\affixline@num%
\fi%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\unless\ifshiftedpstarts%
\add@apparatusL%
\fi%
@@ -4025,7 +4027,7 @@
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
- \numdef{\temp@}{\l@dpscL-1}%
+ \numdef{\temp@}{\pstarts@typeset@L-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled@sectioningtrue%
\bgroup%
@@ -4035,10 +4037,10 @@
\bodydir\l@luatexbodydir@L%
\ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
- \csuse{eled@sectioning@\the\l@dpscL}%
+ \csuse{eled@sectioning@\the\pstarts@typeset@L}%
\egroup%
\@eled@sectioningfalse%
- \global\csundef{eled@sectioning@\the\l@dpscL}%
+ \global\csundef{eled@sectioning@\the\pstarts@typeset@L}%
\if@RTL%
\hspace{-3\paperwidth}%
{\hbox{\l@dunhbox@line{\one@line}} \new@line}%
@@ -5556,9 +5558,9 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\l@pscL}
-% \begin{macro}{\l@pscR}
-% A couple of scratch counts for use in left and right texts, respectively.
+% \begin{macro}{\l@dpscL}
+% \begin{macro}{\l@dpscR}
+% A couple of scratch counts to count left and right \cs{pstart}, respectively.
% \begin{macrocode}
\newcount\l@dpscL
\newcount\l@dpscR
@@ -5778,12 +5780,14 @@
\global\pstartnumtrue
\global\pstartnumRtrue
% \end{macrocode}
-% Increment \protect\cs{l@dpscL} and \protect\cs{l@dpscR} which here count
+% Increase \protect\cs{l@dpscL} and \protect\cs{l@dpscR} which here count
% the numbers of left and right chunks.
+% Increase \cs{pstarts@typeset@L}, which counts the number of \cs{pstart} typeset both in not parallel mode and in the left side of parallel mode.
% Also restore the value of the public pstart counters.
% \begin{macrocode}
\global\advance\l@dpscL \@ne
\global\advance\l@dpscR \@ne
+ \global\advance\pstarts@typeset@L\@ne%
\restore@pstartL@pc%
\restore@pstartR@pc%
% \end{macrocode}
@@ -5806,12 +5810,12 @@
% \begin{macrocode}
\l@duselanguage{\theledlanguageL}%
\do@lineL
- \xifinlist{\the\l@dpscL}{\eled@sections@@}
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{%
\ifdefstring{\@eledsectmark}{L}%
- {\csuse{eled@sectmark@\the\l@dpscL}%
+ {\csuse{eled@sectmark@\the\pstarts@typeset@L}%
}{}%
- \global\csundef{eled@sectmark@\the\l@dpscL}%
+ \global\csundef{eled@sectmark@\the\pstarts@typeset@L}%
\savebox{\@eledsectionL}{\parbox[t][][t]{\Lcolwidth}{\vbox{}\print@eledsectionL}}%\vbox{}-> prevent alignment troubles with RTL language
}%
{}%
@@ -6381,7 +6385,8 @@
% \end{macrocode}
% Loop over the number of chunks, incrementing the chunk counts
% (\protect\cs{l@dpscL}
-% and \protect\cs{l@dpscR} are chunk (box) counts.)
+% and \protect\cs{l@dpscR} are chunk (box) counts).
+%
% \begin{macrocode}
\global\advance\l@dpscL \@ne%
\global\advance\l@dpscR \@ne%
@@ -6420,6 +6425,7 @@
% \begin{macrocode}
\global\advance\l@dpscL \@ne%
\global\advance\l@dpscR \@ne%
+ \global\advance\pstarts@typeset@L\@ne%
\restore@pstartL@pc%
\restore@pstartR@pc%
% \end{macrocode}
@@ -6455,7 +6461,7 @@
\csuse{before@pstartL@\the\l@dpscL}%
\global\csundef{before@pstartL@\the\l@dpscL}%
\do@lineL%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\print@eledsectionL}%
{}%
\advance\numpagelinesL \@ne%
@@ -6473,7 +6479,7 @@
\parledgroup@correction@notespacing{L}%
\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}%
\else%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\add@apparatusL}%
{}%
\unless\ifadvancedshiftedpstarts%
@@ -7174,6 +7180,7 @@
% Go to the next pstart
% \begin{macrocode}
\global\advance\l@dpscL \@ne
+ \global\advance\pstarts@typeset@L\@ne%
\global\pstartnumtrue%
\restore@pstartL@pc%
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 01b2706dfbf..c9aa1e66add 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1792,6 +1792,8 @@
\newcount\num@lines
\newbox\one@line
\newcount\par@line
+\newcount\pstarts@typeset@L%
+\newcount\pstarts@read@L%
\newcommand{\AtStartEveryPstart}[1]{%
\ifstrempty{#1}%
@@ -1851,6 +1853,8 @@
\global\let\next@insert=\empty%
\begingroup\normal@pars%
\global\advance \l@dnumpstartsL\@ne
+ \global\advance \pstarts@typeset@L\@ne%
+ \global\advance \pstarts@read@L\@ne%
\global\setbox\raw@text=\vbox\bgroup%
\if@nobreak%
\if@afterindent\else%
@@ -2009,7 +2013,7 @@
\else%
\affixline@num%
\fi%
- \xifinlist{\the\l@dnumpstartsL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\print@eledsection}%
{\print@line}%
\IfStrEq{\led@pb@setting}{after}{\led@check@pb\led@check@nopb}{}
@@ -2037,14 +2041,7 @@
\l@dlsn@te
{\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%
+ \continuousnumberingwithcolumns@sync@linenumber@singletext%
\ifluatex%
\textdir\l@luatextextdir@L%
\fi%
@@ -2071,12 +2068,12 @@
\insert@msdata%
}%
\affixside@note%
- \numdef{\temp@}{\l@dnumpstartsL-1}%
+ \numdef{\temp@}{\pstarts@typeset@L-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled@sectioningtrue%
- \csuse{eled@sectioning@\the\l@dnumpstartsL}%
+ \csuse{eled@sectioning@\the\pstarts@typeset@L}%
\@eled@sectioningfalse%
- \global\csundef{eled@sectioning@\the\l@dnumpstartsL}%
+ \global\csundef{eled@sectioning@\the\pstarts@typeset@L}%
\if@RTL%
\hspace{-3\paperwidth}%
{\hbox{\l@dunhbox@line{\one@line}} \new@line}%
@@ -2085,6 +2082,7 @@
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip-\baselineskip%
+ \continuousnumberingwithcolumns@sync@linenumber@singletext%
}
\newcommand*{\do@linehook}{}
\newcommand*{\do@insidelinehook}{}
@@ -2237,6 +2235,16 @@
\led@warn@BadAction
\fi}
+\newcommand{\continuousnumberingwithcolumns@sync@linenumber@singletext}{%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new@lineR%
+ \xappto\next@line@list@stuffR{%
+ \unexpanded{\global\line@numR=}\the\line@num%
+ }%
+ \fi%
+ \fi%
+}%
\newcommand{\linenumannotation}[1]{%
\leavevmode%In case it begins with a \pstart, ensure the \@annot is written after \@nl
\ifledRcol%
@@ -8645,7 +8653,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -8660,7 +8668,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -8675,7 +8683,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -8689,7 +8697,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{}{}
+ \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{}{}%
}%
\fi%
}
@@ -8704,7 +8712,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@chapter{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -8719,7 +8727,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@section{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -8734,7 +8742,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@subsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
@@ -8749,7 +8757,7 @@
}%
\else%
\immediate\write\eled@sectioning@out{%
- \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsL}{*}{}
+ \string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\pstarts@read@L}{*}{}%
}%
\fi%
}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index efdf5ef5bdc..c9e83f816ff 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -978,6 +978,7 @@
\fi%
\begingroup\everypar{}%
\global\advance\l@dnumpstartsL \@ne%
+ \global\advance\pstarts@read@L \@ne%
\ifnum\l@dnumpstartsL>\l@dc@maxchunks%
\led@err@TooManyPstarts%
\global\l@dnumpstartsL=\l@dc@maxchunks%
@@ -1242,7 +1243,7 @@
\else%
\affixline@num%
\fi%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\unless\ifshiftedpstarts%
\add@apparatusL%
\fi%
@@ -1295,7 +1296,7 @@
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
- \numdef{\temp@}{\l@dpscL-1}%
+ \numdef{\temp@}{\pstarts@typeset@L-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled@sectioningtrue%
\bgroup%
@@ -1305,10 +1306,10 @@
\bodydir\l@luatexbodydir@L%
\ifdefstring{\l@luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
- \csuse{eled@sectioning@\the\l@dpscL}%
+ \csuse{eled@sectioning@\the\pstarts@typeset@L}%
\egroup%
\@eled@sectioningfalse%
- \global\csundef{eled@sectioning@\the\l@dpscL}%
+ \global\csundef{eled@sectioning@\the\pstarts@typeset@L}%
\if@RTL%
\hspace{-3\paperwidth}%
{\hbox{\l@dunhbox@line{\one@line}} \new@line}%
@@ -2330,6 +2331,7 @@
\global\pstartnumRtrue
\global\advance\l@dpscL \@ne
\global\advance\l@dpscR \@ne
+ \global\advance\pstarts@typeset@L\@ne%
\restore@pstartL@pc%
\restore@pstartR@pc%
\Columns@print@before@pstart%
@@ -2337,12 +2339,12 @@
{ \loop\ifaraw@text
\l@duselanguage{\theledlanguageL}%
\do@lineL
- \xifinlist{\the\l@dpscL}{\eled@sections@@}
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{%
\ifdefstring{\@eledsectmark}{L}%
- {\csuse{eled@sectmark@\the\l@dpscL}%
+ {\csuse{eled@sectmark@\the\pstarts@typeset@L}%
}{}%
- \global\csundef{eled@sectmark@\the\l@dpscL}%
+ \global\csundef{eled@sectmark@\the\pstarts@typeset@L}%
\savebox{\@eledsectionL}{\parbox[t][][t]{\Lcolwidth}{\vbox{}\print@eledsectionL}}%\vbox{}-> prevent alignment troubles with RTL language
}%
{}%
@@ -2735,6 +2737,7 @@
\if@pstarts%
\global\advance\l@dpscL \@ne%
\global\advance\l@dpscR \@ne%
+ \global\advance\pstarts@typeset@L\@ne%
\restore@pstartL@pc%
\restore@pstartR@pc%
\global\@donereallinesL=\z@%
@@ -2750,7 +2753,7 @@
\csuse{before@pstartL@\the\l@dpscL}%
\global\csundef{before@pstartL@\the\l@dpscL}%
\do@lineL%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\print@eledsectionL}%
{}%
\advance\numpagelinesL \@ne%
@@ -2759,7 +2762,7 @@
\parledgroup@correction@notespacing{L}%
\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}%
\else%
- \xifinlist{\the\l@dpscL}{\eled@sections@@}%
+ \xifinlist{\the\pstarts@typeset@L}{\eled@sections@@}%
{\add@apparatusL}%
{}%
\unless\ifadvancedshiftedpstarts%
@@ -3180,6 +3183,7 @@
{\usenamecount{l@dmaxlinesinpar\the\l@dpscL}}%
\global\@donetotallinesL \z@
\global\advance\l@dpscL \@ne
+ \global\advance\pstarts@typeset@L\@ne%
\global\pstartnumtrue%
\restore@pstartL@pc%
\parledgroup@notes@endL