texinfo/makeinfo insertion.c,1.17,1.18

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv18276/makeinfo

Modified Files:
        insertion.c 
Log Message:
2004-02-12  Alper Ersoy  <address@hidden>

        * makeinfo/insertion.c (end_insertion): adjusted caption styles for
        label and type conditions.
        (begin_insertion, end_insertion): indent first paragraphs inside
        @float, even if first paragraph in a chapter.  Increment/decrement
        current_indent.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** insertion.c 7 Feb 2004 11:51:40 -0000       1.17
--- insertion.c 12 Feb 2004 20:46:11 -0000      1.18
***************
*** 864,867 ****
--- 864,870 ----
        else
          { /* Info */
+           close_single_paragraph ();
+           inhibit_paragraph_indentation = 0;
+           current_indent += default_indentation_increment;
          }
  
***************
*** 1146,1163 ****
            no_indent = 1;
  
!           /* Figure 1.1: Title, only if float has an @anchor.  */
            if (strlen (current_float_id ()) > 0)
              {
!               if (strlen (current_float_type ()))
!                 execute_string ("%s ", current_float_type ());
  
!               execute_string ("%s: ", current_float_number ());
              }
  
            if (strlen (current_float_title ()) > 0)
!             execute_string ("%s", current_float_title ());
  
            /* Indent the following paragraph. */
            inhibit_paragraph_indentation = 0;
  
            if (html)
--- 1149,1181 ----
            no_indent = 1;
  
!           /* Legend:
!                1) @float Foo,lbl & no caption:    Foo 1.1
!                2) @float Foo & no caption:        Foo
!                3) @float ,lbl & no caption:       1.1
!                4) @float & no caption:                    */
! 
!           if (strlen (current_float_type ()))
!             execute_string ("%s", current_float_type ());
! 
            if (strlen (current_float_id ()) > 0)
              {
!               if (strlen (current_float_type ()) > 0)
!                 add_char (' ');
  
!               add_word (current_float_number ());
              }
  
            if (strlen (current_float_title ()) > 0)
!             {
!               if (strlen (current_float_type ()) > 0
!                   || strlen (current_float_id ()) > 0)
!                 insert_string (": ");
! 
!               execute_string ("%s", current_float_title ());
!             }
  
            /* Indent the following paragraph. */
            inhibit_paragraph_indentation = 0;
+           current_indent -= default_indentation_increment;
  
            if (html)