diff options
author | Karl Berry <karl@freefriends.org> | 2013-10-27 22:51:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-10-27 22:51:45 +0000 |
commit | f85faa8bc11e179cbb70dbc4818fb575a3e9b955 (patch) | |
tree | 01b99c4aa0184fd186b71de87ab284fb81e9904e /Master/texmf-dist | |
parent | 7133320f806e52d2be935cf77ca710871c8c92d9 (diff) |
eledmac (26oct13)
git-svn-id: svn://tug.org/texlive/trunk@32010 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | bin | 865517 -> 866579 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | bin | 474124 -> 476849 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 144 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/eledmac/eledpar.dtx | 249 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 101 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 204 |
6 files changed, 396 insertions, 302 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex 2c66b4df2cc..69e1c4c6eb2 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 Binary files differindex 3faef478d26..9b52128f935 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 059faf4d3a5..5a0cfb2c36c 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{8452} +% \CheckSum{8451} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -176,6 +176,7 @@ % \changes{v1.4.5}{2013/03/02}{Bug with komasscript + eledpar + chapter.} % \changes{v1.4.6}{2013/04/15}{Bug with memoir class introduced by 1.4.5.} % \changes{v1.4.8}{2013/07/02}{Corrects a bug with parallel texts introduced by 1.1.} +% \changes{v1.6.1}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -1534,6 +1535,8 @@ % is ended by an ampersand (\&), and the stanza itself is ended % by putting \verb?\&? at the end of the last line. % +% \textbf{Be careful: you must have NO space between the end of your verse and} \verb+&+ \textbf{or} \verb+\&+. +% In most cases, you will see no difference, but if your verse is exactly the same length as a line, then you will have an empty hanging verse. % % \DescribeMacro{\stanzaindentbase} % Lines within a stanza may be indented. The indents are integer multiples @@ -1552,10 +1555,17 @@ % The numerical entries must be whole numbers, 0 or greater, separated by % commas without embedded spaces. The first entry % gives the hanging indentation to be used if the stanza line requires more -% than one print line. If it is known that each stanza line will fit on -% a single print line, then this first entry should be 0; \TeX\ does less +% than one print line. +% +% If it is known that each stanza line will fit on more than one print line, +% then this first entry should be 0; \TeX\ does less % work in this case, but no harm ensues if the hanging indentation is not -% 0 but is never used. Enumeration is by stanza lines, not by print lines. +% 0 but is never used. +% +% If you want the hanging verse to be flush right, +% you can use \cs{hanginsymbol}: see p.~\pageref{hfillhanging}. +% +% Enumeration is by stanza lines, not by print lines. % In the above example the lines are indented one unit, two units, one unit, % two units, with 3 units of hanging indentation in case a stanza line is too % long to fit on one print line. @@ -1624,7 +1634,7 @@ % \item Won't be numbered. % \item Won't affect the indent of the next verse. % \end{enumerate} -% It could be use, for example, to add some space between verse. +% It could be used, for example, to add some space between verses. % To add this type of false verse, you have to finish the previous verse with \cs{falseverse} (and not with \verb+&+). % For example: % \begin{verbatim} @@ -1635,10 +1645,14 @@ % True verse % \end{verbatim} % \subsection{Hanging symbol} -%It's possible to insert a symbol on each line of verse's hanging, as in French typography for `['. To insert in eledmac, redefine macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code: -%\begin{verbatim} -%\renewcommand{\hangingsymbol}{[\,} -%\end{verbatim} +% It's possible to insert a symbol in each line of hanging verse, as in French typography for `['., as in French typography for `['. To insert in eledmac, redefine macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code: +% \begin{verbatim} +% \renewcommand{\hangingsymbol}{[\,} +% \end{verbatim} +% \label{hfillhanging} You can also use it to force hanging verse to be flush right: +% \begin{verbatim} +% \renewcommand{\hangingsymbol}{\protect\hfill} +% \end{verbatim} % \subsection{Various tools} % \DescribeMacro{\ampersand} % If you need to print an \& symbol in a stanza, use the \verb?\ampersand? @@ -2705,7 +2719,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2013/10/09 v1.6.0 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2013/10/27 v1.6.1 LaTeX port of EDMAC] % \end{macrocode} % % Generally, these are the modifications to the original. @@ -5488,6 +5502,7 @@ % \end{macro} % % \begin{macro}{\pstart} +% \changes{v1.6.1}{2013/10/27}{Spurious space in \cs{pstart}.} % \begin{macro}{\numberpstarttrue} % \begin{macro}{\numberpstartfalse} % \begin{macro}{\labelpstarttrue} @@ -5518,28 +5533,37 @@ \numberpstartfalse \newif\iflabelpstart \labelpstartfalse -\newcommand*{\pstart}{ -\if@nobreak -\let\@oldnobreak\@nobreaktrue -\else -\let\@oldnobreak\@nobreakfalse -\fi -\@nobreaktrue -\ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi +\newcommand*{\pstart}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% +\@nobreaktrue% +\ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \begingroup\normal@pars - \global\setbox\raw@text=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifinstanza\else\ifsidepstartnum\else\thepstart\fi\fi\fi\fi - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstart\thepstart}\fi + \global\let\next@insert=\empty% + \begingroup\normal@pars% + \global\setbox\raw@text=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifinstanza\else% + \ifsidepstartnum\else% + \thepstart% + \fi% + \fi% + \fi% + \fi% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstart\thepstart}\fi% } % \end{macrocode} % \end{macro} @@ -5549,15 +5573,16 @@ % \end{macro} % \end{macro} % \begin{macro}{\pend} +% \changes{v1.6.1}{2013/10/27}{Spurious space in \cs{pend}.} % \cs{pend} must be used to end a numbered paragraph. % % \begin{macrocode} -\newcommand*{\pend}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi +\newcommand*{\pend}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \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 @@ -5568,31 +5593,31 @@ % paragraph, add a line number and footnotes, and restore it to the page; % we keep doing this until there aren't any more lines left. % \begin{macrocode} - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% % \end{macrocode} % We check if lineation is by pstart: in this case, we reset line number, but only in the second line of the pstart, to prevent some trouble. We can't reset line number at the beginning of \cs{pstart} \cs{setline} is parsed at the end of previous \cs{pend}, and so, we must do it at the end of first line of pstart. % \begin{macrocode} - \csnumdef{pstartline}{0} - \loop\ifvbox\raw@text + \csnumdef{pstartline}{0}% + \loop\ifvbox\raw@text% \csnumdef{pstartline}{\pstartline+1}% - \do@line + \do@line% \ifbypstart@% \ifnumequal{\pstartline}{1}{\setline{1}\resetprevline@}{}% - \fi - \repeat + \fi% + \repeat% % \end{macrocode} % Deal with any leftover notes, and then end the group that was begun % in the \cs{pstart}. % \begin{macrocode} - \flush@notes - \endgroup - \ignorespaces - \ifnumberpstart - \pstartnumtrue - \fi - \@oldnobreak + \flush@notes% + \endgroup% + \ignorespaces% + \ifnumberpstart% + \pstartnumtrue% + \fi% + \@oldnobreak% \addtocounter{pstart}{1}} % \end{macrocode} @@ -5684,6 +5709,7 @@ % \begin{macro}{\l@dunhbox@line} % The \cs{do@line} macro is called by \cs{pend} to % do all the processing for a single line of text. +% \changes{v1.6.1}{2013/10/27}{Move the call to \cs{inserthangingsymbol} to allow use \cs{hfill} inside.} % \begin{macrocode} \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} \newcommand*{\do@line}{% @@ -5701,9 +5727,9 @@ \fi \affixline@num \affixpstart@num - \hb@xt@ \linewidth{\do@insidelinehook\inserthangingsymbol\l@dld@ta\add@inserts\affixside@note + \hb@xt@ \linewidth{\do@insidelinehook\l@dld@ta\add@inserts\affixside@note \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% + {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% \l@drsn@te }}}% % \end{macrocode} @@ -10883,17 +10909,18 @@ % \end{macrocode} % \end{macro} % \end{macro} -%\changes{v0.15}{2012/06/11}{New management of hangingsymbol insertion, preventing undesirable insertions.} -%\changes{v0.17}{2012/08/03}{New new management of hangingsymbol insertion, preventing undesirable insertions.} % \begin{macro}{\inserthangingymbol} % \begin{macro}{\ifinserthangingsymbol} % The boolean \cs{ifinserthangingsymbol} is set to TRUE when \cs{@lock} is greater than 1, i.e. when we are not in the first line of a verse. The switch of \cs{ifinserthangingsymbol} is made in \cs{do@line} before the printing of line but after the line number calculation. +%\changes{v0.15}{2012/06/11}{New management of hangingsymbol insertion, preventing undesirable insertions.} +%\changes{v0.17}{2012/08/03}{New new management of hangingsymbol insertion, preventing undesirable insertions.} +% \changes{v1.6.1}{2013/10/27}{Hang verse is now not automatically flush right.} % \begin{macrocode} \newif\ifinserthangingsymbol \newcommand{\inserthangingsymbol}{% \ifinserthangingsymbol% \ifinstanza% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi% } @@ -12489,9 +12516,8 @@ % \setstanzaindents{5,0,1} % \end{verbatim} % \clearpage -% % \bibliographystyle{alpha} -% \section*{} +% \phantomsection % \addcontentsline{toc}{section}{References} % \begin{thebibliography}{WWW99} % diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx index 91f4b656b5c..49f413a7eb9 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx @@ -51,7 +51,7 @@ % % \fi % -% \CheckSum{4005} +% \CheckSum{4003} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -156,6 +156,7 @@ % \changes{v1.1}{2012/09/25}{Shiftedverses becomes shiftedpstarts.} % \changes{v1.2}{2012/10/15}{Support for \cs{led}\meta{section} commands in parallel texts.} % \changes{v1.3.2}{2012/12/11}{Debug with some classes.} +% \changes{v1.4.3}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.} % \hyphenation{man-u-script man-u-scripts} % % \newcommand{\Lpack}[1]{\textsf{#1}} @@ -213,9 +214,9 @@ % % You can subscribe to the eledmac email list in:\\ \url{https://lists.berlios.de/pipermail/ledmac-users/} % \end{abstract} -% +% \renewcommand{\numberline}[1]{#1~} % \tableofcontents -% +% % \listoffigures % % @@ -719,7 +720,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2013/08/21 v1.4.2 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2013/10/27 v1.4.3 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. @@ -2335,8 +2336,9 @@ % % \begin{macro}{\pstartL} % \begin{macro}{\pstartR} -% changes{v1.1}{2012/09/25}{Add \cs{labelpstarttrue} (from eledmac).} -% changes{v1.1.1}{2012/10/01}{Correct \cs{pstartR} bug introduced by 1.1.} +% \changes{v1.1}{2012/09/25}{Add \cs{labelpstarttrue} (from eledmac).} +% \changes{v1.1.1}{2012/10/01}{Correct \cs{pstartR} bug introduced by 1.1.} +% \changes{v1.4.3}{2013/10/27}{Spurious spaces in \cs{pstartL} and \cs{pstartR}.} % \cs{pstart} starts the paragraph by % clearing the \cs{inserts@list} list and other % relevant variables, and then arranges for the @@ -2360,83 +2362,98 @@ \newcounter{pstartRold} \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } -\newcommand*{\pstartL}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi +\newcommand*{\pstartL}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% % \end{macrocode} % If this is the first \cs{pstart} in a numbered section, clear any inserts % and set \cs{ifpst@rtedL} to FALSE. Save the pstartL counter. % \begin{macrocode} - \ifpst@rtedL\else + \ifpst@rtedL\else% \setcounter{pstartLold}{\value{pstartL}}% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \global\pst@rtedLtrue - \fi - \begingroup\normal@pars + \global\let\next@insert=\empty% + \global\pst@rtedLtrue% + \fi% + \begingroup\normal@pars% % \end{macrocode} % When parallel processing we check that we haven't exceeded % the maximum number of chunks. In any event we grab a box for the % forthcoming text. % \begin{macrocode} - \global\advance\l@dnumpstartsL \@ne - \ifnum\l@dnumpstartsL>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsL=\l@dc@maxchunks - \fi - \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartL\fi\fi\fi% - \hsize=\Lcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartL\thepstartL}\fi + \global\advance\l@dnumpstartsL \@ne% + \ifnum\l@dnumpstartsL>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsL=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum% + \else% + \thepstartL% + \fi% + \fi% + \fi% + \hsize=\Lcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartL\thepstartL}\fi% } % \end{macrocode} % % \begin{macrocode} -\newcommand*{\pstartR}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumberingR \else - \led@err@PstartNotNumbered - \beginnumberingR - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pendR - \fi - \ifpst@rtedR\else +\newcommand*{\pstartR}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumberingR \else% + \led@err@PstartNotNumbered% + \beginnumberingR% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pendR% + \fi% + \ifpst@rtedR\else% \setcounter{pstartRold}{\value{pstartR}}% \list@clear{\inserts@listR}% - \global\let\next@insertR=\empty - \global\pst@rtedRtrue - \fi - \begingroup\normal@pars - \global\advance\l@dnumpstartsR \@ne - \ifnum\l@dnumpstartsR>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsR=\l@dc@maxchunks - \fi - \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartR\fi\fi\fi% - \hsize=\Rcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartR\thepstartR}\fi + \global\let\next@insertR=\empty% + \global\pst@rtedRtrue% + \fi% + \begingroup\normal@pars% + \global\advance\l@dnumpstartsR \@ne% + \ifnum\l@dnumpstartsR>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsR=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum\else% + \thepstartR% + \fi% + \fi% + \fi% + \hsize=\Rcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartR\thepstartR}\fi% } % \end{macrocode} % \end{macro} @@ -2444,17 +2461,18 @@ % % % \begin{macro}{\pendL} +% \changes{v1.4.3}{2013/10/27}{Spurious spaces in \cs{pendL}.} % \cs{pend} must be used to end a numbered paragraph. Again we need % a version % that knows about left parallel texts. % % \begin{macrocode} -\newcommand*{\pendL}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi +\newcommand*{\pendL}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \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 @@ -2462,41 +2480,42 @@ % paragraph into pieces. These penalties revert to the values % that you set when the group for the \cs{vbox} ends. % \begin{macrocode} - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% % \end{macrocode} % End the group that was begun in the \cs{pstart}. % \begin{macrocode} - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartL}{1} + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartL}{1}% \fi} % \end{macrocode} % \end{macro} % % \begin{macro}{\pendR} +% \changes{v1.4.3}{2013/10/27}{Spurious spaces in \cs{pstartR}.} % The version of \cs{pend} needed for right texts. % % \begin{macrocode} -\newcommand*{\pendR}{\ifnumberingR \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@linesR=\prevgraf\egroup - \global\par@lineR=0 - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartR}{1} - \fi +\newcommand*{\pendR}{\ifnumberingR \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@linesR=\prevgraf\egroup% + \global\par@lineR=0% + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartR}{1}% + \fi% } % \end{macrocode} @@ -3471,18 +3490,19 @@ % Like in eledmac, the insertion of hangingsymbol is base on \cs{ifinserthangingsymbol}, and, for the right side, on \cs{ifinserthangingsymbolR}. % \begin{macro}{\inserthangingsymbolL} % \begin{macro}{\inserthangingsymbolR} +% \changes{v1.4.3}{2013/10/27}{Hang verse is now not automatically flush right.} % \begin{macrocode} \newif\ifinserthangingsymbolR \newcommand{\inserthangingsymbolL}{% \ifinserthangingsymbol% \ifinstanzaL% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} \newcommand{\inserthangingsymbolR}{% \ifinserthangingsymbolR% \ifinstanzaR% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} % \end{macrocode} @@ -4218,7 +4238,7 @@ \advance\numpagelinesL \@ne \ifshiftedpstarts \ifdim\ht\l@dleftbox>0pt\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}% \fi % \end{macrocode} @@ -4258,7 +4278,7 @@ \advance\numpagelinesR \@ne \ifshiftedpstarts \ifdim\ht\l@drightbox>0pt\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}% \fi \get@nextboxR @@ -4658,14 +4678,39 @@ % % \section{The End}\label{end} % - - +% %</code> % % \newpage % \appendix % \clearpage % +% \let\oldthesection\thesection +% \renewcommand{\thesection}{Appendix \oldthesection} +% \section{Some things to do when changing version} +% \subsection{Migration to eledpar 1.4.3} +% Version 1.4.3 corrects a bug added in version 0.12, which made hanging verse automatically flush right, despite the given value of the first element of the \cs{setstanzaindents} command. +% +% If, however, you want to return to automatic flush-right margins for verses with hanging indents, you have to redefine the \cs{hangingsymbol} command. +% \begin{verbatim} +% \renewcommand{\hangingsymbol}{\protect\hfill} +% \end{verbatim} +% See the two following examples: +% +% With standard \cs{hangingsymbol}: +% \setstanzaindents{4,0} +% \beginnumbering +% \stanza +% A very long verse should be sometime hanged. The position of the hang verse is fixed.\& +% \endnumbering +% +% With the modification of \cs{hangingsymbol}: +% \renewcommand{\hangingsymbol}{\protect\hfill} +% \setstanzaindents{4,0} +% \beginnumbering +% \stanza +% A very long verse should sometimes be hanging. And we can see that an hanging verse is flush right.\& +% \endnumbering % \bibliographystyle{alpha} % \begin{thebibliography}{WWW99} % \addcontentsline{toc}{section}{References} @@ -4697,7 +4742,7 @@ % \end{thebibliography} % % \Finale -% \section*{} +% \phantomsection % \addcontentsline{toc}{section}{Index} % \PrintIndex % diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 815165548b2..3db143e93d6 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/10/09 v1.6.0 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2013/10/27 v1.6.1 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -901,53 +901,62 @@ \numberpstartfalse \newif\iflabelpstart \labelpstartfalse -\newcommand*{\pstart}{ -\if@nobreak -\let\@oldnobreak\@nobreaktrue -\else -\let\@oldnobreak\@nobreakfalse -\fi -\@nobreaktrue -\ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi +\newcommand*{\pstart}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% +\@nobreaktrue% +\ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \begingroup\normal@pars - \global\setbox\raw@text=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifinstanza\else\ifsidepstartnum\else\thepstart\fi\fi\fi\fi - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstart\thepstart}\fi + \global\let\next@insert=\empty% + \begingroup\normal@pars% + \global\setbox\raw@text=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifinstanza\else% + \ifsidepstartnum\else% + \thepstart% + \fi% + \fi% + \fi% + \fi% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstart\thepstart}\fi% } -\newcommand*{\pend}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 - \csnumdef{pstartline}{0} - \loop\ifvbox\raw@text +\newcommand*{\pend}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% + \csnumdef{pstartline}{0}% + \loop\ifvbox\raw@text% \csnumdef{pstartline}{\pstartline+1}% - \do@line + \do@line% \ifbypstart@% \ifnumequal{\pstartline}{1}{\setline{1}\resetprevline@}{}% - \fi - \repeat - \flush@notes - \endgroup - \ignorespaces - \ifnumberpstart - \pstartnumtrue - \fi - \@oldnobreak + \fi% + \repeat% + \flush@notes% + \endgroup% + \ignorespaces% + \ifnumberpstart% + \pstartnumtrue% + \fi% + \@oldnobreak% \addtocounter{pstart}{1}} \newcommand*{\l@dzeropenalties}{% @@ -993,9 +1002,9 @@ \fi \affixline@num \affixpstart@num - \hb@xt@ \linewidth{\do@insidelinehook\inserthangingsymbol\l@dld@ta\add@inserts\affixside@note + \hb@xt@ \linewidth{\do@insidelinehook\l@dld@ta\add@inserts\affixside@note \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% + {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% \l@drsn@te }}}% \newcommand*{\do@linehook}{} @@ -3213,7 +3222,7 @@ \newcommand{\inserthangingsymbol}{% \ifinserthangingsymbol% \ifinstanza% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi% } diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index cec6bed0d9b..358d09e92db 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}[2013/08/21 v1.4.2 eledmac extension for parallel texts] +\ProvidesPackage{eledpar}[2013/10/27 v1.4.3 eledmac extension for parallel texts] \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -829,103 +829,118 @@ \newcounter{pstartRold} \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } -\newcommand*{\pstartL}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumbering \else - \led@err@PstartNotNumbered - \beginnumbering - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pend - \fi - \ifpst@rtedL\else +\newcommand*{\pstartL}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumbering \else% + \led@err@PstartNotNumbered% + \beginnumbering% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pend% + \fi% + \ifpst@rtedL\else% \setcounter{pstartLold}{\value{pstartL}}% \list@clear{\inserts@list}% - \global\let\next@insert=\empty - \global\pst@rtedLtrue - \fi - \begingroup\normal@pars - \global\advance\l@dnumpstartsL \@ne - \ifnum\l@dnumpstartsL>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsL=\l@dc@maxchunks - \fi - \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartL\fi\fi\fi% - \hsize=\Lcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartL\thepstartL}\fi + \global\let\next@insert=\empty% + \global\pst@rtedLtrue% + \fi% + \begingroup\normal@pars% + \global\advance\l@dnumpstartsL \@ne% + \ifnum\l@dnumpstartsL>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsL=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum% + \else% + \thepstartL% + \fi% + \fi% + \fi% + \hsize=\Lcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartL\thepstartL}\fi% } -\newcommand*{\pstartR}{ -\if@nobreak - \let\@oldnobreak\@nobreaktrue -\else - \let\@oldnobreak\@nobreakfalse -\fi - \@nobreaktrue - \ifnumberingR \else - \led@err@PstartNotNumbered - \beginnumberingR - \fi - \ifnumberedpar@ - \led@err@PstartInPstart - \pendR - \fi - \ifpst@rtedR\else +\newcommand*{\pstartR}{% +\if@nobreak% + \let\@oldnobreak\@nobreaktrue% +\else% + \let\@oldnobreak\@nobreakfalse% +\fi% + \@nobreaktrue% + \ifnumberingR \else% + \led@err@PstartNotNumbered% + \beginnumberingR% + \fi% + \ifnumberedpar@% + \led@err@PstartInPstart% + \pendR% + \fi% + \ifpst@rtedR\else% \setcounter{pstartRold}{\value{pstartR}}% \list@clear{\inserts@listR}% - \global\let\next@insertR=\empty - \global\pst@rtedRtrue - \fi - \begingroup\normal@pars - \global\advance\l@dnumpstartsR \@ne - \ifnum\l@dnumpstartsR>\l@dc@maxchunks - \led@err@TooManyPstarts - \global\l@dnumpstartsR=\l@dc@maxchunks - \fi - \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifsidepstartnum\else\thepstartR\fi\fi\fi% - \hsize=\Rcolwidth - \numberedpar@true - \iflabelpstart\protected@edef\@currentlabel - {\p@pstartR\thepstartR}\fi + \global\let\next@insertR=\empty% + \global\pst@rtedRtrue% + \fi% + \begingroup\normal@pars% + \global\advance\l@dnumpstartsR \@ne% + \ifnum\l@dnumpstartsR>\l@dc@maxchunks% + \led@err@TooManyPstarts% + \global\l@dnumpstartsR=\l@dc@maxchunks% + \fi% + \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup% + \ifautopar\else% + \ifnumberpstart% + \ifsidepstartnum\else% + \thepstartR% + \fi% + \fi% + \fi% + \hsize=\Rcolwidth% + \numberedpar@true% + \iflabelpstart\protected@edef\@currentlabel% + {\p@pstartR\thepstartR}\fi% } -\newcommand*{\pendL}{\ifnumbering \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartL}{1} +\newcommand*{\pendL}{\ifnumbering \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@lines=\prevgraf\egroup% + \global\par@line=0% + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartL}{1}% \fi} -\newcommand*{\pendR}{\ifnumberingR \else - \led@err@PendNotNumbered - \fi - \ifnumberedpar@ \else - \led@err@PendNoPstart - \fi - \l@dzeropenalties - \endgraf\global\num@linesR=\prevgraf\egroup - \global\par@lineR=0 - \endgroup - \ignorespaces - \@oldnobreak - \ifnumberpstart - \addtocounter{pstartR}{1} - \fi +\newcommand*{\pendR}{\ifnumberingR \else% + \led@err@PendNotNumbered% + \fi% + \ifnumberedpar@ \else% + \led@err@PendNoPstart% + \fi% + \l@dzeropenalties% + \endgraf\global\num@linesR=\prevgraf\egroup% + \global\par@lineR=0% + \endgroup% + \ignorespaces% + \@oldnobreak% + \ifnumberpstart% + \addtocounter{pstartR}{1}% + \fi% } \newbox\l@dleftbox @@ -1518,13 +1533,13 @@ \newcommand{\inserthangingsymbolL}{% \ifinserthangingsymbol% \ifinstanzaL% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} \newcommand{\inserthangingsymbolR}{% \ifinserthangingsymbolR% \ifinstanzaR% - \hfill\hangingsymbol% + \hangingsymbol% \fi% \fi} \newcommand{\correcthangingL}{% @@ -1865,7 +1880,7 @@ \advance\numpagelinesL \@ne \ifshiftedpstarts \ifdim\ht\l@dleftbox>0pt\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}% \fi @@ -1886,7 +1901,7 @@ \advance\numpagelinesR \@ne \ifshiftedpstarts \ifdim\ht\l@drightbox>0pt\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}\fi% - \else + \else% \hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}% \fi \get@nextboxR @@ -2096,7 +2111,6 @@ \fi \fi} - \endinput %% %% End of file `eledpar.sty'. |