texinfo/doc texinfo.tex,1.24,1.25

[karl]

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

Modified Files:
        texinfo.tex 
Log Message:
(\dofloat): handle empty float type and empty
float label separately, matching makeinfo behavior.


Index: texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** texinfo.tex 19 Jan 2004 15:02:21 -0000      1.24
--- texinfo.tex 23 Jan 2004 01:33:34 -0000      1.25
***************
*** 4,8 ****
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2004-01-19.07}
  %
  % 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-01-22.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
***************
*** 6296,6300 ****
      \def\floatloc{#3}% we do nothing with this yet.
      %
!     \ifx\floattype\empty \else
        {%
          % the floattype might have accents or other special characters,
--- 6296,6302 ----
      \def\floatloc{#3}% we do nothing with this yet.
      %
!     \ifx\floattype\empty
!       \let\safefloattype=\empty
!     \else
        {%
          % the floattype might have accents or other special characters,
***************
*** 6304,6331 ****
          \xdef\safefloattype{\floattype}%
        }%
        % We want each FLOATTYPE to be numbered separately (Figure 1,
!       % Table 1, Figure 2, ...).
        % 
        \expandafter\getfloatno\csname\safefloattype floatno\endcsname
        \global\advance\floatno by 1
        %
!       \ifx\floatlabel\empty \else
!       {%
!         % This magic value for \thissection is output by \setref as the
!         % XREFLABEL-title value.  \xrefX uses it to distinguish float
!         % labels (which have a completely different output format) from
!         % node and anchor labels.  And \xrdef uses it to construct the
!         % lists of floats.
!         % 
!         \edef\thissection{\floatmagic=\safefloattype}%
!         \setref{\floatlabel}{Yfloat}%
!       }%
!       \fi
      \fi
  }
  
! % we have four possibilities:
  % @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
  % @float Foo,lbl & no caption:    Foo 1.1
  % @float & @caption{Cap}:         Cap
  % @float & no caption:
--- 6306,6337 ----
          \xdef\safefloattype{\floattype}%
        }%
+     \fi
+     %
+     % If label is given but no type, we handle that as the empty type.
+     \ifx\floatlabel\empty \else
        % We want each FLOATTYPE to be numbered separately (Figure 1,
!       % Table 1, Figure 2, ...).  (And if no label, no number.)
        % 
        \expandafter\getfloatno\csname\safefloattype floatno\endcsname
        \global\advance\floatno by 1
        %
!       {%
!         % This magic value for \thissection is output by \setref as the
!         % XREFLABEL-title value.  \xrefX uses it to distinguish float
!         % labels (which have a completely different output format) from
!         % node and anchor labels.  And \xrdef uses it to construct the
!         % lists of floats.
!         % 
!         \edef\thissection{\floatmagic=\safefloattype}%
!         \setref{\floatlabel}{Yfloat}%
!       }%
      \fi
  }
  
! % we have these possibilities:
  % @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
  % @float Foo,lbl & no caption:    Foo 1.1
+ % @float ,lbl & Caption{Cap}:     1.1: Cap
+ % @float ,lbl & no caption:       1.1
  % @float & @caption{Cap}:         Cap
  % @float & no caption: