From owner-svn-doc-all@FreeBSD.ORG  Mon Mar  3 16:16:58 2014
Return-Path: <owner-svn-doc-all@FreeBSD.ORG>
Delivered-To: svn-doc-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ACC5B367;
 Mon,  3 Mar 2014 16:16:58 +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 989D6AA7;
 Mon,  3 Mar 2014 16:16:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23GGwgn095880;
 Mon, 3 Mar 2014 16:16:58 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23GGwPA095878;
 Mon, 3 Mar 2014 16:16:58 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201403031616.s23GGwPA095878@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 3 Mar 2014 16:16:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r44109 - in head/share: misc 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-all@freebsd.org
X-Mailman-Version: 2.1.17
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 16:16:58 -0000

Author: gabor
Date: Mon Mar  3 16:16:57 2014
New Revision: 44109
URL: http://svnweb.freebsd.org/changeset/doc/44109

Log:
  - Add line number indicators to programlisting and screen in the HTML
    version. This makes linewrap indicators unnecessary since the
    line numbers suggest where the line is wrapped.
  
  No objection from:	doc

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

Modified: head/share/misc/docbook.css
==============================================================================
--- head/share/misc/docbook.css	Mon Mar  3 15:11:19 2014	(r44108)
+++ head/share/misc/docbook.css	Mon Mar  3 16:16:57 2014	(r44109)
@@ -265,26 +265,47 @@ html {
 	text-decoration: underline;
 }
 
-pre.screen {
-	white-space: pre;
-	overflow: auto;
+.screen {
+	white-space: pre-wrap;
 	font-family: monospace;
 	padding: 1ex;
 	background-color: #edc;
-	border: 1px solid #ccc;
+	border-style: solid;
+	border-color: #EEB985;
+	border-width: 0 0 0 24px;
 	border-radius: 6px;
 	line-height: 1.1;
+	counter-reset: code;
 }
 
-pre.programlisting {
-	white-space: pre;
-	overflow: auto;
+.programlisting {
+	white-space: pre-wrap;
 	font-family: monospace;
 	padding: 1ex;
 	background-color: #eee;
-	border: 1px solid #ccc;
+	border-style: solid;
+	border-color: #BABABA;
+	border-width: 0 0 0 24px;
 	border-radius: 6px;
 	line-height: 1.1;
+	counter-reset: code;
+}
+
+span.verbatim {
+	counter-increment: code;
+	display: block;
+	padding: 0 13px 0 29px;
+	position: relative;
+	margin: 0 -8px 0 -24px;
+	overflow: hidden;
+}
+
+span.verbatim:before {
+	width: 24px;
+	text-align: right;
+	content: counter(code) " ";
+	position: absolute;
+	left: -10px;
 }
 
 @media screen {  /* hide from IE3 */
@@ -378,7 +399,7 @@ pre.programlisting {
 	font-weight: bold;
 }
 
-pre.screen strong {
+.screen strong {
 	font-weight: normal;
 }
 

Modified: head/share/xml/freebsd-xhtml-common.xsl
==============================================================================
--- head/share/xml/freebsd-xhtml-common.xsl	Mon Mar  3 15:11:19 2014	(r44108)
+++ head/share/xml/freebsd-xhtml-common.xsl	Mon Mar  3 16:16:57 2014	(r44109)
@@ -7,6 +7,7 @@
                 version='1.0'
 		xmlns:str="http://exslt.org/strings"
                 xmlns:db="http://docbook.org/ns/docbook"
+		xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="db"
 		extension-element-prefixes="str">
 
@@ -31,6 +32,7 @@
   <xsl:param name="generate.manifest" select="1"/>
   <xsl:param name="generate.meta.abstract" select="1"/>
   <xsl:param name="html.longdesc" select="0"/>
+  <xsl:param name="hyphenate.verbatim" select="1"/>
 
   <xsl:param name="make.valid.html" select="1"/>
   <xsl:param name="html.cleanup" select="1"/>
@@ -292,4 +294,43 @@
 
     <hr/>
   </xsl:template>
+
+  <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:template>
+
+  <!-- XXX: breaks line numbering and syntax highlighting that we do not use
+       anyway -->
+  <xsl:template match="db:programlisting|db:screen|db:synopsis">
+    <xsl:variable name="id">
+      <xsl:call-template name="object.id"/>
+    </xsl:variable>
+
+    <xsl:call-template name="anchor"/>
+
+    <xsl:variable name="div.element">
+      <xsl:choose>
+	<xsl:when test="$make.clean.html != 0">div</xsl:when>
+	<xsl:otherwise>pre</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:element name="{$div.element}" namespace="http://www.w3.org/1999/xhtml">
+      <xsl:apply-templates select="." mode="common.html.attributes"/>
+      <xsl:if test="@width != ''">
+	<xsl:attribute name="width">
+	  <xsl:value-of select="@width"/>
+	</xsl:attribute>
+      </xsl:if>
+      <xsl:call-template name="wrap.text">
+	<xsl:with-param name="content">
+	  <xsl:apply-templates/>
+	</xsl:with-param>
+      </xsl:call-template>
+    </xsl:element>
+  </xsl:template>
 </xsl:stylesheet>