diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledmac.sty | 32 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 34 |
2 files changed, 47 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty index dcd5a7301a3..8c01163223a 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledmac}[2011/10/02 v0.12.1 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2011/11/08 v0.13 LaTeX port of EDMAC] \newif\ifledfinal \DeclareOption{final}{\ledfinaltrue} @@ -2453,7 +2453,7 @@ \let\ledllfill\hfil \let\ledrlfill\hfil \def\@tempa{#1}\def\@tempb{l}% - \ifx\@tempa\@tempb + \ifx\@tempa\@tempb \let\ledllfill\relax \else \def\@tempb{r}% @@ -2627,23 +2627,37 @@ \newcommand*{\setstanzaindents}[1]{\setstanzavalues{sza}{#1}} \newcommand*{\setstanzapenalties}[1]{\setstanzavalues{szp}{#1}} +\newcounter{stanzaindentsrepetition} +\newcount\stanza@modulo + +\newcommand*{\managestanza@modulo}[0]{ + \advance\stanza@modulo\@ne + \ifnum\stanza@modulo>\value{stanzaindentsrepetition} + \stanza@modulo\@ne + \fi +} \def\stanza@line{ -\parindent=\csname sza@\number\stanza@count + \ifnum\value{stanzaindentsrepetition}=0 + \parindent=\csname sza@\number\stanza@count @\endcsname\stanzaindentbase - \pstart\stanza@hang\ignorespaces} + \else + \managestanza@modulo + \parindent=\csname sza@\number\stanza@modulo + @\endcsname\stanzaindentbase + \fi + \pstart\stanza@hang\ignorespaces} \xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock \hangindent\expandafter \noexpand\csname sza@0@\endcsname\stanzaindentbase \hangafter\@ne} \def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname - \ifnum\count@>\@M\advance\count@-\@M\penalty-\else - \penalty\fi\count@} - + \ifnum\count@>\@M\advance\count@-\@M\penalty-\else + \penalty\fi\count@} \let\startstanzahook\relax \let\endstanzaextra\relax \xdef\stanza{\noexpand\instanzatrue\expandafter - \begingroup\startstanzahook% - \catcode`\&\active\global\stanza@count\@ne + \begingroup\startstanzahook% + \catcode`\&\active\global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax \let\noexpand\endlock\relax\noexpand\else\interlinepenalty diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty index 8c84333c46e..842065f6ed6 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty @@ -24,7 +24,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledpar}[2011/10/02 v0.9.1 ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2011/11/08 v0.9.2 ledmac extension for parallel texts] \newif\ifshiftedverses \shiftedversesfalse @@ -729,6 +729,8 @@ \@afterindentfalse \secdef\@chapter\@schapter} + \newif\ifinstanzaL + \newif\ifinstanzaR \newenvironment{Leftside}{% \ledRcolfalse \let\beginnumbering\beginnumbering\setcounter{pstartL}{1} @@ -737,7 +739,11 @@ \let\pend\pendL \let\memorydump\memorydumpL \Leftsidehook -}{\Leftsidehookend} + \let\oldstanza\stanza + \renewcommand{\stanza}{\oldstanza\global\instanzaLtrue} +}{ + \let\stanza\oldstanza + \Leftsidehookend} \newcommand*{\Leftsidehook}{} \newcommand*{\Leftsidehookend}{} \newcommand*{\Rightsidehook}{} @@ -755,8 +761,11 @@ \let\pend\pendR \let\lineation\lineationR \Rightsidehook + \let\oldstanza\stanza + \renewcommand{\stanza}{\oldstanza\global\instanzaRtrue} }{% \ledRcolfalse + \let\stanza\oldstanza \Rightsidehookend } @@ -874,7 +883,7 @@ \newcount\@donetotallinesR \newcommand*{\do@lineL}{% - \manageparhangingsymbol +\ifinstanzaL\manageparhangingsymbol\fi \advance\countLline \@ne \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% {\vbadness=10000 @@ -907,7 +916,7 @@ \newcommand*{\do@lineRhook}{} \newcommand*{\do@lineR}{% -\manageparhangingsymbol +\ifinstanzaR\manageparhangingsymbol\fi \advance\countRline \@ne \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% {\vbadness=10000 @@ -1659,8 +1668,8 @@ \do@lineR \fi \hb@xt@ \hsize{% - \unhbox\l@dleftbox - \hfill \columnseparator \hfill + \hfill \unhbox\l@dleftbox + \hfill \columnseparator \hfill \unhbox\l@drightbox }% \checkraw@text @@ -1676,7 +1685,9 @@ \global\l@dpscR=\z@ \global\l@dnumpstartsL=\z@ \global\l@dnumpstartsR=\z@ - \ignorespaces} + \ignorespaces + \global\instanzaLfalse + \global\instanzaRfalse} \newcommand*{\columnseparator}{% \smash{\rule[-0.2\baselineskip]{\columnrulewidth}{1.05\baselineskip}}} @@ -1692,7 +1703,8 @@ \ifnum\l@dnumpstartsR>\l@dpscR \@pstartstrue \fi - \fi} + \fi +} \newif\ifaraw@text \araw@textfalse @@ -1704,7 +1716,8 @@ \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR} \araw@texttrue \fi - \fi} + \fi +} \newcommand*{\@writelinesinparL}{% \edef\next{% @@ -1823,7 +1836,8 @@ \global\l@dpscR=\z@ \global\l@dnumpstartsL=\z@ \global\l@dnumpstartsR=\z@ - + \global\instanzaLfalse + \global\instanzaRfalse \ignorespaces} \newcommand*{\ledstrutL}{\strut} |