From owner-svn-doc-projects@FreeBSD.ORG  Wed Apr  3 10:56:15 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 E8DF438D;
 Wed,  3 Apr 2013 10:56:15 +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 CBA98630;
 Wed,  3 Apr 2013 10:56:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33AuFTe095843;
 Wed, 3 Apr 2013 10:56:15 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33AuFQK095841;
 Wed, 3 Apr 2013 10:56:15 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201304031056.r33AuFQK095841@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 3 Apr 2013 10:56:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41361 - 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: Wed, 03 Apr 2013 10:56:16 -0000

Author: gabor
Date: Wed Apr  3 10:56:14 2013
New Revision: 41361
URL: http://svnweb.freebsd.org/changeset/doc/41361

Log:
  - Allow foreign elements in Schematron
  - Add some embedded XSLT to improve the input of validation failures

Modified:
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/xml/freebsd.sch

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Wed Apr  3 09:05:13 2013	(r41360)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Wed Apr  3 10:56:14 2013	(r41361)
@@ -338,7 +338,7 @@ NO_RTF=		yes
 schxslts+=	${sch}.xsl
 
 ${sch}.xsl: ${sch}
-	${XSLTPROC} ${XSLSCH} ${.ALLSRC} > ${.TARGET}
+	${XSLTPROC} --param allow-foreign "true" ${XSLSCH} ${.ALLSRC} > ${.TARGET}
 .endfor
 .endif
 

Modified: projects/xml-tools/share/xml/freebsd.sch
==============================================================================
--- projects/xml-tools/share/xml/freebsd.sch	Wed Apr  3 09:05:13 2013	(r41360)
+++ projects/xml-tools/share/xml/freebsd.sch	Wed Apr  3 10:56:14 2013	(r41361)
@@ -2,11 +2,17 @@
 
 <!-- $FreeBSD$ -->
 
-<schema xmlns="http://purl.oclc.org/dsdl/schematron">
+<schema xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <pattern name="Check file reference validity">
     <rule context="//imagedata|//graphic">
-      <report test="contains(@fileref, '.')">Image references cannot have an extension; the proper format is inferred by the output type to generate.</report>
-      <report test="@format">Image format must not be specified; it is inferred by the output type to generate.</report>
+      <report test="contains(@fileref, '.')">Image reference (<xsl:value-of select="@fileref"/>) cannot have an extension; the proper format is inferred by the output type to generate.</report>
+      <report test="@format">Image reference (<xsl:value-of select="@fileref"/>) format must not be specified; it is inferred by the output type to generate.</report>
+    </rule>
+  </pattern>
+
+  <pattern name="Check cross-reference validity">
+    <rule context="//link">
+      <assert test="* or normalize-space()">Link (<xsl:value-of select="@linkend"/>) element must have a content; or use xref to auto-generate the linking text.</assert>
     </rule>
   </pattern>
 
@@ -20,10 +26,10 @@
 
   <pattern name="Check profiling attributes">
     <rule context="//*/@edition">
-      <assert test="(. = 'online') or (. = 'print')">The edition attribute can only be set to 'online' or "print".</assert>
+      <assert test="(. = 'online') or (. = 'print')">Invalid edition value (<xsl:value-of select="."/>); must be either 'online' or "print".</assert>
     </rule>
     <rule context="//*/@os">
-      <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">The os attribute can only be set to 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
+      <assert test="(. = 'freebsd8') or (. = 'freebsd9') or (. = 'freebsd10')">Invalid os value (<xsl:value-of select="."/>); must be either 'freebsd8', 'freebsd9' or 'freebsd10'.</assert>
     </rule>
   </pattern>
 </schema>