texlive[53675] Master/texmf-dist: reledmac (4feb20)

commits+karl at tug.org commits+karl at tug.org
Tue Feb 4 23:20:09 CET 2020


Revision: 53675
          http://tug.org/svn/texlive?view=revision&revision=53675
Author:   karl
Date:     2020-02-04 23:20:09 +0100 (Tue, 04 Feb 2020)
Log Message:
-----------
reledmac (4feb20)

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-subdivision-number-in-header.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-subdivision-number-in-header.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	2020-02-04 22:19:29 UTC (rev 53674)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx	2020-02-04 22:20:09 UTC (rev 53675)
@@ -539,6 +539,10 @@
 % \changes{v2.32.1}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
 % \changes{v2.32.2}{2019/11/28}{Fix spurious vertical space in familiar footnotes with \protect\LuaLaTeX.}
 % \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting arabic text with \protect\package{polyglossia}.}
+% \changes{v2.32.4}{2020/02/04}{Fix bug \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.}
+% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnotenote number.}
+% \changes{v2.32.4}{2020/02/04}{Fix bug when using \protect\cs{Xgroupbyline} and twocol arrangement.}
+% \changes{v2.32.4}{2020/02/04}{Fix bug with three and two columns footnotes when using \protect\package{bidi}.}
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
 %
