summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/eledmac/eledpar.sty')
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledpar.sty49
1 files changed, 19 insertions, 30 deletions
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%