[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/makeinfo makeinfo.c,1.13,1.14 xml.c,1.9,1.10 xml.h,1.4,1.5 texin
|
From: |
dirt |
|
Subject: |
texinfo/makeinfo makeinfo.c,1.13,1.14 xml.c,1.9,1.10 xml.h,1.4,1.5 texinfo.dtd,1.4,1.5 |
|
Date: |
Tue, 30 Dec 2003 12:15:25 +0100 |
Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv7445/makeinfo
Modified Files:
makeinfo.c xml.c xml.h texinfo.dtd
Log Message:
2003-12-30 Alper Ersoy <address@hidden>
* makeinfo/xml.c:
* makeinfo/xml.h: added new element alttext (IMAGEALTTEXT),
as a child of image.
* makeinfo/makeinfo.c (cm_image): moved alttext attribute to the new
alttext child in XML output, to keep markup intact. Moved filename
CDATA to name attribute.
* makeinfo/texinfo.dtd: updated image element.
Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** makeinfo.c 2003/12/30 10:32:39 1.13
--- makeinfo.c 2003/12/30 11:15:23 1.14
***************
*** 3785,3791 ****
else if (xml)
{
! xml_insert_element_with_attribute (IMAGE, START, "width=\"%s\"
height=\"%s\" alttext=\"%s\" extension=\"%s\"",
! w_arg, h_arg, alt_arg, ext_arg);
! add_word (name_arg);
xml_insert_element (IMAGE, END);
}
--- 3785,3793 ----
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);
}
Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** xml.c 2003/12/25 11:04:58 1.9
--- xml.c 2003/12/30 11:15:23 1.10
***************
*** 189,193 ****
{ "listoffloats", 0, 0, 0 },
{ "anchor", 0, 1, 0 },
! { "image", 0, 1, 0 },
{ "", 0, 1, 0 }, /* PRIMARY (docbook) */
{ "", 0, 1, 0 }, /* SECONDARY (docbook) */
--- 189,196 ----
{ "listoffloats", 0, 0, 0 },
{ "anchor", 0, 1, 0 },
!
! { "image", 0, 0, 0 },
! { "alttext", 0, 0, 0 },
!
{ "", 0, 1, 0 }, /* PRIMARY (docbook) */
{ "", 0, 1, 0 }, /* SECONDARY (docbook) */
***************
*** 387,391 ****
--- 390,397 ----
{ "", 0, 1, 0 }, /* LISTOFFLOATS */
{ "", 0, 1, 0 }, /* ANCHOR */
+
{ "", 0, 1, 0 }, /* IMAGE */
+ { "", 0, 1, 0 }, /* IMAGEALTTEXT */
+
{ "primary", 0, 1, 0 }, /* PRIMARY */
{ "secondary", 0, 1, 0 },
Index: xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xml.h 2003/12/19 15:48:32 1.4
--- xml.h 2003/12/30 11:15:23 1.5
***************
*** 80,84 ****
PRINTINDEX, LISTOFFLOATS,
ANCHOR,
! IMAGE,
PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
IMAGEDATA, TEXTOBJECT,
--- 80,84 ----
PRINTINDEX, LISTOFFLOATS,
ANCHOR,
! IMAGE, IMAGEALTTEXT,
PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
IMAGEDATA, TEXTOBJECT,
Index: texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/texinfo.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** texinfo.dtd 2003/12/19 15:48:32 1.4
--- texinfo.dtd 2003/12/30 11:15:23 1.5
***************
*** 72,77 ****
| %section.level3;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;
| printindex)*">
--- 72,77 ----
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;
| printindex)*">
***************
*** 80,96 ****
| %section.level3;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
--- 80,96 ----
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
***************
*** 148,152 ****
<!-- ***** -->
<!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
! (%section.all; | %block; | %toc; | %lang;)*) >
<!ELEMENT nodename (#PCDATA)>
--- 148,152 ----
<!-- ***** -->
<!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
! (%section.all; | %block; | image | %toc; | %lang;)*) >
<!ELEMENT nodename (#PCDATA)>
***************
*** 199,203 ****
<!ELEMENT center (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT group (#PCDATA | %block; | %Inline.phrase;)*>
! <!ELEMENT image (#PCDATA)>
<!-- Whitespace in these elements are always preserved -->
--- 199,210 ----
<!ELEMENT center (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT group (#PCDATA | %block; | %Inline.phrase;)*>
!
! <!ELEMENT image (alttext)>
! <!ELEMENT alttext (#PCDATA)>
! <!ATTLIST image
! name CDATA #REQUIRED
! extension CDATA #REQUIRED
! width CDATA #REQUIRED
! height CDATA #REQUIRED>
<!-- Whitespace in these elements are always preserved -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/makeinfo makeinfo.c,1.13,1.14 xml.c,1.9,1.10 xml.h,1.4,1.5 texinfo.dtd,1.4,1.5,
dirt <=