httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/docs/manual/style/xsl/util nbsp.xml
Date Mon, 14 Apr 2003 17:50:51 GMT
nd          2003/04/14 10:50:50

  Modified:    docs/manual/style/xsl common.xsl directiveindex.xsl
                        indexpage.xsl manualpage.xsl moduleindex.xsl
                        quickreference.xsl sitemap.xsl synopsis.xsl
  Added:       docs/manual/style/xsl/util nbsp.xml
  Log:
  filter no-break-spaces in text output. In some environments (e.g. mine)
  they are not transformed correctly.
  This change defines the output to be exactly " " (without quotes)
  
  Revision  Changes    Path
  1.27      +31 -4     httpd-2.0/docs/manual/style/xsl/common.xsl
  
  Index: common.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/common.xsl,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- common.xsl	12 Apr 2003 14:35:50 -0000	1.26
  +++ common.xsl	14 Apr 2003 17:50:49 -0000	1.27
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  @@ -754,6 +756,31 @@
   
   
     <!--                                                    -->
  +  <!-- Filter &#160; in text() nodes.                     -->
  +  <!-- In some environments this character won't be       -->
  +  <!-- transformed correctly, so we just write it         -->
  +  <!-- explicitely as "&nbsp;"                            -->
  +  <!--                                                    -->
  +  <xsl:template match="text()" name="filter.nbsp">
  +  <xsl:param name="text"><xsl:value-of select="."/></xsl:param>
  +    <xsl:choose>
  +        <xsl:when test="contains($text, '&#160;')">
  +            <xsl:value-of select="substring-before($text, '&#160;')"/>
  +            &nbsp;
  +            <xsl:call-template name="filter.nbsp">
  +                <xsl:with-param name="text"
  +                              select="substring-after($text, '&#160;')"/>
  +            </xsl:call-template>
  +        </xsl:when>
  +
  +        <xsl:otherwise>
  +            <xsl:value-of select="$text"/>
  +        </xsl:otherwise>
  +    </xsl:choose>
  +  </xsl:template>
  +
  +
  +  <!--                                                    -->
     <!-- Process everything else by just passing it through -->
     <!--                                                    -->
     <xsl:template match="*|@*">
  @@ -776,9 +803,9 @@
       </xsl:if>
   
       <a href="#{substring($letters,1,1)}">
  -      <xsl:text>&nbsp;</xsl:text>
  +      &nbsp;
         <xsl:value-of select="substring($letters,1,1)"/>
  -      <xsl:text>&nbsp;</xsl:text>
  +      &nbsp;
       </a>
   
       <xsl:if test="string-length($letters) &gt; 1">
  @@ -849,4 +876,4 @@
     </xsl:template>
     <!-- /module-translatename -->
   
  -</xsl:stylesheet>
  \ No newline at end of file
  +</xsl:stylesheet>
  
  
  
  1.9       +3 -1      httpd-2.0/docs/manual/style/xsl/directiveindex.xsl
  
  Index: directiveindex.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/directiveindex.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- directiveindex.xsl	11 Apr 2003 21:17:44 -0000	1.8
  +++ directiveindex.xsl	14 Apr 2003 17:50:49 -0000	1.9
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.3       +3 -1      httpd-2.0/docs/manual/style/xsl/indexpage.xsl
  
  Index: indexpage.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/indexpage.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- indexpage.xsl	9 Apr 2003 12:21:21 -0000	1.2
  +++ indexpage.xsl	14 Apr 2003 17:50:49 -0000	1.3
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.4       +3 -1      httpd-2.0/docs/manual/style/xsl/manualpage.xsl
  
  Index: manualpage.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/manualpage.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- manualpage.xsl	9 Apr 2003 14:54:42 -0000	1.3
  +++ manualpage.xsl	14 Apr 2003 17:50:49 -0000	1.4
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.10      +3 -1      httpd-2.0/docs/manual/style/xsl/moduleindex.xsl
  
  Index: moduleindex.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/moduleindex.xsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- moduleindex.xsl	11 Apr 2003 21:17:44 -0000	1.9
  +++ moduleindex.xsl	14 Apr 2003 17:50:49 -0000	1.10
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.11      +4 -2      httpd-2.0/docs/manual/style/xsl/quickreference.xsl
  
  Index: quickreference.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/quickreference.xsl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- quickreference.xsl	11 Apr 2003 21:17:44 -0000	1.10
  +++ quickreference.xsl	14 Apr 2003 17:50:49 -0000	1.11
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  @@ -214,4 +216,4 @@
     </xsl:template>
     <!-- /reference-of-letter -->
   
  -</xsl:stylesheet>
  \ No newline at end of file
  +</xsl:stylesheet>
  
  
  
  1.9       +3 -1      httpd-2.0/docs/manual/style/xsl/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/sitemap.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- sitemap.xsl	6 Apr 2003 18:01:34 -0000	1.8
  +++ sitemap.xsl	14 Apr 2003 17:50:49 -0000	1.9
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.12      +3 -1      httpd-2.0/docs/manual/style/xsl/synopsis.xsl
  
  Index: synopsis.xsl
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/synopsis.xsl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- synopsis.xsl	9 Jan 2003 03:19:00 -0000	1.11
  +++ synopsis.xsl	14 Apr 2003 17:50:49 -0000	1.12
  @@ -1,5 +1,7 @@
   <?xml version="1.0"?>
  -<!DOCTYPE xsl:stylesheet [ <!ENTITY nbsp "&#160;"> ]>
  +<!DOCTYPE xsl:stylesheet [
  +    <!ENTITY nbsp SYSTEM "util/nbsp.xml">
  +]>
   <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                     xmlns="http://www.w3.org/1999/xhtml">
  
  
  
  1.1                  httpd-2.0/docs/manual/style/xsl/util/nbsp.xml
  
  Index: nbsp.xml
  ===================================================================
  <?xml version="1.0" encoding="utf-8"?>
  
  <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text> 
  
  
  

Mime
View raw message