[jboss-cvs] JBossAS SVN: r107221 - projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss.

[jboss-cvs-commits at lists.jboss.org]

Author: jaredmorgs
Date: 2010-07-29 20:58:14 -0400 (Thu, 29 Jul 2010)
New Revision: 107221

Modified:
   projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl
   projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
Log:
Applied patch from JDOCBOOKSTYLE-4 in preparation for v1.1.1 of styles

Modified: projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl
===================================================================
--- projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl	2010-07-30 00:13:08 UTC (rev 107220)
+++ projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/pdf.xsl	2010-07-30 00:58:14 UTC (rev 107221)
@@ -1489,14 +1489,14 @@
 </xsl:template>
 
    
-  <xsl:template match="programlisting|programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
+  <xsl:template match="programlisting">
     
-    <xsl:variable name="role">
-      <xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
+    <xsl:variable name="language">
+      <xsl:value-of select="s:toUpperCase(string(@language))" xmlns:s="java:java.lang.String"/>
     </xsl:variable>
 
     <xsl:variable name="hilighter" select="jbh:new()"/>
-    <xsl:variable name="parsable" select="jbh:isParsable($role)"/>
+    <xsl:variable name="parsable" select="jbh:isParsable($language)"/>
     
     <fo:block background-color="#F5F5F5"
               border-style="solid"
@@ -1521,7 +1521,7 @@
             <xsl:when test="self::text()">
               <xsl:variable name="child.content" select="."/>
       
-              <xsl:variable name="caller" select="jbh:parseText($hilighter, $role, string($child.content), 'UTF-8')"/>
+              <xsl:variable name="caller" select="jbh:parseText($hilighter, $language, string($child.content), 'UTF-8')"/>
               <xsl:variable name="noOfTokens" select="jbh:getNoOfTokens($caller)"/>
 
               <xsl:call-template name="iterator">

Modified: projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl
===================================================================
--- projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2010-07-30 00:13:08 UTC (rev 107220)
+++ projects/docs/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/xhtml-common.xsl	2010-07-30 00:58:14 UTC (rev 107221)
@@ -511,16 +511,16 @@
   </xsl:if>
 </xsl:template>
 
-  <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
+  <xsl:template match="programlisting">
     
-    <xsl:variable name="role">
-      <xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
+    <xsl:variable name="language">
+      <xsl:value-of select="s:toUpperCase(string(@language))" xmlns:s="java:java.lang.String"/>
     </xsl:variable>
     
     <xsl:variable name="factory" select="rf:instance()"/>
-    <xsl:variable name="hiliter" select="rf:getRenderer($factory, string($role))"/>
+    <xsl:variable name="hiliter" select="rf:getRenderer($factory, string($language))"/>
 
-    <pre class="{$role}">
+    <pre class="{$language}">
     <xsl:choose>
       <xsl:when test="$hiliter">
             <xsl:for-each select="node()">
@@ -528,7 +528,7 @@
                 <xsl:when test="self::text()">
                   <xsl:variable name="child.content" select="."/>
           
-                  <xsl:value-of select="jhr:highlight($hiliter, $role, string($child.content), 'UTF-8', true())"
+                  <xsl:value-of select="jhr:highlight($hiliter, $language, string($child.content), 'UTF-8', true())"
             xmlns:jhr="com.uwyn.jhighlight.renderer.Renderer" disable-output-escaping="yes"/>
           </xsl:when>
                 <xsl:otherwise>