From: André Malo <nd@apache.org>
Date: Wed, 5 Feb 2014 23:51:08 +0000 (+0000)
Subject: left-trim one-liner-<pre>s or -<highlight>s completely. The indentation is
X-Git-Tag: 2.5.0-alpha~4514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a4b4dd433aad69258335b4ea5117bf4108db357;p=apache

left-trim one-liner-<pre>s or -<highlight>s completely. The indentation is
usually an accident.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1565001 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/style/latex/html.xsl b/docs/manual/style/latex/html.xsl
index 3436845dc0..e610fad6db 100644
--- a/docs/manual/style/latex/html.xsl
+++ b/docs/manual/style/latex/html.xsl
@@ -153,11 +153,17 @@ interpreted in pre -->
 <xsl:template match="pre|highlight">
 <xsl:text>\begin{verbatim}</xsl:text>
 
-<xsl:call-template name="pre-rtrim">
+<!-- If it's a one-liner, trim the initial indentation as well -->
+<!-- it's most likely an accident                              -->
+<xsl:call-template name="pre-ltrim-one">
   <xsl:with-param name="string">
-    <xsl:call-template name="pre-ltrim">
+    <xsl:call-template name="pre-rtrim">
       <xsl:with-param name="string">
-        <xsl:value-of select="." />
+        <xsl:call-template name="pre-ltrim">
+          <xsl:with-param name="string">
+            <xsl:value-of select="." />
+          </xsl:with-param>
+        </xsl:call-template>
       </xsl:with-param>
     </xsl:call-template>
   </xsl:with-param>
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index bf66e3f7ab..d31a16c1fa 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -613,11 +613,15 @@ if (typeof(prettyPrint) !== 'undefined') {
 <xsl:choose>
 <!-- Simple case: only one text node -->
 <xsl:when test="node()[position() = 1 and self::text()] and count(node()) = 1">
-    <xsl:call-template name="pre-rtrim">
+    <xsl:call-template name="pre-ltrim-one">
         <xsl:with-param name="string">
-            <xsl:call-template name="pre-ltrim">
-                <xsl:with-param name="string"
-                    select="node()[position() = 1 and self::text()]" />
+            <xsl:call-template name="pre-rtrim">
+                <xsl:with-param name="string">
+                    <xsl:call-template name="pre-ltrim">
+                        <xsl:with-param name="string"
+                            select="node()[position() = 1 and self::text()]" />
+                    </xsl:call-template>
+                </xsl:with-param>
             </xsl:call-template>
         </xsl:with-param>
     </xsl:call-template>
@@ -646,11 +650,23 @@ if (typeof(prettyPrint) !== 'undefined') {
         </xsl:choose>
     </xsl:variable>
 
+    <xsl:variable name="out">
+        <xsl:apply-templates select="node()[position() &gt;= $from and position() &lt;= $to]" />
+    </xsl:variable>
+
     <xsl:if test="$from = 2">
-        <xsl:call-template name="pre-ltrim">
-            <xsl:with-param name="string"
-                select="node()[position() = 1 and self::text()]" />
-        </xsl:call-template>
+        <xsl:choose>
+        <xsl:when test="contains($out, '&#x0a;')">
+            <xsl:call-template name="pre-ltrim">
+                <xsl:with-param name="string"
+                    select="node()[position() = 1 and self::text()]" />
+            </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:variable name="tmp" select="node()[position() = 1 and self::text()]" />
+            <xsl:value-of select="substring($tmp, string-length(substring-before($tmp, substring(normalize-space($tmp), 1, 1))) + 1, string-length($tmp))" />
+        </xsl:otherwise>
+        </xsl:choose>
     </xsl:if>
 
     <xsl:apply-templates select="node()[position() &gt;= $from and position() &lt;= $to]" />
diff --git a/docs/manual/style/xsl/util/pretrim.xsl b/docs/manual/style/xsl/util/pretrim.xsl
index 49f292efff..4c8f333733 100644
--- a/docs/manual/style/xsl/util/pretrim.xsl
+++ b/docs/manual/style/xsl/util/pretrim.xsl
@@ -24,6 +24,21 @@
 <xsl:include href="string-reverse.xsl" />
 
 
+<!-- strip whitespace at the beginning if one-liner -->
+<xsl:template name="pre-ltrim-one">
+<xsl:param name="string" />
+
+<xsl:choose>
+<xsl:when test="contains($string, '&#x0a;')">
+  <xsl:value-of select="$string" />
+</xsl:when>
+<xsl:otherwise>
+    <xsl:value-of select="substring($string, string-length(substring-before($string, substring(normalize-space($string), 1, 1))) + 1, string-length($string))" />
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+
 <!-- strip empty lines at the beginning -->
 <xsl:template name="pre-ltrim">
 <xsl:param name="string" />