From 6390fb977ecb8974cd83582aee6ef5cfd273b8ab Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Aug 2014 22:04:15 +0000 Subject: eledmac (14aug14) git-svn-id: svn://tug.org/texlive/trunk@34935 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 217 ++++++++++++++++++------ Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 49 +++--- 2 files changed, 188 insertions(+), 78 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 37d71b7134c..584c5c658ba 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -25,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/08/07 v1.12.2 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/08/15 v1.12.3 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -132,6 +132,42 @@ \eledmac@warning{Bad \string\sidenotemmargin\space argument}} \newcommand*{\led@warn@NoIndexFile}[1]{% \eledmac@warning{Undefined index file #1}} +\newcommand{\led@warn@AddfootinsXObsolete}{% + \eledmac@warning{AddfootinsX is obsolete in eledmac 1.0. Use newseries instead.}% +}% +\newcommand{\led@warn@AddfootinsObsolete}{% + \eledmac@warning{Addfootins is obsolete in eledmac 1.0. Use newseries instead.}% +}% +\newcommand{\led@warn@SeriesStillExist}[1]{% + \eledmac@warning{Series #1 is still existing !}% +}% +\newcommand{\led@err@ManySidenotes}{% + \ifledRcol@% + \eledmac@warning{\itemcount@\space sidenotes on line \the\line@numR\space p. \the\page@numR}% + \else% + \eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num}% + \fi% +}% +\newcommand{\led@err@ManyLeftnotes}{% + \ifledRcol@% + \eledmac@warning{\itemcount@\space leftnotes on line \the\line@numR\space p. \the\page@numR}% + \else% + \eledmac@warning{\itemcount@\space leftnotes on line \the\line@num\space p. \the\page@num}% + \fi% +}% +\newcommand{\led@err@ManyRightnotes}{% + \ifledRcol@% + \eledmac@warning{\itemcount@\space rightnotes on line \the\line@numR\space p. \the\page@numR}% + \else% + \eledmac@warning{\itemcount@\space rightnotes on line \the\line@num\space p. \the\page@num}% + \fi% +}% +\newcommand{\led@war@FalseverseDeprecated}{% + \eledmac@warning{\string\falseverse\space deprecated. Look at \string\newverse\space instead.}% +}% +\newcommand{\led@war@ledxxxDeprecated}[1]{% + \eledmac@warning{\string\led#1\space deprecated. Look at \string\e#1 instead.}% +}% \newcommand*{\led@err@TooManyColumns}{% \eledmac@error{Too many columns}{\@ehc}} \newcommand*{\led@err@UnequalColumns}{% @@ -143,6 +179,12 @@ \eledmac@error{End column is too high}{\@ehc}} \newcommand*{\led@err@ReverseColumns}{% \eledmac@error{Start column is greater than end column}{\@ehc}} +\newcommand{\led@err@EdtextWithoutFootnote}{% + \eledmac@error{edtext without Xfootnote. Check syntaxis.}{\@ehd}% +}% +\newcommand{\led@error@ImakeidxAfterEledmac}{% + \eledmac@error{Imakeidx must be loaded before eledmac.}{\@ehd}% +}% \newcount\section@num \section@num=0 \let\extensionchars=\empty @@ -702,10 +744,28 @@ } \newcommand*{\flag@start}{% - \edef\next{\write\linenum@out{% + \ifledRcol% + \edef\next{\write\linenum@outR{% + \string\@ref[\the\insert@countR][}}% + \next% + \ifnum\insert@countR<1% + \led@err@EdtextWithoutFootnote% + \fi% + \else% + \edef\next{\write\linenum@out{% \string\@ref[\the\insert@count][}}% - \next} -\newcommand*{\flag@end}{\write\linenum@out{]}} + \next% + \ifnum\insert@count<1% + \led@err@EdtextWithoutFootnote% + \fi% + \fi}% + +\newcommand*{\flag@end}{% + \ifledRcol% + \write\linenum@outR{]}% + \else% + \write\linenum@out{]}% + \fi}% \newcommand*{\page@start}{} \newcommand*{\startsub}{\dimen0\lastskip @@ -745,6 +805,7 @@ \list@create{\end@lemmas} \long\def\dummy@text#1#2/{#1} \newcommand{\dummy@edtext}[2]{#1} +\newcommand{\dummy@edtext@showlemma}[2]{\showlemma{#1}}% \newcommand*{\no@expands}{% \let\select@@lemmafont=0% \let\startsub=\relax \let\endsub=\relax @@ -978,10 +1039,10 @@ \@eled@sectioningfalse% \global\csundef{eled@sectioning@\the\l@dnumpstartsL}% \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-\baselineskip% @@ -2268,7 +2329,7 @@ } \newcommand*{\addfootinsX}[1]{% - \eledmac@warning{AddfootinsX is obsolete in eledmac 1.0. Use newseries instead.}% + \led@warn@AddfootinsXObsolete% \footnormalX{#1}% \g@addto@macro{\doxtrafeeti}{% \setbox\@outputbox \vbox{% @@ -2351,7 +2412,7 @@ } \newcommand{\@series}{} \newcommand{\newseries@}[1]{ - \xifinlist{#1}{\@series}{\eledmac@warning{Series #1 is still existing !}} + \xifinlist{#1}{\@series}{\led@warn@SeriesStillExist{#1}}% {% \newtoggle{Xlemmadisablefontselection@#1} \newtoggle{Xendlemmadisablefontselection@#1} @@ -2794,7 +2855,7 @@ } \newcommand*{\addfootins}[1]{% - \eledmac@warning{addfootins is deprecated, use newseries instead} + \led@warn@AddfootinsObsolete% \footnormal{#1} \g@addto@macro{\@opxtrafeetii}{% \ifvoid\@nameuse{#1footins}\else @@ -3028,7 +3089,7 @@ \newcommand*{\ledrightnote}[1]{\edtext{}{\l@drsnote{#1}}} \newcommand*{\ledinnernote}[1]{% - \ifodd\page@num% + \ifodd\c@page% Do not use \page@num, because not yet calculated when command is called \ledleftnote{#1}% \else% \ledrightnote{#1}% @@ -3036,7 +3097,7 @@ } \newcommand*{\ledouternote}[1]{% - \ifodd\page@num% + \ifodd\c@page% Do not use \page@num, because not yet calculated when command is called \ledrightnote{#1}% \else% \ledleftnote{#1}% @@ -3151,19 +3212,20 @@ \newcommand{\sidenotesep}{, } \newcommand*{\affixside@note}{% \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@num\space p. \the\page@num,}}{}% + \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@}% @@ -3178,16 +3240,16 @@ \ifodd\@l@dtempcntb% \setl@drp@rbox{\sidenotecontent@}% \gdef\sidenotecontent@{}% - \numdef{\itemcount@}{0}% + \numgdef{\itemcount@}{0}% \dolistloop{\l@dcsnotetext@l}% - \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space leftnotes on line \the\line@num\space p. \the\page@num,}}{}% + \ifnumgreater{\itemcount@}{1}{\led@err@ManyLeftnotes}{}% \setl@dlp@rbox{\sidenotecontent@}% \else% \setl@dlp@rbox{\sidenotecontent@}% \gdef\sidenotecontent@{}% - \numdef{\itemcount@}{0}% + \numgdef{\itemcount@}{0}% \dolistloop{\l@dcsnotetext@r}% - \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space rightnotes on line \the\line@num\space p. \the\page@num,}}{}% + \ifnumgreater{\itemcount@}{1}{\led@err@ManyRightnotes}{}% \setl@drp@rbox{\sidenotecontent@}% \fi% \fi% @@ -3329,7 +3391,7 @@ \@ifpackageloaded{imakeidx}{\eledmac@after@imakeidx@true}{} \AtBeginDocument{% \ifeledmac@after@imakeidx@\else% - \@ifpackageloaded{imakeidx}{\eledmac@error{Imakeidx must be loaded before eledmac.}}{}% + \@ifpackageloaded{imakeidx}{\led@error@ImakeidxAfterEledmac}{}% \fi } \newcommand{\pagelinesep}{-} @@ -3507,7 +3569,8 @@ \begingroup \expandafter\let\csname\@currenvir\endcsname\l@dcollect@@body \edef\processl@denvbody{\expandafter\noexpand\csname\@currenvir\endcsname}% - \processl@denvbody} + \processl@denvbody% + }% \def\l@dpush@begins#1\begin#2{% \ifx\end#2\else b\expandafter\l@dpush@begins\fi} @@ -3600,7 +3663,7 @@ \expandafter\noexpand\csname szp@0@\endcsname=\z@ \let\noexpand\sza@penalty\relax\noexpand\fi% \def\noexpand\falseverse{% - \noexpand\eledmac@warning{\string\falseverse\space deprecated. Look at \string\newverse\space instead.} + \noexpand\led@war@FalseverseDeprecated% \global\advance\stanza@modulo-\@ne% \global\advance\stanza@count-\@ne% \relax\noexpand&\leavevmode\skipnumbering} @@ -3650,6 +3713,44 @@ \let\edrowfill=0% } +\newcommand{\disable@familiarnotes}{% + \def\do##1{% + \csletcs{footnote@@##1}{footnote##1}% + \expandafter\renewcommand \csname footnote##1\endcsname[1]{% + \protected@csxdef{@thefnmark##1}{\csuse{thefootnote##1}}% + \csuse{@footnotemark##1}% + }% + }% + \dolistloop{\@series}% +}% +\newcommand{\restore@familiarnotes}{% + \def\do##1{% + \csletcs{footnote##1}{footnote@@##1}% + }% + \dolistloop{\@series}% +}% + +\newcommand{\disable@sidenotes}{% + \let\@@ledrightnote\ledrightnote% + \let\@@ledleftnote\ledleftnote% + \let\@@ledsidenote\ledsidenote% + \let\ledrightnote\@gobble% + \let\ledleftnote\@gobble% + \let\ledsidenote\@gobble% +}% +\newcommand{\restore@sidenotes}{% + \let\ledrightnote\@@ledrightnote% + \let\ledleftnote\@@ledleftnote% + \let\ledsidenote\@@ledsidenote% +}% +\newcommand{\disable@notes}{% + \disable@sidenotes% + \disable@familiarnotes% +}% +\newcommand{\restore@notes}{% + \restore@sidenotes% + \restore@familiarnotes% +}% \newcount\l@dampcount \l@dampcount=1\relax \newcount\l@dcolcount @@ -3838,7 +3939,7 @@ \def\edlabel##1{\xedlabel{##1}}} \def\setmcellright #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip \let\Next\relax% \else\l@dcolcount=0% @@ -3847,7 +3948,9 @@ \else% \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{$\displaystyle{#1}$}% + \restore@notes% \letsforverteilen% \hskip\hilfsskip$\displaystyle{#1}$% \hskip\edtabcolsep% @@ -3855,7 +3958,7 @@ \fi\Next} \def\settcellright #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip \let\Next\relax% \else\l@dcolcount=0% @@ -3864,48 +3967,56 @@ \else% \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{#1}% + \restore@notes% \letsforverteilen% \hskip\hilfsskip#1% \hskip\edtabcolsep% \let\Next=\settcellright% \fi\Next} \def\setmcellleft #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% \let\Next=\setmcellleft% \fi% \else \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{$\displaystyle{#1}$}% - \letsforverteilen + \restore@notes% + \letsforverteilen% $\displaystyle{#1}$\hskip\hilfsskip\hskip\edtabcolsep% \let\Next=\setmcellleft% \fi\Next} \def\settcellleft #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% \let\Next=\settcellleft% \fi% \else \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{#1}% - \letsforverteilen + \restore@notes% + \letsforverteilen% #1\hskip\hilfsskip\hskip\edtabcolsep% \let\Next=\settcellleft% \fi\Next} \def\setmcellcenter #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0\let\Next\relax% \else\l@dcolcount=0% \let\Next=\setmcellcenter% \fi% \else \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{$\displaystyle{#1}$}% + \restore@notes% \letsforverteilen% \hskip 0.5\hilfsskip$\displaystyle{#1}$\hskip0.5\hilfsskip% \hskip\edtabcolsep% @@ -3913,14 +4024,16 @@ \fi\Next} \def\settcellcenter #1&{\def\edlabel##1{}% - \let\edindex\nulledindex + \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% \let\Next=\settcellcenter% \fi% \else \disablel@dtabfeet% \stepl@dcolcount% + \disable@notes% \setbox\hilfsbox=\hbox{#1}% + \restore@notes% \letsforverteilen% \hskip 0.5\hilfsskip #1\hskip 0.5\hilfsskip% \hskip\edtabcolsep% @@ -4023,7 +4136,6 @@ \ifnum #1>#2\relax \l@dstartendokfalse \led@err@ReverseColumns -%%% \eledmac@error{Start column is greater than end column}{\@ehc}% \fi } @@ -4113,11 +4225,13 @@ \enablel@dtabfeet} \newcommand{\measuretbody}[1]{% + \disable@notes% \disablel@dtabfeet% \l@dcolcount=0% \nullsetzen% \l@dcolcount=0 \measuretrow #1\\&\\% + \restore@notes% \global\l@dampcount=1} \newcommand{\ltab}[1]{% @@ -4246,42 +4360,48 @@ \usingedtext \newcommand{\initnumbering@sectcmd}{ - \newcommand{\ledsection}[2][]{\eledmac@warning{\string\ledsection\space deprecated}% + \newcommand{\ledsection}[2][]{% + \led@war@ledxxxDeprecated{section}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\section[##1]{##2}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend% \vspace{-2\parskip}\vspace{-2\baselineskip}% \ifautopar\else\pstart\fi } - \WithSuffix\newcommand\ledsection*[1]{\eledmac@warning{\string\ledsection*\space deprecated}% + \WithSuffix\newcommand\ledsection*[1]{% + \led@war@ledxxxDeprecated{section*}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\section*{##1}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend% \vspace{-2\parskip}\vspace{-2\baselineskip}% \ifautopar\else\pstart\fi } - \newcommand{\ledsubsection}[2][]{\eledmac@warning{\string\ledsubsection*\space deprecated}% + \newcommand{\ledsubsection}[2][]{% + \led@war@ledxxxDeprecated{subsection}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend% \vspace{-2\parskip}\vspace{-2\baselineskip}% \ifautopar\else\pstart\fi } - \WithSuffix\newcommand\ledsubsection*[1]{\eledmac@warning{\string\ledsubsection*\space deprecated}% + \WithSuffix\newcommand\ledsubsection*[1]{% + \led@war@ledxxxDeprecated{subsection*}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend% \vspace{-2\parskip}\vspace{-2\baselineskip}% \ifautopar\else\pstart\fi } - \newcommand{\ledsubsubsection}[2][]{\eledmac@warning{\string\ledsubsubsection*\space deprecated}% + \newcommand{\ledsubsubsection}[2][]{% + \led@war@ledxxxDeprecated{subsubsection}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsubsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend% \vspace{-2\parskip}\vspace{-2\baselineskip}% \ifautopar\else\pstart\fi } - \WithSuffix\newcommand\ledsubsubsection*[1]{\eledmac@warning{\string\ledsubsubsection*\space deprecated}% + \WithSuffix\newcommand\ledsubsubsection*[1]{% + \led@war@ledxxxDeprecated{subsubsection*}% \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi% \pstart% \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsubsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend% @@ -4289,7 +4409,7 @@ \ifautopar\else\pstart\fi } \newcommand\ledchapter[2][]{% - \eledmac@warning{\string\ledchapter\space deprecated}% + \led@war@ledxxxDeprecated{chapter}% \ifl@dmemoir% \gdef\ch@pt@c{##1}% \fi% @@ -4298,7 +4418,7 @@ \@patchforledchapter\chapter[##1]{##2}% \pend\pstart} \WithSuffix\newcommand\ledchapter*[1]{% - \eledmac@warning{\string\ledchapter*\space deprecated}% + \led@war@ledxxxDeprecated{chapter*}% ~\pend\skipnumbering% \pstart% \@patchforledchapter\chapter*{##1}\pend% @@ -4420,7 +4540,7 @@ \pretocmd{\M@sect} {\let\old@edtext=\edtext% - \let\edtext=\dummy@edtext% + \let\edtext=\dummy@edtext@showlemma% } {} {} @@ -4448,7 +4568,7 @@ \pretocmd{\@mem@old@ssect} {\let\old@edtext=\edtext% - \let\edtext=\dummy@edtext% + \let\edtext=\dummy@edtext@showlemma% } {} {} @@ -4476,7 +4596,7 @@ \patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{% \if@eled@sectioning\else% - \leavevmode\if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \eledsection : will make the critical notes not in the same page than title. + \leavevmode\if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \eledsection : will keep critical notes from printing on the title page. \fi% }% {}% @@ -4511,7 +4631,7 @@ \pretocmd{\@sect} {\let\old@edtext=\edtext - \let\edtext=\dummy@edtext% + \let\edtext=\dummy@edtext@showlemma% } {} {} @@ -4539,7 +4659,7 @@ \pretocmd{\@ssect} {\let\old@edtext=\edtext% - \let\edtext=\dummy@edtext% + \let\edtext=\dummy@edtext@showlemma% } {} {} @@ -4674,18 +4794,18 @@ {% \ifstrempty{#1}% {% - \global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext\chapter{#2}}% + \global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext@showlemma\chapter{#2}}% \global\csdef{eled@sectmark@#3#5}{\let\edtext=\dummy@edtext{}\chaptermark{#2}}% }%Need for \pairs, because of using parbox. {% - \global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext\chapter[#1]{#2}}% + \global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext@showlemma\chapter[#1]{#2}}% \global\csdef{eled@sectmark@#3#5}{\let\edtext=\dummy@edtext{}\chaptermark{#2}}%Need for \pairs, because of using parbox. }% }% {% \ifstrempty{#1}% - {\global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext\chapter*{#2}}} - {\global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext\chapter*[#1]{#2}}}%Bug in LaTeX! + {\global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext@showlemma\chapter*{#2}}}% + {\global\csdef{eled@sectioning@#3#5}{\let\edtext=\dummy@edtext@showlemma\chapter*[#1]{#2}}}%Bug in LaTeX! }% \listcsgadd{eled@sections#5@@}{#3}% } @@ -4786,6 +4906,7 @@ \fi% \fi\fi\fi% } + \endinput %% %% End of file `eledmac.sty'. diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index 77d996a63d1..bf98ff1bd66 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -22,9 +22,8 @@ %% %% This work consists of the files listed in the README file. %% - \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]% \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -42,16 +41,17 @@ \newdimen\Rcolwidth \Rcolwidth=0.45\textwidth +\newcommand{\eledpar@error}[2]{\PackageError{eledpar}{#1}{#2}} \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}} \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}} \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}} \newcount\section@numR \section@numR=\z@ \pst@rtedLfalse @@ -182,6 +182,10 @@ \fi \fi \fi}} +\WithSuffix\newcommand\lineation*[1]{% + \lineation{#1}% + \lineationR{#1}% +}% \newcount\line@marginR \renewcommand*{\linenummargin}[1]{{% \l@dgetline@margin{#1}% @@ -623,22 +627,6 @@ \write\linenum@out{\string\@nl[\the\c@page][\thepage]}} \newcommand*{\new@lineR}{% \write\linenum@outR{\string\@nl[\the\c@page][\thepage]}} -\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} \renewcommand*{\startsub}{\dimen0\lastskip \ifdim\dimen0>0pt \unskip \fi \ifledRcol \write\linenum@outR{\string\sub@on}% @@ -1025,10 +1013,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% @@ -1493,19 +1481,20 @@ \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@}% @@ -1522,14 +1511,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% -- cgit v1.2.3