os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

- Properly validate and process XInclude

Browse source
This commit is contained in:
Gabor Kovesdan 2013-02-01 13:03:24 +00:00
parent 33e89a267c
commit 5a8e3a368d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/projects/xml-tools/; revision=40852
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/mk/doc.docbook.mk
View file

@ -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 -------------------------------------------------------------

26
share/xml/freebsd45.dtd
View file

@ -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;