texinfo/makeinfo xml.c,1.34,1.35

[dirt]

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

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

        * makeinfo/xml.c (xml_insert_docbook_image): for Docbook, if paragraph
        is open, use inlinemediaobject instead of mediaobject in an
        informalfigure.
        (xml_insert_element_with_attribute): indent after informalfigure.



Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** xml.c       27 Feb 2004 03:29:47 -0000      1.34
--- xml.c       27 Feb 2004 03:53:08 -0000      1.35
***************
*** 398,404 ****
    { "",                    0, 1, 0 }, /* ANCHOR */
  
!   { "",                    0, 1, 0 }, /* IMAGE */
!   { "",                    0, 1, 0 }, /* INLINEIMAGE */
!   { "",                    0, 1, 0 }, /* IMAGEALTTEXT */
  
    { "primary",             0, 1, 0 }, /* PRIMARY */
--- 398,404 ----
    { "",                    0, 1, 0 }, /* ANCHOR */
  
!   { "",                    0, 0, 0 }, /* IMAGE */
!   { "inlinemediaobject",   0, 1, 0 }, /* INLINEIMAGE */
!   { "",                    0, 0, 0 }, /* IMAGEALTTEXT */
  
    { "primary",             0, 1, 0 }, /* PRIMARY */
***************
*** 406,412 ****
    { "informalfigure",      0, 0, 0 },
    { "mediaobject",         0, 0, 0 },
!   { "imageobject",         0, 0, 0 },
!   { "imagedata",           0, 0, 0 },
!   { "textobject",          0, 0, 0 },
    { "indexentry",          0, 0, 0 },
    { "primaryie",           0, 0, 0 },
--- 406,412 ----
    { "informalfigure",      0, 0, 0 },
    { "mediaobject",         0, 0, 0 },
!   { "imageobject",         0, 1, 0 },
!   { "imagedata",           0, 1, 0 },
!   { "textobject",          0, 1, 0 },
    { "indexentry",          0, 0, 0 },
    { "primaryie",           0, 0, 0 },
***************
*** 898,902 ****
          || elt == TABLEITEM || elt == TABLE
          || elt == MULTITABLE || elt == TGROUP || elt == THEAD || elt == TBODY
!         || elt == ROW
          || (!docbook && (elt == DEFINITION || elt == DEFINITIONTERM))))
      xml_indent ();
--- 898,902 ----
          || elt == TABLEITEM || elt == TABLE
          || elt == MULTITABLE || elt == TGROUP || elt == THEAD || elt == TBODY
!         || elt == ROW || elt == INFORMALFIGURE
          || (!docbook && (elt == DEFINITION || elt == DEFINITIONTERM))))
      xml_indent ();
***************
*** 1583,1600 ****
  xml_insert_docbook_image (char *name_arg)
  {
    if (is_in_insertion_of_type (floatenv))
      xml_begin_docbook_float (INFORMALFIGURE);
!   else
      xml_insert_element (INFORMALFIGURE, START);
  
!   xml_insert_element (MEDIAOBJECT, START);
  
    xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA, START, "fileref=\"%s.eps\" 
format=\"EPS\"", name_arg);
    xml_insert_element (IMAGEDATA, END);
    xml_insert_element (IMAGEOBJECT, END);
  
    xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA, START, "fileref=\"%s.jpg\" 
format=\"JPG\"", name_arg);
    xml_insert_element (IMAGEDATA, END);
    xml_insert_element (IMAGEOBJECT, END);
--- 1583,1606 ----
  xml_insert_docbook_image (char *name_arg)
  {
+   int elt = xml_in_para ? INLINEIMAGE : MEDIAOBJECT;
+ 
    if (is_in_insertion_of_type (floatenv))
      xml_begin_docbook_float (INFORMALFIGURE);
!   else if (!xml_in_para)
      xml_insert_element (INFORMALFIGURE, START);
  
!   xml_no_para++;
! 
!   xml_insert_element (elt, START);
  
    xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA,
!       START, "fileref=\"%s.eps\" format=\"EPS\"", name_arg);
    xml_insert_element (IMAGEDATA, END);
    xml_insert_element (IMAGEOBJECT, END);
  
    xml_insert_element (IMAGEOBJECT, START);
!   xml_insert_element_with_attribute (IMAGEDATA,
!       START, "fileref=\"%s.jpg\" format=\"JPG\"", name_arg);
    xml_insert_element (IMAGEDATA, END);
    xml_insert_element (IMAGEOBJECT, END);
***************
*** 1602,1607 ****
    xml_insert_text_file (name_arg);
  
!   xml_insert_element (MEDIAOBJECT, END);
!   xml_insert_element (INFORMALFIGURE, END);
  }
  
--- 1608,1617 ----
    xml_insert_text_file (name_arg);
  
!   xml_insert_element (elt, END);
! 
!   xml_no_para--;
! 
!   if (elt == MEDIAOBJECT)
!     xml_insert_element (INFORMALFIGURE, END);
  }