texlive[43858] Master/texmf-dist: reledmac (14apr17)

commits+karl at tug.org commits+karl at tug.org
Mon Apr 17 00:18:35 CEST 2017


Revision: 43858
          http://tug.org/svn/texlive?view=revision&revision=43858
Author:   karl
Date:     2017-04-17 00:18:35 +0200 (Mon, 17 Apr 2017)
Log Message:
-----------
reledmac (14apr17)

Modified Paths:
--------------
    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.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/source/latex/reledmac/reledpar.dtx
    trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
    trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty

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.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	2017-04-16 22:18:18 UTC (rev 43857)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx	2017-04-16 22:18:35 UTC (rev 43858)
@@ -462,7 +462,10 @@
 % \changes{v2.18.0}{2017/02/22}{Fix bug when using both \protect\cs{Xnumberonlyfirstintwolines} or \protect\cs{Xnumberonlyfirstinline} and \protect\cs{Xparafootsep} and \protect\cs{Xsymlinenum}.}
 % \changes{v2.18.0}{2017/02/22}{Fix bug when using a \protect\cs{edtext} in two lines or more in right-to-left typesetting with \protect\XeLaTeX.}
 % \changes{v2.18.1}{2017/03/20}{Fix bug when using \protect\cs{msdata} with \protect\LuaLaTeX or with \protect\package{hyperref} package.}
+% \changes{v2.19.0}{2017/04/14}{Add better compatibility with \protect\package{csquotes} package when using familiar footnotes.}
+% \changes{v2.19.0}{2017/04/14}{Add \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} commands.}
 % \title{\Macpackage \\
+% \changes{v2.19.0}{2017/04/14}{Fix bug with paragraph indent after sectioning command.} 
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
 %
@@ -1768,6 +1771,21 @@
 % \verb?\providecommand*{\multfootsep}{\textsuperscript{\normalfont,}}? \\
 % and can be changed if necessary.
 %
+% \subsection{Printing footnote mark without printing footnote text}
+% \DescribeMacro{\footnoteXmark}
+% \DescribeMacro{\footnoteXtext}
+% In some case, you can't use directly \cs{footnoteA}, for example when using the \cs{uline} command of the \package{ulem} package. You need to print the footnote mark, and then, call the footnote text to be inserted.
+%
+% For all \meta{X} command, \macpackage provides a \cs{footnote\meta{X}mark} command and a \cs{footnote\meta{X}text} command, equivalent to the standard \LaTeX's command \cs{footnotemark} and \cs{footnotetext}.
+% For example, to use with \cs{uline}, do:
+% \begin{verbatim}
+%  This is \uline{a test containing\mbox{\footnoteAmark}}\footnoteAtext{A  
+% simple footnote.}\uline{ a simple footnote.}
+% \end{verbatim}
+%
+% If you use \parpackage, you can't use these two commands to print footnote mark in one side and footnote text in other side.
+%
+% You muse use \cs{footnote\meta{X}nomk} and \cs{footnote\meta{X}mk}, defined in \parpackage (\reff{reledpar-nomk})
 % \subsection{Changing series}
 % \subsubsection{Create a new series}\label{newseries}
 %
@@ -3881,7 +3899,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/03/20 v2.18.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/04/12 v2.19.0 typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -7923,6 +7941,7 @@
     \if at nobreak%
       \if at afterindent\else%
         \noindent%
+        \global\@afterindenttrue%
       \fi%
     \fi%
     \ifautopar\else%
@@ -13314,6 +13333,12 @@
               \prepare at prenotesX{#1}%
               \newcommand{\content}{##1}%
 %    \end{macrocode}
+% If we use the \cs{csquotes} package, we reset quotation level. 
+%    \begin{macrocode}
+              \ifdefined\csq at qlevel%
+                \csq at qlevel=0\relax%
+              \fi%
+%    \end{macrocode}
 % If we are preparing parallel typesetting, we cannot just increase the footnote counter.
 % Read \parpackage's handbook about that (\reff{reledpar-familiarfootnotenumber}).
 %    \begin{macrocode}
@@ -13374,8 +13399,25 @@
 %    \begin{macrocode}
       \expandafter\gappto\expandafter\no at expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}%
 %    \end{macrocode}
-% Do not forget to initialize the series
+%    And now, define \cs{footnoteXmark} and \cs{footnoteXtext}, equivalent to classical\cs{footnotemark} and \cs{footnotetext}. 
 %    \begin{macrocode}
+      \expandafter\newcommand\csname footnote#1mark\endcsname{%
+         \begingroup%
+            \prepare at prenotesX{#1}%
+            \stepcounter{footnote#1}%
+            \protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+            \csuse{@footnotemark#1}%
+            \m at mmf@prepare%
+         \endgroup%
+      }%
+      \expandafter\newcommand\csname footnote#1text\endcsname[1]{%
+         \begingroup%
+            \csuse{vfootnote#1}{#1}{\expandonce{##1}}%
+         \endgroup%
+      }%
+%    \end{macrocode}
+% Do not forget to initialize the series.
+%    \begin{macrocode}
      \arrangementX at normal{#1}%
   \fi
 %    \end{macrocode}

Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx	2017-04-16 22:18:18 UTC (rev 43857)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx	2017-04-16 22:18:35 UTC (rev 43858)
@@ -808,7 +808,7 @@
 % 
 % Notice that these options just tell you \LaTeX\ to not continue long notes on the other side. 
 % It is not designed to allow you to call footnotes on one side but print them on the other side.
-% \subsubsection{Familiar notes called in the right side, but to be printed in the left side}
+% \subsubsection{Familiar notes called in the right side, but to be printed in the left side}\label{reledpar-nomk}
 % \DescribeMacro{\footnoteXnomk}
 % \DescribeMacro{\footnoteXmk}
 % As often happens, the left side has less room for text.
@@ -1256,7 +1256,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/06 v2.17.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/04/12 v2.17.2a reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}

Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty	2017-04-16 22:18:18 UTC (rev 43857)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty	2017-04-16 22:18:35 UTC (rev 43858)
@@ -35,7 +35,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/03/20 v2.18.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/04/12 v2.19.0 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -1688,6 +1688,7 @@
     \if at nobreak%
       \if at afterindent\else%
         \noindent%
+        \global\@afterindenttrue%
       \fi%
     \fi%
     \ifautopar\else%
@@ -4662,6 +4663,9 @@
           \begingroup%
               \prepare at prenotesX{#1}%
               \newcommand{\content}{##1}%
+              \ifdefined\csq at qlevel%
+                \csq at qlevel=0\relax%
+              \fi%
                \global\expandafter\advance\csname footnote#1 at reading\endcsname by \@ne%
                \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
                   \ifcsdef{footnote#1reading\the\csname footnote#1 at reading\endcsname=typeset}%
@@ -4701,6 +4705,20 @@
       \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{%
+         \begingroup%
+            \prepare at prenotesX{#1}%
+            \stepcounter{footnote#1}%
+            \protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+            \csuse{@footnotemark#1}%
+            \m at mmf@prepare%
+         \endgroup%
+      }%
+      \expandafter\newcommand\csname footnote#1text\endcsname[1]{%
+         \begingroup%
+            \csuse{vfootnote#1}{#1}{\expandonce{##1}}%
+         \endgroup%
+      }%
      \arrangementX at normal{#1}%
   \fi
   \unless\ifnoend@

Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty	2017-04-16 22:18:18 UTC (rev 43857)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty	2017-04-16 22:18:35 UTC (rev 43858)
@@ -29,7 +29,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/06 v2.17.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/04/12 v2.17.2a reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}



More information about the tex-live-commits mailing list