texinfo update (Mon Aug 15 09:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.528
retrieving revision 1.529
diff -c -r1.528 -r1.529
*** ChangeLog   13 Aug 2005 15:58:08 -0000      1.528
--- ChangeLog   15 Aug 2005 13:05:23 -0000      1.529
***************
*** 1,3 ****
--- 1,15 ----
+ 2005-08-14  Per Bothner  <address@hidden>
+ 
+       * makeinfo/index.c (cm_printindex): Don't defer index if docbook,
+       since we don't need it and it prevents output to a pipe.
+ 
+       * makeinfo/insertion.h (default_item_function): New declaration.
+       * makeinfo/insertion.c (default_item_function): New variable.
+       (begin_insertion): Use default_item_function for @bullet default.
+       (pop_insertion): Check if item_function is default_item_function.
+       * makeinfo/xml.c (xml_begin_table): Don't emit mark attribute
+       if the item_function was implied.
+ 
  2005-08-13  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\writetocentry, ...): restore calls to
***************
*** 479,485 ****
  
        * makeinfo/xml.c (docbook_element_list): Add two missing entries.
  
!       * makeinfo/xml.c (xml_begin_document): Check for mipatch between
        enum xml_element and texinfoml_element_list/docbook_element_list.
  
        bug-texinfo-mail, 05 Feb 2005 00:13:44 -0800.
--- 491,497 ----
  
        * makeinfo/xml.c (docbook_element_list): Add two missing entries.
  
!       * makeinfo/xml.c (xml_begin_document): Check for mismatch between
        enum xml_element and texinfoml_element_list/docbook_element_list.
  
        bug-texinfo-mail, 05 Feb 2005 00:13:44 -0800.
Index: makeinfo/index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** makeinfo/index.c    6 Aug 2005 16:04:37 -0000       1.19
--- makeinfo/index.c    15 Aug 2005 13:05:24 -0000      1.20
***************
*** 1,5 ****
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.19 2005/08/06 16:04:37 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
--- 1,5 ----
  /* index.c -- indexing for Texinfo.
!    $Id: index.c,v 1.20 2005/08/15 13:05:24 karl Exp $
  
     Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
     Inc.
***************
*** 711,720 ****
    if (!handling_delayed_writes)
      line_number--;
  
!   if (xml && !docbook)
      {
        xml_insert_element (PRINTINDEX, START);
!       insert_string (index_name);
        xml_insert_element (PRINTINDEX, END);
      }
    else if (!handling_delayed_writes)
--- 711,721 ----
    if (!handling_delayed_writes)
      line_number--;
  
!   if (xml)
      {
        xml_insert_element (PRINTINDEX, START);
!       if (! docbook)
!       insert_string (index_name);
        xml_insert_element (PRINTINDEX, END);
      }
    else if (!handling_delayed_writes)
***************
*** 723,731 ****
        char *index_command = xmalloc (command_len + 1);
  
        close_paragraph ();
-       if (docbook)
-         xml_begin_index ();
- 
        sprintf (index_command, "@%s %s", command, index_name);
        register_delayed_write (index_command);
        free (index_command);
--- 724,729 ----
Index: makeinfo/insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** makeinfo/insertion.c        15 May 2005 00:00:07 -0000      1.59
--- makeinfo/insertion.c        15 Aug 2005 13:05:24 -0000      1.60
***************
*** 1,5 ****
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.59 2005/05/15 00:00:07 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
--- 1,5 ----
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.60 2005/08/15 13:05:24 karl Exp $
  
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
     Software Foundation, Inc.
***************
*** 79,84 ****
--- 79,86 ----
  /* Non-zero if a <dl> element has a <dt> element in it.  We use this when
     deciding whether to insert a <br> or not.  */
  static int html_deflist_has_term = 0;
+ 
+ const char default_item_function[] = { "@bullet" };
  
  void
  init_insertion_stack (void)
***************
*** 209,215 ****
    inhibit_paragraph_indentation = temp->inhibited;
    filling_enabled = temp->filling_enabled;
    indented_fill = temp->indented_fill;
