texlive[44099] Master/texmf-dist: reledmac (28apr17)

commits+karl at tug.org commits+karl at tug.org
Fri Apr 28 23:17:28 CEST 2017


Revision: 44099
          http://tug.org/svn/texlive?view=revision&revision=44099
Author:   karl
Date:     2017-04-28 23:17:28 +0200 (Fri, 28 Apr 2017)
Log Message:
-----------
reledmac (28apr17)

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/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-28 21:16:25 UTC (rev 44098)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx	2017-04-28 21:17:28 UTC (rev 44099)
@@ -1089,7 +1089,7 @@
 % or sub-line depending on what it started out as, even if it 
 % changes in the middle.
 %
-% You can change the separator between line number and subline number or using \cs{Xsublinesep} without any option argument (\reff{Xsublinesep} or using \cs{Xsublinesepside}. But in the second case, it will change the separator only for line number in side, not for the footnotes. 
+% You can change the separator between line number and subline number or using \cs{Xsublinesep} without any option argument (\reff{Xsublinesep} or using \cs{Xsublinesepside}). But in the second case, it will change the separator only for line number in side, not for the footnotes. 
 % \subsubsection{Locking lineation}
 % \DescribeMacro{\startlock}
 % \DescribeMacro{\endlock}

Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx	2017-04-28 21:16:25 UTC (rev 44098)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx	2017-04-28 21:17:28 UTC (rev 44099)
@@ -302,6 +302,7 @@
 % \changes{v2.17.0}{2017/02/22}{Change code for compatibility with \protect\reledmac 2.18.0}
 % \changes{v2.17.1}{2017/03/26}{Fix bug with \protect\option{prevpgstyle} option when not using \protect\option{prevpgnotnumbered}.}
 % \changes{v2.17.3}{2017/04/20}{Fix bug when using multiple sidenotes on the same line, on right side.}
+% \changes{v2.17.4}{2017/04/28}{Fix bugs with sublines in parallel typesetting.}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1257,7 +1258,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/20 v2.17.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -1694,7 +1695,7 @@
   \global\line at numR \z@
   \global\@lockR \z@
   \global\sub at lockR \z@
-  \global\sublines at false
+  \global\sublines at Rfalse
   \global\let\next at page@numR\relax
   \global\let\sub at change\relax
   \global\stopmsdata at inserted@true%
@@ -2096,8 +2097,8 @@
   \setcounter{linenumincrement}{#1}%
 }
 \WithSuffix\newcommand\firstsublinenum*[1]{%
-  \setcounter{subfirstlinenumR}{#1}%
-  \setcounter{subfirstlinenum}{#1}%
+  \setcounter{firstsublinenumR}{#1}%
+  \setcounter{firstsublinenum}{#1}%
 }
 \WithSuffix\newcommand\sublinenumincrement*[1]{%
   \setcounter{sublinenumincrementR}{#1}%
@@ -2215,8 +2216,8 @@
   \l at dlinenumR}
 \newcommand*{\l at dlinenumR}{%
   \numlabfont\linenumrepR{\line at numR}\@Rlineflag%
-  \ifsublines@
-    \ifnum\subline at num>\z@
+  \ifsublines at R
+    \ifnum\subline at numR>\z@
       \unskip\fullstop\sublinenumrepR{\subline at numR}%
     \fi
   \fi}
@@ -2235,6 +2236,7 @@
 % \begin{macro}{\line at numR}
 % \begin{macro}{\subline at numR}
 % \begin{macro}{\absline at numR}
+% \begin{macro}{\ifsublines at R}
 % The count \protect\cs{line at numR} stores the line number that is used in
 % the right text's marginal line numbering and in notes. 
 % The count \protect\cs{subline at numR} stores
@@ -2244,15 +2246,18 @@
 % of the right text section: that is, the number we have actually printed, 
 % no matter what numbers we attached to them. 
 %
+% The boolean \cs{ifsublines at R} is set to true when we start subline on rightside.
 %    \begin{macrocode}
 \newcount\line at numR
 \newcount\subline at numR
 \newcount\absline at numR
+\newif\ifsublines at R%
 
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\line at listR}
 % \begin{macro}{\insertlines at listR}
@@ -2378,9 +2383,9 @@
   \fi
   \ifx\sub at change\relax \else
     \ifnum\sub at change>\z@
-      \sublines at true
+      \sublines at Rtrue
     \else
-      \sublines at false
+      \sublines at Rfalse
     \fi
     \sub at action
     \let\sub at change\relax
@@ -2397,7 +2402,7 @@
   \or\or
     \sub at lockR \z@
   \fi
-  \ifsublines@
+  \ifsublines at R
     \ifnum\sub at lockR<\tw@
       \advance\subline at numR \@ne
     \fi
@@ -2491,7 +2496,7 @@
 
 \newcommand*{\do at lockonR}{%
   \xright at appenditem{\the\absline at numR}\to\actionlines at listR
-  \ifsublines@
+  \ifsublines at R
     \xright at appenditem{-1005}\to\actions at listR
     \ifnum\sub at lockR=\z@
       \sub at lockR \@ne
@@ -2528,7 +2533,7 @@
 
 \newcommand{\do at lockoffR}{%
   \xright at appenditem{\the\absline at numR}\to\actionlines at listR
-  \ifsublines@
+  \ifsublines at R
     \xright at appenditem{-1006}\to\actions at listR
     \ifnum\sub at lockR=\tw@
       \sub at lockR \thr@@
@@ -2622,9 +2627,9 @@
 %    \begin{macrocode}
     \xright at appenditem%
       {\the\page at numR|\the\line at numR|%
-       \ifsublines@ \the\subline at numR \else 0\fi|%
+       \ifsublines at R \the\subline at numR \else 0\fi|%
        \the\endpage at num|\the\endline at num|%
-       \ifsublines@ \the\endsubline at num \else 0\fi}\to\line at listR
+       \ifsublines at R \the\endsubline at num \else 0\fi}\to\line at listR
 %    \end{macrocode}
 % Create a list which will store all the second argument of  each \protect\cs{@sw}
 % in this lemma, at this level.
@@ -3980,7 +3985,7 @@
   \do at ballastR
   \ifledgroupnotesR@\else
         \ifnumberline
-          \ifsublines@
+          \ifsublines at R
             \ifnum\sub at lockR<\tw@
               \global\advance\subline at numR \@ne
            \fi
@@ -4056,9 +4061,9 @@
 \newcommand*{\do at actions@fixedcodeR}{%
   \ifcase\@l at dtempcnta% 
   \or%                     % 1001 = starting sublineation
-    \global\sublines at true
+    \global\sublines at Rtrue
   \or%                     % 1002 = ending sublineation
-    \global\sublines at false
+    \global\sublines at Rfalse
   \or%                     % 1003 = starting locking number
     \global\@lockR=\@ne
   \or%                     % 1004 = ending locking number
@@ -4104,7 +4109,7 @@
       \ifnum\next at actionR<-4999\relax   %  9/05 added relax here
         \@l at dtempcnta=-\next at actionR
         \advance\@l at dtempcnta by -5001\relax
-        \ifsublines@
+        \ifsublines at R
           \global\subline at numR=\@l at dtempcnta
         \else
           \global\line at numR=\@l at dtempcnta
@@ -4210,10 +4215,10 @@
 \ifl at dskipnumber
   \global\l at dskipnumberfalse
 \else
-  \ifsublines@
+  \ifsublines at R
     \@l at dtempcntb=\subline at numR
     \l at dcalcnum{\subline at numR}{\c at firstsublinenumR}{\c at sublinenumincrementR}%
-    \ch at cksub@lockR
+    \ch at cksub@l at ckR
   \else
     \@l at dtempcntb=\line at numR
     \ifx\linenumberlistR\empty%

Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty	2017-04-28 21:16:25 UTC (rev 44098)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty	2017-04-28 21:17:28 UTC (rev 44099)
@@ -29,7 +29,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/20 v2.17.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -197,7 +197,7 @@
   \global\line at numR \z@
   \global\@lockR \z@
   \global\sub at lockR \z@
-  \global\sublines at false
+  \global\sublines at Rfalse
   \global\let\next at page@numR\relax
   \global\let\sub at change\relax
   \global\stopmsdata at inserted@true%
@@ -432,8 +432,8 @@
   \setcounter{linenumincrement}{#1}%
 }
 \WithSuffix\newcommand\firstsublinenum*[1]{%
-  \setcounter{subfirstlinenumR}{#1}%
-  \setcounter{subfirstlinenum}{#1}%
+  \setcounter{firstsublinenumR}{#1}%
+  \setcounter{firstsublinenum}{#1}%
 }
 \WithSuffix\newcommand\sublinenumincrement*[1]{%
   \setcounter{sublinenumincrementR}{#1}%
@@ -481,8 +481,8 @@
   \l at dlinenumR}
 \newcommand*{\l at dlinenumR}{%
   \numlabfont\linenumrepR{\line at numR}\@Rlineflag%
-  \ifsublines@
-    \ifnum\subline at num>\z@
+  \ifsublines at R
+    \ifnum\subline at numR>\z@
       \unskip\fullstop\sublinenumrepR{\subline at numR}%
     \fi
   \fi}
@@ -490,6 +490,7 @@
 \newcount\line at numR
 \newcount\subline at numR
 \newcount\absline at numR
+\newif\ifsublines at R%
 
 \list at create{\line at listR}
 \list at create{\insertlines at listR}
@@ -536,9 +537,9 @@
   \fi
   \ifx\sub at change\relax \else
     \ifnum\sub at change>\z@
-      \sublines at true
+      \sublines at Rtrue
     \else
-      \sublines at false
+      \sublines at Rfalse
     \fi
     \sub at action
     \let\sub at change\relax
@@ -555,7 +556,7 @@
   \or\or
     \sub at lockR \z@
   \fi
-  \ifsublines@
+  \ifsublines at R
     \ifnum\sub at lockR<\tw@
       \advance\subline at numR \@ne
     \fi
@@ -576,7 +577,7 @@
 
 \newcommand*{\do at lockonR}{%
   \xright at appenditem{\the\absline at numR}\to\actionlines at listR
-  \ifsublines@
+  \ifsublines at R
     \xright at appenditem{-1005}\to\actions at listR
     \ifnum\sub at lockR=\z@
       \sub at lockR \@ne
@@ -599,7 +600,7 @@
 
 \newcommand{\do at lockoffR}{%
   \xright at appenditem{\the\absline at numR}\to\actionlines at listR
-  \ifsublines@
+  \ifsublines at R
     \xright at appenditem{-1006}\to\actions at listR
     \ifnum\sub at lockR=\tw@
       \sub at lockR \thr@@
@@ -639,9 +640,9 @@
   \endgroup
     \xright at appenditem%
       {\the\page at numR|\the\line at numR|%
-       \ifsublines@ \the\subline at numR \else 0\fi|%
+       \ifsublines at R \the\subline at numR \else 0\fi|%
        \the\endpage at num|\the\endline at num|%
-       \ifsublines@ \the\endsubline at num \else 0\fi}\to\line at listR
+       \ifsublines at R \the\endsubline at num \else 0\fi}\to\line at listR
      \expandafter\list at create\expandafter{\csname sw at list@edtext at tmp@\the\@edtext at level\endcsname}%
      \@ref at reg@parseR{#2}%
      \global\advance\@edtext at level by -1%
@@ -1334,7 +1335,7 @@
   \do at ballastR
   \ifledgroupnotesR@\else
         \ifnumberline
-          \ifsublines@
+          \ifsublines at R
             \ifnum\sub at lockR<\tw@
               \global\advance\subline at numR \@ne
            \fi
@@ -1381,9 +1382,9 @@
 \newcommand*{\do at actions@fixedcodeR}{%
   \ifcase\@l at dtempcnta%
   \or%                     % 1001 = starting sublineation
-    \global\sublines at true
+    \global\sublines at Rtrue
   \or%                     % 1002 = ending sublineation
-    \global\sublines at false
+    \global\sublines at Rfalse
   \or%                     % 1003 = starting locking number
     \global\@lockR=\@ne
   \or%                     % 1004 = ending locking number
@@ -1428,7 +1429,7 @@
       \ifnum\next at actionR<-4999\relax   %  9/05 added relax here
         \@l at dtempcnta=-\next at actionR
         \advance\@l at dtempcnta by -5001\relax
-        \ifsublines@
+        \ifsublines at R
           \global\subline at numR=\@l at dtempcnta
         \else
           \global\line at numR=\@l at dtempcnta
@@ -1515,10 +1516,10 @@
 \ifl at dskipnumber
   \global\l at dskipnumberfalse
 \else
-  \ifsublines@
+  \ifsublines at R
     \@l at dtempcntb=\subline at numR
     \l at dcalcnum{\subline at numR}{\c at firstsublinenumR}{\c at sublinenumincrementR}%
-    \ch at cksub@lockR
+    \ch at cksub@l at ckR
   \else
     \@l at dtempcntb=\line at numR
     \ifx\linenumberlistR\empty%



More information about the tex-live-commits mailing list