From f8760b32d5812f8c1d935e53d6e19ed6d0d7fae2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Aug 2014 22:36:03 +0000 Subject: eledmac (28aug14) git-svn-id: svn://tug.org/texlive/trunk@35054 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 187 +++++++++++++-------- 1 file changed, 118 insertions(+), 69 deletions(-) (limited to 'Master/texmf-dist/source/latex/eledmac/eledmac.dtx') diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index fe6167411bf..2fda016631e 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx @@ -51,7 +51,7 @@ % % \fi % -% \CheckSum{10050} +% \CheckSum{10093} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -383,7 +383,7 @@ % details of this and other related work, visit the \edmac{} home page % at \url{http://www.homepages.ucl.ac.uk/~ucgadkw/edmac/index.html}. % -% Apart from \Eledmac{} there are some other LaTeX packages for +% Apart from \Eledmac{} there are some other \LaTeX\ packages for % critical edition typesetting. As Peter Wilson is not an author, or even a % prospective one, of any critical % edition work he could not provide any opinions on what authors in this @@ -392,7 +392,7 @@ % % \texttt{EDNOTES}~\cite{EDNOTES}, by Uwe L\"{u}ck\index{L\"uck, Uwe} and % Christian Tapp\index{Tapp, Christian}, is another -% LaTeX package being developed for critical editions. Unlike \Eledmac{} +% \LaTeX\ package being developed for critical editions. Unlike \Eledmac{} % which is based on \edmac, \texttt{EDNOTES} takes a different (internal) % approach and provides a different set of features. For example it % provides additional facilities for overlapping lemmas and for @@ -423,7 +423,7 @@ % \end{itemize} % % -% This manual contains a general description of how to use the LaTeX version of \edmac, namely \Eledmac +% This manual contains a general description of how to use the \LaTeX\ version of \edmac, namely \Eledmac % (in sections~\ref{howto} through~\ref{sec:lastuser}); % the complete source code for the package, % with extensive documentation (in sections~\ref{overview} and following) @@ -578,17 +578,17 @@ % % % \Eledmac{} is a three-pass package like -% LaTeX itself. +% \LaTeX\ itself. % Although your textual apparatus and line % numbers will be printed even on the first run, it takes two more -% passes through LaTeX to be sure that everything gets to its right +% passes through \LaTeX\ to be sure that everything gets to its right % place. Any changes you make to the input file may similarly % require three passes to get everything to the right place, if the % changes alter the number of lines or notes. \Eledmac{} will tell % you that you need to make more runs, when it notices, but it does % not expend the labor to check this thoroughly. If you have % problems with a line or two misnumbered at the top of a page, try -% running LaTeX once or twice more. +% running \LaTeX\ once or twice more. % % A file may mix \emph{numbered} and \emph{unnumbered} text. % Numbered text is printed with marginal line numbers and can include @@ -765,8 +765,8 @@ % footnotes in memory as it goes through a numbered section. But % at the end of such a section, it empties its memory out, so to % speak. If your text has a very long numbered section it is -% possible that your LaTeX may reach its memory limit. There are -% two solutions to this. The first is to get a larger LaTeX with +% possible that your \LaTeX\ may reach its memory limit. There are +% two solutions to this. The first is to get a larger \LaTeX\ with % increased memory. % The second solution is to % split your long section into several smaller ones. The trouble @@ -1229,7 +1229,7 @@ % \changes{v1.0}{2012/09/15}{New generic commands to customize footnote display.} % Since version 1.0, some commands can be used to change the display of the footnotes. All can have an optional argument \oarg{s}, which is the letter of the series --- or a list of letters separated by comma --- depending on which option is applied. % -% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a minus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $b-a \leq m \leq b+c$. If you use relative unity\footnote{Like \verb|em| which is the width of a M.}, it will be relative to fontsize of the footnote. +% When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use relative unity\footnote{Like \verb|em| which is the width of a M.}, it will be relative to fontsize of the footnote. % % \subsubsection{Control line number printing} % \DescribeMacro{\numberonlyfirstinline} @@ -1277,7 +1277,7 @@ % With \cs{beforesymlinenum}\oarg{s}\marg{l} you can add some space before the line symbol in a footnote. The default value is value set by \cs{beforenumberinfootnote}. % % \DescribeMacro{\aftersymlinenum} -% With \cs{aftersymlinenum}\oarg{s}\marg{l} you can add some space before the line symbol in a footnote. The default value is value set by \cs{afternumberinfootnote}. +% With \cs{aftersymlinenum}\oarg{s}\marg{l} you can add some space after the line symbol in a footnote. The default value is value set by \cs{afternumberinfootnote}. % % \DescribeMacro{\inplaceofnumber} % If no number or symbolic line number is printed, you can add a space, with \cs{inplaceofnumber}\oarg{s}\marg{l}. The default value is 1~em. @@ -1327,15 +1327,15 @@ % % \DescribeMacro{\Xnotefontsize} % \cs{Xnotefontsize}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard LaTeX size, like \cs{small}. +% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \cs{small}. % % \DescribeMacro{\notefontsizeX} % \cs{notefontsizeX}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard LaTeX size, like \cs{small}. +% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \cs{small}. % % \DescribeMacro{\Xendnotefontsize} % \cs{Xendnotefontsize}\oarg{s}\marg{l} is used to define the font size of end critical footnotes of the series. The default value is \cs{footnotesize}. -% The \meta{command} must not be a size in pt, but a standard LaTeX size, like \cs{small}. +% The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \cs{small}. % \subsubsection{Font of the lemma} % \changes{v1.11.0}{2014/05/09}{Add hooks to disable the font selection for lemma in footnote.} % \DescribeMacro{\Xlemmadisablefontselection} @@ -1405,7 +1405,7 @@ %\subsubsection{Options for block of notes} % \changes{v1.1}{2012/09/12}{New options for block of notes.} % \DescribeMacro{\txtbeforeXnotes} -% You can add some text before critical notes with \cs{textbeforeXnotes}\oarg{s}\marg{text}. +% You can add some text before critical notes with \cs{txtbeforeXnotes}\oarg{s}\marg{text}. % % \DescribeMacro{\beforeXnotes} % You can change the vertical space printed before the rule of the critical notes with \cs{beforeXnotes}\oarg{s}\marg{l}. @@ -1591,7 +1591,7 @@ % With Wayne Sullivan's\index{Sullivan, Wayne} permission the majority % of this section has % been taken from~\cite{EDSTANZA}. Peter has made a few changes to enable his -% macros to be used in the LaTeX \Lpack{ledmac}, and now in \Lpack{eledmac}. +% macros to be used in the \LaTeX\ \Lpack{ledmac}, and now in \Lpack{eledmac}. % package. % % @@ -1756,7 +1756,7 @@ % \item \verb+\&+ can take a optional argument (in brackets). Its content will be printed after the stanza. % \end{itemize} % \section{Grouping} -% In a \verb?minipage? environment LaTeX changes \verb?\footnote? numbering from +% In a \verb?minipage? environment \LaTeX\ changes \verb?\footnote? numbering from % arabic to alphabetic and puts the footnotes at the end of the minipage. % % \DescribeEnv{minipage} @@ -1862,9 +1862,9 @@ % \cs{edpageref}, \cs{lineref}, \cs{sublineref}, \cs{pstartref} commands can also be used in % the apparatus to refer to \cs{edlabel}s in the text. % -% The \cs{edlabel} command works by writing macros to LaTeX +% The \cs{edlabel} command works by writing macros to \LaTeX % \file{.aux} file. You will need to process -% your document through LaTeX twice in order for the references to +% your document through \LaTeX\ twice in order for the references to % be resolved. % % You will be warned if you say \verb"\edlabel{foo}" and \verb"foo" @@ -2032,9 +2032,9 @@ % \DescribeMacro{\footnoteC} % \DescribeMacro{\footnoteD} % \DescribeMacro{\footnoteE} -% As well as the standard LaTeX footnotes generated via \cs{footnote}, +% As well as the standard \LaTeX\ footnotes generated via \cs{footnote}, % the package also provides -% three series of additional footnotes called \cs{footnoteA} through +% five series of additional footnotes called \cs{footnoteA} through % \cs{footnoteE}. These have the familiar marker in the text, and % the marked text at the foot of the page can be formated using % any of the styles described for the critical footnotes. Note that @@ -2088,7 +2088,7 @@ % \section{Indexing} % % \DescribeMacro{\edindex} -% LaTeX provides the |\index|\marg{item} command for specifying that \meta{item} +% \LaTeX\ provides the |\index|\marg{item} command for specifying that \meta{item} % and the current page number should be added to the raw index (\file{idx}) file. % The |\edindex|\marg{item} macro can be used in numbered text to specify % that \meta{item} and the current page \& linenumber should be added to @@ -2127,7 +2127,7 @@ % % \section{Tabular material} % -% LaTeX's normal |tabular| and |array| environments cannot be used where +% \LaTeX's normal |tabular| and |array| environments cannot be used where % line numbering is being done; more precisely, they can be used but with % odd results, so don't use them. However, \eledmac{} provides some simple % tabulation environments that can be line numbered. The environments @@ -2507,7 +2507,7 @@ % \subsection{Known and suspected limitations} % % In general, \Eledmac's system for adding marginal line numbers -% breaks anything that makes direct use of the LaTeX insert system, +% breaks anything that makes direct use of the \LaTeX\ insert system, % which includes marginpars, footnotes and floats. % % However, you can use both \cs{footnote} and the familiar footnote @@ -2520,7 +2520,7 @@ % % \DescribeMacro{\ballast} % \phantomsection\label{ballastdesc}\relax -% LaTeX is a three-pass system, but even after a document has +% \LaTeX\ is a three-pass system, but even after a document has % been processed three times, there are some tricky situations in % which the page breaks decided by \TeX\ never settle down. At % each successive run, \Eledmac{} may oscillate between two @@ -2544,7 +2544,7 @@ % but this area remains unsatisfactory. % % -% LaTeX has a reputation for putting things in the wrong margin after +% \LaTeX\ has a reputation for putting things in the wrong margin after % a page break. The \Eledmac{} package does nothing to improve the situation % --- in fact it just makes it more obvious if numbered text crosses a % page (or column) boundary and the numbers are meant to flip from side @@ -2590,8 +2590,8 @@ % It is possible that \Eledmac{} and the \Lpack{hyperref} package may % work together. I have not tried this combination but past experience % with \Lpack{hyperref} suggests that cooperation is unlikely; \Lpack{hyperref} -% changes many LaTeX internals and \Lpack{eledmac} does things that are -% not normally seen in LaTeX. +% changes many \LaTeX\ internals and \Lpack{eledmac} does things that are +% not normally seen in \LaTeX. % % If you want to use the option \emph{bottom} of the \Lpack{footmisc} package, % you must load this package \emph{before} the \Eledmac\ package. @@ -2609,7 +2609,7 @@ % this\footnote{Reported by Dirk-Jan Dekker\index{Dekker, Dirk-Jan} % in the CTT thread `Incompatibility % of ``color'' package' on 2003/08/28.} -% you will find LaTeX whinging +% you will find \LaTeX\ whinging % `\texttt{Missing \{ inserted}', and then things start to fall apart. % The trick in this case is to specify either: % \begin{verbatim} @@ -2621,7 +2621,7 @@ % \newcommand{\morenoexpands}{\let\colorbox\@secondoftwo} % \makeatother % \end{verbatim} -% (\cs{@secondoftwo} is an internal LaTeX macro that takes two arguments and +% (\cs{@secondoftwo} is an internal \LaTeX\ macro that takes two arguments and % thows away the first one.) % The first incantation lets color show in both the main text and footnotes % whereas the second one shows color in the main text but kills it @@ -2669,7 +2669,7 @@ % The package still provides the original \cs{text} command, but it is % (a) deprecated, and % (b) its name has been changed\footnote{A name like \cs{text} is likely to be defined by -% other LaTeX packages (it certainly is by the AMS packages) and it +% other \LaTeX\ packages (it certainly is by the AMS packages) and it % seems sensible to try and avoid clashes with other definitions.} % to \cs{critext}; % use the \cs{edtext} macro instead. However, if you do @@ -2790,7 +2790,7 @@ % We present the \Eledmac{} code in roughly the order in which it's used % during a run of \TeX. The order is \emph{exactly} that in which % it's read when you load The \Eledmac{} package, because the same file -% is used to generate this manual and to generate the LaTeX package file. +% is used to generate this manual and to generate the \LaTeX\ package file. % Most of what follows consists of macro definitions, but there % are some commands that are executed immediately---especially % at the start of the code. The documentation generally describes the @@ -2839,20 +2839,20 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/08/25 v1.12.4 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/08/28 v1.12.5 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. % \edmac{} code: % \begin{itemize} % \item Replace as many \cs{def}'s by \cs{newcommand}'s as possible -% to avoid overwriting LaTeX macros. +% to avoid overwriting \LaTeX\ macros. % -% \item Replace user-level TeX counts by LaTeX counters. +% \item Replace user-level TeX counts by \LaTeX\ counters. % -% \item Use the LaTeX font handling mechanisms. +% \item Use the \LaTeX\ font handling mechanisms. % -% \item Use LaTeX messaging and file facilities. +% \item Use \LaTeX\ messaging and file facilities. % % \end{itemize} % @@ -2939,7 +2939,7 @@ % \begin{macro}{\@l@dtempcntb} % In imitation of \LaTeX, we create a couple of scratch counters. % -% LaTeX already defines \cs{@tempcnta} and \cs{@tempcntb} but Peter Wilson have +% \LaTeX\ already defines \cs{@tempcnta} and \cs{@tempcntb} but Peter Wilson have % found in the past that it can be dangerous to use these (for example % one of the AMS packages did something nasty to the \Lpack{ccaption} % package's use of one of these). @@ -3257,7 +3257,7 @@ % You use \cs{beginnumbering} and \cs{endnumbering} to begin % and end a line-numbered section of the text; the pair of commands may % be used as many times as you like within one document to start -% and end multiple, separately line-numbered sections. LaTeX will +% and end multiple, separately line-numbered sections. \LaTeX\ will % maintain and display % a `section number' as a count named % \cs{section@num} that counts how many @@ -3811,7 +3811,7 @@ % \cs{ledlinenum} typesets the line (and subline) number. % % The original \cs{numlabfont} specification is equivalent to -% the LaTeX \cs{scriptsize} for a 10pt document. +% the \LaTeX\ \cs{scriptsize} for a 10pt document. % \changes{v0.3}{2004/02/14}{Added \cs{linenumr@p} and \cs{sublinenum@rep} % to \cs{leftlinenum} and \cs{rightlinenum}} % \changes{v0.7}{2005/02/18}{Added \cs{ledlinenum} for use by @@ -3843,7 +3843,7 @@ % % \subsection{List macros} % -% Reminder: compare these with the LaTeX list macros in case they +% Reminder: compare these with the \LaTeX\ list macros in case they % would be suitable instead. % % We will make heavy use of lists of information, which will be built @@ -3931,7 +3931,7 @@ % passage glossed. And even one-line passages require two passes if we % want line-per-page numbering rather than line-per-section numbering. % -% So we run LaTeX over the text several times, and each time save +% So we run \LaTeX\ over the text several times, and each time save % information about page and line numbers in a `line-list file' to % be used during the next pass. At the start of each section---whenever % \cs{beginnumbering} is executed---the line-list file @@ -4180,14 +4180,14 @@ % \begin{macro}{\noteschanged@false} % If the number of the footnotes in a section is different from what it was % during the last run, or if this is the very first time you've run -% LaTeX, +% \LaTeX, % on this file, the information from the line-list used to place the % notes will be wrong, and some notes will probably be misplaced. % When this happens, we prefer % to give a single error message for the whole section rather than % messages at every point where we notice the problem, because % we don't really know where in the section notes were added or removed, -% and the solution in any case is simply to run LaTeX two more times; +% and the solution in any case is simply to run \LaTeX\ two more times; % there's no fix needed to the document. The % \cs{ifnoteschanged@} flag is set if such % a change in the number of notes is discovered at any point. @@ -4248,7 +4248,7 @@ % line-list file, because we need to write them out one at a time % rather than in balanced pairs, and it's easier to just use % something other than real braces. @ must become a letter, since -% this is run in the ordinary LaTeX context. We ignore carriage +% this is run in the ordinary \LaTeX\ context. We ignore carriage % returns, since if we're in horizontal mode they can get % interpreted as spaces to be printed. % @@ -4303,7 +4303,7 @@ % \end{macro} % % \begin{macro}{\get@linelistfile} -% \Eledmac{} can take advantage of the LaTeX `safe file input' macros +% \Eledmac{} can take advantage of the \LaTeX\ `safe file input' macros % to get the line-list file. % \changes{v0.7}{2005/02/22}{Added \cs{get@linelistfile}} % \begin{macrocode} @@ -4329,7 +4329,7 @@ % paragraph. But this would require that we % have two line-lists open at once, one for reading, one for % writing, and on systems without version numbers we'd have to do -% some file renaming outside of LaTeX for that to work. We've +% some file renaming outside of \LaTeX\ for that to work. We've % retained this slower approach to avoid that sort of hacking % about, but have provided the \cs{pausenumbering} and % \cs{resumenumbering} macros to help you if you run into @@ -5262,7 +5262,7 @@ % \end{macro} % % We're going to need another macro that takes one argument and ignores -% it entirely. This is supplied by the LaTeX \cs{@gobble}\marg{arg}. +% it entirely. This is supplied by the \LaTeX\ \cs{@gobble}\marg{arg}. % % \begin{macro}{\no@expands} % \begin{macro}{\morenoexpands} @@ -6315,7 +6315,7 @@ % that this produces a number that's even for left-margin numbers and % odd for right-margin numbers. % -% For LaTeX we have to consider two column documents as well. In this case +% For \LaTeX\ we have to consider two column documents as well. In this case % I think we need to put the numbers at the outside of the column --- % the left of the first column and the right of the second. Do the twocolumn % stuff before going on with the original code. @@ -6998,7 +6998,7 @@ % \end{itemize} % There's no counter for the line number because it's always printed. % \end{quote} -% LaTeX tends to use a lot of counters and packages should try and +% \LaTeX\ tends to use a lot of counters and packages should try and % minimise the number of new ones they create. In line with this % Peter Wilson have reverted to traditional booleans. % @@ -7422,7 +7422,7 @@ % already, in \cs{notefontsetup}. The argument of the macro is % again the note series letter. % -% Peter Wilson thinks that \cs{columnwidth} should be used here for LaTeX, not \cs{hsize}. +% Peter Wilson thinks that \cs{columnwidth} should be used here for \LaTeX\, not \cs{hsize}. % I've also included \cs{footfudgefiddle}. % \changes{v0.2.2}{2003/11/04}{Added \cs{footfudgefiddle} to \cs{para@footsetup}} % \begin{macrocode} @@ -7437,7 +7437,7 @@ % \end{macrocode} % \end{macro} % -% \edmac{} defines \cs{en@number} which does the same as the LaTeX kernel +% \edmac{} defines \cs{en@number} which does the same as the \LaTeX\ kernel % \cs{strip@pt}, namely strip the characters \verb"pt" from a dimen value. % Eledmac use \cs{strip@pt}. % @@ -7731,7 +7731,7 @@ % \end{macro} % \end{macro} % -% \subsubsection{Insertion of the footnotes separator} +% \subsection{Insertion of the footnotes separator} %The command \cs{insertparafootsep}\marg{series} must be called at the beginning of \cs{parafootftm} (and like commands). % \begin{macro}{\prevpage@num} % \changes{v1.8.0}{2013/12/13}{Correct \cs{parafootsep} when using with ledgroup.} @@ -7769,8 +7769,8 @@ % the extra unboxing in \cs{splitoff}, which allows the new \cs{vbox} to % have its natural height as it goes into the alignment. % -% The LaTeX \cs{line} macro has no relationship to the -% TeX \cs{line}. The LaTeX equivalent is \cs{@@line}. +% The \LaTeX\ \cs{line} macro has no relationship to the +% TeX \cs{line}. The \LaTeX\ equivalent is \cs{@@line}. % \begin{macrocode} \newcount\@k \newdimen\@h \newcommand*{\rigidbalance}[3]{\setbox0=\box#1 \@k=#2 \@h=#3 @@ -8076,7 +8076,7 @@ % % \subsection{Generality} % The original \edmac{} provided users with five series of critical footnotes (\cs{Afootnote} \cs{Bfootnote} \cs{Cfootnote} \cs{Dfootnote} \cs{Efootnote}), -% and LaTeX provides a single numbered footnote. The \Eledmac{} package +% and \LaTeX\ provides a single numbered footnote. The \Eledmac{} package % uses the \edmac{} mechanism to provide five series of numbered footnotes. % % First, though, the \Lpack{footmisc} package has an option whereby @@ -9627,7 +9627,7 @@ % % % The next portion is probably the trickiest part of moving from -% TeX to LaTeX. The original code is below, but we need +% TeX to \LaTeX\. The original code is below, but we need % something very different. % % This is a new output routine, with changes to handle printing all our @@ -10998,6 +10998,7 @@ % % \changes{v1.5}{2013/07/11}{Correct indexing when the call is made in critical notes.} % \changes{v1.8.0}{2014/07/21}{If \Lpack{imakeidx} and \Lpack{hyperref} are loaded, adds hyperref in the index.} +% \changes{v1.8.5}{2014/08/28}{Debug indexing in right column, with eledpar.} % Here's some code for indexing using page \& line numbers. % % \begin{macro}{\ifeledmac@check@imakeidx@} @@ -11226,6 +11227,8 @@ % \changes{v1.12.0}{2014/08/05}{Use correctly default index when \Lpack{imakeidx} is loaded.} % \begin{macrocode} \newcommandx{\@wredindex}[2][1=\expandonce\jobname,usedefault]{%#1 = the index name, #2 = the text + \global\let\old@Rlineflag\Rlineflag% + \gdef\Rlineflag{}% \ifl@imakeidx% \if@edindex@fornote@% \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}% @@ -11251,6 +11254,7 @@ \fi% \fi% \endgroup + \global\let\Rlineflag\old@Rlineflag% \@esphack} % \end{macrocode} % \end{macro} @@ -11263,30 +11267,72 @@ % % \subsection{Hyperref compatibility} % \begin{macro}{\hyperlinkformat} -% \cs{hyperlinkformat} command is to be used to have both a internal hyperlink and a format, when indexding. +% \cs{hyperlinkformat} command is to be used to have both a internal hyperlink and a format, when indexing. % \begin{macrocode} \newcommand{\hyperlinkformat}[3]{% \ifstrempty{#1}% {\hyperlink{#2}{#3}}% {\csuse{#1}{\hyperlink{#2}{#3}}% }} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\hyperlinkR} +% \cs{hyperlinkR} command is to be used to have both a internal hyperlink \cs{ledRflag}, when indexing. +% \begin{macrocode} +\newcommand{\hyperlinkR}[2]{% + \hyperlink{#1}{#2\Rlineflag}% +}% + +% \end{macrocode} +% \end{macro} +% \begin{macro}{\hyperlinkformatR} +% \cs{hyperlinkformatR} command is to be used to have both a internal hyperlink, a format and a \cs{Rlineflag}, when indexing. +% \begin{macrocode} +\newcommand{\hyperlinkformatR}[3]{% + \hyperlinkformat{#1}{#2}{#3\Rlineflag}% +}% + % \end{macrocode} % \end{macro} % \begin{macro}{\get@edindex@hyperref} % \begin{macro}{\@edindex@hyperref} +% \changes{v1.12.5}{2014/08/28}{Debug \cs{edindex} when \Lpack{hyperref} is not load} % \cs{get@edindex@hyperref} is to be used to define the \cs{@edindex@hyperref} macro, which, in index, links to the point where the index was called (with \Lpack{hyperref}. % \begin{macrocode} \newcommand{\get@edindex@hyperref}[1]{% \ifcsdef{hyperlink}% - {\IfSubStr{#1}{|}% +% \end{macrocode} +% We have to disable spaces to work with a \Lpack{xstring} bug +% \begin{macrocode} + {% + \edef\temp@{% + \catcode`\ =9 %space need for catcode + #1% + \catcode`\ =10 % space need for catcode + }% + \IfSubStr{\temp@}{|}% {\get@index@command#1+% - \gdef\@edindex@hyperref{|\@index@parenthesis % - hyperlinkformat{\@index@command} - {\edindexlab\thelabidx}}}% + \ifledRcol% + \gdef\@edindex@hyperref{|\@index@parenthesis %space kept + hyperlinkformatR{\@index@command}% + {\edindexlab\thelabidx}}% + \else% + \gdef\@edindex@hyperref{|\@index@parenthesis %space kept + hyperlinkformat{\@index@command}% + {\edindexlab\thelabidx}}% + \fi% + }% {\get@index@command#1|+ - \gdef\@edindex@hyperref{|hyperlink{\edindexlab\thelabidx}}}% + \ifledRcol% + \gdef\@edindex@hyperref{|hyperlinkR{\edindexlab\thelabidx}}% + \else% + \gdef\@edindex@hyperref{|hyperlink{\edindexlab\thelabidx}}% + \fi% + }% }% - {\gdef\@edindex@hyperref{}}% + {% + \gdef\@index@txt{#1}% + \gdef\@edindex@hyperref{}}% } % \end{macrocode} % \end{macro} @@ -12075,10 +12121,11 @@ % \begin{macro}{\l@dgobblearg} % |\l@dgobbledarg| replaces its delineated argument by |\relax| % (was |\verschwinden|). -% |\l@dgobblearg|\marg{arg} replaces its argument by |\relax|. +% |\l@dgobbleoptarg|\oarg{arg}\marg{arg} replaces these two arguments (first is optional) by |\relax|. +% \changes{v1.18.5}{2014/08/28}{\cs{l@dgobblearg} becomes \cs{l@dgobbeloptarg}} % \begin{macrocode} \def\l@dgobbledarg #1/{\relax} -\newcommand*{\l@dgobblearg}[1]{\relax} +\newcommand*{\l@dgobbleoptarg}[2][]{\relax}% % \end{macrocode} % \end{macro} @@ -12223,10 +12270,11 @@ % \begin{macro}{\l@dmodforedtext} % \begin{macro}{\l@drestoreforedtext} % Modify and restore various macros for when |\edtext| is used. +% \changes{v1.18.5}{2014/08/28}{Debug optional arguments of \cs{Xfootnote} in tabular context} % \begin{macrocode} \newcommand{\l@dmodforedtext}{% \let\edtext\relax - \def\do##1{\global\csletcs{##1footnote}{l@dgobblearg}} + \def\do##1{\global\csletcs{##1footnote}{l@dgobbleoptarg}}% \dolistloop{\@series}% \let\edindex\nulledindex \let\linenum\@gobble} @@ -13447,6 +13495,7 @@ % \begin{macro}{\@makeschapterhead} % \begin{macro}{\@sect} % \begin{macro}{\@ssect} +% \changes{v1.18.5}{2014/08/28}{Debug \cs{eledchapter} in parallel with \Lpack{memoir}} % We have to patch \LaTeX, \Lclass{book} and \Lclass{memoir} sectioning commands in order to: % \begin{itemize} % \item Disable \cs{edtext} inside. @@ -13460,7 +13509,7 @@ \catcode`\#=12 % Space NEEDS by \catcode \AtBeginDocument{% \patchcmd{\chapter}{\clearforchapter}{% - \ifnumbering\else% + \if@eled@sectioning\else% \clearforchapter \fi% } @@ -14059,7 +14108,7 @@ % \bibitem[Fai03]{FOOTMISC} % Robin Fairbairns. % \newblock \emph{\Lpack{footmisc} --- a portmanteau package for -% customising footnotes in LaTeX}. +% customising footnotes in \LaTeX}. % \newblock February 2003. % \newblock (Available from CTAN in % \texttt{macros/latex/contrib/footmisc}) -- cgit v1.2.3