diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 37 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledpar.dtx | 19 |
2 files changed, 23 insertions, 33 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 775f819bc58..926e17c0054 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -427,6 +427,8 @@ % \changes{v2.15.0}{2016/07/22}{Fix \protect\cs{Xtxtbeforenotes} in ledgroup.} % \changes{v2.15.1}{2016/09/07}{Fix \protect\cs{edindex} in tabular environments.} % \changes{v2.15.2}{2016/09/12}{Fix bug with \protect\package{fancyhdr} package 3.8 and later.} +% \changes{v2.15.3}{2016/09/26}{Fix bug with \protect\cs{section} in optional argument of \protect\cs{pstart} and empty line before \protect\cs{pend} (bug added in v2.8.2).} +% \changes{v2.15.3}{2016/09/26}{Simplification of the code concerning sectioning command.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -2408,13 +2410,6 @@ % especially within the notes, and then in % subsequent sections specify how these commands are used. % -% For those who are setting up for a large job, here is -% a list of the complete set of \macpackage macros relating to fonts that -% are intended for manipulation by the user: -% \protect\cs{endashchar}, -% \protect\cs{fullstop}, -% \protect\cs{numlabfont}, and -% \protect\cs{rbracket}. % % % \DescribeMacro{\numlabfont} @@ -2976,6 +2971,9 @@ % If two note commands for the same side are called in the same line, they will % be appended and separated by a comma. % +% \textbf{The notes will appear only at the second \LaTeX\ run. If the note positions change in your \texttt{.tex} file, +% you need two runs to get the correction position in the output file. +% You are strongly encouraged to use tools like \emph{latexmk}, to be sure to get the good number of runs.} % \subsection{Setting} % % \subsubsection{Width} @@ -3763,7 +3761,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/09/12 v2.15.2 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/09/26 v2.15.3 typeset critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -7701,10 +7699,12 @@ \newcommandx*{\pstart}[1][1]{% \normal@pars% \ifstrempty{#1}{\at@every@pstart}{\noindent#1}% + \ifautopar% + \autopar% + \fi% \ifluatex% \edef\l@luatextextdir@L{\the\textdir}% \fi% - \@nobreaktrue% \ifnumbering \else% \led@err@PstartNotNumbered% \beginnumbering% @@ -7715,9 +7715,14 @@ \fi% \list@clear{\inserts@list}% \global\let\next@insert=\empty% - \begingroup% + \begingroup\normal@pars% \global\advance \l@dnumpstartsL\@ne \global\setbox\raw@text=\vbox\bgroup% + \if@nobreak% + \if@afterindent\else% + \noindent% + \fi% + \fi% \ifautopar\else% \ifnumberpstart% \ifinstanza\else% @@ -7805,15 +7810,12 @@ \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% % \end{macrocode} -% Restore standard nobreak setting and autopar setting. -% Normally, \cs{if@nobreak} is equal to true only immediately after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. +% Restore autopar setting. % \begin{macrocode} - \@nobreakfalse% \ifautopar% \autopar% \fi% } - % \end{macrocode} % \end{macro} % Here, two macros to insert content after every \protect\cs{pend}, between numbered line. @@ -7909,7 +7911,7 @@ % are in force. We will want to do this within a footnotes, for % example. % \begin{macrocode} -\newcommand*{\normal@pars}{\ifautopar\everypar{}\fi\let\par\endgraf} +\newcommand*{\normal@pars}{\everypar{}\let\par\endgraf} % \end{macrocode} % \end{macro} @@ -10250,7 +10252,10 @@ % \protect\cs{printlines}. The right bracket macro is the same again; % it crops up in \protect\cs{normalfootfmt} and the other footnote % macros for controlling the format of the footnotes. -% +% +% Note that these commands are not directly called by \macpackage, but are enclosed as default value of specific hooks. +% Consequently, people should not redefine them, but use instead the \cs{Xlinerangeseparator}, \cs{Xendlinerangeseparator}, \cs{Xsublinesep}, \cs{Xendsublinesep} and \cs{Xlemmaseparator} macros. +% % With \protect\package{polyglossia}, each critical note has a \protect\cs{footnote@lang} which shows the language of the lemma, % and which can be used to switch the bracket from right to left. % \changes{v1.4.0}{2012/11/16}{Switch the right bracket to a left bracket when the lemma is RTL (needs polyglossia or LuaTeX).} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 1ce4e2075fe..d556831e0c5 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -279,6 +279,7 @@ % \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{lineationR}.} % \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{AtBeginPairs}.} % \changes{v2.13.0}{2016/07/22}{Compatibility with the new features of \protect\macpackage 2.15.0} +% \changes{v2.13.1}{2016/09/26}{Simplification of the code concerning sectioning command} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1198,7 +1199,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/07/22 v2.13.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/09/26 v2.13.1 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3198,12 +3199,6 @@ \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } \newcommandx*{\pstartL}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@L{\the\textdir}% \xdef\l@luatexpardir@L{\the\pardir}% @@ -3276,12 +3271,6 @@ % % \begin{macrocode} \newcommandx*{\pstartR}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@R{\the\textdir}% \xdef\l@luatexpardir@R{\the\pardir}% @@ -3358,7 +3347,6 @@ % \begin{macrocode} \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -3391,7 +3379,6 @@ \global\par@lineR=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -3587,7 +3574,6 @@ \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} \numdef{\temp@}{\l@dpscL-1}% - \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% @@ -3759,7 +3745,6 @@ \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}% \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}% \numdef{\temp@}{\l@dpscR-1}% - \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% |