!   free_and_clear (&(temp->item_function));
    free_and_clear (&(temp->filename));
    insertion_stack = insertion_stack->next;
    free (temp);
--- 211,220 ----
    inhibit_paragraph_indentation = temp->inhibited;
    filling_enabled = temp->filling_enabled;
    indented_fill = temp->indented_fill;
!   if (temp->item_function == default_item_function)
!     temp->item_function = NULL;
!   else
!     free_and_clear (&(temp->item_function));
    free_and_clear (&(temp->filename));
    insertion_stack = insertion_stack->next;
    free (temp);
***************
*** 622,628 ****
            if (!(*insertion_stack->item_function))
              {
                free (insertion_stack->item_function);
!               insertion_stack->item_function = xstrdup ("@bullet");
              }
          }
  
--- 627,633 ----
            if (!(*insertion_stack->item_function))
              {
                free (insertion_stack->item_function);
!               insertion_stack->item_function = default_item_function;
              }
          }
  
Index: makeinfo/insertion.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** makeinfo/insertion.h        15 May 2005 00:00:07 -0000      1.11
--- makeinfo/insertion.h        15 Aug 2005 13:05:24 -0000      1.12
***************
*** 1,5 ****
  /* insertion.h -- declarations for insertion.c.
!    $Id: insertion.h,v 1.11 2005/05/15 00:00:07 karl Exp $
  
     Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* insertion.h -- declarations for insertion.c.
!    $Id: insertion.h,v 1.12 2005/08/15 13:05:24 karl Exp $
  
     Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
  
***************
*** 34,39 ****
--- 34,41 ----
    rawxml, smalldisplay, smallexample, smallformat, smalllisp, verbatim,
    table, tex, vtable, titlepage, bad_type
  };
+ 
+ extern const char default_item_function[];
  
  typedef struct istack_elt
  {
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -r1.61 -r1.62
*** makeinfo/xml.c      6 Aug 2005 16:04:37 -0000       1.61
--- makeinfo/xml.c      15 Aug 2005 13:05:25 -0000      1.62
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.61 2005/08/06 16:04:37 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.62 2005/08/15 13:05:25 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
***************
*** 1424,1434 ****
          }
        break;
      case itemize:
        if (!docbook)
          {
-           xml_insert_element (ITEMIZE, START);
-           xml_table_level ++;
-           xml_in_item[xml_table_level] = 0;
            xml_insert_element (ITEMFUNCTION, START);
            if (*item_function == COMMAND_PREFIX
                && item_function[strlen (item_function) - 1] != '}'
--- 1424,1440 ----
          }
        break;
      case itemize:
+       if (!docbook || item_function==default_item_function)
+       xml_insert_element (ITEMIZE, START);
+       else
+       xml_insert_element_with_attribute (ITEMIZE, START,
+                                          "mark=\"%s\"",
+                                          (*item_function == COMMAND_PREFIX) ?
+                                          &item_function[1] : item_function);
+       xml_table_level ++;
+       xml_in_item[xml_table_level] = 0;
        if (!docbook)
          {
            xml_insert_element (ITEMFUNCTION, START);
            if (*item_function == COMMAND_PREFIX
                && item_function[strlen (item_function) - 1] != '}'
***************
*** 1437,1451 ****
            else
              execute_string ("%s", item_function);
            xml_insert_element (ITEMFUNCTION, END);
-         }
-       else
-         {
-           xml_insert_element_with_attribute (ITEMIZE, START,
-                                              "mark=\"%s\"",
-                                              (*item_function == 
COMMAND_PREFIX) ?
-                                              &item_function[1] : 
item_function);
-           xml_table_level ++;
-           xml_in_item[xml_table_level] = 0;
          }
        break;
      }
--- 1443,1448 ----
P ChangeLog
P makeinfo/index.c
P makeinfo/insertion.c
P makeinfo/insertion.h
P makeinfo/xml.c