From 53377e1f01537a2ee3e43cd67f0c41c9cb34cd20 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Jul 2017 21:07:15 +0000 Subject: reledmac (7jul17) git-svn-id: svn://tug.org/texlive/trunk@44765 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 67 +++++++++++++++++----- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 16 ++++-- 2 files changed, 66 insertions(+), 17 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 1bc89567a25..a267f41969b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -479,6 +479,8 @@ % \changes{v2.22.0}{2017/06/08}{Fix bug with three and two columns critical footnotes, broken in v.~2.17.6.} % \changes{v2.22.0}{2017/06/08}{Add \protect\cs{txtbeforenotesX} hook.} % \changes{v2.22.0}{2017/06/08}{Add \protect\cs{txtbeforenotesonlyonceX} and \protect\cs{Xtxtbeforenotesonlyonce} hooks.} +% \changes{v2.22.1}{2017/07/07}{Compatibility with new version of \protect\reledpar.} +% \changes{v2.22.1}{2017/07/07}{Fix bug with some commands inside \protect\cs{sameword}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -1741,6 +1743,18 @@ %} % \end{verbatim} % +% \subsubsection{Automatic sameword annotation} +% All potentially ambiguous apparatus entries must be annotated manually. That +% annotation process is laborious and includes a risk of errors. +% \emph{Samewords} is a Python script that can automate this step of the +% process. It can be installed via the \emph{Python Package Index}, but see +% \url{https://github.com/stenskjaer/samewords} +% for more info and documentation. The script is still at a beta stage, so +% comments and questions as well as error reports are very welcome at +% \url{https://github.com/stenskjaer/samewords/issues}. +% +% Please not that the maintener of this script is not the maintener of reledmac. +% % \subsection{Apparatus of Manuscripts} % The critical notes mostly refer to textual variants between manuscripts which contain the text to be edited. % It may so happen that the manuscripts only contain parts of the text. @@ -2361,7 +2375,7 @@ % \subsubsection{Wrapping contents} % \changes{v2.10.0}{2016/05/08}{New hooks: \protect\cs{Xwrapcontent}, \protect\cs{Xendwrapcontent} and \protect\cs{wrapcontentX}.} % \DescribeMacro{\Xwrapcontent} -% \cs{Xwrapcontent}\oarg{s}\marg{cmd} is used to wrap the footnote contents --- excluding the lemma --- in a \LaTeX command. +% \cs{Xwrapcontent}\oarg{s}\marg{cmd} is used to wrap the footnote contents --- excluding the lemma --- in a \LaTeX\ command. % % For example, if the language of your note is not the same as the language of the lemma, use \cs{Xwrapcontent}\arg{\cs{foreignlanguage}\marg{language}} (with \package{babel}) or \cs{Xwrapcontent}\arg{\cs{text\meta{language}}} (for babel). % @@ -2369,7 +2383,7 @@ % \cs{Xendwrapcontent}\oarg{s}\marg{cmd} is the same for endnotes. % % \DescribeMacro{\wrapcontentX} -% \cs{wrapcontentX}\oarg{s}\marg{cmd} is the same for critical footnotes. +% \cs{wrapcontentX}\oarg{s}\marg{cmd} is the same for familiar footnotes. % \subsection{Indent of notes content} % \changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xparindent} and \protect\cs{hangindentX}} % \DescribeMacro{\Xparindent} @@ -4006,7 +4020,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/06/08 v2.22.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/07/07 v2.22.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4956,16 +4970,7 @@ \csuse{setpositionliketwocolumns@\columns@position}% \fi% \fi% - \ifcontinuousnumberingwithcolumns% - \ifdefined\line@numR% - \ifnum\line@numR>\line@num% - \expandafter\setlinenum\expandafter{\the\line@numR}% - \fi% - \ifnum\last@page@numR>\last@page@num% - \global\last@page@num=\last@page@numR% - \fi% - \fi% - \fi% + \set@continuousnumberingforL% \else \led@err@NumberingShouldHaveStarted \endnumbering @@ -4976,6 +4981,28 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \begin{macro}{\set@continuousnumberingforL} +% \cs{set@continuousnumberingforl} set the left line numbers and pstart counter at a \cs{beginnumbering} or a \cs{resumenumbering} in order to have continuous numbering with single column text. +% \begin{macrocode} +\newcommand{\set@continuousnumberingforL}{% + \ifcontinuousnumberingwithcolumns% + \ifdefined\line@numR% + \ifnum\line@numR>\line@num% + \expandafter\setlinenum\expandafter{\the\line@numR}% + \fi% + \ifnum\last@page@numR>\last@page@num% + \global\last@page@num=\last@page@numR% + \fi% + \fi% + \ifl@dpairing% + \unless\ifl@dpaging% + \global\c@pstartL=\c@pstart% + \fi% + \fi% + \fi% +}% +% \end{macrocode} +% \end{macro} % % \section{List macros} % @@ -7758,7 +7785,17 @@ % \begin{macrocode} \newcommand{\get@sw@txt}[1]{% \begingroup% +%. \end{macrocode} +% Allow some macros inside \sameword +%. \begin{macrocode} \let\sameword\@firstofone%Allow to have nested \sameword + \let\emph\@firstofone% + \let\textit\@firstofone% + \let\textbf\@firstofone% + \let\textsc\@firstofone% + \let\framebox\@firstofone% +% \end{macrocode} +%. \begin{macrocode} \ifxetex% \xdef\sw@txt{#1}% \else% @@ -8165,6 +8202,10 @@ \global\pstartnumtrue% \fi% \addtocounter{pstart}{1}% + \ifcontinuousnumberingwithcolumns% + \addtocounter{pstartL}{1}% + \addtocounter{pstartR}{1}% + \fi% % \end{macrocode} % Print the optional arguments of \protect\cs{pend} or the content printed after every \protect\cs{pend} % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 34506e7bd90..a930b94ef78 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -306,6 +306,7 @@ % \changes{v2.18.0}{2017/05/04}{Compatibility with v2.20.0 of \protect\reledmac.} % \changes{v2.19.0}{2017/06/08}{Compatibility with v2.22.0 of \protect\reledmac.} % \changes{v2.19.1}{2017/06/15}{Fix bug with \protect\cs{edtext} in sectioning command with shiftedpstarts mode.} +% \changes{v2.19.2}{2017/07/07}{\protect\option{continuousnumberingwithcolumns} works also for pstart number.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1283,7 +1284,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2017/06/15 v2.19.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/07/07 v2.19.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1726,11 +1727,15 @@ \global\stopmsdata@inserted@true% \global\let\@msdata@list\relax% \global\csundef{@msdata@\add@msd@cR @dataR}% + \ifcontinuousnumberingwithcolumns% + \addtocounter{pstartR}{1}% + \else% + \setcounter{pstartR}{1}% + \fi% \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff - \setcounter{pstartR}{1} \begingroup \initnumbering@sectcountR \gdef\eled@sectionsR@@{}% @@ -1949,7 +1954,7 @@ % \end{macro} % % \begin{macro}{\set@continuousnumberingforR} -% \cs{set@continuousnumberingforR} set the right line numbers at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with single column text. +% \cs{set@continuousnumberingforR} set the right line numbers and pstart counter at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with single column text. % \begin{macrocode} \newcommand{\set@continuousnumberingforR}{% \ifcontinuousnumberingwithcolumns% @@ -2723,7 +2728,7 @@ % % \begin{macro}{\@pstart} % \begin{macro}{\@pstartR} -% \cs{@pstart} and cs{@pstartR} allows us to know, when using \cs{nomaxlines} option in which page we should start a pstart, and also how many empty lines we should let before starting this pstart at the begining of the page +% \cs{@pstart} and cs{@pstartR} allows us to know, when using \cs{nomaxlines} option, in which page we should start a pstart, and also how many empty lines we should let before starting this pstart at the begining of the page % \begin{macrocode} \newcommand{\@pstart}[3]{% \ifcsdef{minpage@pstart@#1}% @@ -3595,6 +3600,9 @@ \ifnumberpstart% \addtocounter{pstartL}{1}% \fi + \ifcontinuousnumberingwithcolumns% + \addtocounter{pstart}{1}% + \fi% \parledgroup@beforenotes@save{L}% % \end{macrocode} % Dump content of the optional argument. -- cgit v1.2.3