Return-Path: 
 <svn-return-1672-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 30466 invoked from network); 17 Mar 2005 04:26:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Mar 2005 04:26:52 -0000
Received: (qmail 61611 invoked by uid 500); 17 Mar 2005 04:26:51 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 61528 invoked by uid 500); 17 Mar 2005 04:26:51 -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>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 61506 invoked by uid 99); 17 Mar 2005 04:26:50 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 16 Mar 2005 20:26:49 -0800
Received: (qmail 30420 invoked by uid 65534); 17 Mar 2005 04:26:48 -0000
Message-ID: <20050317042648.30419.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 17 Mar 2005 04:26:48 -0000
Subject: svn commit: r157889 - in
 forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org: ./
 resources/stylesheets/ src/documentation/content/xdocs/
 src/documentation/content/xdocs/samples/
To: svn@forrest.apache.org
From: crossley@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Wed Mar 16 20:26:46 2005
New Revision: 157889

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157889
Log:
Support Forrest HowTo docs via OpenOffice.org Writer documents.
Contributed by: Ferdinand Soethe
Issue: FOR-464

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/samples/openoffice-writer-howto.sxw   (with props)
Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-common2forrest.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-writer2forrest.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/samples/index.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/status.x=
ml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/re=
sources/stylesheets/openoffice-common2forrest.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/resources/stylesheets/openoffice-common2forrest.xsl?=
view=3Ddiff&r1=3D157888&r2=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-common2forrest.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-common2forrest.xsl Wed Mar 16 20:26:46 2005
@@ -19,6 +19,9 @@
 <xsl:stylesheet version=3D"1.0" xmlns:style=3D"http://openoffice.org/2000/=
style" xmlns:text=3D"http://openoffice.org/2000/text" xmlns:office=3D"http:=
//openoffice.org/2000/office" xmlns:table=3D"http://openoffice.org/2000/tab=
le" xmlns:draw=3D"http://openoffice.org/2000/drawing" xmlns:fo=3D"http://ww=
w=2Ew3.org/1999/XSL/Format" xmlns:xlink=3D"http://www.w3.org/1999/xlink" xm=
lns:dc=3D"http://purl.org/dc/elements/1.1/" xmlns:meta=3D"http://openoffice=
.org/2000/meta" xmlns:number=3D"http://openoffice.org/2000/datastyle" xmlns=
:svg=3D"http://www.w3.org/2000/svg" xmlns:chart=3D"http://openoffice.org/20=
00/chart" xmlns:dr3d=3D"http://openoffice.org/2000/dr3d" xmlns:math=3D"http=
://www.w3.org/1998/Math/MathML" xmlns:form=3D"http://openoffice.org/2000/fo=
rm" xmlns:script=3D"http://openoffice.org/2000/script" xmlns:config=3D"http=
://openoffice.org/2001/config" office:class=3D"text" xmlns:xsl=3D"http://ww=
w=2Ew3.org/1999/XSL/Transform" exclude-result-prefixes=3D"office meta  tabl=
e number dc fo xlink chart math script xsl draw svg dr3d form config text s=
tyle">
   <xsl:param name=3D"filename"/>
   <xsl:param name=3D"extension"/>
+ =20
+  <xsl:variable name=3D"OOtemplate" select=3D"/office:document/office:meta=
/meta:template/@xlink:title"/>
+  =20
   <xsl:output method=3D"xml" indent=3D"yes" omit-xml-declaration=3D"no"/>
   <xsl:output method=3D"xml" version=3D"1.0" encoding=3D"UTF-8"=20
     doctype-public=3D"-//APACHE//DTD Documentation V1.2//EN"=20
@@ -46,6 +49,14 @@
             </xsl:otherwise>
           </xsl:choose>
         </title>
+        <!-- Abstract is required field in HowTos, so always create it and=
 fill with description field  -->
+        <abstract>
+          <xsl:value-of select=3D"/office:document/office:meta/dc:descript=
ion"/>
+        </abstract>
+     =20
+        <!-- last modified date -->
+        <last-modified-content-date date=3D"{substring-before(/office:docu=
ment/office:meta/dc:date, 'T')}"/>
+
         <xsl:call-template name=3D"style"/>
       </header>
       <xsl:apply-templates select=3D"//office:body"/>
@@ -57,8 +68,31 @@
       +-->
   <xsl:template match=3D"office:body">
     <body>
