You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/07/08 00:46:15 UTC
svn commit: r209670 - in /forrest/trunk/main: fresh-site/forrest.properties
fresh-site/src/documentation/resources/templates/ webapp/resources.xmap
webapp/resources/stylesheets/html2document.xsl
Author: thorsten
Date: Thu Jul 7 15:46:13 2005
New Revision: 209670
URL: http://svn.apache.org/viewcvs?rev=209670&view=rev
Log:
svn merge -r190293:head from lm to trunk. That finished the merge of the lm AFAIK.
Added:
forrest/trunk/main/fresh-site/src/documentation/resources/templates/
- copied from r209669, forrest/branches/locationmap_branch/main/fresh-site/src/documentation/resources/templates/
Modified:
forrest/trunk/main/fresh-site/forrest.properties
forrest/trunk/main/webapp/resources.xmap
forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl
Modified: forrest/trunk/main/fresh-site/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/fresh-site/forrest.properties?rev=209670&r1=209669&r2=209670&view=diff
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties (original)
+++ forrest/trunk/main/fresh-site/forrest.properties Thu Jul 7 15:46:13 2005
@@ -27,6 +27,8 @@
# Specifies name of Forrest skin to use
# See list at http://forrest.apache.org/docs/skins.html
#project.skin=pelt
+# uncomment the following skin if you are using views
+#project.skin=leather-dev
# Descriptors for plugins and skins
# comma separated list, file:// is supported
@@ -124,6 +126,8 @@
# version.
# Run "forrest available-plugins" for a list of plug-ins currently available
project.required.plugins=org.apache.forrest.plugin.output.pdf
+# Add the following plugins to project.required.plugins when using views:
+#org.apache.forrest.plugin.input.viewHelper.xhtml.ls,org.apache.forrest.plugin.output.viewHelper.xhtml,org.apache.forrest.plugin.internal.view
# Proxy configuration
# proxy.host=
Modified: forrest/trunk/main/webapp/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources.xmap?rev=209670&r1=209669&r2=209670&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources.xmap (original)
+++ forrest/trunk/main/webapp/resources.xmap Thu Jul 7 15:46:13 2005
@@ -126,6 +126,11 @@
<map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
</map:call>
</map:when>
+
+ <!-- Fourth location: locationmap -->
+ <map:when test="{lm:{path}/{name}.{ext}}">
+ <map:read src="{lm:{path}/{name}.{ext}}"/>
+ </map:when>
<map:otherwise>
<!-- this should always fail; it is used so the error has the correct filename and extension -->
<map:read src=".../{path}/{name}.{ext}" mime-type="{mime-type}" />
@@ -295,12 +300,31 @@
<!-- handles images local to a contributor directory -->
<map:match pattern="**my-images/**.*">
- <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{1}my-images/{2}.{3}">
+ <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
+ </map:when>
+ <map:otherwise>
+ <map:read src="{lm:{1}my-images/{2}.{3}}"/>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match type="regexp" pattern="^(.*?)([^/]*).svg$">
- <map:generate src="{project:content.xdocs}/{1}{2}.svg"/>
- <map:serialize type="xml"/>
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}/{1}{2}.svg">
+ <map:generate src="{project:content.xdocs}/{1}{2}.svg"/>
+ <map:serialize type="xml"/>
+ </map:when>
+ <map:when test="{lm:/{1}{2}.svg}">
+ <map:generate src="{lm:/{1}{2}.svg}"/>
+ <map:serialize type="xml"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="{project:content.xdocs}/{1}{2}.svg"/>
+ <map:serialize type="xml"/>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="images/**.png">
@@ -329,16 +353,21 @@
<map:when test="{project:resources.images}/{1}.png">
<map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
</map:when>
- <map:otherwise>
- <!-- needed for compatibility for the standard resources/images that are now
- in the common skin -->
- <map:call resource="skin-read">
- <map:parameter name="path" value="images" />
- <map:parameter name="name" value="{1}" />
- <map:parameter name="ext" value="png" />
- <map:parameter name="mime-type" value="image/png" />
- </map:call>
- </map:otherwise>
+ <map:when test="{lm:/images/{1}.svg}">
+ <map:call resource="pipe-aggregate-svg2png-resource">
+ <map:parameter name="path" value="{lm:/images/{1}.svg}" />
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <!-- needed for compatibility for the standard resources/images that are now
+ in the common skin -->
+ <map:call resource="skin-read">
+ <map:parameter name="path" value="images" />
+ <map:parameter name="name" value="{1}" />
+ <map:parameter name="ext" value="png" />
+ <map:parameter name="mime-type" value="image/png" />
+ </map:call>
+ </map:otherwise>
</map:select>
</map:match>
@@ -353,16 +382,16 @@
<map:when test="{project:resources.images}/{1}.{2}">
<map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
</map:when>
- <map:otherwise>
- <!-- needed for compatibility for the standard resources/images that are now
- in the common skin -->
- <map:call resource="skin-read">
- <map:parameter name="path" value="images" />
- <map:parameter name="name" value="{1}" />
- <map:parameter name="ext" value="{2}" />
- <map:parameter name="mime-type" value="image/{2}" />
- </map:call>
- </map:otherwise>
+ <map:otherwise>
+ <!-- needed for compatibility for the standard resources/images that are now
+ in the common skin -->
+ <map:call resource="skin-read">
+ <map:parameter name="path" value="images" />
+ <map:parameter name="name" value="{1}" />
+ <map:parameter name="ext" value="{2}" />
+ <map:parameter name="mime-type" value="image/{2}" />
+ </map:call>
+ </map:otherwise>
</map:select>
</map:match>
@@ -374,9 +403,12 @@
<map:when test="resources/images/{2}.{3}">
<map:read src="resources/images/{2}.{3}" mime-type="image/{3}" />
</map:when>
- <map:otherwise>
+ <map:when test="{project:resources.images}/{2}.{3}">
<map:read src="{project:resources.images}/{2}.{3}" mime-type="image/{3}" />
- </map:otherwise>
+ </map:when>
+ <map:otherwise>
+ <map:read src="{lm:{1}/images/{2}.{3}}"/>
+ </map:otherwise>
</map:select>
</map:match>
@@ -392,10 +424,20 @@
<map:call resource="transform-project2text"/>
<map:serialize type="svg2png" />
</map:when>
- <map:otherwise>
- <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
- </map:otherwise>
- </map:select>
+ <map:when test="{project:content.xdocs}/{1}.png">
+ <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
+ </map:when>
+ <map:when test="{lm:{1}.svg}">
+ <map:call resource="pipe-aggregate-svg2png-resource">
+ <map:parameter name="path" value="{lm:{1}.svg}" />
+ </map:call>
+ </map:when>
+ <map:otherwise>
+ <map:call resource="pipe-aggregate-svg2png-resource">
+ <map:read src="{lm:{1}.png}" mime-type="image/png" />
+ </map:call>
+ </map:otherwise>
+ </map:select>
</map:match>
<map:match pattern="**.ico">
@@ -404,12 +446,12 @@
<map:read src="{project:content.xdocs}/{1}.ico" mime-type="image/x-icon" />
</map:when>
<map:otherwise>
- <map:call resource="skin-read">
- <map:parameter name="path" value="images" />
- <map:parameter name="name" value="{1}" />
- <map:parameter name="ext" value="ico" />
- <map:parameter name="mime-type" value="image/x-icon" />
- </map:call>
+ <map:call resource="skin-read">
+ <map:parameter name="path" value="images" />
+ <map:parameter name="name" value="{1}" />
+ <map:parameter name="ext" value="ico" />
+ <map:parameter name="mime-type" value="image/x-icon" />
+ </map:call>
</map:otherwise>
</map:select>
</map:match>
Modified: forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl?rev=209670&r1=209669&r2=209670&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl (original)
+++ forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl Thu Jul 7 15:46:13 2005
@@ -56,31 +56,16 @@
</xsl:template>
<xsl:template match="meta">
- <xsl:text disable-output-escaping = "yes"><![CDATA[ <!-- ]]></xsl:text>
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
</xsl:copy>
- <xsl:text disable-output-escaping = "yes"><![CDATA[ --> ]]></xsl:text>
</xsl:template>
<!--infer structure from sibling headings-->
<xsl:template match="body">
<body>
- <xsl:choose>
- <xsl:when test="h1">
- <xsl:call-template name="process_h1"/>
- </xsl:when>
- <xsl:otherwise>
- <section>
- <xsl:if test="a/@name">
- <xsl:attribute name="id"><xsl:value-of select="a/@name"/></xsl:attribute>
- </xsl:if>
- <title/>
- <xsl:apply-templates/>
- <xsl:call-template name="process_h1"/>
- </section>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:apply-templates select="*[1]" mode="next"/>
+ <xsl:call-template name="process_h1"/>
</body>
</xsl:template>
@@ -128,7 +113,7 @@
</section>
</xsl:for-each>
</xsl:template>
-
+
<!--process each sibling in order until the next heading level-->
<xsl:template match="*" mode="next">