summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-17 23:15:10 +0000
committerKarl Berry <karl@freefriends.org>2012-10-17 23:15:10 +0000
commit868aa39200beca0eda1c1e7578470ee1f3d4b4ed (patch)
tree0572d53474141bd80738b0deade87385cdd841c9 /Master/texmf-dist/tex/latex/eledmac
parentdf2ce83ed9a6a3beca08c07cc656611e26d220d7 (diff)
eledmac (17oct12)
git-svn-id: svn://tug.org/texlive/trunk@28006 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/eledmac')
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty42
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledpar.sty19
2 files changed, 37 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 5a0f1bafd47..027e7112a1c 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,8 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/10/06 v1.1.2 LaTeX port of EDMAC]
-
+\ProvidesPackage{eledmac}[2012/10/08 v1.2 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\parapparatus@false
@@ -212,7 +211,7 @@
\vspace{-2\parskip}\vspace{-2\baselineskip}%
\pstart
}
- \newcommand\ledchapter[2][]{~\pend\skipnumbering\pstart\chapter[##1]{##2}\pend\pstart}
+ \newcommand\ledchapter[2][]{\ifl@dmemoir\gdef\ch@pt@c{##1}\fi~\pend\skipnumbering\pstart\chapter[##1]{##2}\pend\pstart}
\WithSuffix\newcommand\ledchapter*[1]{~\pend\skipnumbering\pstart\chapter*{##1}\pend\pstart}
\patchcmd{\@makeschapterhead}{1\par}{1}{}{}
\pretocmd{\@makeschapterhead}{\par}{}{}
@@ -228,6 +227,7 @@
\patchcmd{\chapter}{\cleardoublepage}{\relax}{}{}
\patchcmd{\chapter}{\clearpage}{\relax}{}{}
}
+\newcommand{\ledsectnotoc}{\let\addcontentsline\@gobblethree}
\def\endnumbering{%
\ifnumbering
\global\numberingfalse
@@ -1393,7 +1393,7 @@
\newcommand*{\preXnotes}[1]{\renewcommand{\preXnotes@}{#1}}
\newtoggle{prenotesX@}
\toggletrue{prenotesX@}
-\newcommand{\prenotes@X}{0pt}
+\newcommand{\prenotesX@}{0pt}
\newcommand*{\prenotesX}[1]{\renewcommand{\prenotesX@}{#1}}
\newcommand*{\footnormal}[1]{%
\csgdef{series@display#1}{normal}
@@ -2442,8 +2442,8 @@
\@ifclassloaded{memoir}{%
\g@addto@macro{\@mem@extranofeet}{%
- \renewcommand{\do}[1]{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
- \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi%
+ \renewcommand{\do}[1]{\ifvoid\cuse{##1footins}\else\@mem@nofootfalse\fi%
+ \ifvoid\csuse{footins##1}\else\@mem@nofootfalse\fi%
}
\dolistloop{\@series}%
\@led@extranofeet}
@@ -2760,26 +2760,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%x
+ \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 3ba695d9dad..b6d6b4efbfb 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/10/06 v1.1.2 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/10/08 v1.2 eledmac extension for parallel texts]
\newif\ifshiftedpstarts
\let\shiftedversestrue\shiftedpstartstrue
@@ -90,6 +90,9 @@
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
\l@dend@stuff
\setcounter{pstartR}{1}
+ \begingroup
+ \initnumbering@sectcmd
+ \initnumbering@sectcountR
}
\def\endnumberingR{%
@@ -111,8 +114,18 @@
\fi
\else
\led@err@NumberingNotStarted
- \fi}
-
+ \fi\endgroup}
+
+\newcommand{\initnumbering@sectcountR}{
+\newcounter{chapterR}
+\newcounter{sectionR}
+\newcounter{subsectionR}
+\newcounter{subsubsectionR}
+\let\c@chapter\c@chapterR
+\let\c@section\c@sectionR
+\let\c@subsection\c@subsectionR
+\let\c@subsubsection\c@subsubsectionR
+}
\newcommand*{\pausenumberingR}{%
\endnumberingR\global\numberingRtrue}
\newcommand*{\resumenumberingR}{%