- Port PGP keyring generation to XSLT

svn path=/head/; revision=41710

en_US.ISO8859-1/books/handbook/Makefile

@@ -299,7 +299,7 @@ XMLFLAGS+= ${CHAPTERS:S/\/chapter.xml//:S/^/-i chap./}
 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

share/mk/doc.docbook.mk

@@ -78,13 +78,13 @@ XMLDECL?=	/usr/local/share/sgml/docbook/dsssl/modular/dtds/decls/xml.dcl
 
 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
 

share/xml/pgp.dsl

@@ -1,26 +0,0 @@
-<!-- $FreeBSD$ -->
-
-<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
-]>
-
-<style-sheet>
-  <style-specification use="docbook">
-    <style-specification-body>
-
-      (element book
-        (process-node-list (select-elements (descendants (current-node)) (normalize "programlisting"))))
-
-      (element programlisting
-        (if (equal? (attribute-string (normalize "role")) "pgpkey")
-            (make sequence
-	      (process-children)
-	      (literal "
-"))
-	    (empty-sosofo)))
-
-    </style-specification-body>
-  </style-specification>
-
-  <external-specification id="docbook" document="docbook.dsl">
-</style-sheet>

share/xsl/freebsd-pgpkeyring.xsl

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