-      <xsl:apply-templates select=3D"key('rootChildren', generate-id())"/>
-      <xsl:apply-templates select=3D"text:h[@text:level=3D'1']"/>     =20
+      <xsl:if test=3D"$OOtemplate =3D 'OpenOffice.org Writer HowTo Templat=
e'">
+        <!-- Special processing for top of HowTos -->
+        <header>
+          <title>
+              <xsl:choose>
+                <xsl:when test=3D"/office:document/office:meta/dc:title =
=3D '' or not(/office:document/office:meta/dc:title)">
+                  <xsl:value-of select=3D"$filename"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select=3D"/office:document/office:meta/dc:=
title"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </title>
+            <section id=3D"Overview">
+              <title>Overview</title>
+            <p>
+              <xsl:value-of select=3D"/office:document/office:meta/dc:desc=
ription"/>
+            </p>
+          </section>
+          </header>
+         =20
+        </xsl:if>=20
+         <xsl:apply-templates select=3D"key('rootChildren', generate-id())=
"/>
+        <xsl:apply-templates select=3D"text:h[@text:level=3D'1']"/> =20
+     =20
     </body>
   </xsl:template>
  =20
@@ -71,6 +105,7 @@
       <xsl:with-param name=3D"prevLevel" select=3D"1"/>
     </xsl:call-template>
   </xsl:template>
+ =20
   <xsl:template match=3D"text:h[@text:level=3D'2'] | text:h[@text:level=3D=
'3']| text:h[@text:level=3D'4'] | text:h[@text:level=3D'5']">
     <xsl:variable name=3D"level" select=3D"@text:level"/>
     <xsl:call-template name=3D"createSection">
@@ -78,29 +113,26 @@
       <xsl:with-param name=3D"prevLevel" select=3D"preceding-sibling::text=
:h[@text:level &lt; $level][1]/@text:level "/>
     </xsl:call-template>
   </xsl:template>
+ =20
   <xsl:template name=3D"createSection">
     <xsl:param name=3D"currentLevel"/>
     <xsl:param name=3D"prevLevel"/>
-    <xsl:choose>
-      <xsl:when test=3D"$currentLevel &gt; $prevLevel+1">
-        <section>
-          <title>hugo</title>
-          <xsl:call-template name=3D"createSection">
-            <xsl:with-param name=3D"currentLevel" select=3D"$currentLevel"=
/>
-            <xsl:with-param name=3D"prevLevel" select=3D"$prevLevel +1"/>
-          </xsl:call-template>
-        </section>
-      </xsl:when>
-      <xsl:otherwise>
-        <section>
-          <title>
-            <xsl:apply-templates/>
-          </title>
-          <xsl:apply-templates select=3D"key('rootChildren', generate-id()=
)"/>
-          <xsl:apply-templates select=3D"key('chieldElements', generate-id=
())"/>
-        </section>
-      </xsl:otherwise>
-    </xsl:choose>
+         =20
+     =20
+    <section class=3D"{.}"> =20
+      <title>
+        <xsl:apply-templates/>
+      </title>
+      <!-- Report structuring errors with a fixme -->
+      <xsl:if test=3D"$currentLevel &gt; $prevLevel+1">
+        <fixme author=3D"openoffice-common2forrest template">
+          The previous heading is more than one level below the heading be=
fore it. To remove this fixme, correct the structuring of your document.
+        </fixme>
+      </xsl:if>
+      <xsl:apply-templates select=3D"key('rootChildren', generate-id())"/>
+      <xsl:apply-templates select=3D"key('chieldElements', generate-id())"=
/>
+    </section>
+ =20
   </xsl:template>
  =20
   <!--+

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/re=
sources/stylesheets/openoffice-writer2forrest.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/resources/stylesheets/openoffice-writer2forrest.xsl?=
view=3Ddiff&r1=3D157888&r2=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-writer2forrest.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/resource=
s/stylesheets/openoffice-writer2forrest.xsl Wed Mar 16 20:26:46 2005
@@ -20,7 +20,6 @@
  =20
   <xsl:import href=3D"openoffice-common2forrest.xsl"/>
  =20
- =20
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
   <!-- The templates below match special styles created in a special=20
        Forrest template. However, there is no longer any need to use this
@@ -109,6 +108,18 @@
       <xsl:apply-templates/>
     </fixme>
   </xsl:template>
