summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-24 22:12:46 +0000
committerKarl Berry <karl@freefriends.org>2016-12-24 22:12:46 +0000
commitbdc2fd6fc8085793ddd27d01d8ec34565f4905e9 (patch)
treefea0659889be6fd53ebc844f05c41f0b72406fb3 /Master/texmf-dist/source
parent365d485fce4ef192ebc967c9a5804b3d3dbcf2d8 (diff)
reledmac (24dec16)
git-svn-id: svn://tug.org/texlive/trunk@42785 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx77
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx55
2 files changed, 100 insertions, 32 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index a3b77f7aa1b..acb6aa8ce8b 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -452,6 +452,8 @@
% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.16.8}{2016/12/16}{Fix bug with \protect\cs{edindex} in footnote in parallel typesetting}
+% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
+% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -1698,6 +1700,12 @@
% By default, it is \enquote{Ms.}.
% You can change it using \cs{setmsdatalabel}\marg{txt}.
%
+% \DescribeMacro{\setmsdataposition}
+% If you tel that the manuscript apparatus will be on the same level of critical footnotes than other apparatus, for each line, reledmac will first insert manuscript apparatus, then other footnotes.
+% You can change it using:\\
+% \cs{msdataposition}\arg{regular-msdata}\\
+% And restore the default behavior using
+% \cs{msdataposition}\arg{msdata-regular}
% \subsection{Familiar notes} \label{sec:desc:familiar}
%
%
@@ -3848,7 +3856,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/12/16 v2.16.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4370,28 +4378,28 @@
% \begin{macro}{\led@error@PackageAfterEledmac}
% \begin{macrocode}
\newcommand{\led@error@PackageAfterEledmac}[1]{%
- \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}%
+ \reledmac@error{#1 must be loaded before reledmac}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@fail@patch@@makecol}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@@makecol}{%
- \reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@fail@patch@@reinserts}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@@reinserts}{%
- \reledmac@error{Fail to patch \string\@reinserts\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@reinserts\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@fail@patch@@doclearpage}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@@doclearpage}{%
- \reledmac@error{Fail to patch \string\@doclearpage\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@doclearpage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4399,21 +4407,21 @@
% \begin{macro}{\led@error@fail@patch@@iiiminipage}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@@iiiminipage}{%
- \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@iiiminipage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@fail@patch@endminipage}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@endminipage}{%
- \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}%
+ \reledmac@error{Failed to patch the \string\endminipage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@fail@patch@endminipage}
% \begin{macrocode}
\newcommand{\led@error@fail@patch@makeindex}{%
- \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}%
+ \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -8121,14 +8129,20 @@
\global\@firstlineofpagefalse%
\fi%
% \end{macrocode}
-% Insert footnotes made of manuscripts data.
+% Insert footnotes made of manuscripts data and critical footnotes.
% \begin{macrocode}
- \insert@msdata%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
% \end{macrocode}
-% Restore marginal and footnotes.
+% Insert marginal notes.
% \begin{macrocode}
- \add@inserts%
- \add@Xgroupbyline%
\affixside@note%
% \end{macrocode}
% Print left notes.
@@ -8179,9 +8193,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@note%
\numdef{\temp@}{\l@dnumpstartsL-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -16286,7 +16306,7 @@
GLSuservi%
}%
% \end{macrocode}
-% First those which arguments are \oarg{options}\marg{label}\marg{link text}.
+% Then those which arguments are \oarg{options}\marg{label}\marg{link text}.
% \begin{macrocode}
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{%
@@ -16299,6 +16319,20 @@
}%
}%
\docsvlist{glsdisp,glslink}%
+% \end{macrocode}
+% Then those which arguments are \oarg{options}\marg{label}.
+% \begin{macrocode}
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ }%
+ }%
+ \docsvlist{glsadd}%
}{}%
}%
% \end{macrocode}
@@ -16770,6 +16804,15 @@
\def\@msdata@series{A}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\setmsdataposition}
+% The label for the manuscripts data.
+% \begin{macrocode}
+\def\ms@data@position{msdata-regular}%
+\newcommand{\setmsdataposition}[1]{%
+ \gdef\ms@data@position{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\setmsdatalabel}
% The label for the manuscripts data.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 004444aaa54..f4baa778199 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -295,6 +295,7 @@
% \changes{v.2.15.0}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
+% \changes{v2.15.0}{2016/12/12}{Compatibility with \protect\cs{setmsdataposition}}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1250,7 +1251,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3657,9 +3658,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@note%
}%
{\print@lineL}%
@@ -3700,10 +3707,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
- \affixside@note%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\l@dlsn@te%
\do@insidelineLhook%
\hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
@@ -3832,9 +3844,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ }{%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@noteR%
}%
{\print@lineR}%
@@ -3877,9 +3895,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ }{%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@noteR%
\l@dlsn@te%
\do@insidelineRhook%
@@ -3891,7 +3915,8 @@
\fi%
\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
\l@drsn@te%
- }}
+ }%
+}
\def\print@eledsectionR{%
\addtocounter{pstartR}{-1}%