forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r344988 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy: ./ resources/stylesheets/ src/documentation/content/ src/documentation/content/xdocs/
Date Wed, 16 Nov 2005 12:19:59 GMT
Author: rgardler
Date: Wed Nov 16 04:19:42 2005
New Revision: 344988

URL: http://svn.apache.org/viewcvs?rev=344988&view=rev
Log:
need recursive includes

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/forrest.properties
Wed Nov 16 04:19:42 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.input.Daisy,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf

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=344988&r1=344987&r2=344988&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 Wed
Nov 16 04:19:42 2005
@@ -37,13 +37,15 @@
 		<!-- ============================================================== -->
 		<map:pipeline>   
        
-       <map:match pattern="**.xml">
+       <map:match pattern="**.daisy.xml">
         <map:aggregate element="daisyDocument">
           <map:part src="cocoon://{1}.daisy.source" />
-          <map:part src="{lm:daisy.siteSnippetFor.{1}}" />
+          <map:part src="{lm:daisy.site.660}" />
         </map:aggregate>
         <map:transform src="{lm:daisy.transform.daisy.html}">
           <map:parameter name="documentPath" value="{0}"/>
+          <map:parameter name="daisyExtension" value=".daisy"/>
+          <map:parameter name="pathPrefix" value=""/>
         </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.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
Wed Nov 16 04:19:42 2005
@@ -47,7 +47,7 @@
    <!-- Navigation elements                                          -->
    <!-- ============================================================ -->
   
-    <map:pipeline>
+    <map:pipeline>      
       <map:match pattern="daisy.site.*">
         <map:generate src="{lm:{0}}" />
         <map:transform src="{lm:daisy.transform.navigation.siteSnippet}"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-includes.xsl
Wed Nov 16 04:19:42 2005
@@ -16,7 +16,11 @@
 -->
 
 <!--+
-    | Add an edit link into the page content.
+    | Create a version of the navigation document that excludes all nodes that 
+    | only contain imports and expand those imports.
+    |
+    | This is a workaround for the fact that Daisy Navigation documents cannot
+    | group content in the menu without adding something to the directory.
     +-->
 
 <xsl:stylesheet version="1.0"
@@ -38,7 +42,7 @@
   
   <xsl:template match="d:import">
     <xi:include>
-      <xsl:attribute name="href"><xsl:value-of select="$publisherURL"/>blob?documentId=<xsl:value-of
select="@docId"/>&amp;version=live&amp;partType=1</xsl:attribute>
+      <xsl:attribute name="href">cocoon://daisy.navigation.<xsl:value-of select="@docId"/></xsl:attribute>
     </xi:include>
   </xsl:template>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
Wed Nov 16 04:19:42 2005
@@ -26,6 +26,7 @@
                 
   <xsl:param name="publisherURL"/>
   <xsl:param name="pathPrefix"/>
+  <xsl:param name="index"/>
                 
   <xsl:template match="/">
     <locationmap>
@@ -41,7 +42,9 @@
       <locator>
      
        <match pattern="index.xml">
-           <location src="cocoon://2.1/index.xml" />
+           <location>
+             <xsl:attribute name="src"><xsl:value-of select="$index"/></xsl:attribute>
+           </location>
        </match>
      
        <xsl:apply-templates/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/locationmap.xml
Wed Nov 16 04:19:42 2005
@@ -28,20 +28,24 @@
   
   <locator>
    
-     <match pattern="index.xml">
-         <location src="cocoon://654.daisy.xml" />
+     <match pattern="project.cocoon/index.xml">
+         <location src="cocoon://659.daisy.xml" />
      </match>
    
      <match pattern="*.daisy.source">
-         <location src="http://cocoon.zones.apache.org:9263/publisher/documentPage?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live"
/>
+         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/document?documentId={1}&amp;includeNavigation=false&amp;locale=en_US&amp;version=live"
/>
      </match>
    
      <match pattern="*.daisy.img">
-         <location src="http://cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=3"
/>
+         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=3"
/>
      </match>
    
      <match pattern="*.daisy.navigation">
-         <location src="http://cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1"
/>
+         <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1"
/>
+     </match>
+     
+     <match pattern="daisy.site.*">
+          <location src="http://publish:publish@cocoon.zones.apache.org:9263/publisher/blob?documentId={1}&amp;version=live&amp;partType=1"
/>
      </match>
  
   </locator>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml?rev=344988&r1=344987&r2=344988&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/site.xml
Wed Nov 16 04:19:42 2005
@@ -38,6 +38,10 @@
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
 
+  <samples label="samples">
+    <cocoon label="Cocoon Home Page" href="cocoon/index.html" description="Cocoon home
page from their Daisy repository"/>
+  </samples>
+  
   <!--
   The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">



Mime
View raw message