+ =20
+  <!--+
+      | Fixme2
+      | - translates the yellow stickers to fixmes
+      |  =20
+      +-->
+  <xsl:template match=3D"office:annotation">
+    <fixme author=3D"{@office:author}">
+      <xsl:apply-templates/>
+    </fixme>
+  </xsl:template>
+ =20
=20
   <!--+
       | Note
@@ -117,5 +128,32 @@
     <note>
       <xsl:apply-templates/>
     </note>
-  </xsl:template>   =20
+  </xsl:template>
+  =20
+  <!--+
+      | special list format p2
+      |
+      | 0verwrites template in openoffice-common2forrest
+      | to allow for bulleted list item 'forrest: instructional step' in o=
o to=20
+      | become a simple para with a class-attr in forrest (instruction)
+      | In order to do so, this template omits the <ul>-Element
+      | and bypasses the processing of the <li>-Element.
+      |       =20
+      +-->
+     =20
+  <xsl:template match=3D"text:unordered-list[@text:style-name=3D'L2']">
+      <xsl:apply-templates select=3D"text:list-item/text:p"/>
+      <xsl:apply-templates select=3D"text:list-item/text:unordered-list"/>
+      <xsl:apply-templates select=3D"text:list-item/text:ordered-list"/>=20
+  </xsl:template>=20
+  =20
+  <!--+
+      | Instructional step
+      +-->
+  <xsl:template match=3D"text:p[@text:style-name=3D'P2']">
+    <p class=3D"instruction">
+      <xsl:apply-templates/>
+    </p>
+  </xsl:template>=20
+     =20
 </xsl:stylesheet>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/sr=
c/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/src/documentation/content/xdocs/samples/index.xml?vi=
ew=3Ddiff&r1=3D157888&r2=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/samples/index.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/samples/index.xml Wed Mar 16 20:26:46 2005
@@ -23,6 +23,7 @@
   <body>=20
     <ul>
       <li><a href=3D"openoffice-writer.html">OpenOffice Writer</a></li>
+      <li><a href=3D"openoffice-writer-howto.html">Creating a Forrest HowT=
o with OpenOffice Writer</a></li>
       <li><a href=3D"openoffice-impress.html">OpenOffice Impress</a> (Note=
 this is very useful in conjunction with the=20
       S5 slides plugin)</li>
     </ul>

Added: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/d=
ocumentation/content/xdocs/samples/openoffice-writer-howto.sxw
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/src/documentation/content/xdocs/samples/openoffice-w=
riter-howto.sxw?view=3Dauto&rev=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/=
src/documentation/content/xdocs/samples/openoffice-writer-howto.sxw
---------------------------------------------------------------------------=
---
    svn:mime-type =3D application/octet-stream

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/sr=
c/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/src/documentation/content/xdocs/site.xml?view=3Ddiff=
&r1=3D157888&r2=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/src/docu=
mentation/content/xdocs/site.xml Wed Mar 16 20:26:46 2005
@@ -41,6 +41,7 @@
   <samples label=3D"Samples" href=3D"samples/">
     <index label=3D"Index" href=3D"index.html" description=3D"Index of exa=
mple files available"/>
     <openOfficeWriter label=3D"SXW" href=3D"openoffice-writer.html" descri=
ption=3D"OpenOffice.org Writer Example"/>
+    <openOfficeWriterhowto label=3D"HowTo" href=3D"openoffice-writer-howto=
.html" description=3D"OpenOffice.org Writer HowTo Example"/>
     <openOfficeImpress label=3D"SXI" href=3D"openoffice-impress.html" desc=
ription=3D"OpenOffice.org Impress Example"/>
   </samples>
  =20

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/st=
atus.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest=
.plugin.OpenOffice.org/status.xml?view=3Ddiff&r1=3D157888&r2=3D157889
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/status.x=
ml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.OpenOffice.org/status.x=
ml Wed Mar 16 20:26:46 2005
@@ -24,6 +24,10 @@
=20
   <changes>
     <release version=3D"0.1" date=3D"unreleased">
+      <action dev=3D"DC" type=3D"add" context=3D"code"
+        due-to=3D"Ferdinand Soethe" fixes-bug=3D"FOR-464">
+        Support Forrest HowTo docs via OpenOffice.org Writer documents.
+      </action>
       <action dev=3D"RDG" type=3D"add" context=3D"code">
         Support embedded images in documents.
       </action>