From owner-svn-doc-head@FreeBSD.ORG  Wed Mar  5 18:10:33 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 652F1AAE;
 Wed,  5 Mar 2014 18:10:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3305A8E;
 Wed,  5 Mar 2014 18:10:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25IAWjs028447;
 Wed, 5 Mar 2014 18:10:32 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25IAWmI028446;
 Wed, 5 Mar 2014 18:10:32 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201403051810.s25IAWmI028446@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 5 Mar 2014 18:10:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44133 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Mar 2014 18:10:33 -0000

Author: gabor
Date: Wed Mar  5 18:10:32 2014
New Revision: 44133
URL: http://svnweb.freebsd.org/changeset/doc/44133

Log:
  - Rewrite text wrapping for HTML line numbering so that empty lines
    are not lost
  
  Reported by:	wblock

Modified:
  head/share/xml/freebsd-xhtml-common.xsl

Modified: head/share/xml/freebsd-xhtml-common.xsl
==============================================================================
--- head/share/xml/freebsd-xhtml-common.xsl	Wed Mar  5 17:26:02 2014	(r44132)
+++ head/share/xml/freebsd-xhtml-common.xsl	Wed Mar  5 18:10:32 2014	(r44133)
@@ -298,9 +298,27 @@
   <xsl:template name="wrap.text">
     <xsl:param name="content"/>
 
-    <xsl:for-each select="str:tokenize($content, '&#x0A;')">
-      <span class="verbatim"><xsl:value-of select="."/>&#x0A;</span>
-    </xsl:for-each>
+    <xsl:choose>
+      <xsl:when test="starts-with($content, '&#x0A;')">
+	<span class="verbatim">&#x200b;</span>
+
+	<xsl:call-template name="wrap.text">
+	  <xsl:with-param name="content" select="substring-after($content, '&#x0A;')"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:when test="contains($content, '&#x0A;')">
+	<span class="verbatim"><xsl:value-of select="substring-before($content, '&#x0A;')"/>&#x0A;</span>
+
+	<xsl:call-template name="wrap.text">
+	  <xsl:with-param name="content" select="substring-after($content, '&#x0A;')"/>
+	</xsl:call-template>
+      </xsl:when>
+
+      <xsl:otherwise>
+	<span class="verbatim"><xsl:value-of select="$content"/>&#x0A;</span>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <!-- XXX: breaks line numbering and syntax highlighting that we do not use