texinfo/doc texinfo.tex,1.28,1.29

[karl]

Update of /cvsroot/texinfo/texinfo/doc
In directory sheep:/tmp/cvs-serv22383

Modified Files:
        texinfo.tex 
Log Message:
(\dofloat): initialize caption macros here, not globally.
(\Efloat): rewrite for more consistent caption
line, matching documentation.
(\appendtomacro): new macro.
(\currentparindent): this \newdimen was not used; removed.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** texinfo.tex 9 Feb 2004 23:23:06 -0000       1.28
--- texinfo.tex 12 Feb 2004 00:24:24 -0000      1.29
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-02-09.15}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--- 4,8 ----
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-02-11.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 973,978 ****
  %
  \def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
- \newdimen\currentparindent
- %
  \def\insertword{insert}
  %
--- 973,976 ----
***************
*** 6303,6306 ****
--- 6301,6307 ----
  %
  \def\dofloat#1,#2,#3,#4\finish{%
+   \let\thiscaption=\empty
+   \let\thisshortcaption=\empty
+   %
    % don't lose footnotes inside @float.
    \startsavinginserts
***************
*** 6342,6345 ****
--- 6343,6352 ----
        }%
      \fi
+     %
+     % start with \parskip glue, I guess.
+     \vskip\parskip
+     %
+     % Don't suppress indentation if a float happens to start a section.
+     \restorefirstparagraphindent
  }
  
***************
*** 6347,6350 ****
--- 6354,6359 ----
  % @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
  % @float Foo,lbl & no caption:    Foo 1.1
+ % @float Foo & @caption{Cap}:     Foo: Cap
+ % @float Foo & no caption:        Foo
  % @float ,lbl & Caption{Cap}:     1.1: Cap
  % @float ,lbl & no caption:       1.1
***************
*** 6353,6372 ****
  %
  \def\Efloat{%
!     \let\printedsomething = \empty
      %
!     \ifx\floattype\empty \else
!       \vskip.5\parskip  % space above caption
!       %
!       % Print the float number preceded by the chapter-level number
!       % (empty in the case of unnumbered), as in "Figure 1.1".  Although
!       % there are other styles of float numbering, we hardwire this one.
!       \def\floatident{\floattype\tie\chaplevelprefix\the\floatno}%
!       \floatident
!       \let\printedsomething = t%
        %
!       % Write the text that goes in the list of floats to the aux file
!       % as \floatlabel-lof.  Besides the float ident, we include the
!       % short caption if specified, else the full caption if specified,
!       % else nothing.
        {%
          \atdummies \turnoffactive \otherbackslash
--- 6362,6405 ----
  %
  \def\Efloat{%
!     \let\floatident = \empty
      %
!     % In all cases, if we have a float type, it comes first.
!     \ifx\floattype\empty \else \def\floatident{\floattype}\fi
!     %
!     % If we have an xref label, the number comes next.
!     \ifx\floatlabel\empty \else
!       \ifx\floattype\empty \else % if also had float type, need tie first.
!         \appendtomacro\floatident{\tie}%
!       \fi
!       % the number.
!       \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
!     \fi
!     %
!     % Start the printed caption with what we've constructed in
!     % \floatident, but keep it separate; we need \floatident again.
!     \let\captionline = \floatident
!     %
!     \ifx\thiscaption\empty \else
!       \ifx\floatident\empty \else
!       \appendtomacro\captionline{: }% had ident, so need a colon between
!       \fi
        %
!       % caption text.
!       \appendtomacro\captionline\thiscaption
!     \fi
!     %
!     % If we have anything to print, print it, with space before.
!     % Eventually this needs to become an \insert.
!     \ifx\captionline\empty \else
!       \vskip.5\parskip
!       \captionline
!     \fi
!     %
!     % If have an xref label, write the list of floats info.  Do this
!     % after the caption, to avoid chance of it being a breakpoint.
!     \ifx\floatlabel\empty \else
!       % Write the text that goes in the lof to the aux file as
!       % \floatlabel-lof.  Besides \floatident, we include the short
!       % caption if specified, else the full caption if specified, else 
nothing.
        {%
          \atdummies \turnoffactive \otherbackslash
***************
*** 6374,6380 ****
            \floatident
            \ifx\thisshortcaption\empty
!             \ifx\thiscaption\empty \else
!               : \thiscaption
!             \fi
            \else
              : \thisshortcaption
--- 6407,6411 ----
            \floatident
            \ifx\thisshortcaption\empty
!             \ifx\thiscaption\empty \else : \thiscaption \fi
            \else
              : \thisshortcaption
***************
*** 6382,6397 ****
          }}%
        }%
-     \fi % end have xref label for this float
-     %
-     \ifx\thiscaption\empty \else
-       \ifx\printedsomething\empty
-       \vskip.5\parskip  % space above caption
-       \else
-       :\space  % had a number, so print a colon before the caption.
-       \fi
-       %
-       % Print caption text.
-       \thiscaption
-       \let\printedsomething = t%
      \fi
      %
--- 6413,6416 ----
***************
*** 6402,6409 ****
  }
  
  \def\caption#1{\checkenv\float \def\thiscaption{#1}}
  \def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
- \let\thiscaption=\empty
- \let\thisshortcaption=\empty
  
  % The parameter is the control sequence identifying the counter we are
--- 6421,6436 ----
  }
  
+ % Append the tokens #2 to the macro #1, not expanding either.
+ % 
+ \def\appendtomacro#1#2{%
+   \toksA = \expandafter{#1}%
+   \toksB = {#2}%
+   \edef#1{\the\toksA \the\toksB}%
+ }
+ 
+ % @caption, @shortcaption are easy.
+ % 
  \def\caption#1{\checkenv\float \def\thiscaption{#1}}
  \def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
  
  % The parameter is the control sequence identifying the counter we are