From 46ab9ee2f4bd479a0161bf89e9431592b843f6d3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Apr 2017 22:18:35 +0000 Subject: reledmac (14apr17) git-svn-id: svn://tug.org/texlive/trunk@43858 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 46 +++++++++++++++++++++- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 4 +- 2 files changed, 46 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/source/latex/reledmac') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 79cd85bddbb..9a676c6c571 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -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@nobreak% \if@afterindent\else% \noindent% + \global\@afterindenttrue% \fi% \fi% \ifautopar\else% @@ -13314,6 +13333,12 @@ \prepare@prenotesX{#1}% \newcommand{\content}{##1}% % \end{macrocode} +% If we use the \cs{csquotes} package, we reset quotation level. +% \begin{macrocode} + \ifdefined\csq@qlevel% + \csq@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,7 +13399,24 @@ % \begin{macrocode} \expandafter\gappto\expandafter\no@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@prenotesX{#1}% + \stepcounter{footnote#1}% + \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% + \csuse{@footnotemark#1}% + \m@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@normal{#1}% \fi diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index ffce70be33b..1c4df2b9707 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -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} -- cgit v1.2.3