From c65913468995f3769a911d824a76b042b8eace47 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Jul 2015 21:22:46 +0000 Subject: reledmac (28jul15) git-svn-id: svn://tug.org/texlive/trunk@37985 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reledmac/README | 2 +- .../doc/latex/reledmac/doc-include/migrate-mac.dtx | 8 +- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17291 -> 17240 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 20226 -> 20195 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21111 -> 21109 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17358 -> 17357 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 17612 -> 17609 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20902 -> 20903 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 19893 -> 19897 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17093 -> 17089 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31603 -> 31600 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 26000 -> 25999 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23191 -> 23147 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22800 -> 22796 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17140 -> 17140 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26221 -> 26219 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12224 -> 12223 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 39708 -> 39708 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23160 -> 23164 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 18431 -> 18430 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21170 -> 21173 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29587 -> 29592 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36483 -> 36485 bytes ...ar_page_titles_in_line_numbering_with_notes.pdf | Bin 31711 -> 31714 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 59060 -> 59059 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22718 -> 22718 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18991 -> 18941 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22222 -> 22219 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16239 -> 16237 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 81998 -> 76837 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 816468 -> 1010680 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 328034 -> 395916 bytes .../texmf-dist/source/latex/reledmac/migration.dtx | 35 +- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 3445 ++++++++++---------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 1322 ++++---- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 7 +- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 97 +- 37 files changed, 2512 insertions(+), 2404 deletions(-) diff --git a/Master/texmf-dist/doc/latex/reledmac/README b/Master/texmf-dist/doc/latex/reledmac/README index 0e221822b56..c16581a579a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/README +++ b/Master/texmf-dist/doc/latex/reledmac/README @@ -89,7 +89,7 @@ Help - [Users list](http://geekographie.maieul.net/146) - [StackExchange](https://tex.stackexchange.com/questions/tagged/reledmac), see also the older tags - (https://tex.stackexchange.com/questions/tagged/rledmac) and + (https://tex.stackexchange.com/questions/tagged/eledmac) and (https://tex.stackexchange.com/questions/tagged/ledmac) Debug and feature requests diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx index dbd113e2e54..56501c3fa34 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx +++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx @@ -219,12 +219,12 @@ % \subsubsection{Risk of `no room for a new'} % The risk to obtain a `no room for a new something' error is greater in \reledmac than it is in \eledmac. See \reff{noroom} in order to know how to limit it. % \subsubsection{Multiple indices with memoir} -% \Eledmac and \ledmac used the specific indexing tools of the \Lclass{memoir} class designed to produce multiple indices. -% However, \eledmac could also use \Lpack{imakeidx} or \Lpack{indextools} tools independently of the \Lclass{memoir} class. +% \Eledmac and \ledmac used the specific indexing tools of the \ltxclass{memoir} class designed to produce multiple indices. +% However, \eledmac could also use \package{imakeidx} or \package{indextools} tools independently of the \ltxclass{memoir} class. % This system forced to maintain redundant code. -% Since \reledmac, we use only the \Lpack{imakeidx} or \Lpack{indextools} tools. +% Since \reledmac, we use only the \package{imakeidx} or \package{indextools} tools. % -% Consequently: Users of \Lpack{memoir}are invited to use \Lpack{indextool} or \Lpack{imakeidx} to produce multiple indices. +% Consequently: Users of \package{memoir}are invited to use \package{indextool} or \package{imakeidx} to produce multiple indices. % \subsubsection{Deprecated commands and options} %The table of deprecated commands and their alternatives follows. 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 b60baf1f229..8a8604cfd79 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 7115c404e5e..a235953639f 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 a8dc197cec1..f2af8d64ae8 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.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index e40c7c3caa5..4a4091a8044 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 1d6dafa2ff5..6ccde05f794 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 16bc01759a0..2821b43ed97 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-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index 9cc042b84ec..622b82951de 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 99e9aca685a..dd02d9f4fcd 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 2c1efb77b55..fbbced43207 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-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf index 8470bb06d2c..9364bab3c4a 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 2f6c9502705..bf753a0df96 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-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 45fa6ef2a4b..71057c6e2ec 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 03c551bfecc..e035cf10392 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 2ddc3cfa12d..a3fbad371f1 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 354ec9b0282..2656d890dc8 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 2a8ea5544b3..50785f17a26 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 266662b8159..7759b0306e8 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/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 3eb5c8c7fcf..8ef07b8e490 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 27538ca738f..9603c356020 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 f2fcdf18c34..ddb0e7e9a99 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_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 36bca2c23f6..bdb78c7c2fa 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_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 index ddd5ec9f192..4ab391c7777 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.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 95bf8bd87c9..cb37f87ad8d 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 823855f4c64..9e6148b10d3 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 1388a46e87a..f8c3b6de5fb 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_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index 970637a39c1..3d102060d29 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 ce85b4d927b..efabdb4a9db 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 56700782f80..c81a0623c6c 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 5354e549cea..eab74755fd1 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 f32a9183c30..8aba02a8234 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/migration.dtx b/Master/texmf-dist/source/latex/reledmac/migration.dtx index 7d26165e23c..0823da6cf68 100644 --- a/Master/texmf-dist/source/latex/reledmac/migration.dtx +++ b/Master/texmf-dist/source/latex/reledmac/migration.dtx @@ -32,6 +32,7 @@ ]{hyperref} \usepackage[mono=false]{libertine} \usepackage{reledmac} +\usepackage{doctools} \usepackage[english]{babel} \usepackage{xspace} \usepackage{graphicx,metalogo} @@ -39,28 +40,26 @@ \pagestyle{headings} \setcounter{StandardModuleDepth}{1} \usepackage{longtable} - \newcommand{\Lpack}[1]{\textsf{#1}} - \newcommand{\Lclass}[1]{\textsf{#1}} - \newcommand{\file}[1]{\texttt{#1}} - \newcommand{\edmac}{\Lpack{edmac}\xspace} - \newcommand{\tabmac}{\Lpack{tabmac}\xspace} - \newcommand{\edstanza}{\Lpack{edstanza}\xspace} - \newcommand{\ledmac}{\Lpack{ledmac}\xspace} - \newcommand{\Ledmac}{\Lpack{Ledmac}\xspace} - \newcommand{\ledpar}{\Lpack{ledpar}\xspace} - \newcommand{\Ledpar}{\Lpack{Ledpar}\xspace} + \newcommand{\edmac}{\protect\package{edmac}\xspace} + \newcommand{\tabmac}{\protect\package{tabmac}\xspace} + \newcommand{\edstanza}{\protect\package{edstanza}\xspace} + \newcommand{\ledmac}{\protect\package{ledmac}\xspace} + \newcommand{\Ledmac}{\protect\package{Ledmac}\xspace} + \newcommand{\ledpar}{\protect\package{ledpar}\xspace} + \newcommand{\Ledpar}{\protect\package{Ledpar}\xspace} - \newcommand{\eledmac}{\Lpack{eledmac}\xspace} - \newcommand{\Eledmac}{\Lpack{Eledmac}\xspace} - \newcommand{\eledpar}{\Lpack{eledpar}\xspace} - \newcommand{\Eledpar}{\Lpack{Eledpar}\xspace} - \newcommand{\reledmac}{\Lpack{reledmac}\xspace} - \newcommand{\Reledmac}{\Lpack{Reledmac}\xspace} - \newcommand{\reledpar}{\Lpack{reledpar}\xspace} - \newcommand{\Reledpar}{\Lpack{Reledpar}\xspace} + \newcommand{\eledmac}{\protect\package{eledmac}\xspace} + \newcommand{\Eledmac}{\protect\package{Eledmac}\xspace} + \newcommand{\eledpar}{\protect\package{eledpar}\xspace} + \newcommand{\Eledpar}{\protect\package{Eledpar}\xspace} + + \newcommand{\reledmac}{\protect\package{reledmac}\xspace} + \newcommand{\Reledmac}{\protect\package{Reledmac}\xspace} + \newcommand{\reledpar}{\protect\package{reledpar}\xspace} + \newcommand{\Reledpar}{\protect\package{Reledpar}\xspace} \let\macpackage\reledmac \let\parpackage\reledpar diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index a505563df99..7d730d1ccd7 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -29,10 +29,12 @@ % hyperindex=true hyperindex=false ]{hyperref} +\addtolength\marginparwidth{30pt} \usepackage[mono=false]{libertine} \usepackage[series={A,B},noend,noeledsec,nofamiliar]{reledmac} \usepackage[english]{babel} \usepackage{xspace} +\usepackage{doctools} \usepackage{graphicx,metalogo} % Index and Changelog in one column \makeatletter @@ -66,7 +68,6 @@ % \fi % % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} -% \CheckSum{11656} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -150,35 +151,32 @@ % \my@changes#1.\@nil % }% %\makeatother -% \newcommand{\Lpack}[1]{\textsf{#1}} -% \newcommand{\Lclass}[1]{\textsf{#1}} -% \newcommand{\file}[1]{\texttt{#1}} -% \newcommand{\edmac}{\Lpack{edmac}\xspace} -% \newcommand{\tabmac}{\Lpack{tabmac}\xspace} -% \newcommand{\edstanza}{\Lpack{edstanza}\xspace} +% \newcommand{\edmac}{\protect\package{edmac}\xspace} +% \newcommand{\tabmac}{\protect\package{tabmac}\xspace} +% \newcommand{\edstanza}{\protect\package{edstanza}\xspace} -% \newcommand{\ledmac}{\Lpack{ledmac}\xspace} -% \newcommand{\Ledmac}{\Lpack{Ledmac}\xspace} -% \newcommand{\ledpar}{\Lpack{ledpar}\xspace} -% \newcommand{\Ledpar}{\Lpack{Ledpar}\xspace} +% \newcommand{\ledmac}{\protect\package{ledmac}\xspace} +% \newcommand{\Ledmac}{\protect\package{Ledmac}\xspace} +% \newcommand{\ledpar}{\protect\package{ledpar}\xspace} +% \newcommand{\Ledpar}{\protect\package{Ledpar}\xspace} -% \newcommand{\eledmac}{\Lpack{eledmac}\xspace} -% \newcommand{\Eledmac}{\Lpack{Eledmac}\xspace} -% \newcommand{\eledpar}{\Lpack{eledpar}\xspace} -% \newcommand{\Eledpar}{\Lpack{Eledpar}\xspace} +% \newcommand{\eledmac}{\protect\package{eledmac}\xspace} +% \newcommand{\Eledmac}{\protect\package{Eledmac}\xspace} +% \newcommand{\eledpar}{\protect\package{eledpar}\xspace} +% \newcommand{\Eledpar}{\protect\package{Eledpar}\xspace} -% \newcommand{\reledmac}{\Lpack{reledmac}\xspace} -% \newcommand{\Reledmac}{\Lpack{Reledmac}\xspace} -% \newcommand{\reledpar}{\Lpack{reledpar}\xspace} -% \newcommand{\Reledpar}{\Lpack{Reledpar}\xspace} +% \newcommand{\reledmac}{\protect\package{reledmac}\xspace} +% \newcommand{\Reledmac}{\protect\package{Reledmac}\xspace} +% \newcommand{\reledpar}{\protect\package{reledpar}\xspace} +% \newcommand{\Reledpar}{\protect\package{Reledpar}\xspace} % \let\macpackage\reledmac % \let\parpackage\reledpar % \let\Macpackage\reledmac % \let\Parpackage\reledpar -% \newcommand{\texbook}{\textit{TeXbook}} -% \newcommand{\thetexbook}{\textit{The TeXbook}} +% \newcommand{\texbook}{\textit{TeXbook}\xspace} +% \newcommand{\thetexbook}{\textit{The TeXbook}\xspace} % % \newcommand{\egstart}{% % \par @@ -204,24 +202,24 @@ % \changes{v0.6.0}{2004/11/16}{Prepared for eledpar package} % \changes{v0.6.0}{2004/12/10}{Fixed minor typos} % \changes{v0.7.0}{2005/02/18}{Tidying up for eledpar and ledarab packages} -% \changes{v0.7.0}{2005/02/18}{Replaced all \cs{interAfootnotelinepenalty}, etc., -% by just \cs{interfootnotelinepenalty}} +% \changes{v0.7.0}{2005/02/18}{Replaced all \protect\cs{interAfootnotelinepenalty}, etc., +% by just \protect\cs{interfootnotelinepenalty}} % \changes{v0.7.0}{2005/03/02}{eledmac having been available for 2 years, % deleted the commented out original edmac texts} % \changes{v0.7.0}{2011/06/17}{Ma\"ieul Rouquette new maintainer} % \changes{v0.8.0}{2011/17/06}{Bug on endnotes fixed: in a // text, all endnotes will print and be placed at the ends of columns (!)} -% \changes{v0.8.1}{2011/07/14}{Bug on \cs{edtext} ; \cs{critex} ; \cs{lemma} fixed: we can now us non-switching commands} +% \changes{v0.8.1}{2011/07/14}{Bug on \protect\cs{edtext} ; \protect\cs{critex} ; \protect\cs{lemma} fixed: we can now us non-switching commands} % \changes{v0.9.0}{2011/08/03}{No more ledpatch. All patches are now in the main file.} % \changes{v0.9.1}{2011/08/08}{Fix some bugs linked to integrating ledpatch on the main file.} -% \changes{v0.10.0}{2011/08/22}{Corrections to \cs{section} and other titles in numbered sections} -% \changes{v0.11.0}{2011/09/16}{Makes it possible to add a symbol on each verse's hanging, as in French typography. Redefines the command \cs{hangingsymbol} to define the character.} -% \changes{v0.12.0}{2011/10/01}{Possibility to number the pstart with the commands \cs{numberpstarttrue}.} -% \changes{v0.12.0}{2011/10/01}{For compatibility with eledpar, possibility to use \cs{autopar} on the right side.} -% \changes{v0.12.1}{2011/10/02}{The numbering of \cs{pstarts} restarts on each \cs{beginnumbering}.} -% \changes{v0.12.1}{2011/10/02}{Don't number \cs{pstarts} of stanza.} +% \changes{v0.10.0}{2011/08/22}{Corrections to \protect\cs{section} and other titles in numbered sections} +% \changes{v0.11.0}{2011/09/16}{Makes it possible to add a symbol on each verse's hanging, as in French typography. Redefines the command \protect\cs{hangingsymbol} to define the character.} +% \changes{v0.12.0}{2011/10/01}{Possibility to number the pstart with the commands \protect\cs{numberpstarttrue}.} +% \changes{v0.12.0}{2011/10/01}{For compatibility with eledpar, possibility to use \protect\cs{autopar} on the right side.} +% \changes{v0.12.1}{2011/10/02}{The numbering of \protect\cs{pstarts} restarts on each \protect\cs{beginnumbering}.} +% \changes{v0.12.1}{2011/10/02}{Don't number \protect\cs{pstarts} of stanza.} % \changes{v0.13.0}{2011/11/08}{New stanzaindentsrepetition counter: to repeat stanza indents every \emph{n} verses.} -% \changes{v0.13.1}{2011/11/18}{\cs{thepstartL} and \cs{thepstartR} use now \cs{bfseries} and not \cs{bf}, which is deprecated and makes conflicts with memoir class.} -% \changes{v0.14.0}{2012/04/04}{Tweaked \cs{edlabel} to get correct line number if the command is first element of a paragraph.} +% \changes{v0.13.1}{2011/11/18}{\protect\cs{thepstartL} and \protect\cs{thepstartR} use now \protect\cs{bfseries} and not \protect\cs{bf}, which is deprecated and makes conflicts with memoir class.} +% \changes{v0.14.0}{2012/04/04}{Tweaked \protect\cs{edlabel} to get correct line number if the command is first element of a paragraph.} % \changes{v1.0.0}{2012/09/15}{Some compatibility break with eledmac. Change of name: eledmac.} % \changes{v1.1.0}{2012/09/25}{New package option: parapparatus.} % \changes{v1.4.0}{2012/11/16}{Compatibility with LuaTeX of RTL notes.} @@ -236,81 +234,83 @@ % \changes{v1.8.0}{2013/12/13}{Compatibility with parledgroup option of eledpar package.} % \changes{v1.8.2}{2014/01/31}{Debug compatibility problem with hebrew option of babel package.} % \changes{v1.8.3}{2014/02/03}{Fixes spurious spaces added by v1.7.0.} -% \changes{v1.10.0}{2014/02/27}{Add \cs{pstartref} and \cs{xpstartref} to refer to a pstart number (extension of \cs{edlabel}).} +% \changes{v1.10.0}{2014/02/27}{Add \protect\cs{pstartref} and \protect\cs{xpstartref} to refer to a pstart number (extension of \protect\cs{edlabel}).} % \changes{v1.10.1}{2014/02/28}{Compatibility with \textsf{cleveref}.} % \changes{v1.10.2}{2014/03/17}{Compatibility of stanza with v1.8a of babel-greek.} % \changes{v1.10.3}{2014/04/07}{Debug of cross-referencing.} % \changes{v1.10.4}{2014/04/09}{Debug of critical notes in edtabular environnment.} -% \changes{v1.10.5}{2014/04/14}{Debug of \cs{xxref}.} -% \changes{v1.10.5}{2014/04/14}{Debug of \cs{pausenumbering}.} -% \changes{v1.10.6}{2014/05/01}{Debug of interaction between \cs{autopar} and\cs{pausenumbering}.} +% \changes{v1.10.5}{2014/04/14}{Debug of \protect\cs{xxref}.} +% \changes{v1.10.5}{2014/04/14}{Debug of \protect\cs{pausenumbering}.} +% \changes{v1.10.6}{2014/05/01}{Debug of interaction between \protect\cs{autopar} and\protect\cs{pausenumbering}.} % \changes{v1.11.1}{2014/05/29}{Correct a bug when a critical note starts with plus or minus.} -% \changes{v1.12.0}{2014/08/05}{Compatibility with \Lpack{musixtex}.} -% \changes{v1.12.0}{2014/08/05}{Debug eledmac sectioning command after using \cs{resumenumbering}.} -% \changes{v1.12.3}{2014/08/15}{Underline lemma in \cs{eledxxx} when using draft mode.} +% \changes{v1.12.0}{2014/08/05}{Compatibility with \protect\package{musixtex}.} +% \changes{v1.12.0}{2014/08/05}{Debug eledmac sectioning command after using \protect\cs{resumenumbering}.} +% \changes{v1.12.3}{2014/08/15}{Underline lemma in \protect\cs{eledxxx} when using draft mode.} % \changes{v1.12.3}{2014/08/15}{Correct bug with side and familiar notes in tabular environments.} % \changes{v1.12.3}{2014/08/15}{Debug left and right notes (bugs added by 1.12.0)} -% \changes{v1.12.3}{2014/08/15}{Debug \cs{eledxxx} with some paper size} -% \changes{v1.12.4}{2014/08/25}{Debug spurious page breaks before \cs{chapter} (bug added in 1.12.0)} -% \changes{v1.13.1}{2014/09/25}{Debug quotation environment inside of a \cs{pstart} preceded by a sectioning command.} +% \changes{v1.12.3}{2014/08/15}{Debug \protect\cs{eledxxx} with some paper size} +% \changes{v1.12.4}{2014/08/25}{Debug spurious page breaks before \protect\cs{chapter} (bug added in 1.12.0)} +% \changes{v1.13.1}{2014/09/25}{Debug quotation environment inside of a \protect\cs{pstart} preceded by a sectioning command.} % \changes{v1.13.1}{2014/09/25}{Coming back of page and line breaking penalties's management, deleted by error in v0.17.} % \changes{v1.13.2}{2014/09/30}{Fix bug with normal footnotes, added by v1.13.0.} % \changes{v1.13.3}{2014/10/04}{Fix extra spaces with paragraphed footnotes, added by v1.13.0.} % \changes{v1.13.4}{2014/10/20}{Fix bug with index when memoir class is used without hyperref} % \changes{v1.15.0}{2015/01/12}{Fix bug with footnotes layout when using some options of the geometry package (bug add by v1.13.0).} % \changes{v1.16.0}{2015/01/23}{Compatibility of standard footnotes with some biblatex styles.} -% \changes{v1.16.0}{2015/01/23}{New \cs{stanzaindent} command.} +% \changes{v1.16.0}{2015/01/23}{New \protect\cs{stanzaindent} command.} % \changes{v1.18.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.} -% \changes{v1.19.0}{2015/03/06}{\cs{Xmaxhnotes} and \cs{maxhnotesX} work now for both two-columns and three-columns setting.} -% \changes{v1.19.0}{2015/03/06}{Compatibility with \Lpack{eledpar} v.1.13.0.} -% \changes{v1.19.1}{2015/03/12}{Call \cs{correct@footinsX@box} and \cs{correct@Xfootins@box} directly in \cs{print@notesX@forpages} and \cs{print@Xnotes@forpages}, that is in \Lpack{eledpar}.} -% \changes{v1.20.0}{2015/03/22}{Correct \cs{Xinplaceofnumber} hook.} +% \changes{v1.19.0}{2015/03/06}{\protect\cs{Xmaxhnotes} and \protect\cs{maxhnotesX} work now for both two-columns and three-columns setting.} +% \changes{v1.19.0}{2015/03/06}{Compatibility with \protect\package{eledpar} v.1.13.0.} +% \changes{v1.19.1}{2015/03/12}{Call \protect\cs{correct@footinsX@box} and \protect\cs{correct@Xfootins@box} directly in \protect\cs{print@notesX@forpages} and \protect\cs{print@Xnotes@forpages}, that is in \protect\package{eledpar}.} +% \changes{v1.20.0}{2015/03/22}{Correct \protect\cs{Xinplaceofnumber} hook.} % \changes{v1.20.0}{2015/03/22}{Add series option.} % \changes{v1.20.0}{2015/03/22}{Fix issues with RTL text in notes when using \LuaLaTeX.} -% \changes{v1.20.0}{2015/03/22}{The \cs{newif}s are not followed by boolean values set to false, because it is the \TeX\ default setting.} -% \changes{v1.20.0}{2015/03/22}{Explicit error message when calling \cs{Xfootnote} outside of \cs{edtext}.} -% \changes{v1.20.0}{2015/03/22}{Fix bug with line number typesetting direction when using \cs{eledsection} and similar commands for RTL texts with \LuaLaTeX.} -% \changes{v1.21.0}{2015/04/13}{\cs{AtEveryPstart} and \cs{AtEveryPend} are now compatible with \cs{autopar}} +% \changes{v1.20.0}{2015/03/22}{The \protect\cs{newif}s are not followed by boolean values set to false, because it is the \TeX\ default setting.} +% \changes{v1.20.0}{2015/03/22}{Explicit error message when calling \protect\cs{Xfootnote} outside of \protect\cs{edtext}.} +% \changes{v1.20.0}{2015/03/22}{Fix bug with line number typesetting direction when using \protect\cs{eledsection} and similar commands for RTL texts with \LuaLaTeX.} +% \changes{v1.21.0}{2015/04/13}{\protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} are now compatible with \protect\cs{autopar}} % \changes{v1.21.0}{2015/04/13}{Fix bug with space between columns with notes in two columns (bug added in v1.13.0).} % \changes{v1.21.0}{2015/04/13}{Add nocritical, noend, nofamiliar and noledgroup options.} -% \changes{v1.21.0}{2015/04/13}{Fix bug with \cs{maxhnotesX} when using \cs{foottwocolX} or \cs{footthreecolX}.} -% \changes{v1.21.0}{2015/04/13}{Add \cs{Xtwolinesbutnotmore} and \cs{Xtwolinesonlyinsamepage}.} -% \changes{v1.21.0}{2015/04/13}{Fix bug when a \cs{Xfootnote} follows a \cs{Xendnote} in the second argument of \cs{edtext} (bug added in eledmac 1.0.0 !).} +% \changes{v1.21.0}{2015/04/13}{Fix bug with \protect\cs{maxhnotesX} when using \protect\cs{foottwocolX} or \protect\cs{footthreecolX}.} +% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xtwolinesbutnotmore} and \protect\cs{Xtwolinesonlyinsamepage}.} +% \changes{v1.21.0}{2015/04/13}{Fix bug when a \protect\cs{Xfootnote} follows a \protect\cs{Xendnote} in the second argument of \protect\cs{edtext} (bug added in eledmac 1.0.0 !).} % \changes{v1.21.0}{2015/04/13}{Add noeledsec package option} % \changes{v1.21.0}{2015/04/13}{parapparatus option works now with familiar footnotes.} -% \changes{v1.21.0}{2015/04/13}{Add \cs{beforenotesX} and \cs{Xbeforenotes} features for notes set in two and three column.} -% \changes{v1.21.0}{2015/04/13}{Debug \cs{beforenotesX} \cs{maxhnotesX} \cs{noteswidthliketwocolumnsX} and \cs{afterruleX} with footnotes set in two and three columns.} -% \changes{v1.21.0}{2015/04/13}{\cs{Xafterrule} and \cs{afterruleX} features no longer create problems of overflowing at the bottom of the page.} -% \changes{v1.21.0}{2015/04/13}{\cs{preXnotes} and \cs{prenotesX} features no longer create problems of overflowing at the bottom of the page.} -% \changes{v1.21.0}{2015/04/13}{Fix spurious space after first page number in \cs{doendnotes}. oldprintnpnumspace option allows to come back to previous setting} -% \changes{v1.21.0}{2015/04/13}{\cs{chapter} inside optional argument of \cs{pstart} works when typesetting parallel pages} -% \changes{v1.22.0}{2015/04/25}{When using hyperref package, internal links in index or with \cs{edlineref} are now targeted to the top and not longer to the bottom of the lines they refer to.} +% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{beforenotesX} and \protect\cs{Xbeforenotes} features for notes set in two and three column.} +% \changes{v1.21.0}{2015/04/13}{Debug \protect\cs{beforenotesX} \protect\cs{maxhnotesX} \protect\cs{noteswidthliketwocolumnsX} and \protect\cs{afterruleX} with footnotes set in two and three columns.} +% \changes{v1.21.0}{2015/04/13}{\protect\cs{Xafterrule} and \protect\cs{afterruleX} features no longer create problems of overflowing at the bottom of the page.} +% \changes{v1.21.0}{2015/04/13}{\protect\cs{preXnotes} and \protect\cs{prenotesX} features no longer create problems of overflowing at the bottom of the page.} +% \changes{v1.21.0}{2015/04/13}{Fix spurious space after first page number in \protect\cs{doendnotes}. oldprintnpnumspace option allows to come back to previous setting} +% \changes{v1.21.0}{2015/04/13}{\protect\cs{chapter} inside optional argument of \protect\cs{pstart} works when typesetting parallel pages} +% \changes{v1.22.0}{2015/04/25}{When using hyperref package, internal links in index or with \protect\cs{edlineref} are now targeted to the top and not longer to the bottom of the lines they refer to.} % \changes{v1.22.0}{2015/04/25}{Provides support for xindy.} % \changes{v1.22.0}{2015/04/25}{Adds hyperlink for references to notes in indices.} % \changes{v1.22.0}{2015/04/25}{Fix conflict between noend package option and edtabularx environments} -% \changes{v1.22.1}{2015/04/29}{Fix bug (added on v1.22.0) with \cs{Xinplaceofnumber} hook.} +% \changes{v1.22.1}{2015/04/29}{Fix bug (added on v1.22.0) with \protect\cs{Xinplaceofnumber} hook.} % \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.} -% \changes{v1.23.0}{2015/05/18}{Fix error of \cs{iftrue} not closed.} -% \changes{v1.23.0}{2015/05/18}{Allow use of \cs{sameword} with inputenc managing of UTF-8.} -% \changes{v1.23.0}{2015/05/18}{Error message when using \cs{beginnumbering}…\cs{endnumbering} without \cs{pstart}.} +% \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.} +% \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.} +% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}…\protect\cs{endnumbering} without \protect\cs{pstart}.} % \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.} -% \changes{v1.23.0}{2015/05/18}{Fix bug with \cs{skipnumbering} called immediately after a \cs{pstart}.} -% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \cs{skipnumbering} (bug added on v1.21.0).} -% \changes{v1.23.1}{2015/05/20}{Fix bug with \cs{lemma} command in the right side.} +% \changes{v1.23.0}{2015/05/18}{Fix bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.} +% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).} +% \changes{v1.23.1}{2015/05/20}{Fix bug with \protect\cs{lemma} command in the right side.} % \changes{v1.23.2}{2015/05/29}{Compatibility with \LaTeX's release 2015.} -% \changes{v1.24.0}{2015/06/02}{We can reinitialize \cs{AtEveryPstart} and \cs{AtEveryPend} providing to it an empty argument.} -% \changes{v1.24.1}{2015/06/21}{\cs{lemma} is disabled when using `nocritical` option.} +% \changes{v1.24.0}{2015/06/02}{We can reinitialize \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} providing to it an empty argument.} +% \changes{v1.24.1}{2015/06/21}{\protect\cs{lemma} is disabled when using `nocritical` option.} % \changes{v1.24.2}{2015/06/26}{Fix incompatibility between `nofamiliar` option and `memoir` package.} % \changes{v1.24.3}{2015/07/07}{Restore marginal numbers and notes with sectioning command (bug introduced in v1.21.0)} -% \changes{v1.24.4}{2015/07/19}{Fix spurious space with \cs{edindex} when using xindy+hyperref option.} -% \changes{v1.24.5}{2015/07/16}{Fix bug of indent, when a added in 1.1.0, when a \cs{beginnumbering} immediately follow a sectioning command.} +% \changes{v1.24.4}{2015/07/19}{Fix spurious space with \protect\cs{edindex} when using xindy+hyperref option.} +% \changes{v1.24.5}{2015/07/16}{Fix bug of indent, when a added in 1.1.0, when a \protect\cs{beginnumbering} immediately follow a sectioning command.} % \changes{v2.0.0}{2015/07/19}{Package's name becomes \reledmac.} % \changes{v2.0.0}{2015/07/19}{In order to have a more consistent name's convention, many names has been changed.} % \changes{v2.0.0}{2015/07/19}{Many \LaTeX's output macros are now patched and not override.} % \changes{v2.0.0}{2015/07/19}{Add nonum option for endnotes.} -% \changes{v2.0.0}{2015/07/19}{Add \cs{Xendinplaceofnumber} hook.} -% \changes{v2.0.0}{2015/07/19}{Add \cs{Xendnonumber} hook.} +% \changes{v2.0.0}{2015/07/19}{Add \protect\cs{Xendinplaceofnumber} hook.} +% \changes{v2.0.0}{2015/07/19}{Add \protect\cs{Xendnonumber} hook.} % \changes{v2.0.0}{2015/07/19}{Fix bug when printing only one series of endnotes, but wanted to keep endnotes for other series.} +% \changes{v2.0.1}{2015/07/27}{Fix incompatibility between optional argument of \protect\cs{pstart} and \protect\cs{numberpstarttrue}} +% \changes{v2.0.1}{2015/07/27}{Fix bug in eledmac-compat option} % \hyphenation{man-u-script man-u-scripts} % % @@ -321,7 +321,7 @@ % % \author{% % Ma\"ieul Rouquette\thanks{\texttt{maieul at maieul dot net}} \\ -% {\small based on the original \Lpack{ledmac} by} \\ +% {\small based on the original \protect\package{ledmac} by} \\ % Peter Wilson \\ % Herries Press \\ % {\small which was based on the original \edmac, \tabmac{} and \edstanza{} by} \\ @@ -330,40 +330,6 @@ % % \date{} % -% \iffalse This is a METACOMMENT -% This METACOMMENT is part of the original EDMAC -% Everything up to the next `\ fi' (without a blank) will -% be ignored. This is necessary because `%' may no longer -% be a comment mark when this file is read in. -% -% The original EDMAC was written by: -% \author{John Lavagnino\thanks{% -% Department of English and American Literature, -% Brandeis University, -% 415 South Street, -% Waltham, MA 02254--9110, USA. -% Internet: {\tt lav@binah.cc.brandeis.edu}, -% Bitnet: {\tt lav@brandeis}.} -% \and Dominik Wujastyk\thanks{% -% Wellcome Institute for the History of Medicine, -% 183 Euston Road, -% London NW1 2BE, UK. -% Internet: {\tt D.Wujastyk@ucl.ac.uk}, -% Bitnet: {\tt dow@harvunxw}.}} -% \date{} -% -% -% Macro file `EDMAC' for use with Plain TeX. -% Copyright (C) 1990, 1991, 1992, 1993, 1994 John Lavagnino and Dominik -% Wujastyk, all rights reserved. -% -% Copying of this file is authorized only if either -% (1) you make absolutely no changes to your copy, including name, or -% (2) if you do make changes, you name it something other than -% edmac.tex or edmac.doc -% This restriction helps to ensure that the macro development is orderly. -% -% \fi % % \maketitle % @@ -499,7 +465,7 @@ % Font Selection Scheme' for use with \PlainTeX\ and \edmac. % Another project Wayne has worked % on is a \verb"DVI" post-processor which works with an \edmac{} -% that has been slightly modified to output \cs{special}s. This +% that has been slightly modified to output \protect\cs{special}s. This % combination enables you to recover to some extent the text of % each line, as {\sc ascii} code, facilitating the creation of % concordances, an {\em index verborum}, etc. @@ -644,12 +610,12 @@ % \end{description} % \subsection{Optimize package's performance}\label{option:performance} % \begin{description} -% \item[nocritical] disables tools for critical footnotes (\cs{Afootnote}, \cs{Bfootnote} etc.). If you do not need critical footnotes, this option lets \eledmac\ run faster. +% \item[nocritical] disables tools for critical footnotes (\protect\cs{Afootnote}, \protect\cs{Bfootnote} etc.). If you do not need critical footnotes, this option lets \eledmac\ run faster. % It will also preserve room for other packages. -% \item[noeledsec] disables tools for \cs{eledsection} and related commands (\reff{eledsection}). -% \item[noend] disables tools for endnotes (\cs{Aendnote}, \cs{Bendnote} etc.). If you do not need endnotes, this option lets \eledmac\ run faster. +% \item[noeledsec] disables tools for \protect\cs{eledsection} and related commands (\reff{eledsection}). +% \item[noend] disables tools for endnotes (\protect\cs{Aendnote}, \protect\cs{Bendnote} etc.). If you do not need endnotes, this option lets \eledmac\ run faster. % It will also preserve room for other packages. -% \item[nofamiliar] disables tools for familiar footnotes (\cs{footnoteA}, \cs{footnoteB} etc.). If you do not need familiar footnotes, this option lets \eledmac\ run faster. +% \item[nofamiliar] disables tools for familiar footnotes (\protect\cs{footnoteA}, \protect\cs{footnoteB} etc.). If you do not need familiar footnotes, this option lets \eledmac\ run faster. % It will also preserve room for other packages. % \item[noledgroup] \macpackage allows to use of series of critical notes and new series of normal notes inside minipage and ledgroup environments (see~\reff{ledgroup}). However, such features use up computer memory, at the expense of other processing needs. So if you do not need this feature, use \verb+noledgroup+ option. This should make \macpackage faster. % \item[series] \Macpackage defines five levels of notes: A, B, C, D, E. @@ -662,7 +628,7 @@ % \DescribeMacro{\beginnumbering} % \DescribeMacro{\endnumbering} % Each section of numbered text must be preceded by -% \cs{beginnumbering} and followed by \cs{endnumbering}, like this: \\ +% \protect\cs{beginnumbering} and followed by \protect\cs{endnumbering}, like this: \\ % \egstart % \begin{verbatim} % \beginnumbering @@ -671,19 +637,19 @@ % \end{verbatim} % \egend % -% The \cs{beginnumbering} macro resets the line number to zero, +% The \protect\cs{beginnumbering} macro resets the line number to zero, % reads an auxiliary file called \meta{jobname}.\file{nn} (where % \meta{jobname} is the name of the main input file for this job, % and \file{nn} is 1 for the first numbered section, 2 for % the second section, and so on), and then creates a new version of % this auxiliary file to collect information during this run. The -% first instance of \cs{beginnumbering} also opens a file called -% \meta{jobname}\file{.\meta{series}end} to receive the text of the endnotes. -% \cs{endnumbering} closes the \meta{jobname}.\file{nn} file. +% first instance of \protect\cs{beginnumbering} also opens a file called +% \meta{jobname}\file{.end} to receive the text of the endnotes. +% \protect\cs{endnumbering} closes the \meta{jobname}.\file{nn} file. % % If the line numbering of a text is to be continuous from start to end, % then the whole text will be typed between one pair of -% \cs{beginnumbering} and \cs{endnumbering} commands. But your text +% \protect\cs{beginnumbering} and \protect\cs{endnumbering} commands. But your text % will most often contain chapter or other divisions marking sections % that should be independently numbered, and these will be appropriate % places to begin new numbered sections. @@ -691,7 +657,7 @@ % \Macpackage has to read and store % in memory % a certain amount of information about the entire section when it -% encounters a \cs{beginnumbering} command, so it speeds up the +% encounters a \protect\cs{beginnumbering} command, so it speeds up the % processing and reduces memory use when a text is divided into a larger % number of sections (at the expense of multiplying the number of % external files that are generated). @@ -701,7 +667,7 @@ % \DescribeMacro{\pstart} % \DescribeMacro{\pend} % Within a numbered section, each paragraph of numbered text must -% be marked using the \cs{pstart} and \cs{pend} commands like this: \\ +% be marked using the \protect\cs{pstart} and \protect\cs{pend} commands like this: \\ % \egstart % \begin{verbatim} % \pstart @@ -711,7 +677,7 @@ % \egend % % Text that appears within a numbered section but is not marked with -% \cs{pstart} and \cs{pend} will not be numbered. +% \protect\cs{pstart} and \protect\cs{pend} will not be numbered. % % The following example shows the proper section and paragraph % markup, and the kind of output that would typically be generated: @@ -739,11 +705,11 @@ % \end{verbatim} % \egend % -% \subsubsection{Producting automatically \cs{pstart}\ldots{}\cs{pend}} +% \subsubsection{Producting automatically \protect\cs{pstart}\ldots{}\protect\cs{pend}} % \DescribeMacro{\autopar}\label{autopar} -% You can use \cs{autopar} to avoid the nuisance of this paragraph markup +% You can use \protect\cs{autopar} to avoid the nuisance of this paragraph markup % and still have every paragraph automatically numbered. The scope of the -% \cs{autopar} command needs to be limited by keeping it within a group, as +% \protect\cs{autopar} command needs to be limited by keeping it within a group, as % follows: % \egstart % \begin{verbatim} @@ -761,52 +727,52 @@ % \end{verbatim} % \egend % -% \cs{autopar} fails, however, on paragraphs that start with a +% \protect\cs{autopar} fails, however, on paragraphs that start with a % \verb"{" or with any other command that starts a new group before it % generates any text. Such paragraphs need to be started explicitly, % before the new group is opened, -% using \cs{indent}, \cs{noindent}, or \cs{leavevmode}, or using -% \cs{pstart} itself.\footnote{For a detailed study of the +% using \protect\cs{indent}, \protect\cs{noindent}, or \protect\cs{leavevmode}, or using +% \protect\cs{pstart} itself.\footnote{For a detailed study of the % reasons for this restriction, see Barbara Beeton, `Initiation % rites', \textit{TUGboat} \textbf{12} (1991), % pp.\,257--258.\protect\index{Beeton, Barbara Ann Neuhaus Friend}} % -% \subsubsection{Content before specific \cs{pstart} and after specific \cs{pend}}\label{pstart:optionalarg} -% \changes{v1.12.0}{2014/08/05}{Optional arguments for \cs{pstart} and \cs{pend}.} +% \subsubsection{Content before specific \protect\cs{pstart} and after specific \protect\cs{pend}}\label{pstart:optionalarg} +% \changes{v1.12.0}{2014/08/05}{Optional arguments for \protect\cs{pstart} and \protect\cs{pend}.} % \DescribeMacro{\AtEveryPstart} % \DescribeMacro{\AtEveryPend} -% Both \cs{pstart} and \cs{pend} can take a optional argument, in brackets. -% Its content will be printed before the beginning of \cs{pstart} / after the end of \cs{pend} instead of the argument of \cs{AtEveryPstart} / \cs{AtEveryPend}. -% If you need to start a \cs{pstart} by brackets, or to add brackets after a \cs{pend}, just add a \cs{relax} between \cs{pstart}/\cs{pend} and the brackets. +% Both \protect\cs{pstart} and \protect\cs{pend} can take a optional argument, in brackets. +% Its content will be printed before the beginning of \protect\cs{pstart} / after the end of \protect\cs{pend} instead of the argument of \protect\cs{AtEveryPstart} / \protect\cs{AtEveryPend}. +% If you need to start a \protect\cs{pstart} by brackets, or to add brackets after a \protect\cs{pend}, just add a \protect\cs{relax} between \protect\cs{pstart}/\protect\cs{pend} and the brackets. % -%. This feature is also useful when typesetting verses (see~\reff{verse}) or \Lpack{eledpar} (see~\reff{eledpar}). +%. This feature is also useful when typesetting verses (see~\reff{verse}) or \protect\package{eledpar} (see~\reff{eledpar}). % -% A \cs{noindent} is automatically added before this argument. -% \subsubsection{Content before every \cs{pstart} and after every \cs{pend}} -% \changes{v1.15.0}{2015/01/12}{New commands \cs{AtEveryPstart} and \cs{AtEveryPend}.} +% A \protect\cs{noindent} is automatically added before this argument. +% \subsubsection{Content before every \protect\cs{pstart} and after every \protect\cs{pend}} +% \changes{v1.15.0}{2015/01/12}{New commands \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend}.} % \label{AtEveryPstart} \DescribeMacro{\AtEveryPstart}\DescribeMacro{\AtEveryPend} -% You can use both \cs{AtEveryPstart} and \cs{AtEveryPend}. -% Their arguments will be printed before every \cs{pstart} begins / after every \cs{pend} ends. -% \subsubsection{Numbering paragraphs (\cs{pstart})} -% \changes{v0.12.0}{2011/10/01}{Possibility to number \cs{pstart}.} -% It is possible to insert a number at every \cs{pstart} command. You must use the \DescribeMacro{\numberpstarttrue}\cs{numberpstarttrue} command to have it. You can stop the numbering with \DescribeMacro{\numberpstartfalse}\cs{numberpstartfalse}. -% You can redefine the command \DescribeMacro{\thepstart}\cs{thepstart} to change style. -% You can change the value of the pstart number by using \emph{after} \cs{beginnumbering}: +% You can use both \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend}. +% Their arguments will be printed before every \protect\cs{pstart} begins / after every \protect\cs{pend} ends. +% \subsubsection{Numbering paragraphs (\protect\cs{pstart})} +% \changes{v0.12.0}{2011/10/01}{Possibility to number \protect\cs{pstart}.} +% It is possible to insert a number at every \protect\cs{pstart} command. You must use the \DescribeMacro{\numberpstarttrue}\protect\cs{numberpstarttrue} command to have it. You can stop the numbering with \DescribeMacro{\numberpstartfalse}\protect\cs{numberpstartfalse}. +% You can redefine the command \DescribeMacro{\thepstart}\protect\cs{thepstart} to change style. +% You can change the value of the pstart number by using \emph{after} \protect\cs{beginnumbering}: % \begin{verbatim} % \setcounter{numberpstart}{value} % \end{verbatim} -% On each \cs{beginnumbering} the numbering restarts. -% \changes{v0.15.0}{2012/06/11}{Possibility to print \cs{pstart} number inside.} +% On each \protect\cs{beginnumbering} the numbering restarts. +% \changes{v0.15.0}{2012/06/11}{Possibility to print \protect\cs{pstart} number inside.} % % \DescribeMacro{\sidepstartnumtrue} -% With the \cs{sidepstartnumtrue} command, the number of \cs{pstart} will be printed inside. In this case, the line number will be not printed. +% With the \protect\cs{sidepstartnumtrue} command, the number of \protect\cs{pstart} will be printed inside. In this case, the line number will be not printed. % -% \changes{v1.1.0}{2012/09/25}{Add \cs{labelpstarttrue}.} +% \changes{v1.1.0}{2012/09/25}{Add \protect\cs{labelpstarttrue}.} % \DescribeMacro{\labelpstarttrue} -% With the \cs{labelpstarttrue} command, a \cs{label} added just after a \cs{pstart} will refer to the number of this pstart. +% With the \protect\cs{labelpstarttrue} command, a \protect\cs{label} added just after a \protect\cs{pstart} will refer to the number of this pstart. % \subsubsection{Languages written in Right to Left} % If you use languages written in right to left, we \LuaLaTeX\ or \XeLaTeX, so -% you must switch text direction \cs{before} the \cs{pstart} command. +% you must switch text direction \protect\cs{before} the \protect\cs{pstart} command. % \subsubsection{Memory limits} % \textbf{This paragraph is kept for history, but problem described below should not appear with recent version of \LaTeX.} % \label{pause} @@ -825,10 +791,10 @@ % split your long section into several smaller ones. The trouble % with this is that your line numbering will start again at zero % with each new section. To avoid this problem, we provide -% \cs{pausenumbering} and \cs{resumenumbering} which are just -% like \cs{endnumbering} \ldots\ \cs{beginnumbering}, except that +% \protect\cs{pausenumbering} and \protect\cs{resumenumbering} which are just +% like \protect\cs{endnumbering} \ldots\ \protect\cs{beginnumbering}, except that % they arrange for your line numbering to continue across the break. -% Use \cs{pausenumbering} only between numbered paragraphs: +% Use \protect\cs{pausenumbering} only between numbered paragraphs: % \egstart % \begin{verbatim} % \beginnumbering @@ -855,22 +821,22 @@ % \begin{verbatim} % \newcommand{\memorybreak}{\pausenumbering\resumenumbering} % \end{verbatim} -% and say \cs{memorybreak} between the relevant \cs{pend} and -% \cs{pstart}. +% and say \protect\cs{memorybreak} between the relevant \protect\cs{pend} and +% \protect\cs{pstart}. % \egend % % \subsection{Lineation commands} % \subsubsection{Disabling lineation} % \DescribeMacro{\numberlinefalse} \DescribeMacro{\numberlinetrue} -% Line numbering can be disabled with \cs{numberlinefalse}. It can be enabled again with \cs{numberlinetrue}. +% Line numbering can be disabled with \protect\cs{numberlinefalse}. It can be enabled again with \protect\cs{numberlinetrue}. % \subsubsection{Setting lineation start and step} % \DescribeMacro{\firstlinenum} % \DescribeMacro{\linenumincrement} % By default, \macpackage numbers every 5th line. There are two counters, % \verb?firstlinenum? and \verb?linenumincrement?, that control this -% behaviour; they can be changed using \cs{firstlinenum}\marg{num} and -% \cs{linenumincrement}\marg{num}. \cs{firstlinenum} specifies the first -% line that will have a printed number, and \cs{linenumincrement} is +% behaviour; they can be changed using \protect\cs{firstlinenum}\marg{num} and +% \protect\cs{linenumincrement}\marg{num}. \protect\cs{firstlinenum} specifies the first +% line that will have a printed number, and \protect\cs{linenumincrement} is % the difference between succesive % numbered lines. For example, to start printing numbers at the first line % and to have every other line numbered: \\ @@ -878,18 +844,18 @@ % % \DescribeMacro{\firstsublinenum} % \DescribeMacro{\sublinenumincrement} -% There are similar commands, \cs{firstsublinenum}\marg{num} and -% \cs{sublinenumincrement}\marg{num} for controlling sub-line numbering. +% There are similar commands, \protect\cs{firstsublinenum}\marg{num} and +% \protect\cs{sublinenumincrement}\marg{num} for controlling sub-line numbering. % % \DescribeMacro{\linenumberlist} -% You can define \cs{linenumberlist} to specify a non-uniform distribution +% You can define \protect\cs{linenumberlist} to specify a non-uniform distribution % of printed line numbers. For example: \\ % \verb?\def\linenumberlist{1,2,3,5,7,11,13,17,19,23,29}? \\ % to have numbers printed on prime-numbered lines only. There must be % no spaces within the definition which consists of comma-separated decimal % numbers. The numbers can be in any order but it is easier to read if you % put them in numerical order. Either omitting the definition of -% \cs{linenumberlist} or following the vacuous definition \\ +% \protect\cs{linenumberlist} or following the vacuous definition \\ % \verb?\def\linenumberlist{}? \\ % the standard numbering sequence is applied. The standard sequence % is that specified by the combination of the \verb+firstlinenum+, @@ -900,7 +866,7 @@ % \DescribeMacro{\lineation} % \changes{v1.0.0}{2012/09/15}{Debug in lineation command} % Lines can be numbered either by page, by pstart or by section; you specify -% this using the \cs{lineation}\marg{arg} +% this using the \protect\cs{lineation}\marg{arg} % macro, where \meta{arg} is either % \texttt{page}, \texttt{pstart} or \texttt{section}. @@ -912,7 +878,7 @@ % % \subsubsection{Setting line number margin} % \DescribeMacro{\linenummargin} -% The command \cs{linenummargin}\meta{location} specifies the margin +% The command \protect\cs{linenummargin}\meta{location} specifies the margin % where the line (or pstart) numbers will be printed. The permissable value % for \meta{location} is one out of the list \texttt{left}, \texttt{right}, % \texttt{inner}, or \texttt{outer}, @@ -924,11 +890,11 @@ % making a paragraph. % % More precisely, the value of -% \cs{linenummargin} used is that in effect at the \cs{pend} +% \protect\cs{linenummargin} used is that in effect at the \protect\cs{pend} % of a numbered paragraph. Apart from an initial setting for -% \cs{linenummargin}, only change it after a \cs{pend}, whereupon +% \protect\cs{linenummargin}, only change it after a \protect\cs{pend}, whereupon % it will apply to all following numbered paragraphs, until -% changed again (changing it between a \cs{pstart} and \cs{pend} +% changed again (changing it between a \protect\cs{pstart} and \protect\cs{pend} % pair will apply the change to all the current paragraph). % % @@ -939,11 +905,11 @@ % \DescribeMacro{\linenumsep} % When a marginal line number is to be printed, there are a % lot of ways to display it. -% You can redefine \cs{leftlinenum} and \cs{rightlinenum} to +% You can redefine \protect\cs{leftlinenum} and \protect\cs{rightlinenum} to % change the way marginal line numbers are printed in the % left and right margins respectively; the initial -% versions print the number in font \cs{numlabfont} (described -% below) at a distance \cs{linenumsep} (initially set to one pica) +% versions print the number in font \protect\cs{numlabfont} (described +% below) at a distance \protect\cs{linenumsep} (initially set to one pica) % from the text. % % \subsection{Changing the line numbers} @@ -957,7 +923,7 @@ % \subsubsection{Sublineation} % \DescribeMacro{\startsub} % \DescribeMacro{\endsub} -% You insert the \cs{startsub} and \cs{endsub} commands in your text +% You insert the \protect\cs{startsub} and \protect\cs{endsub} commands in your text % to turn sub-lineation on and off. In plays, for % example, stage directions are often numbered with sub-line % numbers: as line $10.1$, $10.2$, @@ -975,8 +941,8 @@ % \subsubsection{Locking lineation} % \DescribeMacro{\startlock} % \DescribeMacro{\endlock} -% The \cs{startlock} command, used in running text, locks the -% line number at its current value, until you say \cs{endlock}. +% The \protect\cs{startlock} command, used in running text, locks the +% line number at its current value, until you say \protect\cs{endlock}. % It can tell for itself whether you are in a patch of line or % sub-line numbering. One use for line-number locking is in printing % poetry: there the line numbers should be those of verse lines @@ -990,9 +956,9 @@ % line or the last, or whether you just want the number printed by % them all. (This assumes that, on the basis of the settings of % the previous parameters, it is necessary to display a line number for -% this line.) You specify your preference using \cs{lockdisp}\marg{arg}; its +% this line.) You specify your preference using \protect\cs{lockdisp}\marg{arg}; its % argument is a word, either \verb+first+, \verb+last+, or \verb+all+. -% The package initially sets this as \cs{lockdisp}\verb+{first}+. +% The package initially sets this as \protect\cs{lockdisp}\verb+{first}+. % % \subsubsection{Setting and changing line number} % \DescribeMacro{\setline} @@ -1000,29 +966,29 @@ % In some cases you may want to modify the line numbers that are % automatically calculated: if you are printing only fragments % of a work but want to print line numbers appropriate to a complete -% version, for example. The \cs{setline}\marg{num} and -% \cs{advanceline}\marg{num} commands +% version, for example. The \protect\cs{setline}\marg{num} and +% \protect\cs{advanceline}\marg{num} commands % may be used to change the current line's number (or the sub-line % number, if sub-lineation is currently on). They change both the % marginal line numbers and the line numbers passed to the notes. -% \cs{setline} takes one argument, the value to which you want -% the line number set; it must be $0$ or greater. \cs{advanceline} +% \protect\cs{setline} takes one argument, the value to which you want +% the line number set; it must be $0$ or greater. \protect\cs{advanceline} % takes one argument, an amount that should be added to the current % line number; it may be positive or negative. % % \DescribeMacro{\setlinenum} -% The \cs{setline} and \cs{advanceline} macros should only be used -% within a \cs{pstart}\ldots\cs{pend} group. The \cs{setlinenum}\marg{num} +% The \protect\cs{setline} and \protect\cs{advanceline} macros should only be used +% within a \protect\cs{pstart}\ldots\protect\cs{pend} group. The \protect\cs{setlinenum}\marg{num} % command can be used outside such a group, for example between -% a \cs{pend} and a \cs{pstart}. It sets the line number +% a \protect\cs{pend} and a \protect\cs{pstart}. It sets the line number % to \meta{num}. -% It has no effect if used within a \cs{pstart}\ldots\cs{pend} group. +% It has no effect if used within a \protect\cs{pstart}\ldots\protect\cs{pend} group. % % \subsubsection{Line number style} % \DescribeMacro{\linenumberstyle} % \DescribeMacro{\sublinenumberstyle} % Line numbers are normally printed as arabic numbers. You can -% use \cs{linenumberstyle}\marg{style} to change the numbering style. +% use \protect\cs{linenumberstyle}\marg{style} to change the numbering style. % \meta{style} must be one of: % \begin{itemize} % \item[\texttt{Alph}] Uppercase letters (A\ldots\ Z). @@ -1034,27 +1000,27 @@ % Note that with the \texttt{Alph} or \texttt{alph} styles, `numbers' % must be between 1 and 26 inclusive. % -% Similarly \cs{sublinenumberstyle}\marg{style} can be used to change +% Similarly \protect\cs{sublinenumberstyle}\marg{style} can be used to change % the numbering style of sub-line numbers, which is normally arabic numerals. % % \subsubsection{Skipping and hidding number} % \DescribeMacro{\skipnumbering} -% When inserted into a numbered line the macro \cs{skipnumbering} causes +% When inserted into a numbered line the macro \protect\cs{skipnumbering} causes % the numbering of that particular line to be skipped; that is, the line % number is unchanged and no line number will be printed. -% Note that if you use it in \cs{stanza}, you must call it at the beginning of the verse. +% Note that if you use it in \protect\cs{stanza}, you must call it at the beginning of the verse. % % \DescribeMacro{\hidenumbering} -% \changes{v1.21.0}{2015/04/13}{Add \cs{hidenumbering}} -% When inserted into a numbered line the macro \cs{hidenumbering} causes +% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{hidenumbering}} +% 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 \cs{stanza}, you must call it at the beginning of the verse. +% Note that if you use it in \protect\cs{stanza}, you must call it at the beginning of the verse. % \subsubsection{Execute code at each line} % \Macpackage provides to advanced feature for user. % \DescribeMacro{dolinehook}\DescribeMacro{doinsidelinehook} -% The argument passed to \cs{dolinehook}\marg{arg} will be executed +% The argument passed to \protect\cs{dolinehook}\marg{arg} will be executed % before slicing a new line in the paragraph. -% The argument passed to \cs{doinsidelinehook}\marg{arg} will be executed before printing a new line. +% The argument passed to \protect\cs{doinsidelinehook}\marg{arg} will be executed before printing a new line. % In many case, the second of two is more useful than the first. % The file \href{examples/2-line_numbers_in_header.tex}{examples/2-line\_numbers\_in\_header.tex} provides an example of use in order to print the first and last line number of a page in the header. % \section{Apparatus commands} @@ -1071,21 +1037,21 @@ % % So : % \begin{itemize} -% \item \cs{Afootnote} is a critical footnote of the series A. -% \item \cs{Bendnote} is a critical footnote of the series B. -% \item \cs{footnoteC} is a critical footnote of the series C. +% \item \protect\cs{Afootnote} is a critical footnote of the series A. +% \item \protect\cs{Bendnote} is a critical footnote of the series B. +% \item \protect\cs{footnoteC} is a critical footnote of the series C. % \end{itemize} % \subsection{Critical notes} % \subsubsection{The lemma} % \DescribeMacro{\edtext} % Within numbered paragraphs, all footnotes and endnotes are generated -% by the \cs{edtext} macro: +% by the \protect\cs{edtext} macro: % \begin{verse} -% \cs{edtext}\marg{lemma}\marg{commands} +% \protect\cs{edtext}\marg{lemma}\marg{commands} % \end{verse} % % -% The \meta{lemma} argument is the lemma in the main text: \cs{edtext} +% The \meta{lemma} argument is the lemma in the main text: \protect\cs{edtext} % both prints this as part of the text, and makes it available to the % \meta{commands} you specify to generate notes. % @@ -1115,7 +1081,7 @@ % is supplied with the line number at which the lemma appears % in the main text. % -% The \meta{lemma} may contain further \cs{edtext} commands. +% The \meta{lemma} may contain further \protect\cs{edtext} commands. % Nesting makes % it possible to print an explanatory note on a long passage together with % notes on variants for individual words within the passage. For @@ -1144,16 +1110,16 @@ % \endnumbering % \egend % -% However, \cs{edtext} cannot handle overlapping but unnested +% However, \protect\cs{edtext} cannot handle overlapping but unnested % notes---for example, one note covering lines 10--15, and another -% covering 12--18; a \cs{edtext} that starts in the \meta{lemma} -% argument of another \cs{edtext} must end there, too. (The -% \cs{lemma} and \cs{linenum} commands may be used to +% covering 12--18; a \protect\cs{edtext} that starts in the \meta{lemma} +% argument of another \protect\cs{edtext} must end there, too. (The +% \protect\cs{lemma} and \protect\cs{linenum} commands may be used to % generate overlapping notes if necessary.) % % \subsubsection{Footnotes} % -% The second argument of the \cs{edtext} macro, \meta{commands}, +% The second argument of the \protect\cs{edtext} macro, \meta{commands}, % may contain a series of subsidiary commands that generate % various kinds of notes. % @@ -1163,7 +1129,7 @@ % \DescribeMacro{\Dfootnote} % \DescribeMacro{\Efootnote} % Five separate series of the footnotes are maintained; each macro -% takes one argument like \cs{Afootnote}\marg{text}. +% takes one argument like \protect\cs{Afootnote}\marg{text}. % When all of the six % 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 @@ -1173,17 +1139,17 @@ % % If you need more series of critical notes, please look at \reff{newseries}. % -%\changes{v1.0.0}{2012/09/15}{Options nonum and nosep in \cs{Xfootnote}.} -%\changes{v1.20.0}{2015/03/22}{Options fulllines in \cs{Xfootnote}.}\label{Xfootnoteopt} +%\changes{v1.0.0}{2012/09/15}{Options nonum and nosep in \protect\cs{Xfootnote}.} +%\changes{v1.20.0}{2015/03/22}{Options fulllines in \protect\cs{Xfootnote}.}\label{Xfootnoteopt} %An optional argument can be added before the text of the footnote. Its value is a comma separated list of options. % \label{fulllines}The available options are: % \begin{itemize} -% \item \verb|fulllines| to disable \cs{Xtwolines} and \cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}). +% \item \verb|fulllines| to disable \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}). % \item \verb|nonum| to disable line numbering for this note. % \item \verb|nosep| to disable the lemma separator for this note. % \end{itemize} % -% Example: \cs{Afootnote}\verb|[nonum]|\marg{text}. +% Example: \protect\cs{Afootnote}\verb|[nonum]|\marg{text}. % % \subsubsection{Endnotes} % \DescribeMacro{\Aendnote} @@ -1193,26 +1159,26 @@ % \DescribeMacro{\Eendnote} % The package also maintains five separate series of endnotes. % -% If you do not need the endnotes facility, you should use \verb+noend+ option when loading \Lpack{eledmac}. +% If you do not need the endnotes facility, you should use \verb+noend+ option when loading \protect\package{eledmac}. % % The mechanism is similar to the one for footnotes: each macro takes one or more optional arguments and one single argument, like:\\ -% \cs{Aendnote}\oarg{option}\marg{text}. +% \protect\cs{Aendnote}\oarg{option}\marg{text}. % % \verb+[