summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac/eledpar.dtx')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx86
1 files changed, 45 insertions, 41 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 9d3458ac6b4..0ebc77660de 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -51,7 +51,7 @@
%
% \fi
%
-% \CheckSum{4628}
+% \CheckSum{4593}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -177,6 +177,8 @@
% \changes{v1.8.0}{2014/08/05}{Add, as in eledmac, possibility to insert something after \cs{pend}s / verses.}
% \changes{v1.8.0}{2014/08/05}{Add, as in eledmac, possibility to insert something between \cs{pstart}s / verse.}
% \changes{v1.8.0}{2014/08/05}{Add, as in eledmac, new system of sectioning commands.}
+% \changes{v1.8.2}{2014/08/15}{Debug left and side note (bugs added by 1.8.0)}
+% \changes{v1.8.2}{2014/08/15}{Debug \cs{eledxxx} with some paper size}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -219,7 +221,7 @@
% Note that before September 2012, eledpar was called ledpar. The changes from ledmac/ledpar to eledmac/eledpar is explained in ledmac documentation.
%
% \Lpack{eledpar} provides many tools and options. Normally, they are all documented in this file.
-% However, to help people, a ``\href{examples/.}{examples}'' folder is provided, with example for some needs, but not for all.
+% Also provided is a help folder, ``\href{examples/.}{examples}''. The folder contains additional examples (although not for all cases).
%
% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac). GitHub accounts are free for open-source users. You can report bug in English or in French (better).
%
@@ -517,7 +519,10 @@
% Generally speaking, controls like \cs{firstlinenum} or \cs{linenummargin}
% apply to sequential and left texts. To effect right texts only they have
% to be within a \verb?Rightside? environment.
-
+% \DescribeMacro{\lineationR}
+% \cs{lineationR} macro is the equivalent of \Lpack{eledmac} \cs{lineation} macro for the right side.
+% \DescribeMacro{\lineation*}
+% \cs{lineation*} macro is the equivalent of \Lpack{eledmac} \cs{lineation} macro for both sides.
% If you are using the
% \Lpack{babel} package with different languages
% (via, say, \cs{selectlanguage}) for the left and right texts it is
@@ -601,7 +606,6 @@
% This may be useful for parallel columns but for parallel pages it might
% be more appropriate to redefine it as: \\
% \verb?\renewcommand*{\Rlineflag}{}?.
-%
% \DescribeMacro{\printlinesR}
% \DescribeMacro{\ledsavedprintlines}
% The \cs{printlines} macro is ordinarily used to print the line number
@@ -850,7 +854,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2014/08/07 v1.8.1 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2014/08/15 v1.8.2 eledmac extension for parallel texts]%
% \end{macrocode}
% With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -910,10 +914,16 @@
%
% All the error and warning messages are collected here as macros.
%
+% \begin{macro}{\eledpar@error}
+% \changes{v1.8.2}{2014/08/15}{Errors specific to eledpar send to eledpar handbook}
+% \begin{macrocode}
+\newcommand{\eledpar@error}[2]{\PackageError{eledpar}{#1}{#2}}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led@err@TooManyPstarts}
% \begin{macrocode}
\newcommand*{\led@err@TooManyPstarts}{%
- \eledmac@error{Too many \string\pstart\space without printing.
+ \eledpar@error{Too many \string\pstart\space without printing.
Some text will be lost}{\@ehc}}
% \end{macrocode}
% \end{macro}
@@ -921,7 +931,7 @@
% \begin{macro}{\led@err@BadLeftRightPstarts}
% \begin{macrocode}
\newcommand*{\led@err@BadLeftRightPstarts}[2]{%
- \eledmac@error{The numbers of left (#1) and right (#2)
+ \eledpar@error{The numbers of left (#1) and right (#2)
\string\pstart s do not match}{\@ehc}}
% \end{macrocode}
% \end{macro}
@@ -930,9 +940,9 @@
% \begin{macro}{\led@err@RightOnLeftPage}
% \begin{macrocode}
\newcommand*{\led@err@LeftOnRightPage}{%
- \eledmac@error{The left page has ended on a right page}{\@ehc}}
+ \eledpar@error{The left page has ended on a right page}{\@ehc}}
\newcommand*{\led@err@RightOnLeftPage}{%
- \eledmac@error{The right page has ended on a left page}{\@ehc}}
+ \eledpar@error{The right page has ended on a left page}{\@ehc}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1185,6 +1195,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\lineation*}
+% \changes{v1.8.2}{2014/08/15}{Add \cs{lineation*}}
+% \cs{lineation*} change the lineation system for the side.
+% \begin{macrocode}
+\WithSuffix\newcommand\lineation*[1]{%
+ \lineation{#1}%
+ \lineationR{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\linenummargin}
% \begin{macro}{\line@marginR}
% You call \cs{linenummargin}\marg{word} to specify which margin you want your
@@ -2066,24 +2086,7 @@
% \cs{flag@start} and \cs{flag@end}: these send the \cs{@ref}
% command to the line-list file.
% \changes{v0.3}{2005/02/04}{Removed extraneous spaces from\cs{flag@end}}
-% \begin{macrocode}
-\renewcommand*{\flag@start}{%
- \ifledRcol
- \edef\next{\write\linenum@outR{%
- \string\@ref[\the\insert@countR][}}%
- \next
- \else
- \edef\next{\write\linenum@out{%
- \string\@ref[\the\insert@count][}}%
- \next
- \fi}
-\renewcommand*{\flag@end}{%
- \ifledRcol
- \write\linenum@outR{]}%
- \else
- \write\linenum@out{]}%
- \fi}
-% \end{macrocode}
+% \changes{v1.8.2}{2014/08/15}{\cs{flag@start} and \cs{flag@end} are now defined only one time for eledmac and eledpar}
% \end{macro}
% \end{macro}
%
@@ -2745,7 +2748,7 @@
% \changes{v0.11}{2012/06/11}{Change \cs{do@lineL} and \cs{do@lineR} to allow line numbering by pstart (like in eledmac 0.15).}
% \changes{v1.8.0}{2014/08/05}{Change \cs{do@lineR} and \cs{do@lineR} to allow new sectioning commands.}
% \begin{macro}{\do@lineL}
-% \changes{v1.8.1}{2014/08/07}{Fix a bug with critical notes a the begining of a page, added by v1.8.0 (?).}
+% \changes{v1.8.1}{2014/08/07}{Fix a bug with critical notes a the begining of a page, (maybe added by v1.8.0) (?).}
% The \cs{do@lineL} macro is called to
% do all the processing for a single line of left text.
% \changes{v0.3}{2005/02/10}{Added \cs{do@lineLhook} to \cs{do@lineL}}
@@ -2814,10 +2817,10 @@
\@eled@sectioningfalse%
\global\csundef{eled@sectioning@\the\l@dpscL}%
\if@RTL%
- \hspace{-\paperwidth}%
+ \hspace{-3\paperwidth}%
{\hbox{\l@dunhbox@line{\one@line}} \new@line}%
\else%
- \hspace{\paperwidth}%
+ \hspace{3\paperwidth}%
{\new@line \hbox{\l@dunhbox@line{\one@line}}}%
\fi%
\vskip\eledsection@correcting@skip%
@@ -3573,8 +3576,8 @@
% \end{macro}
%
-% \changes{v1.3.3}{2012/12/19}{Debug on the left notes of the right column.}
-% \changes{v1.3.4}{2013/07/03}{Allow to use commands in sidenotes, like it was introduced by eledmac 1.0.}
+% \changes{v1.3.3}{2012/12/19}{Debugging the left notes of the right column.}
+% \changes{v1.3.4}{2013/07/03}{Allow use of commands in sidenotes, as introduced by eledmac 1.0.}
% \changes{v1.8.0}{2014/08/05}{\cs{l@dlsnote},\cs{l@drsnote} and \cs{l@dcsnote} defined only one time, in \Lpack{eledmac}. }
% \begin{macro}{\affixside@noteR}
% The right text version of \cs{affixside@note}.
@@ -3582,19 +3585,20 @@
% \begin{macrocode}
\newcommand*{\affixside@noteR}{%
\def\sidenotecontent@{}%
- \numdef{\itemcount@}{0}%
+ \numgdef{\itemcount@}{0}%
\def\do##1{%
\ifnumequal{\itemcount@}{0}%
{%
\appto\sidenotecontent@{##1}}% Not print not separator before the 1st note
{\appto\sidenotecontent@{\sidenotesep ##1}%
}%
- \numdef{\itemcount@}{\itemcount@+1}%
+ \numgdef{\itemcount@}{\itemcount@+1}%
}%
\dolistloop{\l@dcsnotetext}%
- \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@numR\space p. \the\page@numR,}}{}%
+ \ifnumgreater{\itemcount@}{1}{\led@err@ManySidenotes}{}%
\gdef\@templ@d{}%
- \ifx\@templ@d\l@dcsnotetext \else%
+ \gdef\@templ@n{\l@dcsnotetext\l@dcsnotetext@l\l@dcsnotetext@r}%
+ \ifx\@templ@d\@templ@n \else%
\if@twocolumn%
\if@firstcolumn%
\setl@dlp@rbox{##1}{\sidenotecontent@}%
@@ -3611,14 +3615,14 @@
\gdef\sidenotecontent@{}%
\numdef{\itemcount@}{0}%
\dolistloop{\l@dcsnotetext@l}%
- \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space leftnotes on line \the\line@numR\space p. \the\page@numR,}}{}%
+ \ifnumgreater{\itemcount@}{1}{\led@err@ManyLeftnotes}{}%
\setl@dlp@rbox{\sidenotecontent@}%
\else%
\setl@dlp@rbox{\sidenotecontent@}%
\gdef\sidenotecontent@{}%
\numdef{\itemcount@}{0}%
\dolistloop{\l@dcsnotetext@r}%
- \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space rightnotes on line \the\line@numR\space p. \the\page@numR,}}{}%
+ \ifnumgreater{\itemcount@}{1}{\led@err@ManyRightnotes}{}%
\setl@drp@rbox{\sidenotecontent@}%
\fi%
\fi%
@@ -4246,9 +4250,9 @@
% \end{macro}
% \begin{macro}{\print@columnseparator}
% \changes{v1.8.0}{2014/08/05}{Move some code of \cs{Columns} to \cs{print@columnseparator}.}
-% \cs{print@columnseparator} print the colum separator, with spaces around, following user's setting.
+% \cs{print@columnseparator} prints the column separator, with surrounding spaces (as the user has set them).
% We use the \TeX\ \cs{ifdim} instead of \Lpack{etoolbox}
-% to avoid having \cs{hfill} in a \verb+{}+, which delete some (little) space.
+% to avoid having \cs{hfill} in a \verb+{}+, which deletes some space (but not much).
% \begin{macrocode}
\def\print@columnseparator{%
\ifdim\beforecolumnseparator<0pt%
@@ -4320,7 +4324,7 @@
% \end{macro}
% \begin{macro}{\beforecolumnseparator}
% \begin{macro}{\aftercolumnseparator}
-% \cs{beforecolumnseparator} and \cs{aftercolumnseparator} lengths are defined to \verb+-1pt+. If user change them to a positive length, the lengths are used to define blank spaces before / after the column separator, instead of \cs{hfill}.
+% \cs{beforecolumnseparator} and \cs{aftercolumnseparator} lengths are defined to \verb+-1pt+. If user changes them to a positive length, the lengths are used to define blank spaces before / after the column separator, instead of \cs{hfill}.
% \begin{macrocode}
\newlength{\beforecolumnseparator}%
\setlength{\beforecolumnseparator}{-2pt}%