From d2eaed0a00c74cf42ca7420db4facc90d91b6b75 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Sep 2014 21:39:42 +0000 Subject: eledmac (25sep14) git-svn-id: svn://tug.org/texlive/trunk@35257 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 970612 -> 970688 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 515172 -> 515188 bytes .../latex/eledmac/examples/columns-alignment.pdf | Bin 21173 -> 21174 bytes .../latex/eledmac/examples/cross-referencing.pdf | Bin 16305 -> 16307 bytes .../doc/latex/eledmac/examples/indexing.pdf | Bin 19899 -> 19896 bytes .../eledmac/examples/line-numbers-in-header.pdf | Bin 31488 -> 31486 bytes .../latex/eledmac/examples/minimal-parallels.pdf | Bin 12220 -> 12221 bytes .../doc/latex/eledmac/examples/minimal-verses.pdf | Bin 17123 -> 17126 bytes .../examples/mixing-columns-and-not-columns.pdf | Bin 18835 -> 18782 bytes .../examples/parallel-column-two-languages.pdf | Bin 24863 -> 24868 bytes .../examples/sections-not-in-line-numbering.pdf | Bin 17151 -> 17150 bytes .../sections-parallel-not-in-line-numbering.pdf | Bin 22222 -> 22221 bytes ...ons-with-critical-notes-in-parallel-columns.pdf | Bin 29010 -> 29009 bytes ...tions-with-critical-notes-in-parallel-pages.pdf | Bin 31610 -> 31612 bytes .../examples/sections-with-critical-notes.pdf | Bin 22790 -> 22787 bytes .../doc/latex/eledmac/examples/side-notes.pdf | Bin 20256 -> 20119 bytes .../examples/spaces-around-footnote-rule.pdf | Bin 20759 -> 20766 bytes .../doc/latex/eledmac/examples/tabular.pdf | Bin 20927 -> 20925 bytes .../examples/text-between-verses-in-parallel.pdf | Bin 16238 -> 16237 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 19 +++++++++++++------ Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 4 +++- 21 files changed, 16 insertions(+), 7 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index 9a1901043dd..a5407dd0261 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf index 6b8e30febd4..fd4961990a7 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf index 6f7cefc35e6..287e56f2287 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf index e7bb587df37..1153ebe38fc 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf index 2a2e3e1ccb6..6cbafbb7aec 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf index d5a37b50306..55c1c58d075 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf index f0d0a2b5eb5..d48b1d8bd94 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf index b7e41801b5b..31db7a9e6db 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf index c4cec74d341..13a0f5ef04c 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf index 8a5c5f8bacc..51a475538dd 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf index 1f5298c8a65..1b7d165485d 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf index 492e936163b..ddb63f217b6 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf index d62cc4bd75f..c116fe13e37 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf index f0d6f7e322e..b37deb4eac5 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf index 513d0f9fd78..2b2778a043e 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf index 843783b51d4..4e04d0e41be 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf index 0a29fa381cb..4d62aadcf00 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf index 9b150631850..c74b7bdf52c 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf index d303059ba96..71510ad4f0a 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf differ diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index c7d383b7086..27ee63af1d9 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{10305} +% \CheckSum{10307} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -207,6 +207,8 @@ % \changes{v1.12.3}{2014/08/15}{Debug left and right notes (bugs added by 1.12.0)} % \changes{v1.12.3}{2014/08/15}{Debug \cs{eledxxx} with some paper size} % \changes{v1.12.4}{2014/08/25}{Debug spurious page breaks before \cs{chapter} (bug added by 1.12.0)} +% \changes{v1.13.1}{2014/09/25}{Debug quotation environment inside of a \cs{pstart} when preceded by a sectioning command.} +% \changes{v1.13.1}{2014/09/25}{Combing back of page and line breaking penalties's management, deleted by error in v0.17.} % \hyphenation{man-u-script man-u-scripts} % % @@ -691,7 +693,7 @@ % \changes{v1.12.0}{2014/08/05}{Optional arguments for \cs{pstart} and \cs{pend}.}\label{pstart:optionalarg} % Both \cs{pstart} and \cs{pend} can take a optional argument, in brackets. % Its content will be printed before the beginning of the \cs{pstart} / after the end of the \cs{pend}. -% If you need to start a \cs{pstart} by brackets, or to add brackets after a \cs{pend}, just add a \cs{\relax} between \cs{pstart}/\cs{pend} and the brackets. +% If you need to start a \cs{pstart} by brackets, or to add brackets after a \cs{pend}, just add a \cs{relax} between \cs{pstart}/\cs{pend} and the brackets. % % This feature is not needed for normal use of \Lpack{eledmac}, but it is needed when using verse (see~\ref{verse} p.~\pageref{verse}) or \Lpack{eledpar} (see~\ref{eledpar} p.~\pageref{eledpar}). % @@ -2454,7 +2456,9 @@ % The \verb+quotation+ and \verb+quote+ environment can be used so that same definition/note appears both inside and outside a numbered section. % The typographical consequences will resemble the outside numbered sections, based on the styles of the \emph{book} class. % However, if you use a package that redefines these environments, these redefinitions won't be available inside the numbering section. -% You must open the quotation environments inside a \cs{start}-\cs{pend} block, not outside. +% You must open the quotation environments inside a \cs{start}-\cs{pend} block, not outside. +% A quotation environment MUST not be opened immediately after a \cs{pstart} +% and MUST not be closed immediately before a \cs{pend}. % % In some case, you don't want these environments be redefined in numbered section. % You can load the package with the option \verb+noquotation+ to prevent this redefinition. @@ -2850,7 +2854,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/09/16 v1.13.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/09/25 v1.13.1 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -5713,7 +5717,7 @@ % 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. -% +% \changes{v1.13.1}{2014/09/25}{Add \cs{l@dzeropenalties} in \cs{pstart}} % \begin{macrocode} \newcounter{pstart} @@ -5756,6 +5760,7 @@ \iflabelpstart\protected@edef\@currentlabel% {\p@pstart\thepstart} \fi% + \l@dzeropenalties% } % \end{macrocode} % \end{macro} @@ -5947,6 +5952,7 @@ % \end{macro} % \end{macro} % +% \changes{v1.13.1}{2014/09/25}{Coming back of add@penalties, deleted by version 0.17!} % \begin{macro}{\print@line} % \begin{macrocode} % \cs{print@line} is for normal line, i. e line without sectioning command. @@ -5958,6 +5964,7 @@ {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol \l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% \l@drsn@te }}% + \add@penalties% } % \end{macrocode} % \end{macro} @@ -14328,7 +14335,7 @@ % \end{itemize} % % Anyway, there is another problem. If you have text in brackets just after \cs{pstart} or \cs{pend}, the text will be considered an optional argument of \cs{pstart} or \cs{pend} (see \ref{pstart:optionalarg}, p.~\pageref{pstart:optionalarg}). -% In this case, just add a \cs{\relax} between \cs{pstart}/\cs{pend} and the brackets. +% In this case, just add a \cs{relax} between \cs{pstart}/\cs{pend} and the brackets. % The version 1.12.0 adds new best way to manage section title inside numbered text. Please read ยง~\ref{eledsection} (p.~\pageref{eledsection}). % \clearpage diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 8d4dfd3ccca..97d00045bcf 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty @@ -25,7 +25,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/09/16 v1.13.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/09/25 v1.13.1 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -967,6 +967,7 @@ \iflabelpstart\protected@edef\@currentlabel% {\p@pstart\thepstart} \fi% + \l@dzeropenalties% } \newcommandx*{\pend}[1][1]{\ifnumbering \else% \led@err@PendNotNumbered% @@ -1054,6 +1055,7 @@ {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol \l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% \l@drsn@te }}% + \add@penalties% } \def\print@eledsection{% \add@inserts\affixside@note% -- cgit v1.2.3