From ccd1b1b3d130d56c728e4f9e8a411a7d5c6c202c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Sep 2018 20:56:03 +0000 Subject: reledmac (14sep18) git-svn-id: svn://tug.org/texlive/trunk@48666 c570f23f-e606-0410-a88d-b1316a301751 --- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 41026 -> 41027 bytes .../latex/reledmac/examples/1-criticalendotes.pdf | Bin 17697 -> 17698 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 16742 -> 16743 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26369 -> 26370 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20869 -> 20867 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 18655 -> 18655 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 18834 -> 18834 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18608 -> 18612 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20717 -> 20716 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21259 -> 21256 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21744 -> 21749 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17124 -> 17121 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31341 -> 31346 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26110 -> 26107 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36352 -> 36355 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24483 -> 24483 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25879 -> 25878 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 22687 -> 22688 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 34258 -> 34323 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 0 -> 39494 bytes .../examples/2-subdivision-number-in-header.tex | 282 +++++++++++++++++++++ .../2-titles_in_line_numbering_with_notes.pdf | Bin 22825 -> 22824 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17204 -> 17208 bytes .../3-reledpar_columns_different_languages.pdf | Bin 27661 -> 27720 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12234 -> 12234 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 43974 -> 43974 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22784 -> 22782 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 43584 -> 43585 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 43155 -> 43160 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 41074 -> 41077 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 43355 -> 43356 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 42851 -> 42850 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 42898 -> 42890 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 43151 -> 43149 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 28315 -> 28315 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27049 -> 27051 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21265 -> 21262 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29534 -> 29533 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22466 -> 22468 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36423 -> 36424 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58556 -> 58563 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22756 -> 22758 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18715 -> 18707 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32467 -> 32468 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22217 -> 22219 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16267 -> 16266 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 91639 -> 91635 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1364010 -> 1367698 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 515984 -> 516137 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 70 ++++- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 10 +- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 19 +- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 5 +- 53 files changed, 372 insertions(+), 14 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.tex (limited to 'Master') 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 4751f23e506..b8a49794ddb 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf index 723b9f373a8..061a672841f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf index ad0274d8949..abe7c4f4697 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index e2428817d12..c3b42ad17d1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index 780249670f4..8202426d57a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf index a7a2ad0817e..9782fe667b1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index 9b92ecf32c5..14309c74720 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf index 231f83d7698..5eeaf319148 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf index d8c8dfaf9c6..d87d7c32136 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index 6d8b7b890fd..8fb0abd2bf4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index 9d301452cbd..d7aaee13582 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf index 2c6e5470fc7..be07912a17d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf index 9fcfa2a7d2f..a6f2c3b85c1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index e569f2f3869..3e40df866d0 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf index af9fb0aad47..f93051e8e6f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf index a8ad78e389a..b4bc7e38ad3 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf index bff1fea9143..2e6380813bf 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index bdc42c71220..789cfe1c713 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf index 81e77a84a4d..0ead2d7a733 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf new file mode 100644 index 00000000000..c07b2ea681b Binary files /dev/null and b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.tex new file mode 100644 index 00000000000..9cd42c4d295 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.tex @@ -0,0 +1,282 @@ +\documentclass[twoside]{article} +\usepackage{fontspec} +\usepackage{libertineotf} +\usepackage{polyglossia} +\setmainlanguage{latin} +\setotherlanguage{english} +\usepackage[series={},noend,nocritical,noeledsec,nofamiliar]{reledmac} +% CONFIG FANCYHDR TO SHOW LEFT/RIGHT MARKS IN HEADERS +\usepackage{fancyhdr} +\pagestyle{fancy} + +%% What to show in the header +\newcommand{\mymarks}{% + \ifdefstrequal{\leftmark}{\rightmark}% + {\rightmark}% + {\rightmark\ – \leftmark}% +} +%% Configure the header itself +\fancyhead[LE,RO]{} +\fancyhead[CE,CO]{\mymarks} +\fancyhead[LO,RE]{} + + +\def\sectionmark#1{}%Disable section marking + +\begin{document} + + +\begin{english} +\date{} +\title{Subdivision number inside the header} +\maketitle +\begin{abstract} + This file shows how to use the \verb+\doinsidethislinehook+ + command to use \verb+\markboth+ to add verse (sentence) numbers inside the headers. + + We can't call \verb+\markboth+ directly inside the \verb+pstart+…\verb+\pend+, because it creates trouble with vertical spacing. + + We show two examples: the first one add directly the verse number inside the source code, while the second use a counter to determine it automatically. + + To understand this example, you must be familiar with \LaTeX\ marking mechanism (\verb+\markboth+) and the \emph{fancyhdr} package. +\end{abstract} +\end{english} + +\begin{english} +\section{Manuel subdivision number} + +\begin{abstract} + In this example, the verse (sentence) number is typeset directly in the source code. + We wrap it in a \verb+\versenumber+ macro, which: + \begin{itemize} + \item typesets it with a bold fontface, followed by a dot; + \item uses \verb+\doinsidelinehook+ to call correctly \verb+\markboth+. + \end{itemize} +\end{abstract} +\end{english} + + +\newcommand{\versenumber}[1]{% + \doinsidethislinehook{\markboth{#1}{#1}}% + \textbf{#1}.% +} + +\beginnumbering +\pstart +\versenumber{1} Lorem ipsum dolor sit amet, consectetur adipiscing elit. +\versenumber{2} Morbi nec augue elit. +\versenumber{3} Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\versenumber{4} Morbi ultrices at magna et cursus. +\versenumber{5} Sed vel purus luctus, euismod erat in, fermentum orci. +\versenumber{6} Vivamus ac rutrum sapien, id ultricies augue. +\versenumber{7} Fusce sed rutrum lorem, ut auctor urna. +\versenumber{8} Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\versenumber{9} Nunc id tristique ipsum. +\versenumber{10} Quisque semper faucibus orci at eleifend. +\versenumber{11} Proin velit velit, sagittis nec consequat in, auctor eget tortor. +\versenumber{12} Pellentesque lorem elit, scelerisque id vulputate vel, faucibus a eros. +\versenumber{13} Nunc nec orci ullamcorper, sollicitudin magna id, maximus quam. +\versenumber{14} Pellentesque nec mauris purus. +\versenumber{15} Duis suscipit nunc vitae faucibus posuere. +\versenumber{16} Integer mattis varius cursus. +\versenumber{17} Proin risus diam, imperdiet sit amet sem sed, dapibus sodales quam. +\versenumber{18} Pellentesque bibendum sapien eu nisl efficitur placerat. +\versenumber{19} Aenean dignissim ante ac erat pharetra, non pellentesque ante sodales. +\versenumber{20} Nunc lorem nunc, elementum in accumsan id, blandit ac elit. +\versenumber{21} In rhoncus augue ex, quis tristique ex laoreet non. +\versenumber{22} Phasellus tincidunt, mauris nec auctor maximus, sapien elit elementum dolor. +\versenumber{23} Id pretium urna tortor sed purus. +\versenumber{24} Donec velit leo, varius ac dui eget, tincidunt euismod nibh. +\versenumber{25} Nulla facilisis sit amet leo et vehicula. +\versenumber{26} Morbi ultrices elementum nisi, ac semper neque faucibus non. +\versenumber{27} Curabitur et justo gravida eros consequat elementum. +\versenumber{28} Quisque eu consequat eros, vitae ullamcorper risus. +\versenumber{29} Nullam pellentesque id lectus a aliquet. +\versenumber{30} Cras rhoncus, arcu ut consequat ultricies, massa ante sollicitudin massa, vehicula ullamcorper quam libero vitae eros. +\versenumber{31} In dapibus arcu sed sem vehicula, ut imperdiet odio hendrerit. +\versenumber{32} Praesent nec diam turpis. +\versenumber{33} Vestibulum erat ante, maximus id pulvinar vitae, sagittis sed odio. +\versenumber{34} Pellentesque sit amet tellus aliquam, mattis purus a, consectetur turpis. +\versenumber{35} Praesent nunc magna, posuere ac faucibus eu, ullamcorper vel sem. +\versenumber{36} Aenean vel dolor eget felis malesuada molestie ac non justo. +\versenumber{37} Phasellus semper gravida mollis. +\versenumber{38} Mauris fermentum eget ex et eleifend. +\versenumber{39} Morbi sit amet cursus velit. +\versenumber{40} Ut efficitur, risus vel mattis ultrices, arcu metus scelerisque dui, eget semper dolor justo ac nisl. +\versenumber{41} Fusce euismod ultrices faucibus. +\versenumber{42} Vestibulum sit amet lacus dui. +\versenumber{43} Maecenas et nisi vel ex scelerisque dictum at vel nibh. +\versenumber{44} Morbi mattis quam ut congue elementum. +\versenumber{45} Etiam luctus ac metus id faucibus. +\versenumber{46} Nulla vulputate massa non tincidunt fringilla. +\versenumber{47} Praesent accumsan eget enim eu dapibus. +\versenumber{48} Nunc auctor, odio nec venenatis auctor, nibh sem efficitur sapien, ut mollis nunc nunc at massa. +\versenumber{49} Morbi vitae turpis iaculis, imperdiet quam vel, blandit purus. +\versenumber{50} Suspendisse lobortis dui et enim egestas, sed convallis dolor viverra. +\versenumber{51} Etiam mollis dolor nec laoreet facilisis. +\versenumber{52} Pellentesque fringilla mauris rhoncus pretium facilisis. +\versenumber{53} Quisque vitae posuere justo. +\versenumber{54} Quisque a rutrum elit. +\versenumber{55} In at pretium magna. +\versenumber{56} Morbi sed ullamcorper lectus. +\versenumber{57} Praesent ut rhoncus odio. +\versenumber{58} Cras a metus nisl. +\versenumber{59} Aliquam et congue nisi, viverra ultricies metus. +\versenumber{60} Duis fringilla laoreet nisi, at suscipit ex porttitor sed. +\versenumber{61} Mauris sit amet purus efficitur, euismod sem vitae, mattis neque. +\versenumber{62} Mauris pretium, turpis a suscipit pulvinar, est nunc lacinia lacus, at pulvinar nunc lacus in erat. +\versenumber{63} Lorem ipsum dolor sit amet, consectetur adipiscing elit. +\versenumber{64} Morbi nec augue elit. +\versenumber{65} Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\versenumber{66} Morbi ultrices at magna et cursus. +\versenumber{67} Sed vel purus luctus, euismod erat in, fermentum orci. +\versenumber{68} Vivamus ac rutrum sapien, id ultricies augue. +\versenumber{69} Fusce sed rutrum lorem, ut auctor urna. +\versenumber{70} Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\versenumber{71} posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\versenumber{72} Morbi ultrices at magna et cursus. +\versenumber{73} Sed vel purus luctus, euismod erat in, fermentum orci. +\versenumber{74} Vivamus ac rutrum sapien, id ultricies augue. +\versenumber{75} Fusce sed rutrum lorem, ut auctor urna. +\versenumber{76} Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\versenumber{77} Id pretium urna tortor sed purus. +\versenumber{78} Donec velit leo, varius ac dui eget, tincidunt euismod nibh. +\versenumber{79} Nulla facilisis sit amet leo et vehicula. +\versenumber{80} Morbi ultrices elementum nisi, ac semper neque faucibus non. +\versenumber{81} Curabitur et justo gravida eros consequat elementum. +\versenumber{82} Quisque eu consequat eros, vitae ullamcorper risus. +\versenumber{83} Nullam pellentesque id lectus a aliquet. +\versenumber{84} Cras rhoncus, arcu ut consequat ultricies, massa ante sollicitudin massa, vehicula ullamcorper quam libero vitae eros. +\versenumber{85} In dapibus arcu sed sem vehicula, ut imperdiet odio hendrerit. +\versenumber{86} Praesent nec diam turpis. +\versenumber{87} Vestibulum erat ante, maximus id pulvinar vitae, sagittis sed odio. +\pend +\endnumbering +\newpage + +\begin{english} +\section{Automatic verse number} + +\begin{abstract} + In this example, the verse (sentence) number is not typeset directly, but stored in a \LaTeX\ counter (whose name is \verb+verse+). + The \verb+\autoversenumber+ macro: + \begin{itemize} + \item increases the counter; + \item typesets it with a bold face, followed by a dot; + \item use \verb+\doinsidelinehook+ to call correctly \verb+\markboth+. + \end{itemize} + + The main problem is that, because of \emph{reledmac} mechanism, the lines are typeset after the \verb+\pend+, + at a time when the \verb+verse+ counter is already set to its maximal value. + Consequently, with the hack, the \verb+\markboth+ macro won't have set the marker to the correct value. + + However, we can solve this issue, because the argument of \verb+doinsidethislinehook+ is written in a auxiliary file + when it is read. + + Nevertheless, to write the correct value of the counter in the auxiliary file, we need to do some hacks with \TeX\'s expansion mechanism. + +\end{abstract} +\end{english} + +\newcounter{verse} +\newcommand{\autoversenumber}{% + \refstepcounter{verse}%Add 1 to the counter + \edef\tmp{\noexpand\markboth{\the\value{verse}}{\the\value{verse}}}%\tmp will be expanded to \markboth{}{ + \expandafter\doinsidethislinehook\expandafter{\tmp}%First, we expand \tmp to the value, and then, pass the result as argument to \doinsidelinehook + \textbf{\theverse}.\space%Typeset the verse counter value in bold, followed by a dot and then a space. +} + +\beginnumbering +\pstart +\autoversenumber Lorem ipsum dolor sit amet, consectetur adipiscing elit. +\autoversenumber Morbi nec augue elit. +\autoversenumber Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\autoversenumber Morbi ultrices at magna et cursus. +\autoversenumber Sed vel purus luctus, euismod erat in, fermentum orci. +\autoversenumber Vivamus ac rutrum sapien, id ultricies augue. +\autoversenumber Fusce sed rutrum lorem, ut auctor urna. +\autoversenumber Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\autoversenumber Nunc id tristique ipsum. +\autoversenumber Quisque semper faucibus orci at eleifend. +\autoversenumber Proin velit velit, sagittis nec consequat in, auctor eget tortor. +\autoversenumber Pellentesque lorem elit, scelerisque id vulputate vel, faucibus a eros. +\autoversenumber Nunc nec orci ullamcorper, sollicitudin magna id, maximus quam. +\autoversenumber Pellentesque nec mauris purus. +\autoversenumber Duis suscipit nunc vitae faucibus posuere. +\autoversenumber Integer mattis varius cursus. +\autoversenumber Proin risus diam, imperdiet sit amet sem sed, dapibus sodales quam. +\autoversenumber Pellentesque bibendum sapien eu nisl efficitur placerat. +\autoversenumber Aenean dignissim ante ac erat pharetra, non pellentesque ante sodales. +\autoversenumber Nunc lorem nunc, elementum in accumsan id, blandit ac elit. +\autoversenumber In rhoncus augue ex, quis tristique ex laoreet non. +\autoversenumber Phasellus tincidunt, mauris nec auctor maximus, sapien elit elementum dolor. +\autoversenumber Id pretium urna tortor sed purus. +\autoversenumber Donec velit leo, varius ac dui eget, tincidunt euismod nibh. +\autoversenumber Nulla facilisis sit amet leo et vehicula. +\autoversenumber Morbi ultrices elementum nisi, ac semper neque faucibus non. +\autoversenumber Curabitur et justo gravida eros consequat elementum. +\autoversenumber Quisque eu consequat eros, vitae ullamcorper risus. +\autoversenumber Nullam pellentesque id lectus a aliquet. +\autoversenumber Cras rhoncus, arcu ut consequat ultricies, massa ante sollicitudin massa, vehicula ullamcorper quam libero vitae eros. +\autoversenumber In dapibus arcu sed sem vehicula, ut imperdiet odio hendrerit. +\autoversenumber Praesent nec diam turpis. +\autoversenumber Vestibulum erat ante, maximus id pulvinar vitae, sagittis sed odio. +\autoversenumber Pellentesque sit amet tellus aliquam, mattis purus a, consectetur turpis. +\autoversenumber Praesent nunc magna, posuere ac faucibus eu, ullamcorper vel sem. +\autoversenumber Aenean vel dolor eget felis malesuada molestie ac non justo. +\autoversenumber Phasellus semper gravida mollis. +\autoversenumber Mauris fermentum eget ex et eleifend. +\autoversenumber Morbi sit amet cursus velit. +\autoversenumber Ut efficitur, risus vel mattis ultrices, arcu metus scelerisque dui, eget semper dolor justo ac nisl. +\autoversenumber Fusce euismod ultrices faucibus. +\autoversenumber Vestibulum sit amet lacus dui. +\autoversenumber Maecenas et nisi vel ex scelerisque dictum at vel nibh. +\autoversenumber Morbi mattis quam ut congue elementum. +\autoversenumber Etiam luctus ac metus id faucibus. +\autoversenumber Nulla vulputate massa non tincidunt fringilla. +\autoversenumber Praesent accumsan eget enim eu dapibus. +\autoversenumber Nunc auctor, odio nec venenatis auctor, nibh sem efficitur sapien, ut mollis nunc nunc at massa. +\autoversenumber Morbi vitae turpis iaculis, imperdiet quam vel, blandit purus. +\autoversenumber Suspendisse lobortis dui et enim egestas, sed convallis dolor viverra. +\autoversenumber Etiam mollis dolor nec laoreet facilisis. +\autoversenumber Pellentesque fringilla mauris rhoncus pretium facilisis. +\autoversenumber Quisque vitae posuere justo. +\autoversenumber Quisque a rutrum elit. +\autoversenumber In at pretium magna. +\autoversenumber Morbi sed ullamcorper lectus. +\autoversenumber Praesent ut rhoncus odio. +\autoversenumber Cras a metus nisl. +\autoversenumber Aliquam et congue nisi, viverra ultricies metus. +\autoversenumber Duis fringilla laoreet nisi, at suscipit ex porttitor sed. +\autoversenumber Mauris sit amet purus efficitur, euismod sem vitae, mattis neque. +\autoversenumber Mauris pretium, turpis a suscipit pulvinar, est nunc lacinia lacus, at pulvinar nunc lacus in erat. +\autoversenumber Lorem ipsum dolor sit amet, consectetur adipiscing elit. +\autoversenumber Morbi nec augue elit. +\autoversenumber Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\autoversenumber Morbi ultrices at magna et cursus. +\autoversenumber Sed vel purus luctus, euismod erat in, fermentum orci. +\autoversenumber Vivamus ac rutrum sapien, id ultricies augue. +\autoversenumber Fusce sed rutrum lorem, ut auctor urna. +\autoversenumber Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\autoversenumber posuere cubilia Curae; Quisque cursus eros a erat placerat, et tempus neque volutpat. +\autoversenumber Morbi ultrices at magna et cursus. +\autoversenumber Sed vel purus luctus, euismod erat in, fermentum orci. +\autoversenumber Vivamus ac rutrum sapien, id ultricies augue. +\autoversenumber Fusce sed rutrum lorem, ut auctor urna. +\autoversenumber Proin rutrum dignissim turpis, placerat pellentesque nulla elementum in. +\autoversenumber Id pretium urna tortor sed purus. +\autoversenumber Donec velit leo, varius ac dui eget, tincidunt euismod nibh. +\autoversenumber Nulla facilisis sit amet leo et vehicula. +\autoversenumber Morbi ultrices elementum nisi, ac semper neque faucibus non. +\autoversenumber Curabitur et justo gravida eros consequat elementum. +\autoversenumber Quisque eu consequat eros, vitae ullamcorper risus. +\autoversenumber Nullam pellentesque id lectus a aliquet. +\autoversenumber Cras rhoncus, arcu ut consequat ultricies, massa ante sollicitudin massa, vehicula ullamcorper quam libero vitae eros. +\autoversenumber In dapibus arcu sed sem vehicula, ut imperdiet odio hendrerit. +\autoversenumber Praesent nec diam turpis. +\autoversenumber Vestibulum erat ante, maximus id pulvinar vitae, sagittis sed odio. + +\pend +\endnumbering + +\end{document} 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 ddec45a6e84..40fa290946e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf index b58e4c9d668..58a26439e86 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf index ff5e16acbe5..e67ce0a986b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf index 9a6857ca0ec..105ba81ef93 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index 249700f3b69..05f22341de9 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index b76c349d6c6..2af2f7665c2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf index 5b127212d68..7eab5388205 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf index 2c54fade907..d6a3af73d10 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf index 8325e2502c0..1024210c4d3 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf index c45a896ccc2..499004f20ff 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf index ee953c13981..5f913df8977 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf index 346e22aedcf..6ecd9c0270d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf index 9e48e87b101..95a06a33b73 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 87e8141d83e..389c5a7ecc4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index a54d7d0696c..d9c9825fb23 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf index 9b146c5fe6f..30b250520ef 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index 0848fb3331e..5ff8cda4b8e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf index e0dc307a1a1..0f49d7efb7e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index d91a9f93b49..8e167d5a185 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf index 2c99f28fbf5..4674e591269 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index 07c0f37ba26..2151b65a594 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index b7496f486b8..3adfd5eca8c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index f04dec5c5f0..7f3f81a60e1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index 7f9ee9546fc..1c0b9305458 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf index 14d21bf635a..91d0d1bbe94 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index 016a802d532..8806058aac6 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index 36fa1300dc9..0f362375b32 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index df99c0eefa0..a68d499e7ba 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index c831474cc9c..ba5f27a5f23 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -514,6 +514,7 @@ % \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments} % \changes{v2.26.11}{2018/05/21}{Allow to use \protect\cs{edtext} inside \protect\cs{sameword}} % \changes{v2.26.12}{2018/07/19}{Precise minimal version of xparse package required.} +% \changes{v2.27.0}{2018/09/13}{Add \protect\cs{doinsidethislinehook}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -748,7 +749,7 @@ % \url{https://www.zotero.org/groups/209265/critical_editions_typeset_with_edmac_ledmac_eledmac_and_reledmac/}. % Please add your own edition made with (r)(e)ledmac. % -% If you write book or article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/1024519/}. +% If you write a book or an article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/1024519/}. % \section{How the package works --- the problem of the number of \LaTeX\ runs}\label{howto} % The \macpackage package is a three-pass package like \LaTeX\ itself. % Although your textual apparatus and line @@ -1250,6 +1251,29 @@ % The file \href{examples/2-line_numbers_in_header.tex}{examples/2-line\_numbers\_in\_header.tex} provides % an example for printing the first and last line numbers of a page in the header. % +% \section{Execution code at a specific line} +% Sometime, you want to execute a code at a precise point in the flow of your text. +% For example, if the current header of the page corresponds to the position inside the text, you may want to use \cs{markboth} (or similar) command. +% The main problem is that you need to execute \cs{markboth} when \macpackage\ typesets the text, and not when it reads it, because that could create damage with vertical spacing. +% +% \DescribeMacro{\doinsidethislinehook} +% The \cs{doinsidethislinehook}\marg{code} macro allows \meta{code} to be executed when the text is typeset. The \meta{code} will be executed in the line equivalent to the position of \cs{doinsidethislinehook} in the flow of the text. +% +% For example, with the following code: +% \begin{verbatim} +% \beginnumbering +% \pstart +% … +% 1.\doinsidelinehook{\markboth{1}{1}} a +% \pend +% \end{verbatim} +% \verb+\markboth{1}{1}+ will be executed at the line the \verb+1.+ will be typeset. +% The \meta{code} of \cs{doinsidethislinehook} will be executed only at the second run of \LaTeX. +% +% See the file +% \href{examples/2-subdivision-number-in-header.tex}{examples/2-subdivision-number-in-header.tex} for an example. +% Especially, the use of this command with \LaTeX\ counters is quite complex, but the example show you how to deal with this problem. +% % \section{Apparatus commands} % % \subsection{Terminology} @@ -1356,9 +1380,9 @@ % \DescribeMacro{\Cfootnote} % \DescribeMacro{\Dfootnote} % \DescribeMacro{\Efootnote} -% Five separate series of the footnotes are maintained; each macro +% Five separate series of footnotes are maintained; each macro % takes one argument like \protect\cs{Afootnote}\marg{text}. -% When all of the six +% When all of the five % are used, the \texttt{A} notes appear in a layer just below the main % text, followed by the rest in turn, down to the \texttt{E} notes at % the bottom. @@ -1373,8 +1397,8 @@ % \label{fulllines}The available options are: % \begin{itemize} % \item \verb|fulllines| to disable \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}). -% \item \verb|nonum| disables line numbering for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceoflemmaseparator} to set it (\reff{Xinplaceoflemmaseparator}). -% \item \verb|nosep| to disable the lemma separator for this note. +% \item \verb|nonum| disables line numbering for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceofnunber} to set it (\reff{Xinplaceofnumber}). +% \item \verb|nosep| to disable the lemma separator for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceoflemmaseparator} to set it (\reff{Xinplaceoflemmaseparator}). % \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note. % \end{itemize} % @@ -2274,7 +2298,7 @@ % \cs{Xendbeforesymlinenum} and \cs{Xendaftersymlinenum} are the equivalents of \cs{Xbeforesymlinenum} and \cs{Xaftersymlinenum} for the endnotes. % % \subsubsection{Space in place of number} -% \DescribeMacro{\Xinplaceofnumber} +% \DescribeMacro{\Xinplaceofnumber}\label{Xinplaceofnumber} % If no number or symbolic line number is printed, you can add a space, with \cs{Xinplaceofnumber}\oarg{s}\marg{l}. The default value is 1~em. % % \DescribeMacro{\Xendinplaceofnumber} \cs{Xendinplaceofnumber}\oarg{s}\marg{l} is the same, for critical endnotes. @@ -2907,7 +2931,6 @@ % \item \DescribeMacro{\AtEveryStopStanza} Use \cs{AtEveryStopStanza} to automatically add content after the end of stanzas (not in the same paragraph). % % Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryStopStanza} to avoid this \cs{noindent}. -% \item \DescribeMacro{\AtStartEveryStanza} Use \cs{AtStartEveryStanza} to automatically add content at the end of stanza (in the same paragraph). % \end{itemize} % % @@ -4192,7 +4215,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/07/19 v2.26.12 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/09/13 v2.27.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8905,9 +8928,11 @@ % \begin{macrocode} \hb@xt@ \linewidth{% % \end{macrocode} -% User hook. +% User hooks. % \begin{macrocode} \do@insidelinehook% + \csuse{insidethis@\the\absline@num @\the\section@num}% + \global\csundef{insidethis@\the\absline@num @\the\section@num}% % \end{macrocode} % Left line number % \begin{macrocode} @@ -9042,6 +9067,33 @@ \newcommand*{\dolinehook}[1]{\gdef\do@linehook{#1}}% \newcommand*{\doinsidelinehook}[1]{\gdef\do@insidelinehook{#1}}% +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\doinsidethislinehook} +% \begin{macro}{\@insidethisline} +% The \cs{doinsidethislinehook} can be called directly in the main flood of a text. +% It will define a hook executed at a specific line, determined by the position of the command in the flood of the text. +% \begin{macrocode} +\newcommand{\doinsidethislinehook}[1]{% + \leavevmode%In case it begins with a \pstart, ensure the \@insidethisline is written after \@nl + \ifledRcol% + \write\linenum@outR{\string\@insidethisline[\unexpanded{#1}]}% + \else% + \write\linenum@out{\string\@insidethisline[\unexpanded{#1}]}% + \fi% +}% +% \end{macrocode} +% The auxiliary files command just store the information to be executed +% when typesseting the specific line. +% \begin{macrocode} +\newcommand{\@insidethisline}[1]{% + \ifledRcol% + \csgappto{insidethisR@\the\absline@numR @\the\section@numR}{#1}% + \else% + \csgappto{insidethis@\the\absline@num @\the\section@num}{#1}% + \fi% +}% % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 18c80baaeae..51dc236a986 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -334,6 +334,7 @@ % \changes{v2.21.8}{2018/05/02}{Fix bug with marginal line number in parallel typesetting when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.} % \changes{v2.21.8}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file} % \changes{v2.21.9}{2018/07/19}{Fix (little) bug when using \protect\package{calc} package.} +% \changes{v2.22.0}{2018/09/13}{Compatibility with \protect\cs{doinsidethislinehook} macro.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -649,8 +650,8 @@ % % You must use \cs{endnumbering} in a right column in the following cases: % \begin{itemize} -% \item there is also a \cs{endnumbering} in the left column, because the line numbering ends with a two columns mode (for ex. at the end of a document); -% \item there will be a \cs{endnumbering} in a text after the columns, in a single column mode, because the ligne numbering finish with single column mode text. +% \item there is also a \cs{endnumbering} in the left column, because the line numbering ends with a two columns mode (e.g. at the end of a document); +% \item there will be a \cs{endnumbering} in a text after the columns, in a single column mode, because the ligne numbering finishes with single column mode text. % \end{itemize} % Without this, you will % get wrong numbering when a right column reappears next time. @@ -1382,7 +1383,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/07/19 v2.21.9 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/09/13 v2.22.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -4033,6 +4034,8 @@ \add@apparatusL% \l@dlsn@te% \do@insidelineLhook% + \csuse{insidethis@\the\absline@num @\the\section@num}% + \global\csundef{insidethis@\the\absline@num @\the\section@num}% \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% \ifluatex% \textdir\l@luatextextdir@L% @@ -4226,6 +4229,7 @@ \add@apparatusR% \l@dlsn@te% \do@insidelineRhook% + \global\csundef{insidethisR@\the\absline@numR @\the\section@numR}% \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{% \new@lineR% \inserthangingsymbolR% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 1896e88fd4a..6c8ca37d838 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/07/19 v2.26.12 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/09/13 v2.27.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -2074,6 +2074,8 @@ \affixpstart@num% \hb@xt@ \linewidth{% \do@insidelinehook% + \csuse{insidethis@\the\absline@num @\the\section@num}% + \global\csundef{insidethis@\the\absline@num @\the\section@num}% \l@dld@ta% \if@firstlineofpage% \set@Xtxtbeforenotes% @@ -2141,6 +2143,21 @@ \newcommand*{\dolinehook}[1]{\gdef\do@linehook{#1}}% \newcommand*{\doinsidelinehook}[1]{\gdef\do@insidelinehook{#1}}% +\newcommand{\doinsidethislinehook}[1]{% + \leavevmode%In case it begins with a \pstart, ensure the \@insidethisline is written after \@nl + \ifledRcol% + \write\linenum@outR{\string\@insidethisline[\unexpanded{#1}]}% + \else% + \write\linenum@out{\string\@insidethisline[\unexpanded{#1}]}% + \fi% +}% +\newcommand{\@insidethisline}[1]{% + \ifledRcol% + \csgappto{insidethisR@\the\absline@numR @\the\section@numR}{#1}% + \else% + \csgappto{insidethis@\the\absline@num @\the\section@num}{#1}% + \fi% +}% \newcommand*{\l@demptyd@ta}{% \gdef\l@dld@ta{}% \gdef\l@drd@ta{}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index e08cc045e2c..3e1dca729c2 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/07/19 v2.21.9 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/09/13 v2.22.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1296,6 +1296,8 @@ \add@apparatusL% \l@dlsn@te% \do@insidelineLhook% + \csuse{insidethis@\the\absline@num @\the\section@num}% + \global\csundef{insidethis@\the\absline@num @\the\section@num}% \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% \ifluatex% \textdir\l@luatextextdir@L% @@ -1436,6 +1438,7 @@ \add@apparatusR% \l@dlsn@te% \do@insidelineRhook% + \global\csundef{insidethisR@\the\absline@numR @\the\section@numR}% \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{% \new@lineR% \inserthangingsymbolR% -- cgit v1.2.3