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.sty136
1 files changed, 78 insertions, 58 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index eeed6e1bdef..871a524420f 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
@@ -24,11 +24,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/09/16 v1.0.1 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/09/25 v1.1 eledmac extension for parallel texts]
-\newif\ifshiftedverses
-\shiftedversesfalse
-\DeclareOption{shiftedverses}{\shiftedversestrue}
+\newif\ifshiftedpstarts
+\let\shiftedversestrue\shiftedpstartstrue
+\let\shiftedversesfalse\shiftedpstartsfalse
+\DeclareOption{shiftedverses}{\shiftedpstartstrue}
+\DeclareOption{shiftedpstarts}{\shiftedpstartstrue}
\ProcessOptions
\l@dpairingfalse
\newif\ifl@dpaging
@@ -162,12 +164,12 @@
\global\bypage@Rfalse
\global\bypstart@Rtrue
\else
- \def@tempb{section}
- \ifx\@tempa\@tempb
+ \def@tempb{section}
+ \ifx\@tempa\@tempb
\global\bypage@Rfalse
\global\bypstart@Rfalse
- \else
- \led@warn@BadLineation
+ \else
+ \led@warn@BadLineation
\fi
\fi
\fi
@@ -792,11 +794,11 @@
\newcommand*{\pstartL}{
\if@nobreak
-\let\@oldnobreak\@nobreaktrue
+ \let\@oldnobreak\@nobreaktrue
\else
-\let\@oldnobreak\@nobreakfalse
+ \let\@oldnobreak\@nobreakfalse
\fi
-\@nobreaktrue
+ \@nobreaktrue
\ifnumbering \else
\led@err@PstartNotNumbered
\beginnumbering
@@ -806,7 +808,7 @@
\pend
\fi
\ifpst@rtedL\else
- \setcounter{pstartLold}{\value{pstartL}}%
+ \setcounter{pstartLold}{\value{pstartL}}%
\list@clear{\inserts@list}%
\global\let\next@insert=\empty
\global\pst@rtedLtrue
@@ -819,14 +821,17 @@
\fi
\global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartL\fi\fi\fi%
\hsize=\Lcolwidth
- \numberedpar@true}
+ \numberedpar@true
+ \iflabelpstart\protected@edef\@currentlabel
+ {\p@pstartL\thepstartL}\fi
+ }
\newcommand*{\pstartR}{
\if@nobreak
-\let\@oldnobreak\@nobreaktrue
+ \let\@oldnobreak\@nobreaktrue
\else
-\let\@oldnobreak\@nobreakfalse
+ \let\@oldnobreak\@nobreakfalse
\fi
-\@nobreaktrue
+ \@nobreaktrue
\ifnumberingR \else
\led@err@PstartNotNumbered
\beginnumberingR
@@ -836,7 +841,7 @@
\pendR
\fi
\ifpst@rtedR\else
- \setcounter{pstartRold}{\value{pstartR}}%
+ \setcounter{pstartRold}{\value{pstartR}}%
\list@clear{\inserts@listR}%
\global\let\next@insertR=\empty
\global\pst@rtedRtrue
@@ -849,7 +854,10 @@
\fi
\global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartR\fi\fi\fi%
\hsize=\Rcolwidth
- \numberedpar@true}
+ \numberedpar@true
+ \iflabelpstart\protected@edef\@currentlabel
+ {\p@pstartR\thepstartR}
+ }
\newcommand*{\pendL}{\ifnumbering \else
\led@err@PendNotNumbered
\fi
@@ -862,9 +870,9 @@
\endgroup
\ignorespaces
\@oldnobreak
-\ifnumberpstart
-\addtocounter{pstartL}{1}
-\fi}
+ \ifnumberpstart
+ \addtocounter{pstartL}{1}
+ \fi}
\newcommand*{\pendR}{\ifnumberingR \else
\led@err@PendNotNumbered
@@ -878,9 +886,9 @@
\endgroup
\ignorespaces
\@oldnobreak
-\ifnumberpstart
-\addtocounter{pstartR}{1}
-\fi
+ \ifnumberpstart
+ \addtocounter{pstartR}{1}
+ \fi
}
\newbox\l@dleftbox
@@ -910,7 +918,7 @@
\ifnum\@lock>\@ne\inserthangingsymboltrue\else\inserthangingsymbolfalse\fi
\setbox\l@dleftbox
\hb@xt@ \Lcolwidth{%
- \affixpstart@numL
+ \affixpstart@numL
\affixline@num
\l@dld@ta
\add@inserts
@@ -944,7 +952,7 @@
\ifnum\@lockR>\@ne\inserthangingsymbolRtrue\else\inserthangingsymbolRfalse\fi
\setbox\l@drightbox
\hb@xt@ \Rcolwidth{%
- \affixpstart@numR
+ \affixpstart@numR
\affixline@numR
\l@dld@ta
\add@insertsR
@@ -979,7 +987,7 @@
\fi
}
\newcommand*{\getline@numL}{%
-\global\advance\absline@num \@ne
+ \global\advance\absline@num \@ne
\do@actions
\do@ballast
\ifnumberline
@@ -1295,7 +1303,7 @@
\gl@p\labelref@listR\to\label@refs
\fi
\ifvmode
- \advancelabel@refs
+ \advancelabel@refs
\fi
\protected@write\@auxout{}%
{\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}%
@@ -1307,7 +1315,7 @@
\gl@p\labelref@list\to\label@refs
\fi
\ifvmode
- \advancelabel@refs
+ \advancelabel@refs
\fi
\protected@write\@auxout{}%
{\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
@@ -1385,13 +1393,25 @@
\fi\ignorespaces}
\newcommand*{\affixside@noteR}{%
+ \def\sidenotecontent@{}%
+ \numdef{\itemcount@}{0}%
+ \renewcommand{\do}[1]{%
+ \ifnumequal{\itemcount@}{0}%
+ {%
+ \appto\sidenotecontent@{##1}}% Not print not separator before the 1st note
+ {\appto\sidenotecontent@{\sidenotesep ##1}%
+ }%
+ \numdef{\itemcount@}{\itemcount@+1}%
+ }%
+ \dolistloop{\l@dcsnotetext}%
+ \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@numR R p. \the\page@numR,}}{}
\gdef\@templ@d{}%
\ifx\@templ@d\l@dcsnotetext \else
\if@twocolumn
\if@firstcolumn
- \setl@dlp@rbox{\l@dcsnotetext}%
+ \setl@dlp@rbox{\sidenotecontent@}%
\else
- \setl@drp@rbox{\l@dcsnotetext}%
+ \setl@drp@rbox{\sidenotecontent@}%
\fi
\else
\@l@dtempcntb=\sidenote@marginR
@@ -1399,9 +1419,9 @@
\advance\@l@dtempcntb by\page@num
\fi
\ifodd\@l@dtempcntb
- \setl@drp@rbox{\l@dcsnotetext}%
+ \setl@drp@rbox{\sidenotecontent@t}%
\else
- \setl@dlp@rbox{\l@dcsnotetext}%
+ \setl@dlp@rbox{\sidenotecontent@}%
\fi
\fi
\fi}
@@ -1436,34 +1456,34 @@
\newif\ifinserthangingsymbolR
\newcommand{\inserthangingsymbolL}{%
\ifinserthangingsymbol%
-\ifinstanzaL%
-\hfill\hangingsymbol%
-\fi%
+ \ifinstanzaL%
+ \hfill\hangingsymbol%
+ \fi%
\fi}
\newcommand{\inserthangingsymbolR}{%
\ifinserthangingsymbolR%
-\ifinstanzaR%
-\hfill\hangingsymbol%
-\fi%
+ \ifinstanzaR%
+ \hfill\hangingsymbol%
+ \fi%
\fi}
\newcommand{\correcthangingL}{%
\ifl@dpaging\else%
-\ifinstanzaL%
-\ifinserthangingsymbol%
-\hskip \@ifundefined{sza@0@}{0}{\expandafter%
- \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
-\fi%
-\fi%
+ \ifinstanzaL%
+ \ifinserthangingsymbol%
+ \hskip \@ifundefined{sza@0@}{0}{\expandafter%
+ \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+ \fi%
+ \fi%
\fi}
\newcommand{\correcthangingR}{%
\ifl@dpaging\else%
-\ifinstanzaR%
-\ifinserthangingsymbolR%
-\hskip \@ifundefined{sza@0@}{0}{\expandafter%
- \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
-\fi%
-\fi%
+ \ifinstanzaR%
+ \ifinserthangingsymbolR%
+ \hskip \@ifundefined{sza@0@}{0}{\expandafter%
+ \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+ \fi%
+ \fi%
\fi}
\chardef\next=\catcode`\&
\catcode`\&=\active
@@ -1775,10 +1795,10 @@
\do@lineL
\advance\numpagelinesL \@ne
- \ifshiftedverses
- \ifdim\ht\l@dleftbox>0pt\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}\fi%
+ \ifshiftedpstarts
+ \ifdim\ht\l@dleftbox>0pt\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}\fi%
\else
- \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}%
+ \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}%
\fi
\get@nextboxL
@@ -1796,10 +1816,10 @@
{ \loop\ifl@dsamepage
\do@lineR
\advance\numpagelinesR \@ne
- \ifshiftedverses
- \ifdim\ht\l@drightbox>0pt\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}\fi%
+ \ifshiftedpstarts
+ \ifdim\ht\l@drightbox>0pt\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}\fi%
\else
- \hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}%
+ \hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}%
\fi
\get@nextboxR
\checkpageR
@@ -1937,7 +1957,7 @@
\fi}
\newdimen\ledthegoal
-\ifshiftedverses
+\ifshiftedpstarts
\newcommand*{\goalfraction}{0.95}
\else
\newcommand*{\goalfraction}{0.9}