summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-15 21:19:17 +0000
committerKarl Berry <karl@freefriends.org>2015-10-15 21:19:17 +0000
commit99fb070ba6190c34b58106fa0f84859114f955f2 (patch)
tree571bf8d9ac17015fed2ede5ebf13a2fee0d47b5f /Master/texmf-dist/source/latex/reledmac
parent50c72771f590cd9092e90e223057639ea1e969f9 (diff)
reledmac (15oct15)
git-svn-id: svn://tug.org/texlive/trunk@38652 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx34
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx70
2 files changed, 81 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index ad4acd16357..1dbaf009d97 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -335,6 +335,9 @@
% \changes{v2.2.2}{2015/10/09}{Fix bug in \protect\cs{sethangingsymbol}.}
% \changes{v2.2.2}{2015/10/09}{Fix bug with old version of \protect\package{etex}.}
% \hyphenation{man-u-script man-u-scripts}
+% \changes{v2.3.0}{2015/10/14}{Warning message when using some setting commands inside rightside environment (deprecated behavior)}
+% \changes{v2.3.0}{2015/10/14}{Disable empty lines as paragraph in stanza.}
+% \changes{v2.3.0}{2015/10/14}{Fix compatibility of paragraphed footnotes with \protect\package{bidi} v17.9 and following.}
%
%
%
@@ -2237,7 +2240,7 @@
% \subsection{Long verse and page break}
% If you want to prevent page breaks inside long verses, use the option \verb+nopbinverse+ when loading package, or use \protect\cs{lednopbinversetrue}.
% Read \reff{lednopbinversetrue} for further details.
-% \subsection{Content before/after verses}
+% \subsection{Content before/after verses}\label{contentverse}
% It is possible to add content, like a subtitle or a spacing, before or after verse:
% \begin{itemize}
% \item \protect\cs{stanza} command can take a optional argument (in brackets). Its content will be printed before the stanza.
@@ -2287,6 +2290,9 @@
% distance \meta{len} before
% the line. The default \meta{len} is \verb?\stanzaindentbase?.
%
+% \subsection{Notes on empty lines}
+% Since v2.3.0 of \reledmac, empty lines when typesetting verse does not produce any more new paragraph, and, consequently, do not insert vertical space.
+% Use optional argument of \cs{stanza} or \cs{newverse} to insert vertical space (\reff{contentverse}).
% \section{Grouping}
% In a \verb?minipage? environment \LaTeX\ changes \verb?\footnote? numbering from
% arabic to alphabetic and puts the footnotes at the end of the minipage.
@@ -3305,7 +3311,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/10/09 v2.2.2 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4376,6 +4382,7 @@
\ifnum\@l@dtempcntb>\m@ne
\ifledRcol
\global\line@marginR=\@l@dtempcntb
+ \led@warn@setting@in@rightside{\linenummargin}%
\else
\global\line@margin=\@l@dtempcntb
\fi
@@ -4457,6 +4464,7 @@
\newcommand*{\firstlinenum}[1]{%
\ifledRcol%
\setcounter{firstlinenumR}{#1}%
+ \led@warn@setting@in@rightside{\firstlinenum}
\else%
\setcounter{firstlinenum}{#1}%
\fi%
@@ -4464,6 +4472,7 @@
\newcommand*{\linenumincrement}[1]{%
\ifledRcol%
\setcounter{linenumincrementR}{#1}%
+ \led@warn@setting@in@rightside{\linenumincrement}
\else%
\setcounter{linenumincrement}{#1}%
\fi%
@@ -4471,6 +4480,7 @@
\newcommand*{\firstsublinenum}[1]{%
\ifledRcol%
\setcounter{firstsublinenumR}{#1}%
+ \led@warn@setting@in@rightside{\firstsublinenum}
\else%
\setcounter{firstsublinenum}{#1}%
\fi%
@@ -4478,6 +4488,7 @@
\newcommand*{\sublinenumincrement}[1]{%
\ifledRcol%
\setcounter{sublinenumincrementR}{#1}%
+ \led@warn@setting@in@rightside{\sublinenumincrement}
\else%
\setcounter{sublinenumincrement}{#1}%
\fi%
@@ -8670,7 +8681,8 @@
\vskip\skip\csname #1footins\endcsname%
\setXnoteswidthliketwocolumns@{#1}%
\setXnotespositionliketwocolumns@{#1}%
- \print@Xfootnoterule{#1}%%
+ \print@Xfootnoterule{#1}%
+ \let\bidi@RTL@everypar\@empty%
\noindent\leavevmode}
% \end{macrocode}
% \end{macro}
@@ -8762,7 +8774,8 @@
\bgroup
\csuse{Xnotefontsize@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
@@ -8802,7 +8815,8 @@
\unvbox\@nameuse{mp#1footins}%
\csuse{Xnotefontsize@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\color@begingroup%
\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}\color@endgroup}%
@@ -10582,7 +10596,8 @@
\bgroup
\csuse{notefontsizeX@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\csuse{bhooknoteX@#1}%
\@nameuse{footfmt#1}{#1}{#2}}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
@@ -10596,7 +10611,8 @@
\unvbox\@nameuse{mpfootins#1}
\csuse{notefontsizeX@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\color@begingroup%
\csuse{bhooknoteX@#1}%
\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
@@ -14293,7 +14309,9 @@
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
\noexpand\@advancestanzanumber%
- \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber}
+ \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber%
+ \let\par\relax%No paragraph in verses
+}
\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 653d943da40..143992208b9 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -247,6 +247,9 @@
% \changes{v2.3.0}{2015/09/05}{New line setting command suffixed by R to set only the right side.}
% \changes{v2.4.0}{2015/09/29}{New way of (not) synchronizing the parallel pages.}
% \changes{v2.4.0}{2015/09/29}{Option to switch to \protect\cs{mainmatter} when calling \protect\cs{Pages}}
+% \changes{v2.5.0}{2015/10/14}{New commands \protect\cs{linenummarginR} and \protect\cs{linenummargin*}}
+% \changes{v2.5.0}{2015/10/14}{Fix bug introduced in v1.15.0 which made hanging indentation in verse was not working anymore.}
+% \changes{v2.3.0}{2015/10/14}{Disable empty lines as paragraph in astanza.}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -836,15 +839,16 @@
% Following
% \protect\cs{firstlinenum}\marg{num} the first line number will be \meta{num}, and
% following \protect\cs{linenumincrement}\marg{num} only every \meta{num}th
-% line will have a printed number. Using these macros inside the
-% \verb?Leftside? and \verb?Rightside? environments gives you independent
-% control over the left and right numbering schemes. The \protect\cs{firstsublinenum}
-% and \protect\cs{sublinenumincrement} macros correspondingly set the numbering
-% scheme for sublines.
-% Generally speaking, controls like \protect\cs{firstlinenum} or \protect\cs{linenummargin}
-% apply to sequential and left texts.
-% To effect right texts only, they have
-% to be within a \verb?Rightside? environment.
+% line will have a printed number.
+%
+%
+% The lineation commands those finish by a \verb+R+ apply for right text.
+% The lineation commands those are starred apply for both left and right texts.
+% The lineation command those does not finish by a \verb+R+ and who are not starred apply for the left side.
+% \textbf{%
+% However, these commands applies for right side when there are called inside a \environment{left} environment.
+% However, such feature should not be used any more, as it a more recommend practice to add all commands about setting on the preamble.
+%}
%
% \DescribeMacro{\firstlinenum*}
% \DescribeMacro{\linenumincrement*}
@@ -871,6 +875,12 @@
% \cs{linenumberstyleR} is the equivalent of \macpackage \cs{linenumberstyle} for right text.
% \cs{sublinenumberstyleR} is the equivalent of \macpackage \cs{sublinenumberstyle} right text.
% The starred version are for both side.
+
+% \DescribeMacro{\linenummarginR}
+% \DescribeMacro{\linenummargin*}
+% \cs{linenummarginR}\marg{margin} sets the line margin for right side.
+% \cs{linenummargin*}\marg{margin} sets for both side.
+% \meta{margin} can be, as for \macpackage's \cs{linenummargin} one of these values: \verb+left+, \verb+right+, \verb+inner+, \verb+outer+.
% \DescribeMacro{\setRlineflag}
% A ``R'' is appended to the line numbers of the
% right texts.
@@ -1106,7 +1116,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2015/09/29 v2.4.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/10/14 v2.5.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1339,6 +1349,15 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led@warn@setting@in@rightside}
+% \begin{macrocode}
+\newcommand{\led@warn@setting@in@rightside}[1]{%
+ \reledpar@warning{You use #1 inside rightside environment.\MessageBreak
+ Such behavior is deprecated.\MessageBreak
+ Use instead #1R or #1* in your preamble}.
+}
+% \end{macrocode}
+% \end{macro}
% \section{Sectioning commands}
%
% \begin{macro}{\section@numR}
@@ -1624,6 +1643,26 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \begin{macro}{\linenummarginR}
+% \begin{macro}{\linenummargin*}
+% \cs{linenummarginR} applies directly for right side, while \cs{linenummargin*} applies for both side.
+% \begin{macrocode}
+\newcommand{\linenummarginR}[1]{%
+ \l@dgetline@margin{#1}%
+ \ifnum\@l@dtempcntb>\m@ne%
+ \global\line@marginR=\@l@dtempcntb%
+ \fi%
+}
+\WithSuffix\newcommand\linenummargin*[1]{%
+ \l@dgetline@margin{#1}%
+ \ifnum\@l@dtempcntb>\m@ne%
+ \global\line@marginR=\@l@dtempcntb%
+ \global\line@margin=\@l@dtempcntb%
+ \fi%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \subsection{Setting lineation start and step}
% \begin{macro}{\c@firstlinenumR}
% \begin{macro}{\c@linenumincrementR}
@@ -3186,7 +3225,7 @@
\l@dld@ta %space kept for backward compatibility
\add@inserts\affixside@note%
\l@dlsn@te %space kept for backward compatibility
- {\ledllfill\hb@xt@ \Lcolwidth{%
+ \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
\do@insidelineLhook%
\ifluatex%
\textdir\l@luatextextdir@L%
@@ -3331,7 +3370,7 @@
\l@dld@ta %space kept for backward compatibility
\add@insertsR\affixside@noteR%
\l@dlsn@te %space kept for backward compatibility
- \ledllfill\hb@xt@ \Rcolwidth{%
+ \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{%
\do@insidelineRhook%
\new@lineR%
\inserthangingsymbolR%
@@ -3340,7 +3379,7 @@
\fi%
\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
\l@drsn@te%
- }
+ }}
\def\print@eledsectionR{%
\addtocounter{pstartR}{-1}%
@@ -4314,6 +4353,7 @@
\def\&{\@stopastanza}%
\pstart[#1]%
\@astanza@line
+ \let\par\relax%No paragraph in verses
}{}
% \end{macrocode}
@@ -4342,8 +4382,8 @@
@\endcsname\stanzaindentbase
\managestanza@modulo
\fi
- \par
- \stanza@hang%\mbox{}%
+ \endgraf
+ \stanza@hang%
\ignorespaces}
% \end{macrocode}