texlive[47794] Master/texmf-dist: reledmac (22may18)
commits+karl at tug.org
commits+karl at tug.org
Tue May 22 23:03:46 CEST 2018
Revision: 47794
http://tug.org/svn/texlive?view=revision&revision=47794
Author: karl
Date: 2018-05-22 23:03:45 +0200 (Tue, 22 May 2018)
Log Message:
-----------
reledmac (22may18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-05-22 21:02:53 UTC (rev 47793)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-05-22 21:03:45 UTC (rev 47794)
@@ -512,6 +512,7 @@
% \changes{v2.26.9}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file}
% \changes{v2.26.10}{2018/05/05}{Really fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)}
% \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments}
+% \changes{v2.26.11}{2018/05/21}{Allow to use \protect\cs{edtext} inside \protect\cs{sameword}}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -3112,10 +3113,10 @@
% \DescribeMacro{\edlineref}
% \DescribeMacro{\sublineref}
% \DescribeMacro{\pstartref}
-% \DescribeMacro{\annotref}
+% \DescribeMacro{\annotationref}
% Elsewhere in the text, either before or after the \protect\cs{edlabel},
% you can refer to its location with \protect\cs{edpageref}\marg{lab},
-% \protect\cs{edlineref}\marg{lab}, \cs{edsublineref}\marg{lab}, \cs{pstartref}\marg{lab} or \cs{annotref}\marg{lab},
+% \protect\cs{edlineref}\marg{lab}, \cs{edsublineref}\marg{lab}, \cs{pstartref}\marg{lab} or \cs{annotationref}\marg{lab},
% that
% will produce, respectively, the page, line, sub-line, pstart, the annotation, on which
% the \protect\cs{edlabel}\marg{lab} command occurred.
@@ -3152,7 +3153,7 @@
% \DescribeMacro{\xlineref}
% \DescribeMacro{\xsublineref}
% \DescribeMacro{\xpstartref}
-% \DescribeMacro{\xannotref}
+% \DescribeMacro{\xannotationref}
%
% However, there are situations in which you will want \macpackage\ to
% return a number without displaying any
@@ -4190,7 +4191,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/05/21 v2.26.11 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -8229,12 +8230,13 @@
% \begin{macro}{\sw at noexpand}
% \begin{macrocode}
\newcommand{\swnoexpands}{%
- \let\sameword\@firstofone%Allow to have nested \sameword
+ \let\sameword\l at secondmandarg%Allow to have nested \sameword
\let\emph\@firstofone%
\let\textit\@firstofone%
\let\textbf\@firstofone%
\let\textsc\@firstofone%
\let\framebox\@firstofone%
+ \let\edtext\dummy at edtext%
\RenewExpandableDocumentCommand{\edindex}{om}{}%
\ifdefined\index%
\RenewExpandableDocumentCommand{\index}{om}{}%
@@ -18995,7 +18997,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\l at dgobblearg}
+% \begin{macro}{\l at dgobbleoptarg}
% \protect\cs{l at dgobbleoptarg}\oarg{arg}\marg{arg} replaces these two arguments (first is optional) by \protect\cs{relax}.
% \changes{v1.12.5}{2014/08/28}{\protect\cs{l at dgobblearg} becomes \protect\cs{l at dgobbeloptarg}}
% \begin{macrocode}
@@ -19003,6 +19005,12 @@
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\l at secondmandarg}
+% \protect\cs{l at secondoptarg}\oarg{arg}\marg{arg} gobble the first (optional) argument, and expand to the second (mandatory) argument.
+% \begin{macrocode}
+\NewExpandableDocumentCommand{\l at secondmandarg}{om}{#2}%
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\Relax}
% \begin{macro}{\NEXT}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-05-22 21:02:53 UTC (rev 47793)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-05-22 21:03:45 UTC (rev 47794)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/05/21 v2.26.11 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -1715,12 +1715,13 @@
\endgroup%
}%
\newcommand{\swnoexpands}{%
- \let\sameword\@firstofone%Allow to have nested \sameword
+ \let\sameword\l at secondmandarg%Allow to have nested \sameword
\let\emph\@firstofone%
\let\textit\@firstofone%
\let\textbf\@firstofone%
\let\textsc\@firstofone%
\let\framebox\@firstofone%
+ \let\edtext\dummy at edtext%
\RenewExpandableDocumentCommand{\edindex}{om}{}%
\ifdefined\index%
\RenewExpandableDocumentCommand{\index}{om}{}%
@@ -7911,6 +7912,7 @@
\let\@line@@num=\linenum
\newcommand*{\l at dgobbleoptarg}[2][]{\relax}%
+\NewExpandableDocumentCommand{\l at secondmandarg}{om}{#2}%
\let\Relax=\relax
\let\NEXT=\next
More information about the tex-live-commits
mailing list