Author: cdupoirieux
Date: Thu Oct 5 02:31:28 2006
New Revision: 453159
URL: http://svn.apache.org/viewvc?view=rev&rev=453159
Log:
Images management.
(inspired by the OOo plugin.)
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap
- copied, changed from r452028,
forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources.xmap
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/opendocument-writer.odt
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap?view=diff&rev=453159&r1=453158&r2=453159
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/input.xmap
Thu Oct 5 02:31:28 2006
@@ -28,7 +28,7 @@
element="content" />
</map:aggregate>
<map:transform src="{lm:transform.odt-forrest.xhtml}">
- <map:parameter name="filename" value="{1}" />
+ <map:parameter name="path" value="{1}"/>
</map:transform>
<map:transform src="{lm:transform.xml.xml-namespace-stripped}" />
<map:transform src="{lm:transform.html.document}" />
Copied:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap
(from r452028,
forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources.xmap)
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap?view=diff&rev=453159&p1=forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources.xmap&r1=452028&p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap&r2=453159
==============================================================================
---
forrest/trunk/plugins/org.apache.forrest.plugin.input.OpenOffice.org/resources.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources.xmap
Thu Oct 5 02:31:28 2006
@@ -15,21 +15,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <!-- ============================================================ -->
- <!-- OpenOffice.org Plugin -->
- <!-- This plugin allows OpenOffice.org application files to be -->
- <!-- uded in a Forrest site -->
- <!-- ============================================================ -->
-
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0";>
<map:pipelines>
<map:pipeline internal="true">
- <map:match pattern="openOfficeEmbeddedImage/zip-**/file-**.*">
+ <map:match pattern="openDocumentEmbeddedImages/zip-**/file-**.*">
<map:read src="jar:file:///{lm:project.{1}!/{2}.{3}}"
mime-type="image/{3}" />
</map:match>
- <map:match pattern="**/openOfficeEmbeddedImage/zip-**/file-**.*">
+ <map:match pattern="**/openDocumentEmbeddedImages/zip-**/file-**.*">
<map:read src="jar:file:///{lm:project.{1}/{2}!/{3}.{4}}"
mime-type="image/{4}" />
</map:match>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl?view=diff&rev=453159&r1=453158&r2=453159
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/resources/stylesheets/odt-to-forrest-xhtml.xsl
Thu Oct 5 02:31:28 2006
@@ -22,7 +22,24 @@
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/"; >
<xsl:import href="lm://transform.odt.xhtml"/>
- <xsl:param name="filename" select="'odt file name'"/>
+ <xsl:param name="path" select="'odt path name'"/>
+
+ <xsl:include href="lm://transform.xml.dotdots"/>
+ <xsl:include href="lm://transform.xml.pathutils"/>
+
+ <!-- Calculate dirname -->
+ <xsl:variable name="dirname">
+ <xsl:call-template name="dirname">
+ <xsl:with-param name="path" select="$path"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <!-- Calculate filename -->
+ <xsl:variable name="filename">
+ <xsl:call-template name="filename">
+ <xsl:with-param name="path" select="$path"/>
+ </xsl:call-template>
+ </xsl:variable>
+
<xsl:template match="/">
<xsl:apply-templates select="/odt/content/*"/>
</xsl:template>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/opendocument-writer.odt
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.odt/src/documentation/content/xdocs/samples/opendocument-writer.odt?view=diff&rev=453159&r1=453158&r2=453159
==============================================================================
Binary files - no diff available.
