texinfo/makeinfo makeinfo.c,1.49,1.50 xml.c,1.33,1.34 xml.h,1.12,1.13

[dirt]

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

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

        * makeinfo/xml.c:
        * makeinfo/xml.h: new element INLINEIMAGE.

        * makeinfo/makeinfo.c (cm_image): for XML, use INLINEIMAGE or IMAGE
        depending on paragraph state.



Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** makeinfo.c  27 Feb 2004 03:09:49 -0000      1.49
--- makeinfo.c  27 Feb 2004 03:29:47 -0000      1.50
***************
*** 3266,3275 ****
        else if (xml)
          {
!           xml_insert_element_with_attribute (IMAGE, START, "width=\"%s\" 
height=\"%s\" name=\"%s\" extension=\"%s\"",
!                                              w_arg, h_arg, name_arg, ext_arg);
            xml_insert_element (IMAGEALTTEXT, START);
            execute_string ("%s", alt_arg);
            xml_insert_element (IMAGEALTTEXT, END);
!           xml_insert_element (IMAGE, END);
          }
        else
--- 3266,3286 ----
        else if (xml)
          {
!           extern int xml_in_para;
!           extern int xml_no_para;
!           int elt = xml_in_para ? INLINEIMAGE : IMAGE;
! 
!           if (!xml_in_para)
!             xml_no_para++;
! 
!           xml_insert_element_with_attribute (elt,
!               START, "width=\"%s\" height=\"%s\" name=\"%s\" 
extension=\"%s\"",
!               w_arg, h_arg, name_arg, ext_arg);
            xml_insert_element (IMAGEALTTEXT, START);
            execute_string ("%s", alt_arg);
            xml_insert_element (IMAGEALTTEXT, END);
!           xml_insert_element (elt, END);
! 
!           if (!xml_in_para)
!             xml_no_para--;
          }
        else

Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** xml.c       24 Feb 2004 02:35:16 -0000      1.33
--- xml.c       27 Feb 2004 03:29:47 -0000      1.34
***************
*** 193,197 ****
  
    { "image",               0, 0, 0 },
!   { "alttext",             0, 0, 0 },
  
    { "",                    0, 1, 0 }, /* PRIMARY (docbook) */
--- 193,198 ----
  
    { "image",               0, 0, 0 },
!   { "inlineimage",         0, 1, 0 },
!   { "alttext",             0, 1, 0 },
  
    { "",                    0, 1, 0 }, /* PRIMARY (docbook) */
***************
*** 398,401 ****
--- 399,403 ----
  
    { "",                    0, 1, 0 }, /* IMAGE */
+   { "",                    0, 1, 0 }, /* INLINEIMAGE */
    { "",                    0, 1, 0 }, /* IMAGEALTTEXT */
  

Index: xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** xml.h       18 Feb 2004 14:02:29 -0000      1.12
--- xml.h       27 Feb 2004 03:29:47 -0000      1.13
***************
*** 89,93 ****
    PRINTINDEX, LISTOFFLOATS,
    ANCHOR, 
!   IMAGE, IMAGEALTTEXT,
    PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
      IMAGEDATA, TEXTOBJECT,  
--- 89,93 ----
    PRINTINDEX, LISTOFFLOATS,
    ANCHOR, 
!   IMAGE, INLINEIMAGE, IMAGEALTTEXT,
    PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
      IMAGEDATA, TEXTOBJECT,