@@ -4317,7 +4321,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/12/09 v2.32.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/02/04 v2.32.4 typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -10050,7 +10054,7 @@
                \unvbox\@nameuse{mp##1footins}%
              \fi%
              \X at atbegininsertion{##1}%
-             \ifcsstring{series at display##1}%
+             \ifcsstring{series at display##1}{normal}%
                {%
                   \Xledsetnormalparstuff{##1}%
                   \rule\z@\splittopskip%
@@ -11352,6 +11356,7 @@
     \prepare at Xgroupbyline{#1}{#2}{\threecolvfootnote at inserted}%
   }%
   {%
+    \let\bidi at RTL@everypar\relax%
     \X at beforeinsertion{#1}%
     \insert\csname #1footins\endcsname{%
       \threecolvfootnote at inserted{#1}{#2}%
@@ -11517,6 +11522,7 @@
   \iftoggle{Xgroupbyline@#1}{%
     \prepare at Xgroupbyline{#1}{#2}{\twocolvfootnote at inserted}%
   }{%
+    \let\bidi at RTL@everypar\relax%
     \X at beforeinsertion{#1}%
     \insert\csname #1footins\endcsname{%
       \twocolvfootnote at inserted{#1}{#2}%
@@ -11547,7 +11553,9 @@
 %    \begin{macrocode}
 \newcommand{\twocol at begin@insert}[1]{%
   \normal at pars%
-  \hsize \csuse{Xhsizetwocol@#1}%
+  \nottoggle{Xgroupbyline@#1}%
+    {\hsize \csuse{Xhsizetwocol@#1}}%
+    {}%
   \Xsetparindent{#1}%
   \tolerance=5000%
   \Xsethangindent{#1}%
@@ -13060,6 +13068,7 @@
 %    \begin{macrocode}
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{%
   \beforeinsertion at X{#1}%
+  \let\bidi at RTL@everypar\relax%
   \insert\csname footins#1\endcsname\bgroup%
     \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
     \noindent\csuse{bhooknoteX@#1}%
@@ -13183,6 +13192,7 @@
 % \protect\cs{threecolvfootnoteX}\marg{series}\marg{text}
 %    \begin{macrocode}
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{%
+  \let\bidi at RTL@everypar\relax%
   \beforeinsertion at X{#1}%
   \insert\csname footins#1\endcsname\bgroup%
     \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
@@ -14850,18 +14860,22 @@
 %    \end{macrocode}
 %    And now, define \cs{footnoteXmark} and \cs{footnoteXtext}, equivalent to classical \cs{footnotemark} and \cs{footnotetext}.
 %    \begin{macrocode}
-      \expandafter\newcommand\csname footnote#1mark\endcsname{%
+      \expandafter\newcommand\csname footnote#1mark\endcsname[1][]{%
          \begingroup%
             \prepare at prenotesX{#1}%
-            \stepcounter{footnote#1}%
+            \ifstrempty{##1}{%
+              \stepcounter{footnote#1}%
+            }{%
+              \setcounter{footnote#1}{##1}%
+            }%
             \protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
             \csuse{@footnotemark#1}%
             \m at mmf@prepare%
          \endgroup%
       }%
-      \expandafter\newcommand\csname footnote#1text\endcsname[1]{%
+      \expandafter\newcommand\csname footnote#1text\endcsname[2][]{%
          \begingroup%
-            \csuse{vfootnote#1}{#1}{\expandonce{##1}}%
+           \csuse{vfootnote#1}{#1}{\expandonce{##2}}{##1}%
          \endgroup%
       }%
 %    \end{macrocode}

Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty	2020-02-04 22:19:29 UTC (rev 53674)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty	2020-02-04 22:20:09 UTC (rev 53675)
@@ -35,7 +35,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/12/09 v2.32.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/02/04 v2.32.4 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \newif\ifsameparallelpagenumber%
@@ -2575,7 +2575,7 @@
                \unvbox\@nameuse{mp##1footins}%
              \fi%
              \X at atbegininsertion{##1}%
-             \ifcsstring{series at display##1}%
+             \ifcsstring{series at display##1}{normal}%
                {%
                   \Xledsetnormalparstuff{##1}%
                   \rule\z@\splittopskip%
@@ -3159,6 +3159,7 @@
     \prepare at Xgroupbyline{#1}{#2}{\threecolvfootnote at inserted}%
   }%
   {%
+    \let\bidi at RTL@everypar\relax%
     \X at beforeinsertion{#1}%
     \insert\csname #1footins\endcsname{%
       \threecolvfootnote at inserted{#1}{#2}%
@@ -3256,6 +3257,7 @@
   \iftoggle{Xgroupbyline@#1}{%
     \prepare at Xgroupbyline{#1}{#2}{\twocolvfootnote at inserted}%
   }{%
+    \let\bidi at RTL@everypar\relax%
     \X at beforeinsertion{#1}%
     \insert\csname #1footins\endcsname{%
       \twocolvfootnote at inserted{#1}{#2}%
@@ -3282,7 +3284,9 @@
 }%
 \newcommand{\twocol at begin@insert}[1]{%
   \normal at pars%
-  \hsize \csuse{Xhsizetwocol@#1}%
+  \nottoggle{Xgroupbyline@#1}%
+    {\hsize \csuse{Xhsizetwocol@#1}}%
+    {}%
   \Xsetparindent{#1}%
   \tolerance=5000%
   \Xsethangindent{#1}%
@@ -4202,6 +4206,7 @@
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{%
   \beforeinsertion at X{#1}%
+  \let\bidi at RTL@everypar\relax%
   \insert\csname footins#1\endcsname\bgroup%
     \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
     \noindent\csuse{bhooknoteX@#1}%
@@ -4286,6 +4291,7 @@
   \multiply\dimen\csname mpfootins#1\endcsname by \thr@@}
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{%
+  \let\bidi at RTL@everypar\relax%
   \beforeinsertion at X{#1}%
   \insert\csname footins#1\endcsname\bgroup%
     \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
@@ -5413,18 +5419,22 @@
       \expandafter\newcount\csname prevpage#1 at num\endcsname%
       \expandafter\newcount\csname prevpage#1 at numR\endcsname%
       \expandafter\gappto\expandafter\no at expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}%
-      \expandafter\newcommand\csname footnote#1mark\endcsname{%
+      \expandafter\newcommand\csname footnote#1mark\endcsname[1][]{%
          \begingroup%
             \prepare at prenotesX{#1}%
-            \stepcounter{footnote#1}%
+            \ifstrempty{##1}{%
+              \stepcounter{footnote#1}%
+            }{%
+              \setcounter{footnote#1}{##1}%
+            }%
             \protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
             \csuse{@footnotemark#1}%
             \m at mmf@prepare%
          \endgroup%
       }%
-      \expandafter\newcommand\csname footnote#1text\endcsname[1]{%
+      \expandafter\newcommand\csname footnote#1text\endcsname[2][]{%
          \begingroup%
-            \csuse{vfootnote#1}{#1}{\expandonce{##1}}%
+           \csuse{vfootnote#1}{#1}{\expandonce{##2}}{##1}%
          \endgroup%
       }%
      \arrangementX at normal{#1}%



More information about the tex-live-commits mailing list.