diff options
Diffstat (limited to 'Master')
47 files changed, 328 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex dbe96dcc326..634ac6c3b42 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex 414f75cdef0..385b6e92df0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf Binary files differindex 82882b68884..86b0cf83208 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex a0974522e18..911a692bb2b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf Binary files differindex 49cb600a435..1b06cf805d8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 99fa32607aa..b19c68cb77c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf Binary files differindex 4edc856887d..d65e3ea20a6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf Binary files differindex d1783090d1b..54543ab9690 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 172defb1d9f..7a47ad5239b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex ab5fb699a88..5e7e0d38584 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf Binary files differindex f9af2eb311c..d47407b7607 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf Binary files differindex 298ae29ee10..02b3bf1f6d4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 6f2170765c4..306061f1658 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex cf298ad2c85..ef0c8e55a39 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex fc0070dbb9e..31d4d9fe928 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 4356e77de22..69106b1232c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 1d1f612c624..b35aff832d3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex be377a0891b..650ed7e87f5 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex 3f0f40bd4a1..898401827b5 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex c303d17c0c7..d7c9ecb4e03 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex 745fd42d194..cbe52180d37 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 6814d6d732d..6a5997010d8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 086db94c3bb..68d130200ac 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 13e2c6f16bf..c1f3cd96fd8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 14884fb5c51..2d53f53a122 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 28c8e1c5ca9..ba6f7c1c7f4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 5414056c14c..12db28d9ed0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differnew file mode 100644 index 00000000000..085167c2f13 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex new file mode 100644 index 00000000000..36d252b34b3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex @@ -0,0 +1,108 @@ +\documentclass{article} +\usepackage[noend,nofamiliar,series={A},noeledsec]{reledmac} +\usepackage{polyglossia} +\setmainlanguage{latin} +\setotherlanguage{english} +\usepackage{libertineotf} +\usepackage[widthliketwocolumns,continuousnumberingwithcolumns]{reledpar} +\setlength{\Lcolwidth}{0.47\textwidth} +\setlength{\Rcolwidth}{0.47\textwidth} +\columnsposition{c} +\setlength{\beforecolumnseparator}{0.03\textwidth} +\setlength{\aftercolumnseparator}{0.03\textwidth} + +\AtBeginPairs{\sloppy} +\usepackage{lipsum} +\firstlinenum*{1} +\linenumincrement*{1} +\begin{document} + +\begin{english} +\title{Mixing columns with not column, using continuous numbering} +\begin{abstract} +In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and normal typesetting, getting continuous line numbering between them. +\end{abstract} +\end{english} +\begin{pairs} +\begin{Leftside} +\beginnumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. +\pend +\pausenumbering +\end{Leftside} + +\begin{Rightside} +\beginnumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering +\end{Rightside} + +\end{pairs} +\Columns + +\resumenumbering +\pstart +Lorem \edtext{ipsum}{\Afootnote{ipsam}} dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering + +\begin{pairs} + + +\begin{Leftside} +\resumenumbering +\pstart + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering +\end{Leftside} + +\begin{Rightside} +\resumenumbering +\pstart +\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. +\pend +\pausenumbering +\end{Rightside} +\end{pairs} +\Columns + +\resumenumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering + +\begin{pairs} + + +\begin{Leftside} +\resumenumbering +\pstart + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering +\end{Leftside} + +\begin{Rightside} +\resumenumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\endnumbering +\end{Rightside} +\end{pairs} + +\Columns +\resumenumbering +\pstart +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio. +\pend +\pausenumbering + +\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 Binary files differindex 24ec212d0a9..01b2c1033b8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex index 607eca1d835..e6398f65f92 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex @@ -6,21 +6,30 @@ \usepackage[series={A,B},noend,noeledsec,noledgroup]{reledmac} -\usepackage{reledpar} +\usepackage[widthliketwocolumns]{reledpar} -\widthliketwocolumnstrue -\Xnoteswidthliketwocolumns \Xnoteswidthliketwocolumns +\noteswidthliketwocolumnsX +\columnsposition{c} +\setlength{\beforecolumnseparator}{0.05\textwidth} +\setlength{\aftercolumnseparator}{0.05\textwidth} \Xarrangement{paragraph} \begin{document} +\begin{english} +\title{Mixing columns with not column} +\maketitle +\begin{abstract} +In this example, we use the \verb+widthliketwocolumns+ option and the \verb+\Xnoteswidthliketwocolumns+ and \verb+\noteswidthliketwocolumnsX+ to alternate parallel typesetting in columns and normal typesetting. +\end{abstract} +\end{english} \begin{pairs}\sloppy \begin{Leftside} \beginnumbering \pstart -\edtext{Lorem}{\Afootnote{lorim}} ipsum\footnoteA{x}\footnoteB{xb} \edtext{Lorem}{\Afootnote{lorim}} dolor sit amet, consectetur adipiscing elit. Sed \edtext{Lorem}{\Afootnote{lorim}} egestas, dolor sed malesuada ultrices, nulla orci \edtext{Lorem}{\Afootnote{lorim}} suscipit massa, a feugiat neque dolor eu augue. \edtext{Lorem}{\Afootnote{lorim}} Lorem ipsum dolor sit amet, consectetur adipiscing \edtext{Lorem}{\Afootnote{lorim}} elit. Pellentesque bibendum \edtext{Lorem}{\Bfootnote{?}} tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in \edtext{Lorem}{\Bfootnote{?}} convallis \edtext{Lorem}{\Bfootnote{?}} luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna \edtext{Lorem}{\Bfootnote{?}} eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut \edtext{Lorem}{\Bfootnote{?}} feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla \edtext{Lorem}{\Afootnote{lorim}} luctus eget\footnoteB{xb}. Proin sodales aliquet felis. \edtext{Lorem}{\Afootnote{lorim}} Vestibulum ante ipsum primis in faucibus orci luctus et \edtext{Lorem}{\Bfootnote{?}} ultrices posuere cubilia Curae; +\edtext{Lorem}{\Afootnote{lorim}} ipsum\footnoteA{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.}\footnoteB{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.} \edtext{Lorem}{\Afootnote{lorim}} dolor sit amet, consectetur adipiscing elit. Sed \edtext{Lorem}{\Afootnote{lorim}} egestas, dolor sed malesuada ultrices, nulla orci \edtext{Lorem}{\Afootnote{lorim}} suscipit massa, a feugiat neque dolor eu augue. \edtext{Lorem}{\Afootnote{lorim}} Lorem ipsum dolor sit amet, consectetur adipiscing \edtext{Lorem}{\Afootnote{lorim}} elit. Pellentesque bibendum \edtext{Lorem}{\Bfootnote{?}} tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in \edtext{Lorem}{\Bfootnote{?}} convallis \edtext{Lorem}{\Bfootnote{?}} luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna \edtext{Lorem}{\Bfootnote{?}} eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut \edtext{Lorem}{\Bfootnote{?}} feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla \edtext{Lorem}{\Afootnote{lorim}} luctus eget\footnoteB{Cras fermentum eleifend sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem.}. Proin sodales aliquet felis. \edtext{Lorem}{\Afootnote{lorim}} Vestibulum ante ipsum primis in faucibus orci luctus et \edtext{Lorem}{\Bfootnote{?}} ultrices posuere cubilia Curae; \pend @@ -80,7 +89,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed \pstart -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend\footnoteB{xb} sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus\footnoteB{xb} orci\footnoteA{x} luctus et ultrices posuere cubilia Curae; +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque bibendum tellus ornare orci luctus, fermentum auctor lacus vehicula. Nunc ex leo, iaculis in convallis luctus, accumsan nec ligula. Praesent molestie, mauris vitae mattis commodo, tellus magna eleifend nunc, eu tempor purus neque quis neque. Morbi volutpat, tellus ac hendrerit fermentum, purus sem placerat mauris, a tristique nisi dolor et mi. Ut aliquam porttitor diam, ut feugiat arcu congue ullamcorper. Nam malesuada, ante sed fermentum blandit, nisi magna sollicitudin eros, vel accumsan magna lorem ut leo. Cras fermentum eleifend\footnoteB{xb} sapien sed aliquet. Duis ac sapien dolor. Donec sagittis nibh in volutpat tincidunt. Fusce tellus nisi, varius vitae massa a, cursus ultricies sem. Etiam ipsum mi, aliquam suscipit mattis id, pretium iaculis enim. Quisque vestibulum tincidunt sem, a egestas nulla luctus eget. Proin sodales aliquet felis. Vestibulum ante ipsum primis in faucibus\footnoteB{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue.} orci\footnoteA{Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas, dolor sed malesuada ultrices, nulla orci suscipit massa, a feugiat neque dolor eu augue.} luctus et ultrices posuere cubilia Curae; \pend diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 3f67155e56b..11477bed082 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 99d0c30f02b..df4d3eec3a8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 7a1a04bd2f0..a985e7682f7 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf Binary files differindex 33c3af055dd..730c8dc4837 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex bf5938c2cec..d7e07611d2f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 18b72c88090..1f7971d782f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 7ef1cc9f471..80be471916c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex 338439de196..cd8fbbd7e85 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex ff5022a9d6d..4e63a8a406f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex c3be8b197d2..b5d4dd9626d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 118f09ca0fb..69b24680441 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 620fbcc1e0b..00da8794912 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index dce84dd0060..903771c1dfb 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -386,6 +386,11 @@ % \changes{v2.8.2}{2016/02/27}{Fix bug with \protect\cs{AtEveryPstart} added in version 2.0.0.} % \changes{v2.8.2}{2016/02/27}{Fix bug with vertical space after between sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content} % \changes{v2.8.2}{2016/02/27}{Fix bug concerning indent in a paragraph immediatly following a sectioning command (bug NOT fixed on reledpar)} +% \changes{v2.9.0}{2016/03/23}{Allow to make continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} option.} +% \changes{v2.9.0}{2016/03/23}{Fix bug when using \protect\cs{linenum}\protect\arg{page} and \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} +% \changes{v2.9.0}{2016/03/23}{Write correct metadata in numbered files when using \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} +% \changes{v2.9.0}{2016/03/23}{Fix bug with three and two columns footnote setting (added in v.2.4.0).} +% \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three columns familiar footnote.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -633,6 +638,9 @@ % but it does not expend the labor to check this thoroughly. If you have % problems with a line or two misnumbered at the top of a page, try % running \LaTeX\ once or twice more. +% +% However, the best way to be sure to have made the good number of runs +% is to use some \LaTeX's run scripts like \emph{latexmk}. % % A file may mix \emph{numbered} and \emph{unnumbered} text. % @@ -3477,7 +3485,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/02/27 v2.8.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/03/23 v2.9.0 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -3537,7 +3545,6 @@ \newif\ifnoquotation@ \DeclareOptionX{noquotation}{\noquotation@true} - \newif\ifledfinal \DeclareOptionX{final}{\ledfinaltrue} \DeclareOptionX{draft}{\ledfinalfalse} @@ -3552,6 +3559,9 @@ \newif\ifwidthliketwocolumns% \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\newif\ifcontinuousnumberingwithcolumns +\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% + \newif\ifxindy@ \DeclareOptionX{xindy}[eledmac-markup-attr.xdy]{% \AtBeginDocument{\immediate\openout\eledmac@xindy@out=#1}% @@ -4355,6 +4365,16 @@ \csuse{setpositionliketwocolumns@\columns@position}% \fi% \fi% + \ifcontinuousnumberingwithcolumns% + \ifdefined\line@numR% + \ifnum\line@numR>\line@num% + \expandafter\setlinenum\expandafter{\the\line@numR}% + \fi% + \ifnum\last@page@numR>\last@page@num% + \global\last@page@num=\last@page@numR% + \fi% + \fi% + \fi% \else \led@err@NumberingShouldHaveStarted \endnumbering @@ -5467,8 +5487,8 @@ \ifbypage@R \line@numR \z@ \subline@numR \z@ \fi - \page@numR=#1\relax - \last@page@numR=#1\relax + \global\page@numR=#1\relax + \global\last@page@numR=#1\relax \def\next@page@numR{#1}% \fi \else @@ -5477,8 +5497,8 @@ \ifbypage@ \line@num \z@ \subline@num \z@ \fi - \page@num=#1\relax - \last@page@num=#1\relax + \global\page@num=#1\relax + \global\last@page@num=#1\relax \def\next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi @@ -6066,6 +6086,10 @@ \fi% \closeout\linenum@out% \openout\linenum@out=#1\relax% + \write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \ifl@dpaging% + \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% + \fi% \fi} % \end{macrocode} @@ -9367,12 +9391,14 @@ \nottoggle{Xparindent@#4}{\parindent=\z@}{}% \tolerance=5000% \hangindent=\csuse{Xhangindent@#4}% - \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% \parindent=\@tempdima% - \strut{\printlinefootnote{#1}{#4}}% + \strut{% + \hspace{\parindent}% + \printlinefootnote{#1}{#4}% + }% {\nottoggle{Xlemmadisablefontselection@#4}% {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% @@ -9499,12 +9525,14 @@ \nottoggle{Xparindent@#4}{\parindent=\z@}{}% \tolerance=5000% \hangindent=\csuse{Xhangindent@#4}% - \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% \parindent=\@tempdima% - \strut{\printlinefootnote{#1}{#4}}% + \strut{% + \hspace{\parindent}% + \printlinefootnote{#1}{#4}% + }% {\nottoggle{Xlemmadisablefontselection@#4}% {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% @@ -10742,8 +10770,11 @@ \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}\allowbreak} + {\hspace{\parindent}% + \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% + #2\strut\par}% + \allowbreak% +}% % \end{macrocode} % \end{macro} @@ -10837,7 +10868,7 @@ \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% - \csuse{notefontsizeX@#1} + \csuse{notefontsizeX@#1}% \footsplitskips% \@nameuse{footfmt#1}{#1}{#2}\egroup} @@ -10857,11 +10888,11 @@ \hsize \csuse{hsizethreecolX@#1}% \nottoggle{parindentX@#1}{\parindent=\z@}{}% \tolerance=5000\relax% - \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% + {\hspace{\parindent}% + \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% #2\strut\par}\allowbreak} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 2d2e6e92a80..62f9ec33255 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -267,6 +267,9 @@ % \changes{v2.6.3}{2015/12/13}{Fix spurious dot when using \protect\cs{linenummargin} on right side (introduced in v2.5.0).} % \changes{v2.7.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.} % \changes{v2.7.1}{2016/03/06}{Fix bug added in \protect\reledmac~2.8.2, when typesetting parallel text just after a sectionning command} +% \changes{v2.8.0}{2016/03/23}{{Allow to make continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} option.}} +% \changes{v2.8.0}{2016/03/23}{Fix bug when the right line number style is not the same to the left line number style} +% \changes{v2.8.0}{2016/03/23}{Add \protect\cs{linenumberLevenifblanktrue} and \protect\cs{linenumberRevenifblank} commands} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -535,13 +538,18 @@ % \subsubsection{Mixing two columns and one column texts} % \DescribeMacro{\widthliketwocolumns} % If you want to mix two-column with single-column text, you can align horizontally single-column text to two-column text with \protect\cs{widthliketwocolumnstrue}. To reset this feature, use \protect\cs{widthliketwocolumnsfalse}. -% You can also call \protect\cs{widthliketwocolumns} as a global option when loading \macpackage or \parpackage. +% You can also use \option{widthliketwocolumns} as a global option when loading \macpackage or \parpackage. % % \DescribeMacro{\Xnoteswidthliketwocolumns} % \DescribeMacro{\notesXwidthliketwocolumns} % In most cases, you should use \protect\cs{widthliketwocolumns} in combination with \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{notesXwidthliketwocolumns} to align the critical/familiar footnotes with the two colums. % See \macpackage's handbook for more details. +% +% If you want to have continuous line numbers between columns and not column, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage. +% You will need to use \cs{pausenumbering}\ldots\cs{resumenumbering} instead of \cs{endnumbering}\ldots{endnumbering} (see \reff{reledmac-pause}). +% +% % \section{Facing pages}\label{pages} % \subsection{Basic usage} % \DescribeEnv{pages} @@ -871,9 +879,6 @@ % When inserted into a numbered line the macro \protect\cs{hidenumbering} causes % the number for that particular line to be hidden; namely, no line number will print. % Note that if you use it in \protect\cs{stanza}, you must call it at the beginning of the verse. -% \subsection{Line numbering scheme} -% Within these environments you can designate the line numbering scheme(s) -% to be used. % \subsection{Lineation system} % \DescribeMacro{\firstlinenum} % \DescribeMacro{\linenumincrement} @@ -930,7 +935,13 @@ % This may be useful for parallel columns but for parallel pages it might % be more appropriate to redefine it using \protect\cs{setRlineflag}\marg{flag}. % Use \verb?\setRlineflag{}? to empty it. -% +% +% \DescribeMacro{\linenumberLevenifblanktrue} +% \DescribeMacro{\linenumberRevenifblanktrue} +% By default, when a blank line is printed on one side for the need of synchronism with the other side, no line number is printed. +% However, you can decide to print them also for blank lines. +% Use \cs{linenumberLevenifblanktrue} to enable it on the left side, and \cs{linenumberRevenifblanktrue} to enable it on right side. +% % \subsection{Chunks} % \DescribeMacro{\pstart} % \DescribeMacro{\pend} @@ -1159,7 +1170,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/03/06 v2.7.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/03/23 v2.8.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1232,10 +1243,11 @@ \DeclareOptionX{parledgroup}{\parledgrouptrue} % \end{macrocode} % \begin{macro}{\ifwidthliketwocolumns} -% The \verb|widthliketwocolumns| option can be called either on \macpackage or \parpackage. +% The \verb|widthliketwocolumns| and \verb+continuousnumberingwithcolumns+ options can be called either on \macpackage or \parpackage. % \changes{v1.9.0}{2014/09/16}{Added widthliketwocolumns option} % \begin{macrocode} \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% % \end{macrocode} % \end{macro} % \begin{macro}{\ifsameparallelpagenumber} @@ -1476,6 +1488,7 @@ \global\sublines@false \global\let\next@page@numR\relax \global\let\sub@change\relax + \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff @@ -1595,6 +1608,7 @@ \l@dend@stuff \begingroup% \initnumbering@sectcountR% + \set@continuousnumberingforR% \else \led@err@numberingShouldHaveStarted \endnumberingR @@ -1691,6 +1705,21 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\set@continuousnumberingforR} +% \cs{set@continuousnumberingforR} set the right line numbers at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with not parallel text. +% \begin{macrocode} +\newcommand{\set@continuousnumberingforR}{% + \ifcontinuousnumberingwithcolumns% + \ifnum\line@numR<\line@num% + \expandafter\setlinenum\expandafter{\the\line@num}% + \fi% + \ifnum\last@page@num>\last@page@numR% + \global\last@page@numR=\last@page@num% + \fi% + \fi% +} +% \end{macrocode} +% \end{macro} % \begin{macro}{\lineation*} % \changes{v1.8.2}{2014/08/15}{Add \protect\cs{lineation*}} % \protect\cs{lineation*} change the lineation system for both sides. @@ -1903,6 +1932,15 @@ % \end{macro} % \end{macro} % \subsection{Print marginal line number} +% \begin{macro}{\iflinenumberLevenifblank} +% \begin{macro}{\iflinenumberRevenifblank} +% \cs{iflinenumberLevenifblank} and \cs{iflinenumberRevenifblank} can be switchen to TRUE if we want to print the line number even if the line is blank. +% \begin{macrocode} +\newif\iflinenumberLevenifblank +\newif\iflinenumberRevenifblank +% \end{macrocode} +% \end{macro} +% \end{macro} % \begin{macro}{\leftlinenumR} % \begin{macro}{\rightlinenumR} % \begin{macro}{\l@dlinenumR} @@ -3363,7 +3401,19 @@ \global\advance\@donereallinesL\@ne% \global\advance\@donetotallinesL\@ne% \else% - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \iflinenumberLevenifblank + \new@lineL% + \l@demptyd@ta% + \getline@numL% + \affixline@num% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \l@dld@ta %space kept for backward compatibility + \hspace*{\Lcolwidth}% + \ledrlfill\l@drd@ta% + }% + \else% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \fi% \global\advance\@donetotallinesL\@ne% \fi% }% @@ -3471,6 +3521,8 @@ % \changes{v1.8.1}{2014/08/07}{Fix a bug with critical notes a the begining of a page, added by v1.8.0 (?).} % \begin{macrocode} \newcommand*{\do@lineR}{% + \let\linenumrepL\linenumrep% + \let\sublinenumrepL\sublinenumrep% \let\linenumrep\linenumrepR% \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% @@ -3508,10 +3560,24 @@ \global\advance\@donereallinesR\@ne% \global\advance\@donetotallinesR\@ne% \else% - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \iflinenumberRevenifblank% + \new@lineR + \l@demptyd@ta% + \getline@numR% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \affixline@numR% + \l@dld@ta %space kept for backward compatibility + \hspace*{\Rcolwidth}% + \ledrlfill\l@drd@ta% + }% + \else% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \fi% \global\advance\@donetotallinesR\@ne% \fi% \ledRcol@false% + \let\linenumrep\linenumrepL% + \let\sublinenumrep\sublinenumrepL% } @@ -6304,7 +6370,7 @@ % \begin{macro}{\par@patch@pagenumbering} % \cs{par@patch@thepage} patches \cs{thepage} in order to use the value of \verb+par@page+ counter and not the value of \verb+par@page+. % It must be called after any redefinition of \cs{thepage}. -% That why we insert it at the end of the \LaTeX macro \cs{pagenumbering}, which is called by some \cs{xxxmatter} commands. +% That why we insert it at the end of the \LaTeX\ macro \cs{pagenumbering}, which is called by some \cs{xxxmatter} commands. % In the case of \ltxclass{memoir} class using, we insert it at the end of \cs{@mempnum}. % When using \cs{pagenumbering}, we also need to restart \verb+par@page+ counter. Consequently, we have wrapped \cs{par@patch@thepage} and counter restart in \cs{par@patch@pagenumbering} % We also call \cs{par@patch@thepage} it at the beginning of the document. diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index c5b2a060489..533987befdd 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}[2016/02/27 v2.8.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/03/23 v2.9.0 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -78,6 +78,9 @@ \newif\ifwidthliketwocolumns% \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\newif\ifcontinuousnumberingwithcolumns +\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% + \newif\ifxindy@ \DeclareOptionX{xindy}[eledmac-markup-attr.xdy]{% \AtBeginDocument{\immediate\openout\eledmac@xindy@out=#1}% @@ -410,6 +413,16 @@ \csuse{setpositionliketwocolumns@\columns@position}% \fi% \fi% + \ifcontinuousnumberingwithcolumns% + \ifdefined\line@numR% + \ifnum\line@numR>\line@num% + \expandafter\setlinenum\expandafter{\the\line@numR}% + \fi% + \ifnum\last@page@numR>\last@page@num% + \global\last@page@num=\last@page@numR% + \fi% + \fi% + \fi% \else \led@err@NumberingShouldHaveStarted \endnumbering @@ -767,8 +780,8 @@ \ifbypage@R \line@numR \z@ \subline@numR \z@ \fi - \page@numR=#1\relax - \last@page@numR=#1\relax + \global\page@numR=#1\relax + \global\last@page@numR=#1\relax \def\next@page@numR{#1}% \fi \else @@ -777,8 +790,8 @@ \ifbypage@ \line@num \z@ \subline@num \z@ \fi - \page@num=#1\relax - \last@page@num=#1\relax + \global\page@num=#1\relax + \global\last@page@num=#1\relax \def\next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi @@ -1079,6 +1092,10 @@ \fi% \closeout\linenum@out% \openout\linenum@out=#1\relax% + \write\linenum@out{\string\line@list@version{\this@line@list@version}}% + \ifl@dpaging% + \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}% + \fi% \fi} \newcommand*{\new@line}{% @@ -2393,12 +2410,14 @@ \nottoggle{Xparindent@#4}{\parindent=\z@}{}% \tolerance=5000% \hangindent=\csuse{Xhangindent@#4}% - \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% \parindent=\@tempdima% - \strut{\printlinefootnote{#1}{#4}}% + \strut{% + \hspace{\parindent}% + \printlinefootnote{#1}{#4}% + }% {\nottoggle{Xlemmadisablefontselection@#4}% {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% @@ -2474,12 +2493,14 @@ \nottoggle{Xparindent@#4}{\parindent=\z@}{}% \tolerance=5000% \hangindent=\csuse{Xhangindent@#4}% - \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% \parindent=\@tempdima% - \strut{\printlinefootnote{#1}{#4}}% + \strut{% + \hspace{\parindent}% + \printlinefootnote{#1}{#4}% + }% {\nottoggle{Xlemmadisablefontselection@#4}% {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% @@ -3194,8 +3215,11 @@ \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}\allowbreak} + {\hspace{\parindent}% + \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% + #2\strut\par}% + \allowbreak% +}% \newcommand*{\twocolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \splittopskip=\ht\strutbox @@ -3256,7 +3280,7 @@ \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% - \csuse{notefontsizeX@#1} + \csuse{notefontsizeX@#1}% \footsplitskips% \@nameuse{footfmt#1}{#1}{#2}\egroup} @@ -3270,11 +3294,11 @@ \hsize \csuse{hsizethreecolX@#1}% \nottoggle{parindentX@#1}{\parindent=\z@}{}% \tolerance=5000\relax% - \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% - {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% + {\hspace{\parindent}% + \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% #2\strut\par}\allowbreak} \newcommand*{\threecolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 3833de76c31..438858dee0c 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/03/06 v2.7.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/03/23 v2.8.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -59,6 +59,7 @@ }% \DeclareOptionX{parledgroup}{\parledgrouptrue} \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% +\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% \newif\ifsameparallelpagenumber \newif\ifprevpgnotnumbered \DeclareOptionX{sameparallelpagenumber}{\sameparallelpagenumbertrue} @@ -145,6 +146,7 @@ \global\sublines@false \global\let\next@page@numR\relax \global\let\sub@change\relax + \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff @@ -229,6 +231,7 @@ \l@dend@stuff \begingroup% \initnumbering@sectcountR% + \set@continuousnumberingforR% \else \led@err@numberingShouldHaveStarted \endnumberingR @@ -288,6 +291,16 @@ \fi \fi \fi}} +\newcommand{\set@continuousnumberingforR}{% + \ifcontinuousnumberingwithcolumns% + \ifnum\line@numR<\line@num% + \expandafter\setlinenum\expandafter{\the\line@num}% + \fi% + \ifnum\last@page@num>\last@page@numR% + \global\last@page@numR=\last@page@num% + \fi% + \fi% +} \WithSuffix\newcommand\lineation*[1]{% \lineation{#1}% \lineationR{#1}% @@ -366,6 +379,8 @@ \sublinenumberstyle{#1}% \sublinenumberstyleR{#1}% }% +\newif\iflinenumberLevenifblank +\newif\iflinenumberRevenifblank \newcommand*{\leftlinenumR}{% \l@dlinenumR \kern\linenumsep} @@ -978,7 +993,19 @@ \global\advance\@donereallinesL\@ne% \global\advance\@donetotallinesL\@ne% \else% - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \iflinenumberLevenifblank + \new@lineL% + \l@demptyd@ta% + \getline@numL% + \affixline@num% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% + \l@dld@ta %space kept for backward compatibility + \hspace*{\Lcolwidth}% + \ledrlfill\l@drd@ta% + }% + \else% + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \fi% \global\advance\@donetotallinesL\@ne% \fi% }% @@ -1037,6 +1064,8 @@ \newcommand*{\do@insidelineRhook}{} \newcommand*{\do@lineR}{% + \let\linenumrepL\linenumrep% + \let\sublinenumrepL\sublinenumrep% \let\linenumrep\linenumrepR% \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% @@ -1074,10 +1103,24 @@ \global\advance\@donereallinesR\@ne% \global\advance\@donetotallinesR\@ne% \else% - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \iflinenumberRevenifblank% + \new@lineR + \l@demptyd@ta% + \getline@numR% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{% + \affixline@numR% + \l@dld@ta %space kept for backward compatibility + \hspace*{\Rcolwidth}% + \ledrlfill\l@drd@ta% + }% + \else% + \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}% + \fi% \global\advance\@donetotallinesR\@ne% \fi% \ledRcol@false% + \let\linenumrep\linenumrepL% + \let\sublinenumrep\sublinenumrepL% } \def\print@lineR{% |