From svn-return-7438-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org Wed Dec 12 12:21:23 2007
Return-Path: <svn-return-7438-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 3047 invoked from network); 12 Dec 2007 12:21:23 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Dec 2007 12:21:23 -0000
Received: (qmail 46989 invoked by uid 500); 12 Dec 2007 12:21:12 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 46940 invoked by uid 500); 12 Dec 2007 12:21:12 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 46931 invoked by uid 99); 12 Dec 2007 12:21:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Dec 2007 04:21:12 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Dec 2007 12:20:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B42A21A9832; Wed, 12 Dec 2007 04:21:01 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r603589 - in
 /forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets:
 generateId.xsl hooks-to-html.xsl variable.helper.xsl
Date: Wed, 12 Dec 2007 12:21:01 -0000
To: svn@forrest.apache.org
From: thorsten@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071212122101.B42A21A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: thorsten
Date: Wed Dec 12 04:21:00 2007
New Revision: 603589

URL: http://svn.apache.org/viewvc?rev=603589&view=rev
Log:
Minor changes to meet the new environment of the xsls

Modified:
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl
    forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl

Modified: forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl?rev=603589&r1=603588&r2=603589&view=diff
==============================================================================
--- forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl (original)
+++ forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/generateId.xsl Wed Dec 12 04:21:00 2007
@@ -17,26 +17,19 @@
 -->
 <!--
 This stylesheet contains templates for converting documentv11 to HTML.  See the
-imported document-to-html.xsl for details.
+imported document2html.xsl for details.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!-- Template that generates an id -->
-  <xsl:include href="lm://transform.xml.replaceCharsInString"/>
+<!--  Templates for "toc" mode.  This will generate a complete
+        Table of Contents for the document.  This will then be used
+        by the site2xhtml to generate a Menu ToC and a Page ToC -->
   <xsl:template name="generate-id">
     <xsl:choose>
       <xsl:when test="@id">
-        <xsl:call-template name="replaceCharsInString">
-          <xsl:with-param name="stringIn" select="@id"/>
-          <xsl:with-param name="charsIn" select="' '"/>
-          <xsl:with-param name="charsOut" select="'-'"/>
-        </xsl:call-template>
+        <xsl:value-of select="@id"/>
       </xsl:when>
-      <xsl:when test="@title">
-        <xsl:call-template name="replaceCharsInString">
-          <xsl:with-param name="stringIn" select="@title"/>
-          <xsl:with-param name="charsIn" select="' '"/>
-          <xsl:with-param name="charsOut" select="'-'"/>
-        </xsl:call-template>
+      <xsl:when test="title">
+        <xsl:value-of select="title"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="generate-id(.)"/>

Modified: forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl?rev=603589&r1=603588&r2=603589&view=diff
==============================================================================
--- forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl (original)
+++ forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/hooks-to-html.xsl Wed Dec 12 04:21:00 2007
@@ -33,7 +33,12 @@
       </div>
     </xsl:if>
     <xsl:if test="@type='inline'">
-      <span id="{@name}">
+      <span>
+        <xsl:if test="@name">
+          <xsl:attribute name="id">
+            <xsl:value-of select="@name"/>
+          </xsl:attribute>
+        </xsl:if>
         <xsl:call-template name="attributes"/>
         <xsl:if test="@nbsp='true'">
 <xsl:text> </xsl:text>

Modified: forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl?rev=603589&r1=603588&r2=603589&view=diff
==============================================================================
--- forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl (original)
+++ forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/src/main/resources/COB-INF/resource/stylesheets/variable.helper.xsl Wed Dec 12 04:21:00 2007
@@ -18,8 +18,8 @@
 <xsl:stylesheet version="1.0"
   xmlns:forrest="http://apache.org/forrest/properties/1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="lm://transform.xml.dotdots"/>
-  <xsl:import href="lm://transform.xml.pathutils"/>
+  <xsl:import href="dotdots.xsl"/>
+  <xsl:import href="pathutils.xsl"/>
   <xsl:param name="path" select="'test.html'"/>
   <xsl:param name="theme" select="'notheme'"/>
 <!-- Path (..'s) to the root directory -->