svn commit: r1674583 - in /jmeter/trunk: build.xml xdocs/stylesheets/website-style.xsl

[fs...@apache.org]

Author: fschumacher
Date: Sat Apr 18 20:48:22 2015
New Revision: 1674583

URL: http://svn.apache.org/r1674583
Log:
Define a doctype with html entities in the new xsl-stylesheet and use the entities.
Because of this change, we don't need to remove superfluos & anymore.

Bugzilla Id: 53764

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/xdocs/stylesheets/website-style.xsl

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1674583&r1=1674582&r2=1674583&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Apr 18 20:48:22 2015
@@ -2322,8 +2322,6 @@ run JMeter unless all the JMeter jars ar
     </copy>
     <echo level="info">Fixing EOL</echo>
     <fixcrlf encoding="iso-8859-1" srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**" fixlast="false"/>
-    <echo level="info">Remove superfluos &amp;amp;</echo>
-    <replace encoding="iso-8859-1" dir="${dest.docs}" includes="**/*.html" token="&amp;amp;" value="&amp;"/>
     <echo level="info">Removing unnecessary &lt;/br> tags</echo>
     <replace encoding="iso-8859-1" dir="${dest.docs}/" includes="**/*.html" token="&lt;/br>" value=""/>
     <copy todir="${dest.docs}/demos">

Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1674583&r1=1674582&r2=1674583&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original)
+++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Apr 18 20:48:22 2015
@@ -11,6 +11,12 @@
   language governing permissions and limitations under the License. -->
 <!-- Content Stylesheet for "jmeter-site" -->
 
+<!DOCTYPE xsl:stylesheet [
+  <!ENTITY copy  "&#x000A9;">
+  <!ENTITY nbsp  "&#160;">
+  <!ENTITY ndash "&#x02013;">
+  <!ENTITY para  "&#x000B6;">
+]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   version="3.0"
 >
@@ -148,8 +154,8 @@
         </div>
         <div class="footer">
           <div class="copyright">
-            Copyright &amp;copy;
-            1999 &amp;ndash;
+            Copyright &copy;
+            1999 &ndash;
             <xsl:value-of select="$year" />
             , Apache Software Foundation
           </div>
@@ -380,7 +386,7 @@
     <xsl:param name="anchor" />
     <a class="sectionlink" href="#{translate(normalize-space($anchor), ' ', '_')}"
       title="Link to here"
-    >&amp;para;</a>
+    >&para;</a>
   </xsl:template>
 
   <xsl:template match="properties">