From owner-svn-doc-all@freebsd.org  Wed Apr 13 15:22:43 2016
Return-Path: <owner-svn-doc-all@freebsd.org>
Delivered-To: svn-doc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C245EB0E4B9;
 Wed, 13 Apr 2016 15:22:43 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9593E1ED5;
 Wed, 13 Apr 2016 15:22:43 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3DFMgiT088427;
 Wed, 13 Apr 2016 15:22:42 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DFMg0q088426;
 Wed, 13 Apr 2016 15:22:42 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201604131522.u3DFMg0q088426@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Wed, 13 Apr 2016 15:22:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48609 - head/en_US.ISO8859-1/htdocs/news/status
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire doc trees \(except for &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Apr 2016 15:22:43 -0000

Author: wblock
Date: Wed Apr 13 15:22:42 2016
New Revision: 48609
URL: https://svnweb.freebsd.org/changeset/doc/48609

Log:
  The stylesheet did not consider long, wrapped lines when generating IDs,
  and produced broken IDs with linefeeds and multiple dashes.  Fix that
  with numerous applications of normalize-space() before translating
  spaces into dashes.  This stylesheet is XSL 1.0. I don't know if there
  is a reason for that.  If it were XSL 2.0, we could define a single
  xsl:function to format IDs and factor out all these normalize-space()
  and translate(, ' ','-') functions into it.

Modified:
  head/en_US.ISO8859-1/htdocs/news/status/report.xsl

Modified: head/en_US.ISO8859-1/htdocs/news/status/report.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Wed Apr 13 14:04:51 2016	(r48608)
+++ head/en_US.ISO8859-1/htdocs/news/status/report.xsl	Wed Apr 13 15:22:42 2016	(r48609)
@@ -30,14 +30,14 @@
 	<xsl:for-each select="report/category">
 	  <!-- category title and link -->
 	  <h3><a><xsl:attribute name="href">#<xsl:value-of
-	    select="translate(description,' ', '-')"/></xsl:attribute>
+	    select="translate(normalize-space(description),' ', '-')"/></xsl:attribute>
 	    <xsl:value-of select="description"/></a></h3>
 	  <xsl:variable name="cat-short" select="name"/>
 	  <ul>
 	    <xsl:for-each select="//project[@cat=$cat-short and @summary]">
   	      <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	      <li><a><xsl:attribute name="href">#<xsl:value-of
-	      select="translate(title, ' ',
+	      select="translate(normalize-space(title), ' ',
 	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
 	      </li>
 	    </xsl:for-each>
@@ -45,7 +45,7 @@
 	    <xsl:for-each select="//project[@cat=$cat-short and not(@summary)]">
   	      <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	      <li><a><xsl:attribute name="href">#<xsl:value-of
-	      select="translate(title, ' ',
+	      select="translate(normalize-space(title), ' ',
 	      '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
 	      </li>
 	    </xsl:for-each>
@@ -55,7 +55,7 @@
 	  <xsl:for-each select="//project[not(@cat)]">
   	    <xsl:sort select="translate(title, $lowercase, $uppercase)"/>
 	    <li><a><xsl:attribute name="href">#<xsl:value-of
-	    select="translate(title, ' ',
+	    select="translate(normalize-space(title), ' ',
 	    '-')"/></xsl:attribute><xsl:value-of select="title"/></a>
 	    </li>
 	  </xsl:for-each>
@@ -72,8 +72,8 @@
 
 		<!-- category title -->
 		<br/><h1><a>
-		  <xsl:attribute name="name"><xsl:value-of select="translate(description, ' ', '-')"/></xsl:attribute>
-		  <xsl:attribute name="href">#<xsl:value-of select="translate(description, ' ', '-')"/></xsl:attribute>
+		  <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:variable name="cat-short" select="name"/>
@@ -108,9 +108,9 @@
   <xsl:template match="project">
     <h2><a>
 	<xsl:attribute name="name"><xsl:value-of
-	  select="translate(title, ' ', '-')"/></xsl:attribute>
+	  select="translate(normalize-space(title), ' ', '-')"/></xsl:attribute>
 	  <xsl:attribute name="href">#<xsl:value-of
-	  select="translate(title, ' ', '-')"/></xsl:attribute>
+	  select="translate(normalize-space(title), ' ', '-')"/></xsl:attribute>
 	  <xsl:value-of select="title"/></a></h2>
 
     <xsl:apply-templates select="links"/>