Date: Mon, 13 Aug 2012 21:34:39 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r39376 - projects/sgml2xml/share/sgml Message-ID: <201208132134.q7DLYdRI097033@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Mon Aug 13 21:34:39 2012 New Revision: 39376 URL: http://svn.freebsd.org/changeset/doc/39376 Log: - Use XHTML customizations instead of redefining XHTML elements where possible Approved by: doceng (implicit) Modified: projects/sgml2xml/share/sgml/gallery.dtd projects/sgml2xml/share/sgml/press.dtd projects/sgml2xml/share/sgml/statusreport.dtd projects/sgml2xml/share/sgml/usergroups.dtd Modified: projects/sgml2xml/share/sgml/gallery.dtd ============================================================================== --- projects/sgml2xml/share/sgml/gallery.dtd Mon Aug 13 20:58:20 2012 (r39375) +++ projects/sgml2xml/share/sgml/gallery.dtd Mon Aug 13 21:34:39 2012 (r39376) @@ -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> - -<!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> +<!-- + 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 description %Flow;> <!ENTITY % cvs PUBLIC "-//FreeBSD//DTD FreeBSD CVS Keywords//EN" Modified: projects/sgml2xml/share/sgml/press.dtd ============================================================================== --- projects/sgml2xml/share/sgml/press.dtd Mon Aug 13 20:58:20 2012 (r39375) +++ projects/sgml2xml/share/sgml/press.dtd Mon Aug 13 21:34:39 2012 (r39376) @@ -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">; Modified: projects/sgml2xml/share/sgml/statusreport.dtd ============================================================================== --- projects/sgml2xml/share/sgml/statusreport.dtd Mon Aug 13 20:58:20 2012 (r39375) +++ projects/sgml2xml/share/sgml/statusreport.dtd Mon Aug 13 21:34:39 2012 (r39376) @@ -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 Modified: projects/sgml2xml/share/sgml/usergroups.dtd ============================================================================== --- projects/sgml2xml/share/sgml/usergroups.dtd Mon Aug 13 20:58:20 2012 (r39375) +++ projects/sgml2xml/share/sgml/usergroups.dtd Mon Aug 13 21:34:39 2012 (r39376) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208132134.q7DLYdRI097033>