- Use XHTML customizations instead of redefining XHTML elements where possible

Approved by:	doceng (implicit)
This commit is contained in:
Gabor Kovesdan 2012-08-13 21:34:39 +00:00
parent 89b9da42e7
commit 06db13014c
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/projects/sgml2xml/; revision=39376
4 changed files with 22 additions and 73 deletions

View file

@ -21,24 +21,15 @@
<!ELEMENT name (#PCDATA)>
<!ELEMENT url (#PCDATA)>
<!ELEMENT description (#PCDATA|a|b|br|i|tt|em|p|strong|img|ul)*>
<!-- misc HTML tags -->
<!ELEMENT a (#PCDATA|img)*>
<!ATTLIST a href CDATA #REQUIRED>
<!--
Allow full HTML cotent in description.
-->
<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
%html.orig;
<!ELEMENT b (#PCDATA|a)*>
<!ELEMENT br (#PCDATA|a)*>
<!ELEMENT i (#PCDATA|a)*>
<!ELEMENT tt (#PCDATA|a)*>
<!ELEMENT em (#PCDATA|a)*>
<!ELEMENT p (#PCDATA|a)*>
<!ELEMENT strong (#PCDATA|a)*>
<!ELEMENT ul (li)*>
<!ELEMENT li (#PCDATA|a)*>
<!ELEMENT img (#PCDATA|a)*>
<!ATTLIST img alt CDATA #IMPLIED>
<!ATTLIST img src CDATA #REQUIRED>
<!ELEMENT description %Flow;>
<!ENTITY % cvs
PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"

View file

@ -12,6 +12,10 @@
id ID #IMPLIED
>
<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
%html.orig;
<!ELEMENT story (name, url, site-name, site-url, date, author, (p)+)>
<!ATTLIST storyevent
id ID #IMPLIED
@ -42,22 +46,6 @@
id ID #IMPLIED
>
<!ELEMENT p (#PCDATA | a | tt)*>
<!ATTLIST p
id ID #IMPLIED
>
<!ELEMENT tt (#PCDATA)>
<!ATTLIST tt
id ID #IMPLIED
>
<!ELEMENT a (#PCDATA)>
<!ATTLIST a
id ID #IMPLIED
href CDATA #REQUIRED
>
<!ENTITY % cvs
PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN"
"http://www.FreeBSD.org/XML/doc/share/sgml/cvs.dtd">

View file

@ -1,5 +1,12 @@
<!-- $FreeBSD$ -->
<!--
Allow full HTML cotent in body.
-->
<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
%html.orig;
<!ELEMENT report (date, section, category+, project+)>
<!ELEMENT date (month, year)>
@ -43,11 +50,6 @@
cat CDATA #REQUIRED
>
<!ELEMENT title (#PCDATA)>
<!ATTLIST title
id ID #IMPLIED
>
<!ELEMENT contact (person+)>
<!ATTLIST contact
id ID #IMPLIED
@ -84,36 +86,6 @@
href CDATA #REQUIRED
>
<!ENTITY % mixed.inline "#PCDATA | a | br | p | strong | b | em | ul">
<!ELEMENT body (%mixed.inline;)*>
<!ATTLIST body
id ID #IMPLIED
>
<!ELEMENT br EMPTY>
<!ELEMENT ul (li)+>
<!ATTLIST ul
id ID #IMPLIED
>
<!ELEMENT li (%mixed.inline;)*>
<!ATTLIST li
id ID #IMPLIED
>
<!ELEMENT p (%mixed.inline;)*>
<!ATTLIST p
id ID #IMPLIED
>
<!ELEMENT a (#PCDATA)>
<!ATTLIST a
id ID #IMPLIED
href CDATA #REQUIRED
>
<!ELEMENT help (task)+>
<!ATTLIST help
id ID #IMPLIED

View file

@ -16,13 +16,11 @@
<!ELEMENT url (#PCDATA)>
<!ELEMENT description (#PCDATA|a)*>
<!ENTITY % html.orig PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
%html.orig;
<!ELEMENT a (#PCDATA)>
<!ATTLIST a
id ID #IMPLIED
href CDATA #REQUIRED
>
<!ELEMENT description (#PCDATA|a)*>
<!ENTITY % iso8879.ent
PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"