From 22c251adda514ed7b453066de05b2f89707d0fe6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Aug 2012 22:39:07 +0000 Subject: ledmac (16aug12) git-svn-id: svn://tug.org/texlive/trunk@27426 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ledmac/ledmac.sty | 22 +++++++++----- Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 44 +++++++++++++++++++++------ 2 files changed, 49 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ledmac') diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty index a303b951ab0..1afbb55234b 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}[2012/06/21 v0.16 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2012/08/03 v0.17 LaTeX port of EDMAC] \newif\ifledfinal \DeclareOption{final}{\ledfinaltrue} @@ -833,16 +833,18 @@ \global\setbox\one@line=\vsplit\raw@text to\baselineskip}% \unvbox\one@line \global\setbox\one@line=\lastbox \getline@num + \ifnum\@lock>\@ne + \inserthangingsymboltrue + \else + \inserthangingsymbolfalse + \fi \affixline@num \affixpstart@num \hb@xt@ \linewidth{\inserthangingsymbol\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% \l@drsn@te - }}% - \prevline@num=\line@num% - \add@penalties} - + }}}% \newcommand*{\do@linehook}{} \newcommand*{\l@demptyd@ta}{% \gdef\l@dld@ta{}% @@ -2685,8 +2687,14 @@ \newcommand*{\hangingsymbol}{} \newif\ifinstanza \instanzafalse -\newcount\prevline@num -\newcommand{\inserthangingsymbol}{\ifinstanza\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi} +\newif\ifinserthangingsymbol +\newcommand{\inserthangingsymbol}{% +\ifinserthangingsymbol% +\ifinstanza% +\hfill\hangingsymbol% +\fi% +\fi% +} \newcommand*{\ampersand}{\char`\&} \chardef\body=\catcode`\@ diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty index 07645da57fe..ff1018f0e2d 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}[2012/06/11 v0.11 ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2012/08/03 v0.12 ledmac extension for parallel texts] \newif\ifshiftedverses \shiftedversesfalse @@ -907,6 +907,7 @@ to\baselineskip}% \unvbox\one@line \global\setbox\one@line=\lastbox \getline@numL +\ifnum\@lock>\@ne\inserthangingsymboltrue\else\inserthangingsymbolfalse\fi \setbox\l@dleftbox \hb@xt@ \Lcolwidth{% \affixpstart@numL @@ -918,7 +919,6 @@ {\ledllfill\hb@xt@ \wd\one@line{\inserthangingsymbolL\new@line\l@dunhbox@line{\one@line}}\correcthangingL\ledrlfill\l@drd@ta% \l@drsn@te }}% - \prevline@num=\line@num% \add@penaltiesL \global\advance\@donereallinesL\@ne \global\advance\@donetotallinesL\@ne @@ -941,6 +941,7 @@ to\baselineskip}% \unvbox\one@lineR \global\setbox\one@lineR=\lastbox \getline@numR +\ifnum\@lockR>\@ne\inserthangingsymbolRtrue\else\inserthangingsymbolRfalse\fi \setbox\l@drightbox \hb@xt@ \Rcolwidth{% \affixpstart@numR @@ -952,7 +953,6 @@ {\correcthangingR\ledllfill\hb@xt@ \wd\one@lineR{\inserthangingsymbolR\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% \l@drsn@te }}% - \prevline@numR=\line@numR% \add@penaltiesR \global\advance\@donereallinesR\@ne \global\advance\@donetotallinesR\@ne @@ -1592,14 +1592,38 @@ \fi\ignorespaces} -\newcount\prevline@numR -\newcommand{\inserthangingsymbolL}{\ifinstanzaL\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi} -\newcommand{\inserthangingsymbolR}{\ifinstanzaR\ifnum\line@numR=\prevline@numR\hfill\hangingsymbol\fi\fi} -\newcommand{\correcthangingL}{\ifl@dpaging\else\ifinstanzaL\ifnum\line@num=\prevline@num\hskip \@ifundefined{sza@0@}{0}{\expandafter% - \noexpand\csname sza@0@\endcsname}\stanzaindentbase\fi\fi\fi} +\newif\ifinserthangingsymbolR +\newcommand{\inserthangingsymbolL}{% +\ifinserthangingsymbol% +\ifinstanzaL% +\hfill\hangingsymbol% +\fi% +\fi} +\newcommand{\inserthangingsymbolR}{% +\ifinserthangingsymbolR% +\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% +\fi} -\newcommand{\correcthangingR}{\ifl@dpaging\else\ifinstanzaR\ifnum\line@numR=\prevline@numR\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% +\fi} \chardef\next=\catcode`\& \catcode`\&=\active -- cgit v1.2.3