summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac/eledmac.dtx')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx106
1 files changed, 55 insertions, 51 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 8b4e52d0118..8a610002f8b 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -31,7 +31,7 @@
]{hyperref}
\usepackage[utf8]{inputenc}
\providecommand{\phantomsection}{} % just in case hyperref is not used
-\usepackage{graphicx}
+\usepackage{graphicx,eledmac}
\makeatletter
\@mparswitchfalse
\makeatother
@@ -51,7 +51,7 @@
%
% \fi
%
-% \CheckSum{7909}
+% \CheckSum{7910}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -117,34 +117,24 @@
% \DoNotIndex{\ ,\to,\hsize,\multiply,\textit}
%
% \newcommand{\dtxfilename}{\texttt{eledmac.dtx}}
-% \def\fileversion{v0.1} \def\filedate{2003/03/25}
-% \def\fileversion{v0.2} \def\filedate{2003/08/16}
-% \def\fileversion{v0.2.1} \def\filedate{2003/09/13}
-% \def\fileversion{v0.2.2} \def\filedate{2003/11/09}
-% \def\fileversion{v0.3} \def\filedate{2004/02/14}
-% \def\fileversion{v0.3.1} \def\filedate{2004/02/18} ^^A never released
-% \def\fileversion{v0.4} \def\filedate{2004/02/29}
-% \def\fileversion{v0.5} \def\filedate{2004/04/04}
-% \def\fileversion{v0.5.1} \def\filedate{2004/04/10}
-% \def\fileversion{v0.6} \def\filedate{2004/12/10}
-% \def\fileversion{v0.7} \def\filedate{2005/03/24}
-% \def\fileversion{v0.8} \def\filedate{2011/07/11}
-% \def\fileversion{v0.8.1} \def\filedate{2011/07/14}
-% \def\fileversion{v0.9} \def\filedate{2011/08/03}
-% \def\fileversion{v0.9.1} \def\filedate{2011/08/08}
-% \def\fileversion{v0.10} \def\filedate{2011/08/22}
-% \def\fileversion{v0.11} \def\filedate{2011/09/16}
-% \def\fileversion{v0.12} \def\filedate{2011/10/01}
-% \def\fileversion{v0.12.1} \def\filedate{2011/10/02}
-% \def\fileversion{v0.13} \def\filedate{2011/11/08}
-% \def\fileversion{v0.13.1} \def\filedate{2011/11/18}
-% \def\fileversion{v0.14} \def\filedate{2012/04/04}
-% \def\fileversion{v0.15} \def\filedate{2012/06/11}
-% \def\fileversion{v0.16} \def\filedate{2012/06/21}
-% \def\fileversion{v0.17} \def\filedate{2012/08/03}
-% \def\fileversion{v1.0}\def\filedate{2012/09/15}
-% \def\fileversion{v1.0.1}\def\filedate{2012/09/16}
-% \def\fileversion{v1.1}\def\filedate{2012/09/25}
+% \GetFileInfo{eledmac.sty}
+% ^^A Have the changes in the right order : see http://tex.stackexchange.com/a/74113/7712
+%\makeatletter
+% \let\org@changes@\changes@
+% \def\my@changes v#1.#2#3\@nil{%
+% \org@changes@{v#1.\six@digits{#2}#3=v#1.#2#3}%
+% }%
+% \newcommand*{\six@digits}[1]{%
+% \ifnum#1<100000 0\fi
+% \ifnum#1<10000 0\fi
+% \ifnum#1<1000 0\fi
+% \ifnum#1<100 0\fi
+% \two@digits{#1}%
+% }%
+% \renewcommand*{\changes@}[1]{%
+% \my@changes#1\@nil
+% }%
+%\makeatother
% \changes{v0.1}{2003/03/25}{First public release}
% \changes{v0.2}{2003/08/16}{Added tabmac code, and extended indexing}
% \changes{v0.2.1}{2003/09/13}{Bug fixes and match with mempatch v1.8}
@@ -162,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}{eledmac having been available for 2 years,
+% \changes{v0.7}{2005/03/02}{ledmac 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 (!)}
@@ -175,7 +165,7 @@
% \changes{v0.12}{2011/10/01}{For compatibility with eledpar, possibility to use \cs{autopar} on the right side.}
% \changes{v0.12.1}{2011/10/02}{The numbering of \cs{pstarts} restarts on each \cs{beginnumbering}.}
% \changes{v0.12.1}{2011/10/02}{Don't number \cs{pstarts} of stanza.}
-%\changes{v0.13}{2011/11/08}{New stanzaindentsrepetition counter to repeat stanza indents every \emph{n} verses.}
+% \changes{v0.13}{2011/11/08}{New stanzaindentsrepetition counter to repeat stanza indents every \emph{n} verses.}
% \changes{v0.13.1}{2011/11/18}{\cs{thepstartL} and \cs{thepstartR} use now \cs{bfseries} and not \cs{bf}, which is deprecated and makes conflicts with memoir class.}
% \changes{v0.14}{2012/04/04}{Tweaked \cs{edlabel} to get correct line number if the command is first element of a paragraph.}
% \changes{v1.0}{2012/09/15}{Some compatibility break with eledmac. Change of name: eledmac.}
@@ -284,6 +274,9 @@
% Other LaTeX packages for critical editions include EDNOTES, and
% \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.
+%
% 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.
%
% You can subscribe to the eledmac mail list in:\\ \url{https://lists.berlios.de/pipermail/ledmac-users/}
@@ -774,7 +767,7 @@
% and say \cs{memorybreak} between the relevant \cs{pend} and
% \cs{pstart}.
%
-%\changes{v0.12}{2011/10/01}{Possibilty to number \cs{pstart}.}
+%\changes{v0.12}{2011/10/01}{Possibility to number \cs{pstart}.}
% It's possible to insert a number at every \cs{pstart} command. You must use the \DescribeMacro{\numberpstarttrue}\cs{numberpstarttrue} command to have it. You can stop the numbering with \DescribeMacro{\numberpstartfalse}\cs{numberpstartfalse}. You can redefine the command \DescribeMacro{\thepstart}\cs{thepstart} to change style. On each \cs{beginnumbering} the numbering restarts.
% \changes{v0.15}{2012/06/11}{Possibilty to print \cs{pstart} number in side.}
%
@@ -1148,6 +1141,15 @@
% \let\testimonia=\Cfootnote
% \end{verbatim}
%
+% \paragraph{Formalism for textual criticism}
+%
+% If your notes are for textual criticism, you should
+% use the \emph{eledform} package\footnote{\url{http://www.ctan.org/pkg/eledform}.}.
+%
+% This package provides some tools to describes the textual variants in a
+% formal way.
+%
+% It is base on eledmac for the typographical aspect.
%
% \subsection{Alternate footnote formatting}
% If you just launch into \Eledmac{} using the commands outlined
@@ -2628,7 +2630,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/09/25 v1.1 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/10/06 v1.1.2 LaTeX port of EDMAC]
% \end{macrocode}
%
@@ -9034,13 +9036,14 @@
% \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\cuse{##1footins}\else\@mem@nofootfalse\fi%
- \ifvoid\csuse{footins##1}\else\@mem@nofootfalse\fi%
+ \renewcommand{\do}[1]{\ifvoid\csuse{#1footins}\else\@mem@nofootfalse\fi%
+ \ifvoid\csuse{footins#1}\else\@mem@nofootfalse\fi%
}
\dolistloop{\@series}%
\@led@extranofeet}
@@ -9847,6 +9850,7 @@
% \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}.
@@ -9866,29 +9870,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
+ \fi%
+ \fi%x
\fi}
% \end{macrocode}
% \end{macro}