diff options
author | Karl Berry <karl@freefriends.org> | 2012-11-18 00:44:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-11-18 00:44:30 +0000 |
commit | 470ffcd8dbbbffcee050065eb4671f7581e02024 (patch) | |
tree | f27083f65b637fa451347892f3184c735e474fee /Master/texmf-dist/tex/latex/eledmac | |
parent | 38f5841b2d128e31223c2cbace56b0416b3e806f (diff) |
eledmac (17nov12)
git-svn-id: svn://tug.org/texlive/trunk@28288 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 | 48 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 7 |
2 files changed, 30 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index bbea3d69724..08d33c61c5b 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -24,10 +24,12 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2012/11/16 v1.4 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2012/11/16 v1.4.1 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ +\newif\ifnoquotation@ \parapparatus@false +\DeclareOption{noquotation}{\noquotation@true} \DeclareOption{final}{\ledfinaltrue} \DeclareOption{draft}{\ledfinalfalse} \DeclareOption{parapparatus}{\parapparatus@true} @@ -228,6 +230,7 @@ \newcommand\beforeledchapter{\pend\cleardoublepage\pstart} \patchcmd{\chapter}{\cleardoublepage}{\relax}{}{} \patchcmd{\chapter}{\clearpage}{\relax}{}{} + \ifnoquotation@\else \renewcommand{\quotation}{\par\leavevmode% \parindent=1.5em% \skipnumbering% @@ -272,6 +275,7 @@ \vskip\topsep% \fi% } + \fi } \newcommand{\ledsectnotoc}{\let\addcontentsline\@gobblethree} \def\endnumbering{% @@ -1803,14 +1807,14 @@ \fi} \newcommand{\l@dbfnote}[1]{% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}% + \gdef\@tag{#1} + \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} \newcommand{\vl@dbfnote}[2]{% \def\@thefnmark{#2}% \l@doldold@footnotetext{#1}} - \newcommand*{\prebodyfootmark}{% \leavevmode \ifhmode @@ -2634,18 +2638,18 @@ {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}% \@esphack} +\newcounter{line}% +\newcounter{subline}% \newcommand{\advancelabel@refs}{% - \newcounter{line}% \setcounter{line}{\expandafter\labelrefsparseline\label@refs}% \stepcounter{line}% \ifsublines@% - \newcounter{subline}% \setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}% \stepcounter{subline}{1}% - \def\label@refs{\theline|\thesubline}% + \def\label@refs{\theline|\thesubline}% \else% \def\label@refs{\theline|0}% -\fi% + \fi% } \def\labelrefsparseline#1|#2{#1} \def\labelrefsparsesubline#1|#2{#2} @@ -2882,26 +2886,26 @@ \numdef{\itemcount@}{\itemcount@+1}% }% \dolistloop{\l@dcsnotetext}% - \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{} + \ifnumgreater{\itemcount@}{1}{\eledmac@warning{\itemcount@\space sidenotes on line \the\line@num\space p. \the\page@num,}}{}% \gdef\@templ@d{}% - \ifx\@templ@d\l@dcsnotetext \else - \if@twocolumn - \if@firstcolumn + \ifx\@templ@d\l@dcsnotetext \else% + \if@twocolumn% + \if@firstcolumn% \setl@dlp@rbox{##1}{\sidenotecontent@}% - \else + \else% \setl@drp@rbox{\sidenotecontent@}% - \fi - \else - \@l@dtempcntb=\sidenote@margin - \ifnum\@l@dtempcntb>\@ne - \advance\@l@dtempcntb by\page@num - \fi - \ifodd\@l@dtempcntb + \fi% + \else% + \@l@dtempcntb=\sidenote@margin% + \ifnum\@l@dtempcntb>\@ne% + \advance\@l@dtempcntb by\page@num% + \fi% + \ifodd\@l@dtempcntb% \setl@drp@rbox{\sidenotecontent@}% - \else + \else% \setl@dlp@rbox{\sidenotecontent@}% - \fi - \fi + \fi% + \fi% \fi} \newcommand*{\l@dfeetbeginmini}{\l@dedbeginmini\l@dfambeginmini} \newcommand*{\l@dfeetendmini}{\l@dedendmini\l@dfamendmini} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index c7f4ac9b085..9104b44b5cf 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}[2012/11/16 v1.3 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2012/11/16 v1.3.1 eledmac extension for parallel texts] \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -1455,12 +1455,13 @@ \renewcommand{\l@dbfnote}[1]{% \ifnumberedpar@ + \gdef\@tag{#1} \ifledRcol% - \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}% + \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}% \to\inserts@listR \global\advance\insert@countR \@ne% \else% - \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}% + \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}% \to\inserts@list \global\advance\insert@count \@ne% \fi |