svn commit: r50861 - in head: en_US.ISO8859-1/htdocs/news/status share/xml

[Benjamin Kaduk]

Author: bjk
Date: Sun Sep 17 21:33:02 2017
New Revision: 50861
URL: https://svnweb.freebsd.org/changeset/doc/50861

Log:
  Allow per-category intro text in quarterly status reports
  
  Update the dtd to permit the <p> element to appear within
  <category> and update the xsl template to render any paragraph(s)
  of such introductory text before the line break that preceeds the
  rendering of project entries in the given category.

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report.xsl
  head/share/xml/statusreport.dtd

Modified: head/en_US.ISO8859-1/htdocs/news/status/report.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Sep 17 20:45:11 2017	(r50860)
+++ head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Sun Sep 17 21:33:02 2017	(r50861)
@@ -74,7 +74,9 @@
 		<br/><h1><a>
 		  <xsl:attribute name="name"><xsl:value-of select="translate(normalize-space(description), ' ', '-')"/></xsl:attribute>
 		  <xsl:attribute name="href">#<xsl:value-of select="translate(normalize-space(description), ' ', '-')"/></xsl:attribute>
-		  <xsl:value-of select="description"/></a></h1><br/>
+		  <xsl:value-of select="description"/></a></h1>
+		  <!-- per-category intro text, if present -->
+		  <xsl:apply-templates select="p" mode="copy.html"/><br/>
 
 		<xsl:variable name="cat-short" select="name"/>
 		<xsl:apply-templates select="//project[@cat=$cat-short]">

Modified: head/share/xml/statusreport.dtd
==============================================================================
--- head/share/xml/statusreport.dtd	Sun Sep 17 20:45:11 2017	(r50860)
+++ head/share/xml/statusreport.dtd	Sun Sep 17 21:33:02 2017	(r50861)
@@ -29,7 +29,7 @@
   id		ID	#IMPLIED
 >
 
-<!ELEMENT category (name, description)>
+<!ELEMENT category (name, description, p*)>
 <!ATTLIST category
   id		ID	#IMPLIED
 >