svn commit: r41710 - in head: en_US.ISO8859-1/books/handbook share/mk share/xml share/xsl

[Gabor Kovesdan]

Author: gabor
Date: Thu May 23 06:12:40 2013
New Revision: 41710
URL: http://svnweb.freebsd.org/changeset/doc/41710

Log:
  - Port PGP keyring generation to XSLT

Added:
  head/share/xsl/freebsd-pgpkeyring.xsl   (contents, props changed)
Deleted:
  head/share/xml/pgp.dsl
Modified:
  head/en_US.ISO8859-1/books/handbook/Makefile
  head/share/mk/doc.docbook.mk

Modified: head/en_US.ISO8859-1/books/handbook/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/Makefile	Wed May 22 20:41:12 2013	(r41709)
+++ head/en_US.ISO8859-1/books/handbook/Makefile	Thu May 23 06:12:40 2013	(r41710)
@@ -299,7 +299,7 @@ XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:
 XMLFLAGS+= -i chap.freebsd-glossary
 
 pgpkeyring: pgpkeys/chapter.xml ${DOC}.parsed.xml
-	@${JADE} -V nochunks ${JADEOPTS} -d ${DSLPGP} -t xml ${XMLDECL} ${DOC}.parsed.print.xml
+	@${XSLTPROC} ${XSLPGP} ${DOC}.parsed.xml
 
 #
 # Handbook-specific variables

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Wed May 22 20:41:12 2013	(r41709)
+++ head/share/mk/doc.docbook.mk	Thu May 23 06:12:40 2013	(r41710)
@@ -78,13 +78,13 @@ XMLDECL?=	/usr/local/share/sgml/docbook/
 
 DSLHTML?=	${DOC_PREFIX}/share/xml/spellcheck.dsl
 DSLPRINT?=	${DOC_PREFIX}/share/xml/default.dsl
-DSLPGP?=	${DOC_PREFIX}/share/xml/pgp.dsl
 
 XSLPROF?=	/usr/local/share/xsl/docbook/profiling/profile.xsl
 XSLXHTML?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml.xsl
 XSLXHTMLCHUNK?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-xhtml-chunk.xsl
 XSLEPUB?=	${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-epub.xsl
 XSLFO?=		${DOC_PREFIX}/${LANGCODE}/share/xsl/freebsd-fo.xsl
+XSLPGP?=	${DOC_PREFIX}/share/xsl/freebsd-pgpkeyring.xsl
 
 XSLSCH?=	/usr/local/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl
 

Added: head/share/xsl/freebsd-pgpkeyring.xsl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/xsl/freebsd-pgpkeyring.xsl	Thu May 23 06:12:40 2013	(r41710)
@@ -0,0 +1,16 @@
+<?xml version='1.0'?>
+
+<!-- $FreeBSD$ -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version='1.0'>
+
+  <xsl:output method="text"/>
+
+  <xsl:template match="/">
+    <xsl:for-each select="//programlisting[@role='pgpkey']">
+      <xsl:value-of select="."/>
+      <xsl:text>&#xA;</xsl:text>
+    </xsl:for-each>
+  </xsl:template>
+</xsl:stylesheet>