texinfo update (Fri Apr 22 18:22:01 EDT 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.492
retrieving revision 1.493
diff -c -r1.492 -r1.493
*** ChangeLog   21 Apr 2005 13:52:40 -0000      1.492
--- ChangeLog   22 Apr 2005 22:14:21 -0000      1.493
***************
*** 1,3 ****
--- 1,10 ----
+ 2005-04-22  Per Bothner  <address@hidden>
+ 
+       * makeinfo/xml.c (docbook_element_list, xml_begin_defterm): Improved
+       docbook translation of definition commands: Use <synopsis> for the
+       summary line, and don't include it (only the body) in a <blockquote>.
+       Wrap the whole definition in an <informalfigure>.
+ 
  2005-04-21  Karl Berry  <address@hidden>
  
        * util/texi2dvi: also accept .drv and .dtx as LaTeX.
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** makeinfo/xml.c      1 Apr 2005 21:30:40 -0000       1.56
--- makeinfo/xml.c      22 Apr 2005 22:14:21 -0000      1.57
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.56 2005/04/01 21:30:40 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.57 2005/04/22 22:14:21 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
***************
*** 454,466 ****
    { "",                    0, 0, 0 }, /* SETVALUE (xml) */
    { "",                    0, 0, 0 }, /* CLEARVALUE (xml) */
  
!   { "blockquote",          1, 0, 0 }, /* DEFINITION */
!   { "screen",              0, 0, 1 }, /* DEFINITIONTERM */
!   { "",                    0, 0, 0 }, /* DEFINITIONITEM (xml) */
    { "",                    0, 0, 0 }, /* DEFCATEGORY (xml) */
    { "function",            0, 0, 0 }, /* DEFFUNCTION */
    { "varname",             0, 0, 0 }, /* DEFVARIABLE */
!   { "varname",             0, 0, 0 }, /* DEFPARAM */
    { "",                    0, 0, 0 }, /* DEFDELIMITER (xml) */
    { "returnvalue",         0, 0, 0 }, /* DEFTYPE */
    { "type",                0, 0, 0 }, /* DEFPARAMTYPE */
--- 454,466 ----
    { "",                    0, 0, 0 }, /* SETVALUE (xml) */
    { "",                    0, 0, 0 }, /* CLEARVALUE (xml) */
  
!   { "informalfigure",      1, 0, 0 }, /* DEFINITION */
!   { "synopsis",            0, 0, 1 }, /* DEFINITIONTERM */
!   { "blockquote",          1, 0, 0 }, /* DEFINITIONITEM (xml) */
    { "",                    0, 0, 0 }, /* DEFCATEGORY (xml) */
    { "function",            0, 0, 0 }, /* DEFFUNCTION */
    { "varname",             0, 0, 0 }, /* DEFVARIABLE */
!   { "replaceable",         0, 0, 0 }, /* DEFPARAM */
    { "",                    0, 0, 0 }, /* DEFDELIMITER (xml) */
    { "returnvalue",         0, 0, 0 }, /* DEFTYPE */
    { "type",                0, 0, 0 }, /* DEFPARAMTYPE */
***************
*** 2228,2234 ****
      char *defined_name, char *type_name, char *type_name2)
  {
    xml_after_def_term = 0;
!   xml_insert_element (DEFINITIONTERM, START);
  
    /* Index entry */
    switch (base_type)
--- 2228,2238 ----
      char *defined_name, char *type_name, char *type_name2)
  {
    xml_after_def_term = 0;
!   if (docbook)
!     xml_insert_element_with_attribute (DEFINITIONTERM, START,
!                                      "role=\"%s\"", category);
!   else
!     xml_insert_element (DEFINITIONTERM, START);
  
    /* Index entry */
    switch (base_type)
***************
*** 2257,2266 ****
      }
  
    /* Start with category.  */
!   xml_insert_element (DEFCATEGORY, START);
!   execute_string (docbook ? "--- %s:" : "%s", category);
!   xml_insert_element (DEFCATEGORY, END);
!   add_char(' ');
  
    /* Output type name first for typed definitions.  */
    switch (base_type)
--- 2261,2273 ----
      }
  
    /* Start with category.  */
!   if (! docbook)
!     {
!       xml_insert_element (DEFCATEGORY, START);
!       execute_string (docbook ? "[%s]" : "%s", category);
!       xml_insert_element (DEFCATEGORY, END);
!       add_char(' ');
!     }
  
    /* Output type name first for typed definitions.  */
    switch (base_type)
P ChangeLog
P makeinfo/xml.c