From owner-svn-doc-projects@FreeBSD.ORG  Fri Feb  1 13:03:25 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3672EF2A;
 Fri,  1 Feb 2013 13:03:25 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0697F378;
 Fri,  1 Feb 2013 13:03:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11D3O0N016029;
 Fri, 1 Feb 2013 13:03:24 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11D3OAA016027;
 Fri, 1 Feb 2013 13:03:24 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201302011303.r11D3OAA016027@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 13:03:24 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40852 - in projects/xml-tools/share: mk xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Feb 2013 13:03:25 -0000

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;