eledmac (17oct12)

git-svn-id: svn://tug.org/texlive/trunk@28006 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 43 insertions, 27 deletions

diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 8a610002f8b..964c506ddb2 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{7910}
+% \CheckSum{7918}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -152,7 +152,7 @@
 % \changes{v0.7}{2005/02/18}{Tidying up for eledpar and ledarab packages}
 % \changes{v0.7}{2005/02/18}{Replaced all \cs{interAfootnotelinepenalty}, etc.,
 %                         by just \cs{interfootnotelinepenalty}}
-% \changes{v0.7}{2005/03/02}{ledmac having been available for 2 years,
+% \changes{v0.7}{2005/03/02}{eledmac having been available for 2 years,
 %                         deleted the commented out original edmac texts}
 % \changes{v0.7}{2011/06/17}{Ma\"ieul Rouquette new maintainer}
 % \changes{v0.8}{2011/17/06}{Bug on endnotes fixed: in a // text, all endnotes will print and be placed at the ends of columns (!)}
@@ -275,7 +275,7 @@
 % \Lpack{poemscol} for poetical works.
 % 
 % In october 2012, Maïeul Rouquette released the \emph{eledform} package\footnote{\url{http://www.ctan.org/eledform}.}. 
-% Based on eledmac, this package provides macro to describe in a formal way the textual variants.
+% Based on eledmac, this package provides macro to describe the textual variants in a formal way.
 %
 % To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users.
 %
@@ -1149,7 +1149,7 @@
 % This package provides some tools to describes the textual variants in a
 % formal way.
 %
-% It is base on eledmac for the typographical aspect.
+% It is based on eledmac for the typographical aspect.
 %
 % \subsection{Alternate footnote formatting}
 % If you just launch into \Eledmac{} using the commands outlined
@@ -2260,6 +2260,17 @@
 % \item For the non-starred sections, use the optional argument \meta{text} to provide the text to the table of contents.
 % \item The \cs{ledchapter} doesn't open a new page. You must use \cs{beforeledchapter} before. This also closes a \cs{pstart} and opens a new.
 % \end{enumerate}
+% \changes{v1.2}{2012/10/13}{Add \cs{ledsectnotoc} command.}
+% \DescribeMacro{\ledsectnotoc}If you use the sectionning commands in parallel texts (with eledpar),
+% you could want the table of contents works only  
+% for one side, in many case, the side of the original text.
+% You could use \cs{ledsectnotoc} at the begining of the side environnment :
+% \begin{verbatim}
+% \begin{Rightside}
+% \ledsectnotoc 
+% ...
+% \end{Rightside}
+% \end{verbatim}
 % \section{Miscellaneous}
 %
 %
@@ -2630,8 +2641,7 @@
 %    \begin{macrocode}
 %<*code>
 \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]
 %    \end{macrocode}
 %
 %    In general there is the following modifications to the original
@@ -3091,6 +3101,7 @@
 % \begin{macro}{\ledsubsubsection*}
 % \begin{macro}{\ledchapter}
 % \begin{macro}{\ledchapter*}
+% \changes{v1.2}{2012/10/08}{Compatibility of \cs{ledchapter} with the \emph{memoir} class.}
 % \cs{initnumbering@sectcmd} define sectioning commands inside numbered section.
 % Note that it's suppose user didn't change \cs{chapter}.
 % If he did, he should redefine \cs{initnumbering@sectcmd}.
@@ -3138,7 +3149,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}{}{}
@@ -3164,6 +3175,12 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \begin{macro}{\ledsectnotoc}
+% The \cs{ledsectnotoc} only disables the \cs{addcontentsline} macro.
+%    \begin{macrocode}
+\newcommand{\ledsectnotoc}{\let\addcontentsline\@gobblethree}
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\endnumbering}
 % \cs{endnumbering} must follow the last text for a numbered section.
 % It takes care of notifying you when changes have been noted in the
@@ -6787,6 +6804,7 @@
 % \begin{macro}{\preXnotes@}
 % \begin{macro}{\preXnotes}
 % \changes{v1.1}{2012/09/25}{New skip \cs{preXnotes@}}
+% \changes{v1.2}{2012/10/08}{Debug in familiar footnotes (but introduced by v1.1).}
 % If user redefines \cs{preXnotes@}, via \cs{preXnotes} to a value greater than 0~pt,
 % this skip will be added before first series notes
 % instead of the notes skip.
@@ -6804,7 +6822,7 @@
 %    \begin{macrocode}
 \newtoggle{prenotesX@}
 \toggletrue{prenotesX@}
-\newcommand{\prenotes@X}{0pt}
+\newcommand{\prenotesX@}{0pt}
 \newcommand*{\prenotesX}[1]{\renewcommand{\prenotesX@}{#1}}
 %    \end{macrocode}
 % \end{macro}
@@ -9036,14 +9054,13 @@
 %    \begin{macrocode}
 \@ifclassloaded{memoir}{%
 %    \end{macrocode}
-% \changes{v1.1.1}{2012/10/03}{Debug of eledmac with the memoir class.}
 % If the \Lclass{memoir} class is loaded we hook into its modified 
 % \verb?\@doclearpage?.
 %    \begin{macro}{\@mem@extranofeet}
 %    \begin{macrocode}
 \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}
@@ -9850,7 +9867,6 @@
 %   \end{macrocode}
 % \end{macro}
 % \begin{macro}{\affixside@note}
-% \changes{v1.1.2}{2012/10/06}{Remove spurious space between line number and line content}
 % This macro puts any moveable sidenote text into the left or right sidenote
 % box, depending on which margin it is meant to go in. It's a very much
 % stripped down version of \cs{affixlin@num}.
@@ -9870,29 +9886,29 @@
             \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,}}{}
 %    \end{macrocode}
 % And now, the main part of the macro
 % \begin{macrocode}
   \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}
 %    \end{macrocode}
 % \end{macro}