diff options
author | Karl Berry <karl@freefriends.org> | 2011-10-04 23:07:56 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-10-04 23:07:56 +0000 |
commit | 517d814fc2151f1a207e0fff3705de6384552f86 (patch) | |
tree | 5f4fca431c7002bd3a0a588a37ae95a6d0dcfc76 /Master/texmf-dist/source/latex | |
parent | fee12533281613d6c84ae9bbd720dc24e5a54928 (diff) |
ledmac (4oct11)
git-svn-id: svn://tug.org/texlive/trunk@24192 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/ledmac/ledmac.dtx | 89 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ledmac/ledpar.dtx | 59 |
2 files changed, 108 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx index dfed346c774..d953b907969 100644 --- a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx +++ b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx @@ -50,7 +50,7 @@ % % \fi % -% \CheckSum{9085} +% \CheckSum{9130} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -133,6 +133,8 @@ % \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} % \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} @@ -153,12 +155,16 @@ % \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/07/11}{Bug on endnotes fixed : in a // text, every endnotes can be at the end (!)} -% \changes{v0.8.1}{2011/07/14}{Bug on \cs{edtext} ; \cs{critex} ; \cs{lemma} fixed : we can now us non switching commands, like \cs{textit}} +% \changes{0.8}{2011/17/06}{Bug on endnotes fixed : in a // text, all endnotes will print and be placed at the ends of columns (!)} +% \changes{v0.8.1}{2011/07/14}{Bug on \cs{edtext} ; \cs{critex} ; \cs{lemma} fixed : we can now us non switching commands} % \changes{v0.9}{2011/08/03}{No more ledpatch. All patches are now in the main file.} -% \changes{v0.9.1}{2011/08/08}{Fix some bug's linked with the integration of ledpatch on the main file.} -% \changes{v0.10}{2011/08/22}{Corrections about \cs{section} and other titles in numbered sections} -% \changes{v0.11}{2011/09/16}{Possibility to have a symbol on each hanging of verses, like in the french typography. Redefine the commande \cs{hangingsymbol} to define the character.} +% \changes{v0.9.1}{2011/08/08}{Fix some bugs linked to integrating ledpatch on the main file.} +% \changes{v0.10}{2011/08/22}{Corrections to \cs{section} and other titles in numbered sections} +% \changes{v0.11}{2011/09/16}{Makes it possible to add a symbol on each verse's hanging, as in French typography. Redefines the command \cs{hangingsymbol} to define the character.} +% \changes{v0.12}{2011/10/01}{Possibility to number the pstart with the commands \cs{numberpstarttrue}.} +% \changes{v0.12}{2011/10/01}{For compatibilty with ledpar, 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.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -268,7 +274,7 @@ % \Lpack{poemscol} for poetical works. % \end{PW} % -% Please, for all bug's report, open a ticket on \url{https://github.com/maieul/ledmac/issues/} +% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{lhttps://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. % \end{abstract} % % \tableofcontents @@ -583,7 +589,7 @@ % edited text. % % -% \section{Numbering text lines} +% \section{Numbering text lines and paragraphs} % % \DescribeMacro{\beginnumbering} % \DescribeMacro{\endnumbering} @@ -782,6 +788,8 @@ % and say \cs{memorybreak} between the relevant \cs{pend} and % \cs{pstart}. % +%\changes{v.0.12}{2011/10/01}{Possibilty 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. % \subsection{Lineation commands} % % \DescribeMacro{\lineation} @@ -1549,7 +1557,7 @@ % \end{verbatim} % \end{PW} %\begin{PW} -% It's possible to insert a symbol on each hanging of verse. For example, in the french typography, the symbol is `]'.To say to ledmac to insert it, just redefine the macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code : +%It's possible to insert a symbol on each line of verse's hanging, as in French typography for `]'. To insert in ledmac, redefine macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code : %\begin{verbatim} %\renewcommand{\hangingsymbol}{[\,} %\end{verbatim} @@ -2947,7 +2955,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledmac}[2011/09/16 v0.11 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2011/10/02 v0.12.1 LaTeX port of EDMAC] % \end{macrocode} % @@ -3315,6 +3323,7 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\ifnumberingR} % \begin{macro}{\ifl@dpairing} % \begin{macro}{\l@dpairingtrue} % \begin{macro}{\l@dpairingfalse} @@ -3322,19 +3331,26 @@ % \begin{macro}{\pst@rtedLtrue} % \begin{macro}{\pst@rtedLfalse} % \begin{macro}{\l@dnumpstartsL} +% \begin{macro}{\ifledRcol} % In preparation for the \Lpack{ledpar} package, these are related to % the `left' text of parallel texts (when \cs{ifl@dpairing} is TRUE). % They are explained in the \Lpack{ledpar} % manual. % \changes{v0.7}{2005/02/24}{Added \cs{l@dnumpstartsL}, \cs{ifl@dpairing} % and \cs{ifpst@rted} for/from ledpar} +% \changes{v0.12}{2005/10/01}{Added \cs{ifledRcol} and \cs{ifnumberingR} for/from ledpar} % \begin{macrocode} \newif\ifl@dpairing \l@dpairingfalse \newif\ifpst@rtedL \pst@rtedLfalse \newcount\l@dnumpstartsL - +\newif\ifledRcol +% \end{macrocode} +% The \cs{ifnumberingR} flag is +% set to \verb"true" if we're within a right text numbered section. +% \begin{macrocode} +\newif\ifnumberingR % \end{macrocode} % \end{macro} % \end{macro} @@ -3343,7 +3359,8 @@ % \end{macro} % \end{macro} % \end{macro} -% +% \end{macro} +% \end{macro} % \begin{macro}{\beginnumbering} % \begin{macro}{\initnumbering@reg} % \cs{beginnumbering} begins a section of numbered text. @@ -3375,7 +3392,9 @@ \initnumbering@reg \message{Section \the\section@num }% \line@list@stuff{\jobname.\extensionchars\the\section@num}% - \l@dend@stuff} + \l@dend@stuff + \setcounter{pstart}{1} +} \newcommand*{\initnumbering@reg}{% \global\pst@rtedLfalse \global\l@dnumpstartsL \z@ @@ -3419,8 +3438,8 @@ \fi \else \led@err@NumberingNotStarted - \fi} - + \fi + \autoparfalse} % \end{macrocode} % \end{macro} % @@ -5527,6 +5546,9 @@ % \end{macro} % % \begin{macro}{\pstart} +% \begin{macro}{numberpstarttrue} +% \begin{macro}{numberpstartfalse} +% \begin{macro}{thepstart} % \cs{pstart} starts the paragraph by % clearing the \cs{inserts@list} list and other % relevant variables, and then arranges for the @@ -5538,7 +5560,18 @@ % Beware: everything that occurs between \cs{pstart} and \cs{pend} % is happening within a group; definitions must be global if you want % them to survive past the end of the paragraph. +% +%You can use the command \cs{numberpstarttrue} to insert a number on every \cs{pstart}. To stop the numbering, you must use \cs{numberpstartfalse}. To reset the numebering of \cs{pstarts}, insert +% \begin{verbatim} +%\setcounter{pstart}{0} +% \end{verbatim} +% % \begin{macrocode} + +\newcounter{pstart} +\renewcommand{\thepstart}{{\bf\@arabic\c@pstart}. } +\newif\ifnumberpstart +\numberpstartfalse \newcommand*{\pstart}{ \managehangingsymbol \if@nobreak @@ -5547,7 +5580,7 @@ \let\@oldnobreak\@nobreakfalse \fi \@nobreaktrue - \ifnumbering \else +\ifnumbering \else \led@err@PstartNotNumbered \beginnumbering \fi @@ -5558,11 +5591,13 @@ \list@clear{\inserts@list}% \global\let\next@insert=\empty \begingroup\normal@pars - \global\setbox\raw@text=\vbox\bgroup + \global\setbox\raw@text=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifinstanza\else\thepstart\fi\fi\fi \numberedpar@true} % \end{macrocode} % \end{macro} -% +% \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\pend} % \cs{pend} must be used to end a numbered paragraph. % @@ -5573,6 +5608,9 @@ \ifnumberedpar@ \else \led@err@PendNoPstart \fi +\ifnumberpstart +\addtocounter{pstart}{1} +\fi % \end{macrocode} % We set all the usual interline penalties to zero and then immediately % call \cs{endgraf} to end the paragraph; this ensures that there'll @@ -5649,13 +5687,24 @@ % \cs{pstart}, restoring the indentation that we saved, and % locally change \verb"\par" so that it'll do our \cs{pend} for us. % \begin{macrocode} -\newcommand*{\autopar}{\ifnumbering \else +\newif\ifautopar +\autoparfalse +\newcommand*{\autopar}{ + \ifledRcol + \ifnumberingR \else + \led@err@AutoparNotNumbered + \beginnumberingR + \fi + \else + \ifnumbering \else \led@err@AutoparNotNumbered \beginnumbering + \fi \fi + \autopartrue \everypar={\setbox0=\lastbox \endgraf \vskip-\parskip - \pstart \noindent \kern\wd0 + \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi \let\par=\pend}% \ignorespaces} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx index 92471dbdc8b..898fe8b4e26 100644 --- a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx +++ b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx @@ -50,7 +50,7 @@ % % \fi % -% \CheckSum{4448} +% \CheckSum{4485} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -127,6 +127,8 @@ % \def\fileversion{v0.6} \def\filedate{2011/08/22} % \def\fileversion{v0.7} \def\filedate{2011/08/31} % \def\fileversion{v0.8} \def\filedate{2011/09/16} +% \def\fileversion{v0.9}\def\filedate{2011/10/01} +% \def\fileversion{v0.9.1}\def\filedate{2011/10/02} % \changes{v0.1}{2004/12/10}{First public release} % \changes{v0.2}{2005/01/01}{Fix babel problems} % \changes{v0.3}{2005/03/24}{Reorganize for ledarab} @@ -138,6 +140,8 @@ % \changes{v0.6}{2011/08/22}{Be able to us \cs{chapter} in parallel pages.} % \changes{v0.7}{2011/08/31}{Option `shiftedverses' which make there is no blank between two parallel verses with inequal length.} % \changes{v0.8}{2011/09/16}{Possibility to have a symbol on each hanging of verses, like in the french typography. Redefine the commande \cs{hangingsymbol} to define the character.} +% \changes{v0.9}{2011/10/01}{Possibilty to number the pstart with the commands \cs{numberpstarttrue}.} +% \changes{v0.9.1}{2011/10/02}{The numbering of the pstarts restarts on each \cs{beginnumbering}.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -192,7 +196,7 @@ % which enables texts and their critical apparatus to be typeset in % parallel, either in two columns or on pairs of facing pages. % -% Please, for all bug's report, open a ticket on \url{https://github.com/maieul/ledmac/issues/} +% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{lhttps://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. % \end{abstract} % % \tableofcontents @@ -289,7 +293,7 @@ % meaning that there can be up to 10 chunks in the left text and up to % 10 chunks in % the right text, requiring a total of 20 boxes. If you need more chunks -% then you can increase \cs{maxchunks}. +% then you can increase \cs{maxchunks}. The \cs{maxchunks} must be called in the preamble. % % TeX has a limited number of boxes; if you get an error % message along the lines of `no room for a new box', then decrease @@ -485,7 +489,7 @@ % then blank lines are output on the shorter side until the end of the longer % chunk is reached. % -% \section{Numbering text lines} +% \section{Numbering text lines and paragraphs} % % \DescribeMacro{\beginnumbering} % \DescribeMacro{\endnumbering} @@ -560,6 +564,10 @@ % \oldBfootfmt{#1}{#2}{#3}} % \end{verbatim} % +% +% +%\changes{v.0.9}{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 numerotation with \DescribeMacro{\numberpstartfalse}\cs{numberpstartfalse}. You can redefine the commands \DescribeMacro{\thepstartL}\cs{thepstartL} and \DescribeMacro{\thepstartR}\cs{thepstartR} to change style. The numbering restarts on each \cs{beginnumbering} % \section{Verse} % % If you are typesetting verse with \Ledmac{} you can use the \cs{stanza} @@ -693,7 +701,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledpar}[2011/09/16 v0.8 ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2011/10/02 v0.9.1 ledmac extension for parallel texts] % \end{macrocode} % With the option `shiftedverses' a long verse one the left side (or in the right side) don't make a blank on the corresponding verse, but the blank is put on the bottom of the page. Consequently, the verses on the parallel pages are shifted, but the shifted stop at every end of pages. @@ -720,11 +728,11 @@ % \cs{ifledRcol} is set TRUE if we are doing the right hand text. % \cs{ifl@dpairing} is defined in \Lpack{ledmac}. % \changes{v0.3}{2005/02/24}{Moved \cs{ifl@dpairing} to ledmac} +% \changes{v0.9}{2005/10/01}{Moved \cs{iflledRcol} and \cs{ifnumberingR} to ledmac} % \begin{macrocode} \l@dpairingfalse \newif\ifl@dpaging \l@dpagingfalse -\newif\ifledRcol \ledRcolfalse % \end{macrocode} % \end{macro} @@ -793,13 +801,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\ifnumberingR} -% The \cs{ifnumberingR} flag is -% set to \verb"true" if we're within a right text numbered section. -% \begin{macrocode} -\newif\ifnumberingR -% \end{macrocode} -% \end{macro} % % \begin{macro}{\ifpst@rtedL} % \begin{macro}{\ifpst@rtedR} @@ -859,7 +860,9 @@ \global\let\sub@change\relax \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% - \l@dend@stuff} + \l@dend@stuff + \setcounter{pstartR}{1} +} % \end{macrocode} % \end{macro} @@ -2095,7 +2098,7 @@ } % \end{macrocode} % The \verb?pages? environment additionally sets the `column' widths to the -% \cs{textwidth} (as known at the time the package is called). As in this environnement there is two text in parallels in 2 pages, chapter have not to start in a left page. So the \cs{chapter} command is redefined to make no test about clearing page. +% \cs{textwidth} (as known at the time the package is called). In this environment, there are two text in parallel on 2 pages. To prevent chapters starting on a lefthand page, the \cs{chapter} command is redefined to not clear pages. % \begin{macrocode} \newenvironment{pages}{% \let\oldchapter\chapter @@ -2129,7 +2132,9 @@ % \begin{macrocode} \newenvironment{Leftside}{% \ledRcolfalse + \let\beginnumbering\beginnumbering\setcounter{pstartL}{1} \let\pstart\pstartL + \let\thepstart\thepstartL \let\pend\pendL \let\memorydump\memorydumpL \Leftsidehook @@ -2169,7 +2174,8 @@ \let\endnumbering\endnumberingR \let\pausenumbering\pausenumberingR \let\resumenumbering\resumenumberingR - \let\memorydump\memorydumpR + \let\memorydump\memorydumpR + \let\thepstart\thepstartR \let\pstart\pstartR \let\pend\pendR \let\lineation\lineationR @@ -2243,6 +2249,12 @@ % among other things because of potential changes in the linewidth. % % \begin{macrocode} + +\newcounter{pstartL} +\renewcommand{\thepstartL}{{\bf\@arabic\c@pstartL}. } +\newcounter{pstartR} +\renewcommand{\thepstartR}{{\bf\@arabic\c@pstartR}. } + \newcommand*{\pstartL}{ \if@nobreak \let\@oldnobreak\@nobreaktrue @@ -2278,7 +2290,7 @@ \led@err@TooManyPstarts \global\l@dnumpstartsL=\l@dc@maxchunks \fi - \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup% + \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\thepstartL\fi\fi% \hsize=\Lcolwidth \numberedpar@true} % \end{macrocode} @@ -2310,7 +2322,7 @@ \led@err@TooManyPstarts \global\l@dnumpstartsR=\l@dc@maxchunks \fi - \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup% + \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\thepstartR\fi\fi% \hsize=\Rcolwidth \numberedpar@true} % \end{macrocode} @@ -2345,7 +2357,10 @@ % \begin{macrocode} \endgroup \ignorespaces - \@oldnobreak} + \@oldnobreak + \ifnumberpstart + \addtocounter{pstartL}{1} + \fi} % \end{macrocode} % \end{macro} @@ -2365,7 +2380,11 @@ \global\par@lineR=0 \endgroup \ignorespaces - \@oldnobreak} + \@oldnobreak + \ifnumberpstart + \addtocounter{pstartR}{1} + \fi +} % \end{macrocode} % \end{macro} |