[jboss-cvs] JBossAS SVN: r70596 - in trunk/docbook-support/jbossorg-docbook-xslt: src/main/resources/xslt/org/jboss and 1 other directory.

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

Author: newtonm
Date: 2008-03-09 14:07:46 -0400 (Sun, 09 Mar 2008)
New Revision: 70596

Modified:
   trunk/docbook-support/jbossorg-docbook-xslt/pom.xml
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
Log:
Added correct highlight.xsl file and changed version fro 1.0.0 to 1.1.0-SNAPSHOT. Also used file system for snapshot repository.

Modified: trunk/docbook-support/jbossorg-docbook-xslt/pom.xml
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/pom.xml	2008-03-09 15:19:23 UTC (rev 70595)
+++ trunk/docbook-support/jbossorg-docbook-xslt/pom.xml	2008-03-09 18:07:46 UTC (rev 70596)
@@ -7,7 +7,7 @@
     <groupId>org.jboss</groupId>
     <artifactId>jbossorg-docbook-xslt</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <name>JBoss.org DocBook XSLT</name>
     <description>The main project to transform DocBook XML into XHTML and other formats for JBoss.org Documentation.</description>
@@ -41,7 +41,8 @@
         <snapshotRepository>
             <id>snapshots.jboss.org</id>
             <name>JBoss Snapshot Repository</name>
-            <url>dav:https://snapshots.jboss.org/maven2</url>
+            <!--<url>dav:https://snapshots.jboss.org/maven2</url>-->
+            <url>file://${maven.snapshot.root}</url>
         </snapshotRepository>
     </distributionManagement>
 

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	2008-03-09 15:19:23 UTC (rev 70595)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	2008-03-09 18:07:46 UTC (rev 70596)
@@ -1,25 +1,37 @@
 <?xml version='1.0'?>
 
-<!--<!DOCTYPE xsl:stylesheet>
+<!--
+        Copyright 2007 Red Hat, Inc.
+        License: GPL
+        Author: Mark Newton <mark.newton at jboss.org>
+-->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
-	exclude-result-prefixes="#default">-->
+                version="1.0"
+                xmlns:rf="java:org.richfaces.highlight.XhtmlRendererFactory"
+                exclude-result-prefixes="#default">
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                                xmlns:exsl="http://exslt.org/common"
-                                version="1.0"
-                                exclude-result-prefixes="exsl">
-	
-  <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
-    <xsl:variable name="kidz">
-      <xsl:apply-templates></xsl:apply-templates>
-    </xsl:variable>
-    <pre class="{@role}">
-      <xsl:value-of 
-        select="javahl:highlight(string($kidz), attribute::role)"
-        xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
-        disable-output-escaping="yes"/>
-    </pre>
-  </xsl:template>
-	
+	<xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']|programlisting[@role='CSS']">
+		
+		<xsl:variable name="role">
+			<xsl:value-of select="s:toUpperCase(string(@role))" xmlns:s="java:java.lang.String"/>
+		</xsl:variable>
+		<xsl:variable name="child.content">
+			<xsl:apply-templates/>
+		</xsl:variable>
+		<xsl:variable name="factory" select="rf:instance()"/>
+		<xsl:variable name="hiliter" select="rf:getRenderer($factory, string($role))"/>
+		<pre class="{$role}">	
+			<xsl:choose>
+				<xsl:when test="$hiliter">
+					<xsl:value-of select="jhr:highlight($hiliter, $role, string($child.content), 'UTF-8', true())"
+						xmlns:jhr="com.uwyn.jhighlight.renderer.Renderer" disable-output-escaping="yes"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="$child.content"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</pre>
+		
+	</xsl:template>
+                
 </xsl:stylesheet>