You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/12/21 00:35:31 UTC
svn commit: r358144 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy:
input.xmap resources/stylesheets/daisy-to-html.xsl
Author: rgardler
Date: Tue Dec 20 15:35:23 2005
New Revision: 358144
URL: http://svn.apache.org/viewcvs?rev=358144&view=rev
Log:
use daisyExt to identify documents to be handled by the daisy plugin
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?rev=358144&r1=358143&r2=358144&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Tue Dec 20 15:35:23 2005
@@ -37,9 +37,10 @@
<map:part src="cocoon://{project:daisy.pathPrefix}{docID}.daisy.source" />
<map:part src="cocoon://daisy.site.{project:daisy.navigation.docID}" />
</map:aggregate>
- <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl">
+ <map:transform src="{lm:daisy.transform.daisy.html}">
<map:parameter name="documentPath" value="{path}"/>
<map:parameter name="pathPrefix" value="{project:daisy.pathPrefix}"/>
+ <map:parameter name="daisyExt" value="{project:daisy.fileExt}"/>
</map:transform>
<map:transform src="{lm:transform.html.document}"/>
<map:select type="exists">
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl?rev=358144&r1=358143&r2=358144&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl Tue Dec 20 15:35:23 2005
@@ -195,7 +195,7 @@
<xsl:variable name="url">
<xsl:choose>
<xsl:when test="//daisyDocument/descendant::doc[@id=$docId]"><xsl:value-of select="$pathToRoot"/><xsl:value-of select="$path"/><xsl:value-of select="//doc[@id=$docId]/@href"/><xsl:value-of select="$anchor"/></xsl:when>
- <xsl:otherwise><xsl:value-of select="$pathToRoot"/><xsl:value-of select="$docId"/><xsl:value-of select="$daisyExt"/>.html<xsl:value-of select="$anchor"/></xsl:otherwise>
+ <xsl:otherwise><xsl:value-of select="$pathToRoot"/><xsl:value-of select="$path"/><xsl:value-of select="$docId"/><xsl:value-of select="$daisyExt"/>.html<xsl:value-of select="$anchor"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<a>