Date: Fri, 1 Feb 2013 13:03:24 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40852 - in projects/xml-tools/share: mk xml Message-ID: <201302011303.r11D3OAA016027@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Fri Feb 1 13:03:24 2013 New Revision: 40852 URL: http://svnweb.freebsd.org/changeset/doc/40852 Log: - Properly validate and process XInclude Modified: projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/freebsd45.dtd Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 11:04:50 2013 (r40851) +++ projects/xml-tools/share/mk/doc.docbook.mk Fri Feb 1 13:03:24 2013 (r40852) @@ -490,7 +490,7 @@ NO_RTF= yes # Parsed XML ------------------------------------------------------- ${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --nonet --noent --valid --dropdtd ${MASTERDOC} > ${.TARGET} + ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET} # XHTML ------------------------------------------------------------- Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 11:04:50 2013 (r40851) +++ projects/xml-tools/share/xml/freebsd45.dtd Fri Feb 1 13:03:24 2013 (r40852) @@ -11,6 +11,32 @@ <!ENTITY % ISOgrk4.module "IGNORE"> +<!ENTITY % xmlns.attrib + "xmlns CDATA #IMPLIED"> + +<!ENTITY % xmlns.xi.attrib + "xmlns:xi CDATA #IMPLIED"> + +<!ENTITY % local.common.attrib "%xmlns.attrib; + %xmlns.xi.attrib;"> + +<!ELEMENT xi:include (xi:fallback?)> + +<!ATTLIST xi:include + xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude" + href CDATA #IMPLIED + parse (xml|text) "xml" + xpointer CDATA #IMPLIED + encoding CDATA #IMPLIED + accept CDATA #IMPLIED + accept-language CDATA #IMPLIED +> + +<!ELEMENT xi:fallback ANY> +<!ATTLIST xi:fallback + xmlns:xi CDATA #FIXED "http://www.w3.org/2001/XInclude" +> + <!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "/usr/local/share/xml/docbook/4.5/docbookx.dtd"> %orig-docbook;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302011303.r11D3OAA016027>