summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/Makefile2
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin852464 -> 853726 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin471589 -> 471390 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx24
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty15
5 files changed, 25 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/Makefile b/Master/texmf-dist/doc/latex/eledmac/Makefile
index fc139a78913..091bf0cc0fa 100644
--- a/Master/texmf-dist/doc/latex/eledmac/Makefile
+++ b/Master/texmf-dist/doc/latex/eledmac/Makefile
@@ -16,7 +16,7 @@ doc: *.pdf
%.sty: %.ins %.dtx
- rm -f $*.sty led*tex
+ rm -f $*.sty $*tex
@pdflatex $*.ins
%.pdf: %.sty %.dtx
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index f3e7d93cb1b..18f03a11e30 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index a1c5336c951..1bf5fa4cdc9 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index e245fb5358c..65950688829 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{8225}
+% \CheckSum{8244}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -1865,6 +1865,12 @@
% and the right text into a box of width \cs{ledrsnotewidth}. These
% are initially set to the value of \cs{marginparwidth}.
%
+%
+% \DescribeMacro{\rightnoteupfalse}
+% \DescribeMacro{\leftnoteupfalse}
+% By defaut, left and right sidenotes have their \emph{end} at the line they are called.
+% If you want they to have their \emph{start} at the line they are called, use \cs{leftnoteupfalse} (for left note) and/or \cs{rightnoteupfalse} (for right note).
+%
% \DescribeMacro{\ledlsnotesep}
% \DescribeMacro{\ledrsnotesep}
% The texts are put a distance \cs{ledlsnotesep} (or \cs{ledrsnotesep})
@@ -2658,7 +2664,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/04/15 v1.4.6 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/06/07 v1.4.7 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -2710,6 +2716,7 @@
% \begin{macrocode}
\RequirePackage{xargs}
\RequirePackage{etoolbox}
+\reserveinserts{32}
\RequirePackage{suffix}
\RequirePackage{ifluatex}
% \end{macrocode}
@@ -3138,6 +3145,7 @@
% \changes{v1.2}{2012/10/08}{Compatibility of \cs{ledchapter} with the \emph{memoir} class.}
% \changes{v1.3}{2012/11/01}{\emph{Quotation} and {quote} environment inside the numbering sections.}
% \changes{v1.4.1}{2012/11/16}{New option \emph{noquotation}.}
+% \changes{v1.4.7}{2012/06/07}{Compatibility of sectionning commands with \cs{autopar}.}
% \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}.
@@ -3149,42 +3157,42 @@
\pstart%
\leavevmode\section[##1]{##2}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\section*{##1}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\newcommand{\ledsubsection}[2][]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsubsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\newcommand{\ledsubsubsection}[2][]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsubsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsubsubsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsubsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\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}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 023da25acfb..87bb54b8fb2 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}[2013/04/15 v1.4.6 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/06/07 v1.4.7 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -38,6 +38,7 @@
\RequirePackage{xargs}
\RequirePackage{etoolbox}
+\reserveinserts{32}
\RequirePackage{suffix}
\RequirePackage{ifluatex}
\ifcsdef{if@RTL}{}{\newif\if@RTL}
@@ -178,42 +179,42 @@
\pstart%
\leavevmode\section[##1]{##2}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\section*{##1}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\newcommand{\ledsubsection}[2][]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsubsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\newcommand{\ledsubsubsection}[2][]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsubsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\WithSuffix\newcommand\ledsubsubsection*[1]{%
\leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\skipnumbering%
\pstart%
\leavevmode\subsubsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
\vspace{-2\parskip}\vspace{-2\baselineskip}%
- \pstart
+ \ifautopar\else\pstart\fi
}
\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}