summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-27 22:03:19 +0000
committerKarl Berry <karl@freefriends.org>2015-08-27 22:03:19 +0000
commite757f45a3b3950bf1e92dfe74af805a789961720 (patch)
tree4bbac1143a34f1df78dd7740e9b68796b194838e /Master/texmf-dist/source/latex/reledmac
parentd0b7455f5ef6000af94ff3365c9f7e36a411dc42 (diff)
reledmac (27aug15)
git-svn-id: svn://tug.org/texlive/trunk@38222 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx237
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx21
2 files changed, 130 insertions, 128 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 8d89a5ca043..09c7af31f3f 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -21,6 +21,7 @@
%
%<*driver>
\documentclass[twoside]{ltxdoc}
+\usepackage[T1]{fontenc}
\usepackage{url}
\usepackage[draft=false,
plainpages=false,
@@ -320,6 +321,7 @@
% \changes{v2.1.0}{2015/08/08}{Fix space bug with \protect\cs{Xbhooknote} and \protect\cs{bhooknoteX} when using to insert text and not to execute code.}
% \changes{v2.1.0}{2015/08/08}{Fix space bug with \protect\cs{Xbhooknote} and \protect\cs{bhooknoteX} when using to insert text and not to execute code.}
% \changes{v2.1.1}{2015/08/13}{Fix bug with \protect\cs{ledpbsetting}\protect\arg{before}.}
+% \changes{v2.1.2}{2015/08/26}{Fix bug with lineation by pstart and tabular environment (added in 2.1.0).}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -345,7 +347,7 @@
%
% \begin{abstract}
%
-% The \macpackage provides many tool in order to typesset scholarly edition.
+% The \macpackage provides many tools in order to typeset scholarly editions.
% It is base on the \eledmac package, which was was based on \ledmac package, which was based on \edmac \TeX\ package.
%
% It can be use in combination with \parpackage in order to typeset two texts in parallel, like an original text and its translation in modern language.
@@ -357,7 +359,7 @@
%
% To report bugs or request a new feature, please go to ledmac GitHub page and click on ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must create an account on github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can post messages in English or in French (preferred).
%
-% You can subscribe to the \macpackage mail list in:\\ \url{http://geekographie.maieul.net/146}
+% You can subscribe to the \macpackage mail list at:\\ \url{http://geekographie.maieul.net/146}
% \end{abstract}
%
% \renewcommand{\numberline}[1]{#1~}
@@ -373,7 +375,7 @@
%
% \subsection{Aim of the package}
%
-% The \Eledmac{} package, together with LaTeX, provides several
+% The \macpackage\ package, together with \LaTeX, provides several
% important facilities for formatting critical editions of texts in
% a traditional manner. Major features include:
% \begin{itemize}
@@ -388,7 +390,7 @@
% \end{itemize}
%
%
-% \Eledmac{} allows the scholar engaged in preparing a critical
+% \Macpackage allows the scholar engaged in preparing a critical
% edition to focus attention wholly on the task of creating the
% critical text and evaluating the variant readings, text-critical
% notes and testimonia. \LaTeX{} and \Eledmac{} will take care of
@@ -398,15 +400,15 @@
%
% Apart from \macpackage there are some other \LaTeX\ packages for
% critical edition typesetting.
-% However, the am of \macpackage is to provide a ``all in one'' and flexible tool in the field of critical edition.
+% However, the aim of \macpackage is to provide an ``all in one'' and flexible tool in the field of critical edition.
%
% Any suggestion for new features are welcome.
%
%
% This manual contains a general description of how to use \macpackage and
% the complete source code for the package,
-% with extensive documentation (in sections~\ref{overview} and following, numbered in Roman numeric)
-% It finish by a list of action to do when migrating from some version to other, a historical of the change and an index to the
+% with extensive documentation (in sections~\ref{overview} and following, numbered in Roman numeric).
+% It ends with a list of actions to do when migrating from some version to other, a change history and an index to the
% source code.
% We do not suggest that you need to
@@ -556,7 +558,7 @@
%
% That is why a new name was selected: \eledmac (extended \ledmac).
%
-% To migrate from \ledmac to \eledmac, please read Appendix \ref{migration} (p.~\pageref{migration}).
+% To migrate from \ledmac to \eledmac, please read \reff{migration}.
%
% \subsubsection{\reledmac}
%
@@ -570,7 +572,7 @@
%
% A new name was selected: \reledmac (extended renewed \eledmac).
-% To migrate from \eledmac to \reledmac, please read Appendix \ref{migration:reledmac} (p.~\pageref{migration:reledmac}).
+% To migrate from \eledmac to \reledmac, please read \reff{migratereledmac}.
% \subsection{List of works edited with (r)(e)ledmac}
% A collaborative list of works edited with (r)(e)ledmac is available on \url{https://www.zotero.org/groups/critical_editions_typeset_with_edmac_ledmac_and_eledmac/items}. Please add your own edition made with (r)(e)ledmac.
@@ -629,7 +631,7 @@
% \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.
% Using all these levels consumes memory space and processing speed.
-% This is why, if your work does not require all of the A-E series, you can narrow down the available number of series.
+% This is why, if your work does not require all of the A--E series, you can narrow down the available number of series.
% For example, if you only need A and B series, call the package with \verb+series={A,B}+ option.
% \end{description}
% \section{Text lines and paragraphs numbering}
@@ -641,7 +643,7 @@
% \egstart
% \begin{verbatim}
% \beginnumbering
-% text
+% Text
% \endnumbering
% \end{verbatim}
% \egend
@@ -752,7 +754,7 @@
% 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 \protect\package{eledpar} (see~\reff{eledpar}).
+% This feature is also useful when typesetting verses (see~\reff{verse}) or \parpackage\ (see~\reff{eledpar}).
%
% A \protect\cs{noindent} is automatically added before this argument.
% \subsubsection{Content before every \protect\cs{pstart} and after every \protect\cs{pend}}
@@ -778,10 +780,11 @@
% \DescribeMacro{\labelpstarttrue}
% 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 \protect\cs{before} the \protect\cs{pstart} command.
+% If you use languages written in right to left, with \LuaLaTeX\ or \XeLaTeX,
+% you must switch text direction \emph{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}
% \DescribeMacro{\pausenumbering}
% \DescribeMacro{\resumenumbering}
@@ -859,7 +862,7 @@
% 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
+% no spaces within the definition which consists of comma-separated integer
% 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
% \protect\cs{linenumberlist} or following the vacuous definition \\
@@ -885,7 +888,7 @@
%
% \subsubsection{Setting line number margin}
% \DescribeMacro{\linenummargin}
-% The command \protect\cs{linenummargin}\meta{location} specifies the margin
+% The command \protect\cs{linenummargin}\marg{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},
@@ -954,7 +957,7 @@
% sub-line numbering. One use for line-number locking is in printing
% poetry: there the line numbers should be those of verse lines
% rather than of printed lines, even when a verse line requires several
-% printed lines.
+% printed lines. But in this case you may use the \cs{stanza} mechanism, see \reff{verse}.
%
% \DescribeMacro{\lockdisp}
% When line-number locking is used,
@@ -997,13 +1000,13 @@
% Line numbers are normally printed as arabic numbers. You can
% 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).
-% \item[\texttt{alph}] Lowercase letters (a\ldots\ z).
+% \begin{description}
+% \item[\texttt{Alph}] Uppercase letters (A \ldots\ Z).
+% \item[\texttt{alph}] Lowercase letters (a \ldots\ z).
% \item[\texttt{arabic}] Arabic numerals (1, 2, \ldots)
% \item[\texttt{Roman}] Uppercase Roman numerals (I, II, \ldots)
% \item[\texttt{roman}] Lowercase Roman numerals (i, ii, \ldots)
-% \end{itemize}
+% \end{description}
% Note that with the \texttt{Alph} or \texttt{alph} styles, `numbers'
% must be between 1 and 26 inclusive.
%
@@ -1024,11 +1027,11 @@
% 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}
+% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
% The argument passed to \protect\cs{dolinehook}\marg{arg} will be executed
% before slicing a new line in the paragraph.
% 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.
+% In many case, the latter 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}
% \subsection{Terminology}
@@ -1039,14 +1042,14 @@
%
% \Macpackage manages many series of notes of each category.
% A series of notes is identified by an uppercase letter.
-% When the series letter is at the beginning of a command name, it refers to a critical footnote.
-% When the series letter is at the end of a command name, it refers to a critical endnote.
+% When the series letter is at the \emph{beginning} of a command name, it refers to a critical footnote.
+% When the series letter is at the \emph{end} of a command name, it refers to a familiar footnote.
%
% So :
% \begin{itemize}
% \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.
+% \item \protect\cs{Bendnote} is a critical endnote of the series B.
+% \item \protect\cs{footnoteC} is a familiar footnote of the series C.
% \end{itemize}
% \subsection{Critical notes}
% \subsubsection{The lemma}
@@ -1119,7 +1122,7 @@
%
% However, \protect\cs{edtext} cannot handle overlapping but unnested
% notes---for example, one note covering lines 10--15, and another
-% covering 12--18; a \protect\cs{edtext} that starts in the \meta{lemma}
+% covering 12--18; an \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.)
@@ -1166,21 +1169,21 @@
% \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 \protect\package{eledmac}.
+% If you do not need the endnotes facility, you should use \verb+noend+ option when loading \macpackage.
%
% The mechanism is similar to the one for footnotes: each macro takes one or more optional arguments and one single argument, like:\\
% \protect\cs{Aendnote}\oarg{option}\marg{text}.
%
-% \verb+[<option>]+ can contain a comma separated list of values. Allowed values are:
+% \meta{option} can contain a comma separated list of values. Allowed values are:
% \begin{itemize}
% \item \verb|fulllines| to disable \protect\cs{Xendtwolines} and \protect\cs{Xendmorethantwolines} features for this particular note (cf. \reff{Xtwolines}).
% \item \verb+nonum+ to disable line number for this particular note.
% \item \verb|nosep| to disable the lemma separator for this particular note.
% \end{itemize}
%
-% \label{doendnotes} Normally, endnotes are not printed: you must use the
+% \DescribeMacro{\doendnotes}\label{doendnotes} Normally, endnotes are not printed: you must use the
% \protect\cs{doendnotes}\marg{s}, where \meta{s} is the letter of the series to be printed. Put this command where you want the corresponding set of endnotes printed.
-% In this case, all the endnotes of the \meta{s} series are printed, for all numbered section.
+% In this case, all the endnotes of the \meta{s} series are printed, for all numbered sections.
% \changes{v1.22.0}{2015/04/25}{Add \protect\cs{doendnotesbysection} command.}
% \changes{v1.22.0}{2015/04/25}{Standardize endnotes handbook.}
%
@@ -1252,19 +1255,20 @@
% \DescribeMacro{\linenum}
% \label{linenum}
% You can use \protect\cs{linenum}\marg{arg} to change the line numbers passed to
-% the notes. The notes are actually given seven parameters: the page,
+% the notes. \meta{arg} actually consist of seven parameters: the page,
% line, and sub-line number for the start of the lemma; the same
% three numbers for the end of the lemma; and the font specifier
% for the lemma. As the argument to \protect\cs{linenum}, you specify
% those seven parameters in that order, separated by vertical bars
-% (the \verb"|" character). However, you can retain the value
+% (the \verb"|" character). I.e.\\
+% .\verb+\linenum{+\meta{start page}\verb+|+\meta{s. line}\verb+|+\meta{s. sub-l.}\verb+|+\meta{end p.}\verb+|+\meta{e. l.}\verb+|+\meta{e. sub-l.}\verb+|+\meta{font}\verb+|+\verb+}+\\
+% However, you can retain the value
% computed by \macpackage for any number by simply omitting it; and
% you can omit a sequence of vertical bars at the end of the
-% argument. For example, \verb"\linenum{|||23}" changes one number,
-% the ending page number of the current lemma.
+% argument. For example, \verb"\linenum{|||23}" changes only the ending page number of the current lemma.
%
% This command does not change the marginal line numbers in any way;
-% it just changes the numbers passed to the footnotes. Its use comes in
+% it just changes the numbers passed to the notes. Its use comes in
% situations that \protect\cs{edtext} has trouble dealing with for
% whatever reason. If you need notes for overlapping passages that
% aren't nested, for instance, you can use \protect\cs{lemma} and
@@ -1333,7 +1337,7 @@
%
% Which unicode number you use depends, many times, on your keyboard configuration (the computer-input system).
%
-% Inside \macpackage, the \protect\cs{sameword} command considers these two unicodes options as different characters. If you use only one unicode number consistently, the distinction will probably make no difference to how your text looks, but \protect\cs{sameword} will process the text inaccurately, based on the unicode numbers. To prevent this, do the following:
+% Inside \macpackage, the \protect\cs{sameword} command considers these two unicodes (code positions) as different characters. If you use only one unicode number consistently, the distinction will probably make no difference to how your text looks, but \protect\cs{sameword} will process the text inaccurately, based on the unicode numbers. To prevent this, do the following:
% \begin{itemize}
% \item If you use \XeLaTeX, add this line in your preamble:\verb+ \XeTeXinputnormalization 1+.
% \item If you use \LuaLaTeX, use the \protect\package{uninormalize} package of Michal Hoftich\footnote{\url{https://github.com/michal-h21/uninormalize}.} with the \verb+buffer+ option set to true.
@@ -1342,7 +1346,7 @@
% With these tools, \XeTeX\ / \LuaTeX\ will dynamicaly normalize unicode input when reading the file.
% Consequently, you will have no problems with the \protect\cs{sameword} command.
% \subsubsection{Use with \protect\cs{lemma} command}
-% If you use the \protect\cs{lemma} command, \protect\package{eledmac} cannot know to which occurence of \protect\cs{sameword} in the first argument of \protect\cs{edtext} a word marked with \protect\cs{sameword} in \protect\cs{lemma} should refer.
+% If you use the \protect\cs{lemma} command, \macpackage\ cannot know to which occurence of \cs{sameword} in the first argument of \cs{edtext} a word marked with \cs{sameword} in \cs{lemma} should refer.
%
% For example in the following example:
% \begin{verbatim}
@@ -1351,11 +1355,11 @@
% and other \sameword{sw}
% and again \sameword{sw}
% it is all}%
-% }{\lemma{\sameword{sw} \ldots all}\Afootnote{critical note}}.%
+% {\lemma{\sameword{sw} \ldots all}\Afootnote{critical note}}.%
% \end{verbatim}
-% \protect\package{eledmac} cannot know if the ``sw'' in \protect\cs{lemma} refers to the word after ``thing'', after ``other'', or after ``again''.
+% \Macpackage\ cannot know if the ``sw'' in \protect\cs{lemma} refers to the word after ``thing'', after ``other'', or after ``again''.
%
-% Consequently, you have to tell to \protect\package{eledmac} which instance of \protect\cs{sameword} in the first argument of \protect\cs{edtext} you want to reference:
+% Consequently, you have to tell to \macpackage which instance of \protect\cs{sameword} in the first argument of \protect\cs{edtext} you want to reference:
% \begin{itemize}
% \item In the content of \protect\cs{lemma}, use \protect\cs{sameword} with no optional argument.
% \item In the first argument of \protect\cs{edtext}, use \protect\cs{sameword} with the optional argument \oarg{X}. \meta{X} is the depth of the \protect\cs{edtext} where the \protect\cs{lemma} is used.
@@ -1374,11 +1378,11 @@
% \end{verbatim}
% Here the \protect\cs{sameword} occurs in an \protect\cs{edtext} of level 2, but since it is referenced by \protect\cs{lemma} on level 1, it has ``1'' in the optional argument.
-% In the following schema, each framed box represents an \protect\cs{edtext} level. Each number is an occurrence of \protect\cs{sameword}. After a framed box, the text in superscript represents the content of \protect\cs{lemma} for that \protect\cs{edtext} level. The text in subscript at the right of a number represents the content of the optional argument of \protect\cs{sameword}.
+% In the following example figure, each framed box represents an \protect\cs{edtext} level. Each number is an occurrence of \protect\cs{sameword}. After a framed box, the text in superscript represents the content of \protect\cs{lemma} for that \protect\cs{edtext} level. The text in subscript at the right of a number represents the content of the optional argument of \protect\cs{sameword}.
%
%\fbox{%
% \fbox{%
-% $1_{inlemma}$
+% $1_{\mathrm{inlemma}}$
% \fbox{$2$}
% $3_2$%
% }\textsuperscript{$1$\ldots$3$}%
@@ -1450,7 +1454,7 @@
% sequential footnote
% marks in the text can be separated by
% commas\textsuperscript{3,4} like so.
-% As a convenience \Eledmac{} provides this automatically.
+% As a convenience \reledmac\ provides this automatically.
%
% \DescribeMacro{\multfootsep}
% \protect\cs{multfootsep} is used as the separator between footnote markers.
@@ -1461,12 +1465,12 @@
% \subsection{Changing series}
% \subsubsection{Create a new series}\label{newseries}
%
-% If you need more than six series of critical footnotes you can
-% create extra series, using \protect\cs{newseries} command. For example to create G and H series \protect\cs{newseries}\verb+G,H+.
+% If you need more than five series of critical footnotes you can
+% create extra series, using \protect\cs{newseries} command. For example to create F and G series \protect\cs{newseries}\verb+{G,H}+.
%
% \subsubsection{Delete series}
% As the number of series which are defined increases, \macpackage gets slower.
-% If you do not need all of the six standard series (A, B, C, D, E),
+% If you do not need all of the six standard series (A--E),
% you can load the package with the \verb+series+ option.
% For example if you need only series~A and~B, use:
% \begin{verbatim}
@@ -1496,7 +1500,7 @@
% \changes{v1.0.0}{2012/09/15}{New generic commands to customize footnote display.}
% Some commands can be used to change the display of the footnotes. All can have an optional argument \oarg{s}, which is the letter of the series --- or a list of letters separated by comma --- depending on which option is applied. If the optional argument is omitted or empty, the setting will concern all series.
%
-% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use some relative unity\footnote{Like \verb|em| which is the width of a mg.}, it will be relative to fontsize of the footnote, except for commands concerning the place kept by the notes --- including blank space.
+% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use some relative unit\footnote{Like \verb|em| which is the width of a mg.}, it will be relative to fontsize of the footnote, except for commands concerning the place kept by the notes --- including blank space.
%
% There is also name convention:
% \begin{itemize}
@@ -1539,19 +1543,19 @@
% the trick. \reff{nobreak} explains why this restriction
% is necessary.}
%
-% The notes arrangement must be called after having defined the document geometry setting. If you must change geometry setting inside your document, do not forget to call again not arrangement.
+% The notes arrangement must be called after having defined the document geometry setting. If you must change geometry setting inside your document, do not forget to call again note arrangement.
%
% \protect\cs{hsize} has been set for the pages that use
% this series of notes; otherwise \TeX\ will try to put too
% many or too few of these notes on each page. If you need to
% change the \protect\cs{hsize} within the document, call
-% \protect\cs{footparagraph} again afterwards to take account of the new
+% the arrangement macro again afterwards to take account of the new
% value.
% \subsection{Control line number printing}
% \subsubsection{Print line number only at first time}
% \DescribeMacro{\Xnumberonlyfirstinline}
% \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{Xnumberonlyfirstinline} with lineation by pstart or by page.}
-% By default, the line number is printed in every note. If you want to print it only the first time for a given line number (i.e one time for line 1, one time for line 2 etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}.
+% By default, the line number is printed in every note. If you want to print it only the first time for a given line number (i.e. one time for line 1, one time for line 2 etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}.
%
% Use \protect\cs{Xnumberonlyfirstinline}\oarg{s}\verb+[false]+ to disable this (\meta{s} can be empty if you want to disable it for every series).
%
@@ -1560,7 +1564,7 @@
% Suppose you have a lemma on line~2 and a lemma between line~2 and line~3.
% With \protect\cs{Xnumberonlyfirstinline}, the second lemma is considered to be on the same line as the first lemma.
% But if you use both \protect\cs{Xnumberonlyfirstinline}\oarg{s} and \protect\cs{Xnumberonlyfirstintwolines}\oarg{s}, the distinction is made.
-% Use \protect\cs{Xnumberonlyfirstintwolines}\oarg{s}\verb+[false]+ to disable this (\meta{s} can be empty if you want to disable it for every series).
+% Use the command \linebreak\protect\cs{Xnumberonlyfirstintwolines}\oarg{s}\verb+[false]+ to disable this (\meta{s} can be empty if you want to disable it for every series).
% \DescribeMacro{\Xsymlinenum}
% For setting a particular symbol in place of the line number, you can use \protect\cs{Xsymlinenum}\oarg{s}\marg{symbol} in combination with \protect\cs{Xnumberonlyfirstinline}\oarg{s}. From the second lemma of the same line, the symbol will be used instead of the line number. Note that any command called in \meta{symbol} must be robust. Use \protect\cs{robustify} to robustify a not robust command.
%
@@ -1568,7 +1572,7 @@
% \changes{v1.20.0}{2015/03/22}{Add \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} hooks}
% \label{Xtwolines}
% \DescribeMacro{\Xtwolines}\DescribeMacro{\Xmorethantwolines}
-% If a lemma is printed on two subsequent lines, \Eledmac\ will print the first and the last line numbers.
+% If a lemma is printed on two subsequent lines, \macpackage\ will print the first and the last line numbers.
% Instead of this, it is also possible to print an abbreviation which stands for ``line 1 and subsequent line(s)''.
%
% To achieve this, use \protect\cs{Xtwolines}\oarg{s}\marg{text} and \protect\cs{Xmorethantwolines}\oarg{s}\marg{text}.
@@ -1578,13 +1582,13 @@
% \Xtwolines{sq.}
% \Xmorethantwolines{sqq.}
% \end{verbatim}
-% Will print ``1sq.'' for a lemma which falls on lines 1-2 and ``1sqq.'' for a lemma which falls on lines 1-4.
+% Will print ``1sq.'' for a lemma which falls on lines 1--2 and ``1sqq.'' for a lemma which falls on lines 1--4.
%
-% \DescribeMacro{\Xmorethantwolines} If you use \protect\cs{Xtwolines} without setting \protect\cs{Xmorethantwolines}, the \meta{text} argument of \protect\cs{Xtwolines} will be used for lemmas which fall on three or more lines.
+% If you use \protect\cs{Xtwolines} without setting \protect\cs{Xmorethantwolines}, the \meta{text} argument of \protect\cs{Xtwolines} will be used for lemmas which fall on three or more lines.
%
% However, if you want to use a short form (when the lemma overlaps two lines, but not more than two), use \protect\cs{Xtwolinesbutnotmore}\oarg{series}.
%
-% It is possible to disable \protect\cs{Xtwolinesbutnotmore}\oarg{series} with \protect\cs{Xtwolinesbutnotmore}\oarg{series}\verb+[false]+.
+% It is possible to disable this again with \protect\cs{Xtwolinesbutnotmore}\oarg{series}\verb+[false]+.
%
% When you use lineation by page, the final page number, if different from the initial page number,
% will not be printed, because the final page number is included in the \protect\cs{Xendtwolines} symbol.
@@ -1599,7 +1603,7 @@
%
% \label{Xendtwolines}\changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xendtwolines}, \protect\cs{Xendmorethantwolines}, \protect\cs{Xendtwolinesbutnotmore} and \protect\cs{Xendtwolinesonlyinsamepage}.}
% \DescribeMacro{\Xendtwolines}\DescribeMacro{\Xendmorethantwolines}\DescribeMacro{\Xendtwolinesbutnotmore}
-% For endnotes, use \protect\cs{Xendtwolines}; \protect\cs{Xendmorethantwolines}; \protect\cs{Xendtwolinesbutnotmore}; \protect\cs{Xendtwolinesonlyinsamepage} instead of \protect\cs{Xtwolines}; \protect\cs{Xmorethantwolines}; \protect\cs{Xtwolinesbutnotmore}; \protect\cs{Xtwolinesonlyinsamepage}.
+% For endnotes, use the macros \protect\cs{Xendtwolines}; \protect\cs{Xendmorethantwolines}; \linebreak \protect\cs{Xendtwolinesbutnotmore}; \protect\cs{Xendtwolinesonlyinsamepage} instead of \protect\cs{Xtwolines}; \protect\cs{Xmorethantwolines}; \protect\cs{Xtwolinesbutnotmore}; \protect\cs{Xtwolinesonlyinsamepage}.
%
%
@@ -1662,9 +1666,9 @@
%
% \subsubsection{Space in place of number}
% \DescribeMacro{\Xinplaceofnumber}
-% If no number or symbolic line number is printed, you can add a space, with \protect\cs{Xinplaceofnumber}\oarg{s}\marg{l}. The default value is 1~em.
+% 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}. \protect\cs{Xendinplaceofnumber}\oarg{s}\marg{l} is the same, for critical endnotes.
+% \DescribeMacro{\Xendinplaceofnumber} \cs{Xendinplaceofnumber}\oarg{s}\marg{l} is the same, for critical endnotes.
% \subsubsection{Boxing line number and line symbol}
% \DescribeMacro{\Xboxlinenum}
% It could be useful to put the line number inside a fixed box: the content of the note will be printed after this box.
@@ -1681,7 +1685,7 @@
% \protect\cs{Xboxsymlinenum}\oarg{s}\marg{l} is the same as \protect\cs{Xboxlinenum} but for the line number symbol.
%
% \changes{v1.23.0}{2015/05/18}{Add \protect\cs{Xboxlinenumalign} and \protect\cs{Xendboxlinenumalign}.}
-% \DescribeMacro{Xboxlinenumalign}
+% \DescribeMacro{\Xboxlinenumalign}
% If you put line number in box, it will be aligned left inside the box.
% However, you can change it using \protect\cs{Xboxlinenumalign}\oarg{s}\marg{text} where \meta{text} can be the following:
% \begin{description}
@@ -1715,7 +1719,7 @@
%\subsection{Separator between the lemma and the note}
% \subsubsection{For footnotes}
% \DescribeMacro{\Xlemmaseparator}
-% By default, in a footnote, the separator between the lemma and the note is a right bracket (\protect\cs{rbracket}). You can use \protect\cs{Xlemmaseparator}\oarg{s}\marg{Xlemmaseparator} to change it. The optional argument can be used to specify the series in which it is used. Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the lemma.
+% By default, in a footnote, the separator between the lemma and the note is a right bracket (\protect\cs{rbracket}). You can use \protect\cs{Xlemmaseparator}\oarg{s}\marg{Xlemmaseparator} to change it. The optional argument can be used to specify the series in which it is used. Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the following text.
%
% \DescribeMacro{\Xbeforelemmaseparator}
% Using \protect\cs{Xbeforelemmaseparator}\oarg{s}\marg{l} you can add some space between lemma and separator. If your lemma separator is empty, this space won't be printed. The default value is 0~em.
@@ -1734,9 +1738,9 @@
% \changes{v1.22.0}{2015/04/25}{Add option for lemma separator inside endnotes}
% \DescribeMacro{\Xendlemmaseparator}
% By default, there is no separator inside endnotes between the lemma and the content of the note. You can use \protect\cs{Xendlemmaseparator}\oarg{s}\marg{Xendlemmaseparator} to change this. The optional argument can be used to specify the series in which it is used.
-% An common value of \verb+<Xendlemmaseparator>+ is \verb+\rbracket+.
+% A common value of \meta{Xendlemmaseparator} is \cs{rbracket}.
%
-% Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the lemma.
+% Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the following text.
%
% \DescribeMacro{\Xendbeforelemmaseparator}
% Using \protect\cs{Xendbeforelemmaseparator}\oarg{s}\marg{l} you can add some space between the lemma and the separator. If your lemma separator is empty, this space won't be printed. The default value is 0~em.
@@ -1768,7 +1772,7 @@
% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}.
%
% \DescribeMacro{\notefontsizeX}
-% \protect\cs{notefontsizeX}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \protect\cs{footnotesize}.
+% \protect\cs{notefontsizeX}\oarg{s}\marg{command} is used to define the font size of familiar footnotes of the series. The default value is \protect\cs{footnotesize}.
% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}.
%
% \DescribeMacro{\Xendnotefontsize}
@@ -1787,17 +1791,17 @@
% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xparindent} and \protect\cs{hangindentX}}
% \DescribeMacro{\Xparindent}
% By default, \macpackage does not add indentation before the paragraphs inside critical footnotes.
-% Use \protect\cs{Xparindent}\oarg{series} to enable indentation.
+% Use \protect\cs{Xparindent}\oarg{s} to enable indentation.
%
% \DescribeMacro{\parindentX}
% By default, \macpackage does not add indentation before the paragraphs inside familiar footnotes.
-% Use \protect\cs{parindentX}\oarg{series} to enable indentation.
+% Use \protect\cs{parindentX}\oarg{s} to enable indentation.
%
% \DescribeMacro{\Xhangindent}
% For critical notes NOT paragraphed you can define an indent with \protect\cs{Xhangindent}\oarg{s}\marg{l}, which will be applied in the second line of notes. It can help to make distinction between a new note and a break in a note. The default value is 0~pt.
%
% \DescribeMacro{\hangindentX}
-% For familiar notes NOT paragraphed you can define an indentation with \protect\cs{Xhangindent}\oarg{s}\marg{l}, which will be applied in the second line of notes. It can help to make a distinction between a new note and a break in a note.
+% For familiar notes NOT paragraphed you can define an indentation with \protect\cs{hangindentX}\oarg{s}\marg{l}, which will be applied in the second line of notes. It can help to make a distinction between a new note and a break in a note.
%
% \subsection{Arbitrary code at the beginning of notes}
% \changes{v1.1.0}{2012/09/25}{New hook to add arbitrary code at the beginning of the notes}
@@ -1809,18 +1813,20 @@
% \end{verbatim}
%
% \DescribeMacro{\Xbhooknote}
-% \protect\cs{Xbhooknote}\oarg{series}\marg{code} is to be used at the beginning of the critical footnotes.
+% \protect\cs{Xbhooknote}\oarg{s}\marg{code} is to be used at the beginning of the critical footnotes.
%
%
% \DescribeMacro{\bhooknoteX}
-% \protect\cs{bhooknoteX}\oarg{series}\marg{code} is to be used at the beginning of the familiar footnotes.
+% \protect\cs{bhooknoteX}\oarg{s}\marg{code} is to be used at the beginning of the familiar footnotes.
%
%
% \DescribeMacro{\Xendbhooknote}
-% \protect\cs{Xendbhooknote}\oarg{series}\marg{code} is to be used at the beginning of the endnotes.
+% \protect\cs{Xendbhooknote}\oarg{s}\marg{code} is to be used at the beginning of the endnotes.
%
% \subsection{Options for footnotes in columns}
% \subsubsection{Alignment}
+% \DescribeMacro{\Xcolalign}
+% \DescribeMacro{\colalignX}
% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xcolalign} and \protect\cs{colalignX} hooks}
% By default, texts in footnotes in two or three columns are flushed left without hyphenation.
% However, you can change this with \protect\cs{Xcolalign}\oarg{s}\marg{code}, for critical footnotes, and \protect\cs{colalignX}\oarg{s}\marg{code}, for familiar footnotes.
@@ -1828,12 +1834,12 @@
% \verb+<code>+ must be one of the following command:
% \begin{description}
% \item[\protect\cs{justifying}] to have text justified, as usual with \LaTeX. You can also let \verb+<code>+ empty.
-% \item[\protect\cs{raggedright}] to have text left aligned, but \emph{without hyphenation}. That is the default \protect\package{eledmac} setting.
-% \item[\protect\cs{RaggedRight}] to have text left aligned \emph{with hyphenation}.
+% \item[\protect\cs{raggedright}] to have text left aligned, but \emph{without hyphenation}. That is the default \macpackage\ setting.
+% \item[\protect\cs{RaggedRight}] to have text left aligned \emph{with hyphenation} (requires \package{ragged2e}).
% \item[\protect\cs{raggedleft}] to have text right aligned, but \emph{without hyphenation}.
-% \item[\protect\cs{RaggedLeft}] to have text right aligned \emph{with hyphenation}.
+% \item[\protect\cs{RaggedLeft}] to have text right aligned \emph{with hyphenation} (requires \package{ragged2e}).
% \item[\protect\cs{centering}] to have text centered, but \emph{without hyphenation}.
-% \item[\protect\cs{Centering}] to have text centered \emph{with hyphenation}.
+% \item[\protect\cs{Centering}] to have text centered \emph{with hyphenation} (requires \package{ragged2e}).
% \end{description}
%
% \subsubsection{Size of the columns}
@@ -1865,10 +1871,10 @@
% \subsubsection{Ragging}
% \changes{v1.12.0}{2014/08/05}{New options for ragged-paragraph notes}
% \DescribeMacro{\Xragged}
-% Text in paragraphed critical notes is justified, but you can use \protect\cs{Xragged}\oarg{s}+{L}+ if you want it to be ragged left, or \protect\cs{Xragged}\oarg{s}+{R} if you want it to be ragged right.
+% Text in paragraphed critical notes is justified, but you can use \protect\cs{Xragged}\oarg{s}\arg{L} if you want it to be ragged left, or \protect\cs{Xragged}\oarg{s}\arg{R} if you want it to be ragged right.
% \DescribeMacro{\raggedX}
-% Text in paragraphed footnotes is justified, but you can use \protect\cs{raggedX}\oarg{s}+{L}+ if you want it to be ragged left, or \protect\cs{raggedX}\oarg{s}+{R} if you want it to be ragged right.
+% Text in paragraphed footnotes is justified, but you can use \protect\cs{raggedX}\oarg{s}\arg{L} if you want it to be ragged left, or \protect\cs{raggedX}\oarg{s}\arg{R} if you want it to be ragged right.
%
% \subsection{Options for block of notes}
% \subsubsection{Text before notes}
@@ -1881,13 +1887,13 @@
% You can change the vertical space printed before the rule of the critical notes with \protect\cs{Xbeforenotes}\oarg{s}\marg{l}.
% The default value is \verb|1.2em plus .6em minus .6em|.
%
-% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \protect\package{eledmac}, decreases by 3pt. This 3pt decrease is not changed by this command..}
-% \DescribeMacro{\beforenotesX}
+% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, decreases by 3pt. This 3pt decrease is not changed by this command..}
%
+% \DescribeMacro{\beforenotesX}
% You can change the vertical space printed before the rule of the familiar notes with \protect\cs{beforenotesX}\oarg{s}\marg{l}.
% The default value is \verb|1.2em plus .6em minus .6em|.
%
-% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \protect\package{eledmac}, decreases 3pt. These 3pt are not changed by this command.}
+% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, decreases 3pt. These 3pt are not changed by this command.}
%
% \DescribeMacro{\preXnotes}
% You can set the space before the first series of critical notes printed on each page
@@ -1900,20 +1906,8 @@
% \DescribeMacro{\prenotesX}
% You can want the space before the first printed (in a page) series of familiar notes not to be the same as before other series. Default value is \verb+0pt+.
% You can do it with \protect\cs{prenotesX}\marg{l}.
-% You can disable this feature by setting the length to 0~pt.
-%
-% \DescribeMacro{\preXnotes}
-% You can set the space before the first series of critical notes printed on each page
-% and set a different amount of space for subsequent the series on the page.
-% You can do it with \protect\cs{preXnotes}\marg{l}. Default value is \verb+0pt+.
% You can disable this feature by setting the length to 0pt.
%
-%
-%
-% \DescribeMacro{\prenotesX}
-% You can want the space before the first printed (in a page) series of familiar notes not to be the same as before other series. Default value is \verb+0pt+.
-% You can do it with \protect\cs{prenotesX}\marg{l}.
-% You can disable this feature by setting the length to 0~pt.
%
%
% \subsubsection{Rule}
@@ -1922,14 +1916,14 @@
% You can change the vertical space printed after the rule of the critical notes with \protect\cs{Xafterrule}\oarg{s}\marg{l}.
% The default value is \verb|0pt|.
%
-% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \protect\package{eledmac}, adds 2.6pt. These 2.6pt are not changed by this command.}
+% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, adds 2.6pt. These 2.6pt are not changed by this command.}
%
%
% \DescribeMacro{\afterruleX}
-% You can change the vertical space printed after the rule of the familiar notes with \protect\cs{beforenotesX}\oarg{s}\marg{l}.
+% You can change the vertical space printed after the rule of the familiar notes with \protect\cs{afterruleX}\oarg{s}\marg{l}.
% % The default value is \verb|0pt|.
%
-% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \protect\package{eledmac}, adds 2.6pt. These 2.6pt are not changed by this command.}
+% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, adds 2.6pt. These 2.6pt are not changed by this command.}
%
%
% \subsubsection{Maximum height}
@@ -1937,19 +1931,19 @@
% By default, one series of critical notes can take 80\% of the page size, before being broken to the next page.
% If you want to change the size use \protect\cs{Xmaxhnotes}\oarg{s}\marg{l}.
% Be careful : the length can't be flexible, and is relative to the the current font.
-% For example, if you want the note to take, at most, 33% of the text height, do \verb|\Xmaxhnotes{.33\textheight}|.
+% For example, if you want the note to take, at most, 33\% of the text height, do \verb|\Xmaxhnotes{.33\textheight}|.
%
% \DescribeMacro{\maxhnotesX}
% \protect\cs{maxhnotesX}\oarg{s}\marg{l} is the same as previous, but for familiar footnotes.
%
% Be careful with the two previous commands.
% Actually, for technical purposes, one paragraphed note is considered as one block.
-% Consequently, it ca not be broken between two pages, even if you used these commands.
+% Consequently, it can not be broken between two pages, even if you used these commands.
% The debug is in the todolist.
% \subsection{Footnotes and the \parpackage columns}
% \changes{v1.13.0}{2014/09/16}{Add \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{noteswidthliketwocolumnsX}}
% \DescribeMacro{Xnoteswidthliketwocolumns}\DescribeMacro{noteswidthliketwocolumnsX}
-% If you use \protect\package{eledpar} \protect\cs{columns} macro, you can call :
+% If you use \parpackage\ \protect\cs{columns} macro, you can call :
% \begin{itemize}
% \item \protect\cs{Xnoteswidthliketwocolumns}\oarg{s} to create critical notes with a two-column size width. Use \protect\cs{Xnoteswidthliketwocolumns}\oarg{s}\verb+[false]+ to disable it.
% \item \protect\cs{noteswidthliketwocolumnsX}\oarg{s} to create familiar notes with a two-column size width. Use \protect\cs{noteswidthliketwocolumnsX}\oarg{s}\verb+[false]+ to disable it.
@@ -1958,13 +1952,13 @@
% \changes{v1.12.0}{2015/04/25}{Add \protect\cs{Xendparagraph} and related settings.}
% \DescribeMacro{\Xendparagraph}
% By default, any new endnote starts a new paragraph.
-% Use \protect\cs{Xendparagraph}\oarg{series} to have all end notes of one given series set in one paragraph.
+% Use \protect\cs{Xendparagraph}\oarg{s} to have all end notes of one given series set in one paragraph.
%
% \DescribeMacro{\Xendafternote}
% You can add some space after a endnote series by using \protect\cs{Xendafternote}\oarg{s}\marg{l}. The default value is \verb|1em plus.4em minus.4em|.
%
% \DescribeMacro{\Xendsep}
-% You can choose the separator between each note by \protect\cs{Xendsep}\oarg{s}\marg{text}. A common separator is the double pipe (\verb+$||$+), which you can set by using \protect\cs{Xendsep}\verb+{$\parallel$}+.
+% You can choose the separator between each note by \protect\cs{Xendsep}\oarg{s}\marg{text}. A common separator is the double pipe ($\parallel$), which you can set by using \protect\cs{Xendsep}\verb+{$\parallel$}+.
%
% \section{Fonts}\label{fonts}
% One of the most important features of the appearance of the notes,
@@ -2062,7 +2056,7 @@
% \DescribeMacro{\stanza}
% \DescribeMacro{\&}
% Use \verb?\stanza? at the start of a stanza. Each line in a stanza
-% is ended by an ampersand (\&), and the stanza itself is ended
+% is ended by an ampersand (\verb+&+), and the stanza itself is ended
% by putting \verb?\&? at the end of the last line.
%
%
@@ -2086,7 +2080,7 @@
% gives the hanging indentation to be used if the stanza line requires more
% than one print line.
%
-% If it is known that each stanza line will fit on more than one print line,
+% If it is known that each stanza line will fit in one print line,
% then this first entry should be 0; \TeX\ does less
% work in this case, but no harm ensues if the hanging indentation is not
% 0 but is never used.
@@ -2109,7 +2103,7 @@
%
% is like
%\begin{verbatim}
-%\setstanzaindents{0,1,0,1,0,1,0,1,0,1,0}
+%\setstanzaindents{5,1,0,1,0,1,0,1,0,1,0}
% \end{verbatim}
%
% \textbf{Be careful: the feature is changed in eledmac 1.5.1. See \reff{change151}.}
@@ -2165,7 +2159,7 @@
% between penalties and \emph{glue}, so it may take some adjustment of skips
% and penalties to achieve the best results.
% \subsection{Hanging symbol}
-% It is possible to insert a symbol in each line of hanging verse, as in French typography for `['. To insert it in \macpackage, use macro \DescribeMacro{\sethangingsymbol}\protect\cs{hangingsymbol}\meta{h} with this code.
+% It is possible to insert a symbol in each line of hanging verse, as in French typography for example the opening bracket [. To insert it in \macpackage, use macro \DescribeMacro{\sethangingsymbol}\protect\cs{sethangingsymbol}\marg{h} with this code.
% In the example of French typography, do
% \begin{verbatim}
% \sethangingsymbol{[\,}
@@ -2177,11 +2171,6 @@
% \subsection{Long verse and page break}
% If you want to prevent page breaks inside long verses, use the option \verb+nopbinverse+ when loading package, or use \protect\cs{lednopbinversetrue}.
% Read \reff{lednopbinversetrue} for further details.
-% \subsection{Hanging symbol}
-% It is possible to insert a symbol on each line of hanging verse, as in French typography for `['. To insert in \macpackage, use macro \DescribeMacro{\sethangingsymbol}\protect\cs{sethangingsymbol}\marg{symbol}. Fro exemple:
-% \begin{verbatim}
-% \hangingsymbol}{[\,}
-% \end{verbatim}
% \subsection{Content before/after verses}
% It is possible to add content, like a subtitle or a spacing, before or after verse:
% \begin{itemize}
@@ -2507,9 +2496,8 @@
% follows that for a \protect\cs{ledleftnote} or a \protect\cs{ledrightnote} depending
% on the margin it is put in.
%
-% If two, say, \protect\cs{ledleftnote}, commands are called in the same line the
-% second \meta{text} will obliterate the first. There is no problem though with
-% having both a left and a right sidenote on the same line.
+% If two note commands for the same side are called in the same line, they will
+% be appended and separated by a comma.
% \subsection{Setting}
% \subsubsection{Width}
% \DescribeMacro{\ledlsnotewidth}
@@ -2555,7 +2543,7 @@
% the raw index file.
%
% Note that the file \verb+.idx+ will contain the right reference only after the third run, because of the internal indexing mechanism of \protect\package{eledmac}.
-% That means you must first run three times (Xe/Lua)\LaTeX, then run \verb+makeindex+ and finally run again (Xe/Lua)\LaTeX to get an index with the right page numbers.
+% That means you must first run three times (Xe/Lua)\LaTeX, then run \verb+makeindex+ and finally run again (Xe/Lua)\LaTeX\ to get an index with the right page numbers.
%
% If the \protect\package{imakeidx} or \protect\package{indextools} package is used then the macro takes an optional
% argument, which is the name of a raw index file. For example
@@ -2975,8 +2963,8 @@
% \subsection{Prevent page break in a long verses}
%\label{lednopbinversetrue}\DescribeMacro{\lednopbinversetrue} You can also decide to prevent page breaks between two lines of a long verse. To do this, use \verb+nopbinverse+ when loading package, or add \protect\cs{lednopbinversetrue} in the beginning of your file (better: in your preamble).
%
-%This feature works only with verse of 2 lines, not more. It works at the third run, or at fourth run with \eledpar.
-% By default, when a long verse runs normally between two pages, a page break will be placed at the beginning of the verse. However, if you have added\verb+ledpbsetting{after}+, the page break will be placed at the end of the long verse, and the page containing the long verse will have one extra line.
+%This feature works only with verse of 2 lines, not more. It works at the third run, or at fourth run with \reledpar.
+% By default, when a long verse runs normally between two pages, a page break will be placed at the beginning of the verse. However, if you have added \cs{ledpbsetting}\arg{after}, the page break will be placed at the end of the long verse, and the page containing the long verse will have one extra line.
% \section{Miscellaneous}
%
%
@@ -3036,7 +3024,7 @@
%
% If after reading and applying these advices you have still problem, contact us with a minimal working example.
%
-% \subsubsection{Marginal notes}
+% \subsection{Marginal notes}
% In general, \macpackage's system for adding marginal line numbers
% breaks anything that makes direct use of the \LaTeX\ insert system,
% which includes marginpars, footnotes and floats.
@@ -3046,7 +3034,7 @@
% will throw away its contents and send a warning message to the terminal
% and log file, but will do no harm.
%
-% \subsubsection{Paragraph shape}
+% \subsection{Paragraph shape}
% \protect\cs{parshape} cannot be used within numbered text, except in a
% very restricted way.
%
@@ -3066,7 +3054,7 @@
% or some such figure, and with any
% luck the page breaks will settle down. Luckily, this problem
% does not crop up at all often.
-% \subsubsection{Paragraphed footnotes}
+% \subsection{Paragraphed footnotes}
% The restriction on explicit line-breaking in paragraphed footnotes,
% mentioned in a footnote \reff{nobreaks}, and
% described in more detail on \reff{nobreaks-detail}, really is a
@@ -3084,7 +3072,7 @@
% \protect\cs{renewcommand} for this, like: \\
% \verb?\renewcommand{\footfudgefiddle}{68}?
%
-% \subsubsection{Use with other packages}
+% \subsection{Use with other packages}
%
%
% Because of \macpackage's complexity it may not play well with other
@@ -3120,7 +3108,7 @@
% \makeatother
% \end{verbatim}
% (\protect\cs{@secondoftwo} is an internal \LaTeX\ macro that takes two arguments and
-% thows away the first one.)
+% throws away the first one.)
% The first incantation lets color show in both the main text and footnotes
% whereas the second one shows color in the main text but kills it
% in the lemma and footnotes. On the other hand if you use
@@ -3239,7 +3227,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/08/13 v2.1.1 typesset critical edition]%
+\ProvidesPackage{reledmac}[2015/08/26 v2.1.2 typesset critical edition]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -7000,7 +6988,12 @@
\csnumdef{pstartline}{\pstartline+1}%
\do@line%
\ifbypstart@%
- \ifnumequal{\pstartline}{1}{\setline{1}\resetprevline@}{}%
+ \ifnumequal{\pstartline}{1}{%
+ \bgroup%
+ \let\leavevmode\relax%
+ \setline{1}%
+ \egroup%
+ \resetprevline@}{}%
\fi%
\repeat%
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index fb83fc1afc4..65de1a12139 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -21,6 +21,7 @@
%
%<*driver>
\documentclass[twoside]{ltxdoc}
+\usepackage[T1]{fontenc}
\usepackage{url}
\usepackage{xr-hyper}
\usepackage[draft=false,
@@ -32,7 +33,7 @@
]{hyperref}
\addtolength\marginparwidth{30pt}
\usepackage{doctools}
-\usepackage{libertineotf}
+\usepackage[mono=false]{libertine}
\usepackage[series={A,B},noend,noeledsec,nofamiliar]{reledmac}
\usepackage{reledpar}
\usepackage[english]{babel}
@@ -572,7 +573,7 @@
% We have not changed this default setting, because we do not want to break compatibility with older version of \macpackage and we want to be as close as possible to default \LaTeX's feature.
%
% So, you MUST change the default setting via \protect\cs{Xmaxnotes} (for critical notes) and \protect\cs{maxhnotesX} (for familiar notes).
-% Both commands are explained in \macpackage handbook (\reff{reledmac-xmaxhnotes}).
+% Both commands are explained in \macpackage handbook (\reff{reledmac-Xmaxhnotes}).
% As an advisable setting:
% \begin{verbatim}
% \maxhXnotes{0.6\textheight}
@@ -583,14 +584,14 @@
% \DescribeMacro{\onlysideX}
% You may want to typeset notes on one side only (either left or right).
% Use \protect\cs{Xonlyside}\oarg{s}\marg{p} to set critical notes, and \protect\cs{onlysideX}\oarg{s}\marg{p} to set familiar notes.
-% \marg{p} must be set to \verb+L+ for notes to be confined only on the left side and to \verb+R+ for notes to be confined only on the right side.
+% \meta{p} must be set to \verb+L+ for notes to be confined only on the left side and to \verb+R+ for notes to be confined only on the right side.
% \subsubsection{Familiar notes called in the right side, but to be printed in the left side}
% \DescribeMacro{\footnoteXnomk}
% \DescribeMacro{\footnoteXmk}
% As often happens, the left side has less room for text.
% We may want to call familiar notes in the right side while using at the same time the available space in the left side to print them.
%
-% To achieve this, we call \protect\cs{footnoteXnomk}\marg{notecontent} in the left side. X is to be replaced by the series letter. We do this call in the left side after the word which matches up to the one in the right side after which we want to insert the actual footnote mark.
+% To achieve this, we call \protect\cs{footnoteXnomk}\marg{notecontent} in the left side. \verb+X+ is to be replaced by the series letter. We do this call in the left side after the word which matches up to the one in the right side after which we want to insert the actual footnote mark.
%
% In the right side, we call \protect\cs{footnoteXmk} at the place we want to have the footnote mark. X is to be replaced by the series letter.
% For example:
@@ -688,6 +689,11 @@
% useful if you are putting some kind of marker (even if it is only a
% blank line) between stanzas. Remember, parallel texts must be numbered
% and this provides a way to slip in an ``unnumbered'' line.
+% \DescribeMacro{\hidenumbering}
+% \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 \protect\cs{stanza}, you must call it at the beginning of the verse.
% \subsection{Line numbering scheme}
% Within these environments you can designate the line numbering scheme(s)
% to be used.
@@ -803,7 +809,7 @@
% To enable this function, load \parpackage with the option \verb+shiftedpstarts+.
% \section{Verse}
%
-% If you are typesetting verse with \macpackage you can use the \protect\cs{stanza}
+% If you are typesetting verses with \macpackage you can use the \protect\cs{stanza}
% construct, and you can also use this in right or left parallel texts.
% In this case each verse line is a chunk which has two implications.
% (1) you can unexpectedly exceed the \protect\cs{maxchunks} limit or the overall
@@ -819,9 +825,12 @@
% \env{astanza} environment each verse line is treated as an individual paragraph,
% so there must be no blank lines in the environment otherwise there will
% be some extraneous vertical spacing.
-% To use \env{astanza}, imply replace \cs{astanza} by \cs{begin}\arg{astanza} and
+% To use \env{astanza}, simply replace \cs{stanza} by \cs{begin}\arg{astanza} and
% add \cs{end}\arg{astanza} after the ending \expandafter\cs\expandafter{\&}.
%
+% The difference between \env{astanza} and \cs{stanza} is, that the letter syncs
+% verse by verse, while the enviornment syncs stanza by stanza.
+%
% If you get an error message along the lines of `Missing number,
% treated as zero \protect\cs{sza@0@}' it is because you have forgotten to use
% \protect\cs{setstanzaindents} to set the stanza indents.