eledmac (2nov12)

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

6 files changed, 115 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 27846868902..a2d68cde91d 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index fea3fb17022..3842fb1fcf2 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 964c506ddb2..b3498697675 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{7918}
+% \CheckSum{7988}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -2271,6 +2271,11 @@
 % ...
 % \end{Rightside}
 % \end{verbatim}
+% \subsection{Quotation environments}
+% Inside a numbered section, the \verb+quotation+ and \verb+quote+ environment can be used with the same meaning as outside.
+% The typographical consequences are similar as outside, based on the styles of the \emph{book} class.
+% However, if you used some package which redefine these environnments, theses redefinition won't be available inside the numbering section.
+% You must open the quotation environments inside a \cs{pstart}-\cs{pend} block, and not outside.
 % \section{Miscellaneous}
 %
 %
@@ -2641,7 +2646,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/10/08 v1.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/11/01 v1.3 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    In general there is the following modifications to the original
@@ -3101,8 +3106,14 @@
 % \begin{macro}{\ledsubsubsection*}
 % \begin{macro}{\ledchapter}
 % \begin{macro}{\ledchapter*}
+% \begin{macro}{\quotation}
+% \begin{macro}{\endquotation}
+% \begin{macro}{\quote}
+% \begin{macro}{\endquote}
 % \changes{v1.2}{2012/10/08}{Compatibility of \cs{ledchapter} with the \emph{memoir} class.}
-% \cs{initnumbering@sectcmd} define sectioning commands inside numbered section.
+% \changes{v1.3}{2012/11/01}{\emph{Quotation} and {quote} environment inside the numbering sections.}
+% \cs{initnumbering@sectcmd} defines sectioning commands inside numbered section.
+% It also defines quotation environment. 
 % Note that it's suppose user didn't change \cs{chapter}.
 % If he did, he should redefine \cs{initnumbering@sectcmd}.
 %    \begin{macrocode}
@@ -3164,6 +3175,50 @@
     \newcommand\beforeledchapter{\pend\cleardoublepage\pstart}
     \patchcmd{\chapter}{\cleardoublepage}{\relax}{}{}
     \patchcmd{\chapter}{\clearpage}{\relax}{}{}
+    \renewcommand{\quotation}{\par\leavevmode%
+                                \parindent=1.5em%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                \global\leftskip=\leftmargin%
+                                \global\rightskip=\leftmargin%
+                            }
+    \renewcommand{\endquotation}{\par%
+    							 	\global\leftskip=0pt%
+                                \global\rightskip=0pt%
+                                \leavevmode%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                }
+    \renewcommand{\quote}{\par\leavevmode%
+                                \parindent=0pt%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                \global\leftskip=\leftmargin%
+                                \global\rightskip=\leftmargin%                                              
+    }
+    \renewcommand{\endquote}{\par%
+                                \global\leftskip=0pt%
+                                \global\rightskip=0pt%
+                                \leavevmode%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                }
 }
 %    \end{macrocode}
 % \end{macro}
@@ -3175,6 +3230,10 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
 % \begin{macro}{\ledsectnotoc}
 % The \cs{ledsectnotoc} only disables the \cs{addcontentsline} macro.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 2ec3c879ce8..bcee41d4e4c 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -718,7 +718,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/10/08 v1.2 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/11/01 v1.2.1 eledmac extension for parallel texts]
 
 %    \end{macrocode}
 %  With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -925,15 +925,16 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\initnumbering@sectcountR}
+% \changes{v1.2.1}{2012/11/01}{The counter of the right section are define only one time.}
 % For we want the numbering of the section commands in the right side to be not continous
 % with the numbering of the rightside
 % we switch the \LaTeX\ counter in \cs{numberingR}.
 %    \begin{macrocode}
+\newcounter{chapterR}
+\newcounter{sectionR}
+\newcounter{subsectionR}
+\newcounter{subsubsectionR}
 \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
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 027e7112a1c..49b4a53407b 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,7 +24,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/10/08 v1.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/11/01 v1.3 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \parapparatus@false
@@ -226,6 +226,50 @@
     \newcommand\beforeledchapter{\pend\cleardoublepage\pstart}
     \patchcmd{\chapter}{\cleardoublepage}{\relax}{}{}
     \patchcmd{\chapter}{\clearpage}{\relax}{}{}
+    \renewcommand{\quotation}{\par\leavevmode%
+                                \parindent=1.5em%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                \global\leftskip=\leftmargin%
+                                \global\rightskip=\leftmargin%
+                            }
+    \renewcommand{\endquotation}{\par%
+       \global\leftskip=0pt%
+                                \global\rightskip=0pt%
+                                \leavevmode%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                }
+    \renewcommand{\quote}{\par\leavevmode%
+                                \parindent=0pt%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                \global\leftskip=\leftmargin%
+                                \global\rightskip=\leftmargin%
+    }
+    \renewcommand{\endquote}{\par%
+                                \global\leftskip=0pt%
+                                \global\rightskip=0pt%
+                                \leavevmode%
+                                \skipnumbering%
+                                \ifautopar%
+                                    \vskip-\parskip%
+                                \else%
+                                    \vskip\topsep%
+                                \fi%
+                                }
 }
 \newcommand{\ledsectnotoc}{\let\addcontentsline\@gobblethree}
 \def\endnumbering{%
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index b6d6b4efbfb..2a019cbd64c 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/08 v1.2 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/11/01 v1.2.1 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -116,11 +116,11 @@
     \led@err@NumberingNotStarted
   \fi\endgroup}
 
-\newcommand{\initnumbering@sectcountR}{
 \newcounter{chapterR}
 \newcounter{sectionR}
 \newcounter{subsectionR}
 \newcounter{subsubsectionR}
+\newcommand{\initnumbering@sectcountR}{
 \let\c@chapter\c@chapterR
 \let\c@section\c@sectionR
 \let\c@subsection\c@subsectionR