diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-27 22:51:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-27 22:51:45 +0000 |
commit | f85faa8bc11e179cbb70dbc4818fb575a3e9b955 (patch) | |
tree | 01b99c4aa0184fd186b71de87ab284fb81e9904e /Master/texmf-dist/tex/latex/eledmac | |
parent | 7133320f806e52d2be935cf77ca710871c8c92d9 (diff) |
eledmac (26oct13)
git-svn-id: svn://tug.org/texlive/trunk@32010 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/eledmac')
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 101 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 204 |
2 files changed, 164 insertions, 141 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 815165548b2..3db143e93d6 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2013/10/09 v1.6.0 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2013/10/27 v1.6.1 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -901,53 +901,62 @@ \numberpstartfalse \newif\iflabelpstart \labelpstartfalse -\newcommand*{\pstart}{ -\if@nobreak -\let\@oldnobreak\@nobreaktrue -\else -\let\@oldnobreak\@nobreakfalse -\fi -\@nobreaktrue -\ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi +\newcommand*{\pstart}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% +\@nobreaktrue% +\ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \begingroup\normal@pars - \global\setbox\raw@text=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifinstanza\else\ifsidepstartnum\else\thepstart\fi\fi\fi\fi - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstart\thepstart}\fi + \global\let\next@insert=\empty% + \begingroup\normal@pars% + \global\setbox\raw@text=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifinstanza\else% + \ifsidepstartnum\else% + \thepstart% + \fi% + \fi% + \fi% + \fi% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstart\thepstart}\fi% } -\newcommand*{\pend}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 - \csnumdef{pstartline}{0} - \loop\ifvbox\raw@text +\newcommand*{\pend}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% + \csnumdef{pstartline}{0}% + \loop\ifvbox\raw@text% \csnumdef{pstartline}{\pstartline+1}% - \do@line + \do@line% \ifbypstart@% \ifnumequal{\pstartline}{1}{\setline{1}\resetprevline@}{}% - \fi - \repeat - \flush@notes - \endgroup - \ignorespaces - \ifnumberpstart - \pstartnumtrue - \fi - \@oldnobreak + \fi% + \repeat% + \flush@notes% + \endgroup% + \ignorespaces% + \ifnumberpstart% + \pstartnumtrue% + \fi% + \@oldnobreak% \addtocounter{pstart}{1}} \newcommand*{\l@dzeropenalties}{% @@ -993,9 +1002,9 @@ \fi \affixline@num \affixpstart@num - \hb@xt@ \linewidth{\do@insidelinehook\inserthangingsymbol\l@dld@ta\add@inserts\affixside@note + \hb@xt@ \linewidth{\do@insidelinehook\l@dld@ta\add@inserts\affixside@note \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% + {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% \l@drsn@te }}}% \newcommand*{\do@linehook}{} @@ -3213,7 +3222,7 @@ \newcommand{\inserthangingsymbol}{% \ifinserthangingsymbol% \ifinstanza% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi% } diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index cec6bed0d9b..358d09e92db 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2013/08/21 v1.4.2 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2013/10/27 v1.4.3 eledmac extension for parallel texts] \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -829,103 +829,118 @@ \newcounter{pstartRold} \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } -\newcommand*{\pstartL}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi - \ifpst@rtedL\else +\newcommand*{\pstartL}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% + \ifpst@rtedL\else% \setcounter{pstartLold}{\value{pstartL}}% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \global\pst@rtedLtrue - \fi - \begingroup\normal@pars - \global\advance\l@dnumpstartsL \@ne - \ifnum\l@dnumpstartsL>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsL=\l@dc@maxchunks - \fi - \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartL\fi\fi\fi% - \hsize=\Lcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartL\thepstartL}\fi + \global\let\next@insert=\empty% + \global\pst@rtedLtrue% + \fi% + \begingroup\normal@pars% + \global\advance\l@dnumpstartsL \@ne% + \ifnum\l@dnumpstartsL>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsL=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum% + \else% + \thepstartL% + \fi% + \fi% + \fi% + \hsize=\Lcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartL\thepstartL}\fi% } -\newcommand*{\pstartR}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumberingR \else - \led@err@PstartNotNumbered - \beginnumberingR - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pendR - \fi - \ifpst@rtedR\else +\newcommand*{\pstartR}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumberingR \else% + \led@err@PstartNotNumbered% + \beginnumberingR% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pendR% + \fi% + \ifpst@rtedR\else% \setcounter{pstartRold}{\value{pstartR}}% \list@clear{\inserts@listR}% - \global\let\next@insertR=\empty - \global\pst@rtedRtrue - \fi - \begingroup\normal@pars - \global\advance\l@dnumpstartsR \@ne - \ifnum\l@dnumpstartsR>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsR=\l@dc@maxchunks - \fi - \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartR\fi\fi\fi% - \hsize=\Rcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartR\thepstartR}\fi + \global\let\next@insertR=\empty% + \global\pst@rtedRtrue% + \fi% + \begingroup\normal@pars% + \global\advance\l@dnumpstartsR \@ne% + \ifnum\l@dnumpstartsR>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsR=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum\else% + \thepstartR% + \fi% + \fi% + \fi% + \hsize=\Rcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartR\thepstartR}\fi% } -\newcommand*{\pendL}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartL}{1} +\newcommand*{\pendL}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartL}{1}% \fi} -\newcommand*{\pendR}{\ifnumberingR \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@linesR=\prevgraf\egroup - \global\par@lineR=0 - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartR}{1} - \fi +\newcommand*{\pendR}{\ifnumberingR \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@linesR=\prevgraf\egroup% + \global\par@lineR=0% + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartR}{1}% + \fi% } \newbox\l@dleftbox @@ -1518,13 +1533,13 @@ \newcommand{\inserthangingsymbolL}{% \ifinserthangingsymbol% \ifinstanzaL% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} \newcommand{\inserthangingsymbolR}{% \ifinserthangingsymbolR% \ifinstanzaR% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} \newcommand{\correcthangingL}{% @@ -1865,7 +1880,7 @@ \advance\numpagelinesL \@ne \ifshiftedpstarts \ifdim\ht\l@dleftbox>0pt\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}% \fi @@ -1886,7 +1901,7 @@ \advance\numpagelinesR \@ne \ifshiftedpstarts \ifdim\ht\l@drightbox>0pt\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}% \fi \get@nextboxR @@ -2096,7 +2111,6 @@ \fi \fi} - \endinput %% %% End of file `eledpar.sty'. |