forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527035 [1/4] - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core: ./ content/xdocs/ themes/ themes/common/css/ themes/common/fo/ themes/common/html/ themes/common/images/ themes/common/panels/ themes/common/xhtml2/ themes...
Date Tue, 10 Apr 2007 05:26:54 GMT
Author: crossley
Date: Mon Apr  9 22:26:50 2007
New Revision: 527035

URL: http://svn.apache.org/viewvc?view=rev&rev=527035
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/build.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/site.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/tabs.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-generic-css.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/profiling.css.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/layout-master-set.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/noFt.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-copyright.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-header.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/ajax-example.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/apache-ssi.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/blank.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-breadcrumbs.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-css-links.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-fontsize.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-logo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-tagline.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/branding-theme-switcher.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-author.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-authors.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-css.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-feeder.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-include-html.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-ls-contracts.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main-lenya.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-minitoc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-motd-page.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pdf-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-pod-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-source-xml-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-txt-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/content-xml-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericMarkup.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/genericXhtml.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-form-blank.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-prototype-ajax.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/helper-render-image.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/master.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing-foo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main-testing.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/noFt.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-compliance-links.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-copyright.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-current-time.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback-dyn.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-feedback.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published-net.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-last-published.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-icon.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta-navigation.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/siteinfo-meta.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-body.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/html/xhtml2-content-toc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/corner-imports.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/dc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/poddoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/rc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/images/txtdoc.svg.xslt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-html.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/export-link.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/body.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/xhtml2/toc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/nav-section-round-bottom.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/html/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-css.panel.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.panel.xml

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/build.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/build.xml Mon Apr  9 22:26:50 2007
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 <project default="docs" basedir="." name="Forrest plugin build file">
-
   <property name="plugin-name" value="org.apache.forrest.themes.core"/>
   <property name="forrest.version" value="0.8"/>
   <property name="type" value="output"/>
@@ -26,10 +25,8 @@
   <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.themes.core/"/>
   <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
   <property name="publish" value="true"/>
-    
   <import file="../build.xml"/>
-
-  <!-- Add any additional installation work here in the build target, for example:
+<!-- Add any additional installation work here in the build target, for example:
   <target name="build"
           description="Extract the tools">
      <unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
@@ -40,5 +37,3 @@
   </target>
   -->
 </project>
-  
-  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/index.xml Mon Apr  9 22:26:50 2007
@@ -16,35 +16,44 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
+<document>
+  <header>
     <title>forrest:viewsHelper - style your site</title>
-    <abstract>This plugin is a ViewHelper implementation used by the view plugin.</abstract> 
-  </header> 
-  <body> 
-<section>
-  <title>How to create your own implementation </title>
-	<p>Diwaker Gupta wrote: "Of course, we can have a good debate on whats the best way to
-generate XHTML content for the tabs to make it "most amenable" to CSS
-skinning. Personally, I would just output each tab in its own div
-element, with class attributes denoting the selected tab. One can then
-use CSS to structure/color them appropriately."</p>
-<note>All following explanations/steps assume you use the default
-configuration of forrest.</note>
-	<p>Ok, you may want to try another feature that is coming with
-forrest:views.</p>
-<section>
-	<title>Create your own contract implementation</title>
-		<ol>
-		<li>Create in src/documentation the folder resources/templates. ...or
+    <abstract>
+      This plugin is a ViewHelper implementation used by the view plugin.
+    </abstract>
+  </header>
+  <body>
+    <section>
+      <title>How to create your own implementation </title>
+      <p>
+        Diwaker Gupta wrote: "Of course, we can have a good debate on whats the
+        best way to generate XHTML content for the tabs to make it "most
+        amenable" to CSS skinning. Personally, I would just output each tab in
+        its own div element, with class attributes denoting the selected tab.
+        One can then use CSS to structure/color them appropriately."
+      </p>
+      <note>
+        All following explanations/steps assume you use the default
+        configuration of forrest.
+      </note>
+      <p>
+        Ok, you may want to try another feature that is coming with
+        forrest:views.
+      </p>
+      <section>
+        <title>Create your own contract implementation</title>
+        <ol>
+          <li>Create in src/documentation the folder resources/templates. ...or
 more generally speaking create ${project.resources-dir}/templates.</li>
-		<li>Copy
+          <li>Copy
 {this.plugins.path}/resources/templates/nav-main.ft to this folder.
 </li>
-		<li>Add after the <![CDATA[<xsl:template name="nav-main-body"/>]]> something like 
+          <li>Add after the <![CDATA[<xsl:template name="nav-main-body"/>]]> something like 
 </li>
-</ol>
-		<source><![CDATA[<xsl:template match="ul[@id='nav-main']">
+        </ol>
+        <source>
+<![CDATA[<xsl:template match="ul[@id='nav-main']">
 <div id="nav-main">
   <xsl:apply-templates select="li"/>
 </div>
@@ -58,16 +67,19 @@
 <div class="current">
   <xsl:apply-templates/>
 </div>
-</xsl:template>]]></source>
-<ol>
-<li>Change the css in <![CDATA[<xsl:template name="nav-main-css">]]>. I tried but
+</xsl:template>]]>
+        </source>
+        <ol>
+          <li>Change the css in <![CDATA[<xsl:template name="nav-main-css">]]>. I tried but
 the result is not nice. If you succeed please change the name of the
 contract to "nav-main-div", add the patch to the issue-tracker and I add
 the new contract to the themer plugin. ;-)</li>
-	</ol>
-</section>
-	
-  <p>You can find more implementations in {this.plugins.path}/resources/templates/.</p>
-  </section>
+        </ol>
+      </section>
+      <p>
+        You can find more implementations in
+        {this.plugins.path}/resources/templates/.
+      </p>
+    </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/site.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/site.xml Mon Apr  9 22:26:50 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,23 +28,19 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <site label="org.apache.forrest.plugin.themes.core" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.themes.core"/>
-    <!--<changes label="Changes" href="changes.html" description="History of Changes" />
+<!--<changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />-->
   </about>
-
-  <!--
+<!--
   The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">
     <whole_site_html label="Whole Site HTML" href="wholesite.html"/>
     <whole_site_pdf label="Whole Site PDF" href="wholesite.pdf"/>
   </all>
   -->
-
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
@@ -56,5 +51,4 @@
     <cocoon href="http://cocoon.apache.org/"/>
     <xml.apache.org href="http://xml.apache.org/"/>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/tabs.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/content/xdocs/tabs.xml Mon Apr  9 22:26:50 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,11 +30,9 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="" label="Home" dir="" indexfile="index.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/status.xml Mon Apr  9 22:26:50 2007
@@ -18,28 +18,25 @@
 <!DOCTYPE status PUBLIC "-//APACHE//DTD Status V1.3//EN"
  "http://forrest.apache.org/dtd/status-v13.dtd">
 <status>
-
   <developers>
     <person name="Thorsten Scherler" email="thorsten@apache.org" id="TS"/>
     <person name="David Crossley" email="crossley@apache.org" id="DC" />
     <person name="Cyriaque Dupoirieux" email="cdupoirieux@apache.org" id="CD" />
     <person name="Volunteer needed" email="dev@forrest.apache.org" id="open"/>
   </developers>
-
-  <!-- Define here the Title of the Context you want to display in the Changes pages.
+<!-- Define here the Title of the Context you want to display in the Changes pages.
        id = the context value of actions
        title = Title of the Context
-  -->  
+  -->
   <contexts>
-   <context id="code" title="Changes to the Code Base"/>
-   <context id="docs" title="Changes to Documentation"/>
-   <context id="admin" title="Changes to Project Administration"/>
-   <context id="design" title="Changes to Design"/>
-   <context id="build" title="Changes to Build"/>
-  </contexts> 
-
+    <context id="code" title="Changes to the Code Base"/>
+    <context id="docs" title="Changes to Documentation"/>
+    <context id="admin" title="Changes to Project Administration"/>
+    <context id="design" title="Changes to Design"/>
+    <context id="build" title="Changes to Build"/>
+  </contexts>
   <changes>
-    <!-- Add new releases here -->
+<!-- Add new releases here -->
     <release version="0.1" date="unreleased">
       <action context="code" type="fix" dev="CD" due-to="Paul Bolger" fixes-bug="FOR-830">
         Fix error where XML link was actually outputting PDF instead.
@@ -58,7 +55,6 @@
         former view/dispatcher plugins. </action>
     </release>
   </changes>
-
   <todo>
     <actions priority="high">
       <action type="fix" context="docs" dev="open">
@@ -66,5 +62,4 @@
       </action>
     </actions>
   </todo>
-
 </status>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/coat.fv Mon Apr  9 22:26:50 2007
@@ -15,35 +15,32 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-  
 <forrest:views 
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- The following variables are used to contact data models and/or contracts. -->
+<!-- The following variables are used to contact data models and/or contracts. -->
   <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
   <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
   <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
   <forrest:view type="html" hooksXpath="/html/body">
-    <!-- 
+<!-- 
         @type defines this structurer to html.
         @hooksXpath defines where all hooks will be injected (as prefix).
         -->
     <forrest:contract name="branding-css-links">
-      <!-- More information around this contract
+<!-- More information around this contract
         http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
         -->
-      <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
       <forrest:property name="branding-css-links-input">
         <css url="coat.css"/>
       </forrest:property>
     </forrest:contract>
-
     <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
       <forrest:property name="custom">
-         <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
       </forrest:property>
     </forrest:contract>
-    
     <forrest:hook name="container">
       <forrest:hook name="header">
         <forrest:hook name="group-logo">
@@ -81,12 +78,12 @@
     </forrest:hook>
     <forrest:hook name="footer">
       <forrest:contract name="siteinfo-feedback">
-          <forrest:property name="siteinfo-feedback">
-            <feedback to="webmaster@foo.com"
+        <forrest:property name="siteinfo-feedback">
+          <feedback to="webmaster@foo.com"
               href="mailto:webmaster@foo.com?subject=Feedback&#160;" >
               Send feedback about the website to:
             </feedback>
-          </forrest:property>
+        </forrest:property>
       </forrest:contract>
       <forrest:contract name="siteinfo-last-published"/>
     </forrest:hook>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common.fv Mon Apr  9 22:26:50 2007
@@ -15,15 +15,14 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-  
 <forrest:views 
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <!-- The following variables are used to contact data models and/or contracts. -->
+<!-- The following variables are used to contact data models and/or contracts. -->
   <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
   <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
   <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
-  <!-- 
+<!-- 
     You can group elements (hooks and contracts) to a template 
     and import it from any structurer. 
     The following <jx:import uri="cocoon://prepare.panels.*"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-generic-css.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-generic-css.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-generic-css.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-generic-css.ft Mon Apr  9 22:26:50 2007
@@ -19,26 +19,27 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-generic-css" type="nugget">
-  
-  <!--NOTE: 
+<!--NOTE: 
     When using the branding-generic-css template as c'n p master just search and replace 'branding-generic-css' by the {contract-name}!-->
-  
   <description>
-    {contract-name} will output {contract-funtion}. This is just a branding-generic-css contract, it will output *nothing*.
+    {contract-name} will output {contract-funtion}. This is just a
+    branding-generic-css contract, it will output *nothing*.
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-generic-css"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="branding-generic-css"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="branding-generic-css" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-        <xsl:param name="branding-generic-css-input"/>
-        <xsl:template match="/">
-          <forrest:content>
-            <forrest:part>
-<xsl:value-of select="$branding-generic-css-input"/>
-            </forrest:part>
-          </forrest:content>
-        </xsl:template>
+      <xsl:param name="branding-generic-css-input"/>
+      <xsl:template match="/">
+        <forrest:content>
+          <forrest:part>
+            <xsl:value-of select="$branding-generic-css-input"/>
+          </forrest:part>
+        </forrest:content>
+      </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/branding-theme-profiler.ft Mon Apr  9 22:26:50 2007
@@ -19,20 +19,27 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-theme-profiler" type="nugget">
-  
   <description>
     <p>
-      <strong>branding-theme-profiler</strong> provides a quick 
-      way to change the colors of the theme (it not a "real" color-theme switcher).
+      <strong>branding-theme-profiler</strong> provides a quick way to change
+      the colors of the theme (it not a "real" color-theme switcher).
     </p>
-    <pre class="code"><![CDATA[ A theme is a presentation layer that provides an aggregation of
+    <pre class="code">
+<![CDATA[ A theme is a presentation layer that provides an aggregation of
 a) theme structure information (*.fv)
 b) theme style information (*.css & *.png|jpg|gif|...)
-c) theme functionality (*.js & *.ft)]]> </pre>
-    <p> A "real" theme switcher would change a/b/c. </p>
-    <p> A "real" color-theme switcher should also provide a possibility to 
-      change each color with a WEB-GUI. </p>
-    <pre class="code"><![CDATA[ <!--Color group: Forrest: example colors similar to forrest.apache.org-->
+c) theme functionality (*.js & *.ft)]]>
+    </pre>
+    <p>
+      A "real" theme switcher would change a/b/c.
+    </p>
+
+    <p>
+      A "real" color-theme switcher should also provide a possibility to change
+      each color with a WEB-GUI.
+    </p>
+    <pre class="code">
+<![CDATA[ <!--Color group: Forrest: example colors similar to forrest.apache.org-->
  <color name="breadtrail" value="#CFDCED" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
  <color name="header" value="#294563"/>
  <color name="tab-selected" value="#4A6D8C" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
@@ -60,15 +67,14 @@
  <color name="footer" value="#CEDFEF"/>]]>
     </pre>
     <p>
-      These values are used for the generated CSS files.
-      They essentially "override" the default colors defined in the chosen theme.
-      To customize the colors of any theme,
-      use one or all color elements and change the values
-      of the particular color elements that you wish to change.
-      Note that by default, if you do not overide them means that
-      the default colors provided by the theme are being used.
+      These values are used for the generated CSS files. They essentially
+      "override" the default colors defined in the chosen theme. To customize
+      the colors of any theme, use one or all color elements and change the
+      values of the particular color elements that you wish to change. Note that
+      by default, if you do not overide them means that the default colors
+      provided by the theme are being used.
     </p>
-    <div class="warning">  
+    <div class="warning">
       <div class="label">fixme</div>
       <div class="content">We need to use naming convention for the naming. To overcome following comment:<br/>
           Some of the element names are obscure, so comments are added to show how
@@ -80,28 +86,44 @@
       <div class="label">Comments</div>
       <div class="content">
         <p>
-          pelt: breadtrail: the strip at the top of the page and the second strip under the tabs<br/>
-          pelt: header: top strip containing project and group logos<br/>
-          pelt: heading|subheading: section headings within the content<br/>
-          pelt: navstrip: the strip under the tabs which contains the published date<br/>
-          pelt: menu: the left-hand navigation panel<br/>
-          pelt: toolbox: the selected menu item<br/>
-          pelt: border: line border around selected menu item<br/>
-          pelt: searchbox: the background of the searchbox<br/>
-          pelt: body: any remaining parts, e.g. the bottom of the page<br/>
-          pelt: footer: the second from bottom strip containing credit logos and published date<br/>
-          pelt: feedback: the optional bottom strip containing feedback link<br/>
+          pelt: breadtrail: the strip at the top of the page and the second
+          strip under the tabs
+          <br/>
+          pelt: header: top strip containing project and group logos
+          <br/>
+          pelt: heading|subheading: section headings within the content
+          <br/>
+          pelt: navstrip: the strip under the tabs which contains the published
+          date
+          <br/>
+          pelt: menu: the left-hand navigation panel
+          <br/>
+          pelt: toolbox: the selected menu item
+          <br/>
+          pelt: border: line border around selected menu item
+          <br/>
+          pelt: searchbox: the background of the searchbox
+          <br/>
+          pelt: body: any remaining parts, e.g. the bottom of the page
+          <br/>
+          pelt: footer: the second from bottom strip containing credit logos and
+          published date
+          <br/>
+          pelt: feedback: the optional bottom strip containing feedback link
+          <br/>
         </p>
       </div>
     </div>
   </description>
-  <usage><![CDATA[<forrest:contract name="branding-theme-profiler">
+  <usage>
+<![CDATA[<forrest:contract name="branding-theme-profiler">
   <forrest:property name="branding-theme-profiler-theme">pelt</forrest:property>
   <forrest:property name="branding-theme-profiler">
     <color name="header" value="#ff0000"/>
     <!-- more colors -->
   </forrest:property>
-</forrest:contract>]]></usage>
+</forrest:contract>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
    name="branding-theme-profiler" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -202,49 +224,42 @@
     background-repeat: no-repeat;
     background-position: bottom left;
 }
-            <xsl:apply-templates select="$branding-theme-profiler/color"/> 
+            <xsl:apply-templates select="$branding-theme-profiler/color"/>
           </forrest:part>
         </forrest:content>
       </xsl:template>
-
-      <!-- ==================== main block colors ============================ -->
+<!-- ==================== main block colors ============================ -->
       <xsl:template match="color[@name='header']"> 
 #container #header { background-color: <xsl:value-of select="@value"/>;} </xsl:template>
-      
-<xsl:template match="color[@name='tab-selected']"> 
+      <xsl:template match="color[@name='tab-selected']"> 
 #nav-main .current { background-color: <xsl:value-of select="@value"/>;} 
 #nav-main .current a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main .current a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main .current a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='tab-unselected']"> 
+</xsl:template>
+      <xsl:template match="color[@name='tab-unselected']"> 
 #nav-main li      { background-color: <xsl:value-of select="@value"/> ;} 
 #nav-main li a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main li a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main li a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='subtab-selected']">
+</xsl:template>
+      <xsl:template match="color[@name='subtab-selected']">
 #level2tabs       { background-color: <xsl:value-of select="@value"/> ;} 
 #level2tabs a:link {  color: <xsl:value-of select="@link"/>;  }
 #level2tabs a:visited { color: <xsl:value-of select="@vlink"/>; }
 #level2tabs a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
+</xsl:template>
 <!--xsl:template match="color[@name='subtab-unselected']">
 .level2tabstrip { background-color: <xsl:value-of select="@value"/>;}
 .datenote { background-color: <xsl:value-of select="@value"/>;} 
 .level2tabstrip.unselected a:link {  color: <xsl:value-of select="@link"/>;  }
 .level2tabstrip.unselected a:visited { color: <xsl:value-of select="@vlink"/>; }
 .level2tabstrip.unselected a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template--> 
-
-<xsl:template match="color[@name='heading']">
+</xsl:template-->
+      <xsl:template match="color[@name='heading']">
 .heading { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='subheading']">
+</xsl:template>
+      <xsl:template match="color[@name='subheading']">
 .boxed { background-color: <xsl:value-of select="@value"/>;} 
 .underlined_5   {border-bottom: solid 5px <xsl:value-of select="@value"/>;}
 .underlined_10   {border-bottom: solid 10px <xsl:value-of select="@value"/>;}
@@ -252,8 +267,8 @@
 background-color: <xsl:value-of select="@value"/>; 
 color: <xsl:value-of select="@font"/>;
 }
-</xsl:template> 
-<xsl:template match="color[@name='feedback']">    
+</xsl:template>
+      <xsl:template match="color[@name='feedback']">    
 #feedback {
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>;
@@ -263,8 +278,7 @@
 color: <xsl:value-of select="@font"/>;
 }   
 </xsl:template>
-
-<xsl:template match="color[@name='breadtrail']">
+      <xsl:template match="color[@name='breadtrail']">
 .breadtrail {
 background: <xsl:value-of select="@value"/>; 
 color: <xsl:value-of select="@font"/>;
@@ -274,30 +288,28 @@
 .breadtrail a:hover { color: <xsl:value-of select="@hlink"/>; }
 </xsl:template>
 <!--Fix for other (old) profiles-->
-<xsl:template match="color[@name='navstrip']">
+      <xsl:template match="color[@name='navstrip']">
 #publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>; 
 }
-</xsl:template> 
+</xsl:template>
 <!--has to go after the nav-strip (no 'navstrip')-->
-<xsl:template match="color[@name='published']">
+      <xsl:template match="color[@name='published']">
 #publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>; 
 }
-</xsl:template> 
-<xsl:template match="color[@name='toolbox']">
+</xsl:template>
+      <xsl:template match="color[@name='toolbox']">
 #nav-section .menupagetitle  { background-color: <xsl:value-of select="@value"/>}
-</xsl:template> 
-
-<xsl:template match="color[@name='border']">
+</xsl:template>
+      <xsl:template match="color[@name='border']">
 #leftbar           { border-color: <xsl:value-of select="@value"/>;}
 #nav-section .menupagetitle  { border-color: <xsl:value-of select="@value"/>;}
 #nav-section .menupageitemgroup  { border-color: <xsl:value-of select="@value"/>;}
-</xsl:template> 
-
-<xsl:template match="color[@name='menu']">
+</xsl:template>
+      <xsl:template match="color[@name='menu']">
 #leftbar      { background-color: <xsl:value-of select="@value"/>;} 
 #leftbar  {  color: <xsl:value-of select="@font"/>;} 
 #leftbar a:link {  color: <xsl:value-of select="@link"/>;} 
@@ -305,8 +317,8 @@
 #leftbar a:hover {  
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@hlink"/>;} 
-</xsl:template> 
-<xsl:template match="color[@name='dialog']"> 
+</xsl:template>
+      <xsl:template match="color[@name='dialog']"> 
 #nav-section .menupagetitle  { color: <xsl:value-of select="@font"/>;}    
 #nav-section .menupageitemgroup     { 
 background-color: <xsl:value-of select="@value"/>;
@@ -320,21 +332,20 @@
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@hlink"/>;
 }
-</xsl:template> 
-<xsl:template match="color[@name='menuheading']">
+</xsl:template>
+      <xsl:template match="color[@name='menuheading']">
 #leftbar h1 {
 color: <xsl:value-of select="@font"/>;
 background-color: <xsl:value-of select="@value"/>;
 }   
-</xsl:template> 
-<xsl:template match="color[@name='searchbox']"> 
+</xsl:template>
+      <xsl:template match="color[@name='searchbox']"> 
 #header .searchbox { 
 background-color: <xsl:value-of select="@value"/> ;
 color: <xsl:value-of select="@font"/>; 
 } 
 </xsl:template>
-
-<xsl:template match="color[@name='body']">
+      <xsl:template match="color[@name='body']">
 body{ 
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@font"/>;
@@ -344,40 +355,31 @@
 a:hover { color:<xsl:value-of select="@hlink"/>} 
 
 </xsl:template>
-
-<xsl:template match="color[@name='footer']"> 
+      <xsl:template match="color[@name='footer']"> 
 #footer       { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-
+</xsl:template>
 <!-- ==================== other colors ============================ -->
-<xsl:template match="color[@name='highlight']"> 
+      <xsl:template match="color[@name='highlight']"> 
 .highlight        { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='fixme']"> 
+</xsl:template>
+      <xsl:template match="color[@name='fixme']"> 
 .fixme        { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='note']"> 
+</xsl:template>
+      <xsl:template match="color[@name='note']"> 
 .note         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='warning']"> 
+</xsl:template>
+      <xsl:template match="color[@name='warning']"> 
 .warning         { border-color: <xsl:value-of select="@value"/>;} 
 </xsl:template>
-
-<xsl:template match="color[@name='code']"> 
+      <xsl:template match="color[@name='code']"> 
 .code         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='table']"> 
+</xsl:template>
+      <xsl:template match="color[@name='table']"> 
 .ForrestTable      { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-<xsl:template match="color[@name='table-cell']"> 
+</xsl:template>
+      <xsl:template match="color[@name='table-cell']"> 
 .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
+</xsl:template>
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/profiling.css.xslt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/profiling.css.xslt?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/profiling.css.xslt (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/css/profiling.css.xslt Mon Apr  9 22:26:50 2007
@@ -16,49 +16,41 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
   <xsl:import href="../../common/css/forrest.css.xslt"/>
-
-  <!-- This is not used by Forrest but makes it possible to debug the 
+<!-- This is not used by Forrest but makes it possible to debug the 
        stylesheet in standalone editors -->
   <xsl:output method = "text"  omit-xml-declaration="yes"  />
-  
 <!-- ==================== main block colors ============================ -->
-
-<xsl:template match="color[@name='header']">
+  <xsl:template match="color[@name='header']">
 #branding {
 background-color: <xsl:value-of select="@value"/>;
 }  
 </xsl:template>
-
-<xsl:template match="color[@name='tab-selected']"> 
+  <xsl:template match="color[@name='tab-selected']"> 
 #nav-main .current { background-color: <xsl:value-of select="@value"/>;} 
 #nav-main .current a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main .current a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main .current a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='tab-unselected']"> 
+</xsl:template>
+  <xsl:template match="color[@name='tab-unselected']"> 
 #nav-main li      { background-color: <xsl:value-of select="@value"/> ;} 
 #nav-main li a:link {  color: <xsl:value-of select="@link"/>;  }
 #nav-main li a:visited { color: <xsl:value-of select="@vlink"/>; }
 #nav-main li a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
-<xsl:template match="color[@name='subtab-selected']">
+</xsl:template>
+  <xsl:template match="color[@name='subtab-selected']">
 #branding-tagline   { background-color: <xsl:value-of select="@value"/> ;} 
 #branding-tagline a:link {  color: <xsl:value-of select="@link"/>;  }
 #branding-tagline a:visited { color: <xsl:value-of select="@vlink"/>; }
 #branding-tagline a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template> 
-
+</xsl:template>
 <!--xsl:template match="color[@name='subtab-unselected']">
 .level2tabstrip { background-color: <xsl:value-of select="@value"/>;}
 .datenote { background-color: <xsl:value-of select="@value"/>;} 
 .level2tabstrip.unselected a:link {  color: <xsl:value-of select="@link"/>;  }
 .level2tabstrip.unselected a:visited { color: <xsl:value-of select="@vlink"/>; }
 .level2tabstrip.unselected a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template--> 
+</xsl:template-->
 <!--
 <xsl:template match="color[@name='heading']">
 .heading { background-color: <xsl:value-of select="@value"/>;} 
@@ -116,9 +108,8 @@
 #menu           { border-color: <xsl:value-of select="@value"/>;}
 #menu .menupagetitle  { border-color: <xsl:value-of select="@value"/>;}
 #menu .menupageitemgroup  { border-color: <xsl:value-of select="@value"/>;}
-</xsl:template--> 
-
-<xsl:template match="color[@name='menu']">
+</xsl:template-->
+  <xsl:template match="color[@name='menu']">
 #nav-section {
 background-color: <xsl:value-of select="@value"/>;
 color: <xsl:value-of select="@font"/>;
@@ -130,7 +121,7 @@
 color: <xsl:value-of select="@hlink"/>;
 } 
 #nav-section .menupagetitle  { color: <xsl:value-of select="@hlink"/>;}     
-</xsl:template> 
+</xsl:template>
 <!--xsl:template match="color[@name='dialog']"> 
 #menu .menupageitemgroup     { 
 	background-color: <xsl:value-of select="@value"/>;
@@ -138,27 +129,26 @@
 #menu .menupageitem {
 	color: <xsl:value-of select="@font"/>;
 } 
-</xsl:template--> 
-<xsl:template match="color[@name='menuheading']">
+</xsl:template-->
+  <xsl:template match="color[@name='menuheading']">
 .nav-section-title {
     color: <xsl:value-of select="@font"/>;
     background-color: <xsl:value-of select="@value"/>;
 }   
-</xsl:template> 
-<xsl:template match="color[@name='menuarea']">
+</xsl:template>
+  <xsl:template match="color[@name='menuarea']">
 #nav-section .currentmenuitemgroup {
     color: <xsl:value-of select="@font"/>;
     background-color: <xsl:value-of select="@value"/>;
 }   
-</xsl:template> 
-<xsl:template match="color[@name='searchbox']"> 
+</xsl:template>
+  <xsl:template match="color[@name='searchbox']"> 
 .search-input { 
     background-color: <xsl:value-of select="@value"/> ;
     color: <xsl:value-of select="@font"/>; 
 } 
 </xsl:template>
-
-<xsl:template match="color[@name='body']">
+  <xsl:template match="color[@name='body']">
 body         { background-color: <xsl:value-of select="@value"/>;
                color: <xsl:value-of select="@font"/>;} 
 a:link { color:<xsl:value-of select="@link"/>} 
@@ -173,12 +163,9 @@
                                 color:<xsl:value-of select="@hlink"/>} 
 */
 </xsl:template>
-
-<xsl:template match="color[@name='footer']"> 
+  <xsl:template match="color[@name='footer']"> 
 #footer       { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
-
-
+</xsl:template>
 <!-- ==================== other colors ============================ -->
 <!--xsl:template match="color[@name='highlight']"> 
 .highlight        { background-color: <xsl:value-of select="@value"/>;} 
@@ -206,7 +193,5 @@
 
 <xsl:template match="color[@name='table-cell']"> 
 .ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template--> 
-
-
+</xsl:template-->
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-abstract.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-abstract">
   <description>
-    <p>content-abstract will output the abstract of the content.</p>
+    <p>
+      content-abstract will output the abstract of the content.
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
+<![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
   </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -32,22 +34,19 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
             <fo:block font-size="12pt" text-align="center"
               space-before="20pt" space-after="25pt" width="7.5in"
               font-family="serif" font-style="italic">
-              <!-- FIXME - Don't know how to manage the insertPageBreaks... -->
-              <!--xsl:call-template name="insertPageBreaks"/-->
+<!-- FIXME - Don't know how to manage the insertPageBreaks... -->
+<!--xsl:call-template name="insertPageBreaks"/-->
               <xsl:apply-templates select="//div[@class='abstract']"/>
             </fo:block>
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-authors.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,14 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-authors">
   <description>
-    <p>content-authors will output the authors of the content.</p>
+    <p>
+      content-authors will output the authors of the content.
+    </p>
   </description>
- <usage><![CDATA[<forrest:contract name="content-authors" 
-          dataURI="cocoon://#{$getRequest}.authors.xml"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="content-authors" 
+          dataURI="cocoon://#{$getRequest}.authors.xml"/>]]>
+  </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="content-authors" inputFormat="xsl">
@@ -31,15 +35,14 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
             <xsl:if test="//div[@class='author']">
               <fo:block space-before="20pt" font-weight="bold" font-size="9pt">
-                <!-- FIXME - Don't know how to manage the insertPageBreaks... -->
-                <!--xsl:call-template name="insertPageBreaks"/-->
-                <!-- FIXME - insert i18n stuff here --> by
+<!-- FIXME - Don't know how to manage the insertPageBreaks... -->
+<!--xsl:call-template name="insertPageBreaks"/-->
+<!-- FIXME - insert i18n stuff here --> by
                 <xsl:for-each select="//div[@class='author']">
                   <xsl:value-of select="./div[@class='name']/text()"/>
                   <xsl:if test="not(position() = last())">,
@@ -49,9 +52,7 @@
             </xsl:if>
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main-outline.ft Mon Apr  9 22:26:50 2007
@@ -19,10 +19,11 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main-outline">
-<description>
+  <description>
     content-main-outline will output the main content outline of the document.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>]]>
+  <usage>
+<![CDATA[<forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>]]>
   </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -32,26 +33,23 @@
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       xmlns:fox="http://xml.apache.org/fop/extensions"
       version="1.0">
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/fox/outline">
             <xsl:apply-templates select="/tocitems"/>
           </forrest:part>
-        </forrest:content>  
+        </forrest:content>
       </xsl:template>
-
       <xsl:template match="tocitem">
         <fox:outline internal-destination="{@href}">
           <fox:label>
             <xsl:number format="1.1.1.1.1.1.1" count="tocitem" level="multiple"/>
-            <xsl:text> </xsl:text>
+<xsl:text> </xsl:text>
             <xsl:value-of select="@title"/>
           </fox:label>
           <xsl:apply-templates select="tocitem"/>
         </fox:outline>
       </xsl:template>
-
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Mon Apr  9 22:26:50 2007
@@ -19,10 +19,11 @@
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-main">
-<description>
+  <description>
     content-main will output the main content of the document.
   </description>
-  <usage><![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
+  <usage>
+<![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
        <forrest:property name="config">
         <!-- Settings specific to PDF output. -->
         <!-- 
@@ -64,25 +65,20 @@
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
       <xsl:param name="config"/>
-      <!-- left, justify, right -->
+<!-- left, justify, right -->
       <xsl:variable name="text-align"
         select="string($config/page/@text-align)"/>
-      
-      <!-- print URL of external links -->
+<!-- print URL of external links -->
       <xsl:variable name="show-external-urls"
         select="$config/show-external-urls"/>
-      
       <xsl:param name="numbersections" select="'true'"/>
-
-      <!-- page breaks after TOC and each page if an aggregate document -->
+<!-- page breaks after TOC and each page if an aggregate document -->
       <xsl:variable name="page-break-top-sections"
         select="'true'"/>
-
-      <!-- Section depth at which we stop numbering and just indent -->
+<!-- Section depth at which we stop numbering and just indent -->
       <xsl:param name="numbering-max-depth" select="'3'"/>
       <xsl:param name="imagesdir" select="."/>
       <xsl:param name="xmlbasedir"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/body">
@@ -91,62 +87,50 @@
             </fo:block>
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-
       <xsl:template match="anchor">
         <fo:block id="{@id}"/>
         <xsl:apply-templates/>
       </xsl:template>
-      
       <xsl:template match="section">
-        
         <xsl:param name="level">0</xsl:param>
-        
         <xsl:variable name="size">
-          <!-- 14pt for level 1 12pt for level 2 -->
+<!-- 14pt for level 1 12pt for level 2 -->
           <xsl:value-of select="14-number($level)"/>
         </xsl:variable>
-        
         <xsl:variable name="background-color"
           select="$config/page/@background-color"/>
         <xsl:variable name="heading-color"
           select="$config/headings/@color"/>
         <xsl:variable name="heading-type"
           select="$config/headings/@type"/>
- 
         <fo:block font-family="serif" font-size="{$size}pt"
           font-weight="bold" space-before="12pt"
           space-after="4pt" id="#{@id}">
-          
           <xsl:call-template name="insertPageBreaks"/>
-          
           <xsl:if test="$heading-type = 'boxed'">
             <xsl:attribute name="background-color">
               <xsl:value-of select="$heading-color"/>
             </xsl:attribute>
           </xsl:if>
-
           <xsl:if
             test="$numbersections = 'true' and number($level) &lt; $numbering-max-depth+1">
             <xsl:number format="1.1.1.1.1.1.1" count="section"
               level="multiple"/>
-            <xsl:text>. </xsl:text>
+<xsl:text>. </xsl:text>
           </xsl:if>
-
-          <!-- For sections 4  or more nestings deep, indent instead of number -->
+<!-- For sections 4  or more nestings deep, indent instead of number -->
           <xsl:if
             test="number($level) &gt; $numbering-max-depth+1">
             <xsl:attribute name="start-indent">
               <xsl:value-of select="4+number($level)"/>
-              <xsl:text>pt</xsl:text>
+<xsl:text>pt</xsl:text>
             </xsl:attribute>
           </xsl:if>
-          
           <xsl:value-of select="title"/>
         </fo:block>
         <xsl:if test="$heading-type = 'underlined'">
-          <!-- The non-breaking space in this block is required, otherwise
+<!-- The non-breaking space in this block is required, otherwise
           the block won't be rendered at all. -->
           <fo:block font-family="serif"
             font-size="{10 div (number($level) +1 )}pt"
@@ -160,10 +144,8 @@
           </xsl:apply-templates>
         </fo:block>
       </xsl:template>
-
-      <!-- Already taken into account with sections -->
+<!-- Already taken into account with sections -->
       <xsl:template match="title"/>
-
       <xsl:template match="p">
         <xsl:choose>
           <xsl:when
@@ -182,7 +164,6 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
-      
       <xsl:template match="source">
         <xsl:variable name="color"
           select="$config/colors/color[@name='code']/@value"/>
@@ -196,7 +177,6 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:template>
-      
       <xsl:template match="ol|ul">
         <fo:list-block
           provisional-distance-between-starts="18pt"
@@ -205,7 +185,6 @@
           <xsl:apply-templates/>
         </fo:list-block>
       </xsl:template>
-      
       <xsl:template match="ol/li">
         <fo:list-item>
           <xsl:if test="not(following-sibling::li[1])">
@@ -224,8 +203,7 @@
           </fo:list-item-body>
         </fo:list-item>
       </xsl:template>
-      
-      <!-- Emulate browser handling of these invalid combinations that our DTD
+<!-- Emulate browser handling of these invalid combinations that our DTD
       unfortunately allows -->
       <xsl:template match="ul/ul | ul/ol | ol/ul | ol/ol">
         <fo:list-item>
@@ -239,7 +217,6 @@
           </fo:list-item-body>
         </fo:list-item>
       </xsl:template>
-      
       <xsl:template match="ul/li">
         <fo:list-item>
           <xsl:if test="not(following-sibling::li[1])">
@@ -257,7 +234,6 @@
           </fo:list-item-body>
         </fo:list-item>
       </xsl:template>
-      
       <xsl:template match="dl">
         <fo:list-block
           provisional-distance-between-starts="18pt"
@@ -266,7 +242,6 @@
           <xsl:apply-templates/>
         </fo:list-block>
       </xsl:template>
-      
       <xsl:template match="dt">
         <fo:list-item>
           <fo:list-item-label end-indent="label-end()">
@@ -279,7 +254,6 @@
           </fo:list-item-body>
         </fo:list-item>
       </xsl:template>
-      
       <xsl:template match="dd">
         <fo:list-item>
           <fo:list-item-label end-indent="label-end()">
@@ -292,25 +266,21 @@
           </fo:list-item-body>
         </fo:list-item>
       </xsl:template>
-      
       <xsl:template match="strong">
         <fo:inline font-weight="bold">
           <xsl:apply-templates/>
         </fo:inline>
       </xsl:template>
-      
       <xsl:template match="em">
         <fo:inline font-style="italic">
           <xsl:apply-templates/>
         </fo:inline>
       </xsl:template>
-      
       <xsl:template match="code">
         <fo:inline font-family="monospace">
           <xsl:apply-templates/>
         </fo:inline>
       </xsl:template>
-      
       <xsl:template match="warning">
         <xsl:variable name="color"
           select="$config/colors/color[@name='warning']/@value"/>
@@ -341,7 +311,6 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:template>
-      
       <xsl:template match="note">
         <xsl:variable name="color"
           select="$config/colors/color[@name='note']/@value"/>
@@ -357,7 +326,7 @@
             <xsl:when test="@label">
               <xsl:value-of select="@label"/>
             </xsl:when>
-            <!-- insert i18n stuff here -->
+<!-- insert i18n stuff here -->
             <xsl:otherwise>Note: </xsl:otherwise>
           </xsl:choose>
           <xsl:value-of select="title"/>
@@ -372,7 +341,6 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:template>
-      
       <xsl:template match="fixme">
         <xsl:variable name="color"
           select="$config/colors/color[@name='fixme']/@value"/>
@@ -384,9 +352,10 @@
           border-color="{$color}"
           background-color="{$color}">
           <xsl:call-template name="insertPageBreaks"/>
-          <!-- insert i18n stuff here --> FIXME (
+<!-- insert i18n stuff here --> FIXME (
           <xsl:value-of select="@author"/>):
-          <xsl:value-of select="title"/> </fo:block>
+          <xsl:value-of select="title"/>
+        </fo:block>
         <fo:block margin-left="0.25in" margin-right="0.25in"
           font-family="serif" font-size="8pt"
           space-after="10pt" border-after-style="solid"
@@ -397,7 +366,6 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:template>
-      
       <xsl:template match="link|fork|jump">
         <xsl:variable name="color"
           select="$config/colors/color[@name = 'body']/@link"/>
@@ -422,7 +390,6 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:template>
-      
       <xsl:template match="figure|img">
         <fo:block text-align="center">
           <xsl:call-template name="insertPageBreaks"/>
@@ -431,22 +398,21 @@
               <xsl:value-of select="@id"/>
             </xsl:attribute>
           </xsl:if>
-          
-          <!-- Make relative paths absolute -->
+<!-- Make relative paths absolute -->
           <xsl:variable name="imgpath">
             <xsl:choose>
-              <!-- resources image dir -->
+<!-- resources image dir -->
               <xsl:when
                 test="starts-with(string(@src),'images/')">
                 <xsl:value-of
                   select="concat($imagesdir,substring-after(@src,'images'))"/>
               </xsl:when>
-              <!-- already absolute -->
+<!-- already absolute -->
               <xsl:when
                 test="contains(string(@src),':') or starts-with(string(@src),'/')">
                 <xsl:value-of select="@src"/>
               </xsl:when>
-              <!-- relative to document -->
+<!-- relative to document -->
               <xsl:otherwise>
                 <xsl:value-of
                   select="concat($xmlbasedir,@src)"/>
@@ -465,7 +431,7 @@
               </xsl:attribute>
             </xsl:if>
           </fo:external-graphic>
-          <!-- alt text -->
+<!-- alt text -->
           <xsl:if test="$config/show-image-alt-text='true'">
             <xsl:if test="normalize-space(@alt)!=''">
               <fo:block>
@@ -475,13 +441,11 @@
           </xsl:if>
         </fo:block>
       </xsl:template>
-      
       <xsl:template match="table">
-        <!-- FIXME: Apache FOP must have column widths specified at present,
+<!-- FIXME: Apache FOP must have column widths specified at present,
         this section can be removed when this limitation is removed from Fop.
         Unfortunately, this means that each column is a fixed width,
         but at least the table displays! -->
-        
         <xsl:variable name="max-number-columns-td">
           <xsl:for-each select="tr">
             <xsl:sort select="count(td|th)" data-type="number"
@@ -491,7 +455,6 @@
             </xsl:if>
           </xsl:for-each>
         </xsl:variable>
-        
         <xsl:variable name="max-number-columns-colspan">
           <xsl:for-each select="tr">
             <xsl:sort select="count(td|th)" data-type="number"
@@ -501,7 +464,6 @@
             </xsl:if>
           </xsl:for-each>
         </xsl:variable>
-        
         <xsl:variable name="max-number-columns">
           <xsl:choose>
             <xsl:when test="$max-number-columns-colspan&gt;$max-number-columns-td">
@@ -512,55 +474,47 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        
         <xsl:variable name="column-width">
           <xsl:value-of
             select="6.25 div number($max-number-columns)"/>
           in </xsl:variable>
-        
         <fo:table>
-          
           <fo:table-column>
             <xsl:attribute name="column-width">
               <xsl:value-of select="$column-width"/>
             </xsl:attribute>
-            
             <xsl:attribute name="number-columns-repeated">
               <xsl:value-of
                 select="number($max-number-columns)"/>
             </xsl:attribute>
           </fo:table-column>
-          
-          <!-- End of hack for Fop support (if removing this hack, remember
+<!-- End of hack for Fop support (if removing this hack, remember
           you need the <fo:table> element) -->
-          
           <fo:table-body font-size="10pt"
             font-family="sans-serif">
             <xsl:apply-templates select="tr"/>
           </fo:table-body>
         </fo:table>
-        
-        <!-- FIXME: Apache Fop does not support the caption element yet.
+<!-- FIXME: Apache Fop does not support the caption element yet.
         
         
         This hack will display the table caption accordingly. -->
         <xsl:if test="caption">
           <fo:block text-align="center" font-weight="bold">
-            <!-- insert i18n stuff here --> Table
+<!-- insert i18n stuff here --> Table
             <xsl:text>
             </xsl:text>
             <xsl:number count="table" level="multiple"/>
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="caption"/> </fo:block>
+<xsl:text>: </xsl:text>
+            <xsl:value-of select="caption"/>
+          </fo:block>
         </xsl:if>
       </xsl:template>
-      
       <xsl:template match="tr">
         <fo:table-row>
           <xsl:apply-templates/>
         </fo:table-row>
       </xsl:template>
-      
       <xsl:template match="th">
         <xsl:variable name="border-color"
           select="$config/colors/color[@name = 'table']/@value"/>
@@ -582,7 +536,6 @@
           </fo:block>
         </fo:table-cell>
       </xsl:template>
-      
       <xsl:template match="td">
         <xsl:variable name="border-color"
           select="$config/colors/color[@name = 'table']/@value"/>
@@ -604,28 +557,21 @@
           </fo:block>
         </fo:table-cell>
       </xsl:template>
-      
       <xsl:template match="br">
         <fo:block></fo:block>
       </xsl:template>
-      
       <xsl:template match="legal">
         <fo:inline font-size="8pt">
           <xsl:apply-templates/>
         </fo:inline>
       </xsl:template>
-
-      <!-- ====================================================================== -->
-      <!-- Local Extensions section -->
-      
-      
-      <!-- ====================================================================== -->
-      
+<!-- ====================================================================== -->
+<!-- Local Extensions section -->
+<!-- ====================================================================== -->
       <xsl:template match="citation">
         <fo:inline> [
           <xsl:value-of select="@def"/>] </fo:inline>
       </xsl:template>
-      
       <xsl:template match="p[@class='quote']">
         <fo:block start-indent="1em" space-before="4pt"
           space-after="4pt" background-color="#f0f0f0"
@@ -634,42 +580,30 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:template>
-      
       <xsl:template name="insertPageBreaks">
-        
-        
-        <!-- if marked as a 'pageBreakBefore', and we're breaking on pages, and were not the first node -->
+<!-- if marked as a 'pageBreakBefore', and we're breaking on pages, and were not the first node -->
         <xsl:if
           test="contains(@class, 'pageBreakBefore') and preceding-sibling::node()">
           <xsl:attribute name="break-before">
             page</xsl:attribute>
         </xsl:if>
-        
-        
-        <!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and were not the last node -->
+<!-- if marked as a 'pageBreakAfter', and we're breaking on pages, and were not the last node -->
         <xsl:if
           test="contains(@class, 'pageBreakAfter') and following-sibling::node()">
           <xsl:attribute name="break-after">
             page</xsl:attribute>
         </xsl:if>
       </xsl:template>
-
-      <!-- ====================================================================== -->
-      
-      
-      <!-- Temporary section - subject to change on short notice  -->
-      
-      
-      <!-- ====================================================================== -->
-      
+<!-- ====================================================================== -->
+<!-- Temporary section - subject to change on short notice  -->
+<!-- ====================================================================== -->
       <xsl:template match="//style">
-        <!-- HACK: The OpenOffice.org input plugin currently produces
+<!-- HACK: The OpenOffice.org input plugin currently produces
         intermediate documents that contain a style element, invalid per
         the Forrest Document DTD. This style element must be ignored
         here. To find out why this is done this way, read the comments
         attached to issue FOR-433. -->
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-notice.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-notice">
   <description>
-    <p>content-notice will output the notice of the content.</p>
+    <p>
+      content-notice will output the notice of the content.
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>]]>
+<![CDATA[<forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>]]>
   </usage>
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -32,7 +34,6 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
@@ -40,16 +41,15 @@
               <fo:block font-size="10pt" text-align="left" space-before="20pt" width="7.5in"
                 font-family="serif" border-top="0.25pt solid" border-bottom="0.25pt solid" padding-before="6pt"
                 padding-after="6pt">
-                <!-- FIXME - Don't know how to manage the insertPageBreaks... -->
-                <!--xsl:call-template name="insertPageBreaks"/-->
-                <!-- FIXME - insert i18n stuff here --> NOTICE:
+<!-- FIXME - Don't know how to manage the insertPageBreaks... -->
+<!--xsl:call-template name="insertPageBreaks"/-->
+<!-- FIXME - insert i18n stuff here --> NOTICE:
                 <xsl:apply-templates/>
               </fo:block>
             </xsl:if>
           </forrest:part>
         </forrest:content>
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-title.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-title">
   <description>
-    <p>content-title - - Template will output the title of the pdf file.</p>
+    <p>
+      content-title - - Template will output the title of the pdf file.
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="content-title"
+<![CDATA[<forrest:contract name="content-title"
       dataURI="cocoon://#{$getRequest}.title.xml"/>]]>
   </usage>
   <forrest:template
@@ -33,7 +35,6 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
- 
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/page-sequence">
@@ -45,8 +46,8 @@
             <fo:block padding-before="24pt" padding-after="24pt" font-size="24pt" font-weight="bold" id="{generate-id()}">
               <xsl:value-of select="title"/>
             </fo:block>
-            <!-- FIXME - Need to manage Subtitle -->       
-            <!--
+<!-- FIXME - Need to manage Subtitle -->
+<!--
             <fo:block font-weight="bold" font-size="16pt">
               <xsl:call-template name="insertPageBreaks"/>
               <xsl:apply-templates/>
@@ -55,7 +56,6 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-toc.ft Mon Apr  9 22:26:50 2007
@@ -20,12 +20,17 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="content-toc">
   <description>
-    <p>content-toc will output the table of content.</p>
-    <p>@toc-max-depth - Specifies how many "section" levels need to be included in the
-        generated Table of Contents (TOC).</p>
+    <p>
+      content-toc will output the table of content.
+    </p>
+
+    <p>
+      @toc-max-depth - Specifies how many "section" levels need to be included
+      in the generated Table of Contents (TOC).
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="content-toc" dataURI="cocoon://#{$getRequest}.toc.xml">
+<![CDATA[<forrest:contract name="content-toc" dataURI="cocoon://#{$getRequest}.toc.xml">
       <forrest:property name="max-depth">2</forrest:property>
       <forrest:property name="page-break-after">[true|false]</forrest:property>
     </xsl:forrest:contract>]]>
@@ -39,7 +44,6 @@
       version="1.0">
       <xsl:param name="max-depth" select="2"/>
       <xsl:param name="page-break-after" select="'true'"/>
-
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
@@ -47,9 +51,9 @@
               font-weight="bold" space-after="5pt"
               space-before="5pt" text-align="justify"
               width="7.5in">
-              <!-- xsl:call-template name="insertPageBreaks"/ -->
-              <!-- FIXME - insert i18n stuff here -->
-              <xsl:text>Table of contents</xsl:text>
+<!-- xsl:call-template name="insertPageBreaks"/ -->
+<!-- FIXME - insert i18n stuff here -->
+<xsl:text>Table of contents</xsl:text>
             </fo:block>
             <fo:block font-family="sans" font-size="12pt"
               space-after="5pt" space-before="0pt"
@@ -62,9 +66,8 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-
       <xsl:template match="tocitem">
-        <!-- FIXME: see bug FOR-640 -->
+<!-- FIXME: see bug FOR-640 -->
         <xsl:param name="depth" select="'1'"/>
         <fo:block space-before="5pt" text-align-last="justify"
           start-indent=".5em" text-indent=".5em">
@@ -76,7 +79,7 @@
                 <xsl:number count="tocitem"
                   format="1.1.1.1.1.1.1" level="multiple"/>
               </fo:inline>
-              <xsl:text>
+<xsl:text>
               </xsl:text>
               <xsl:value-of select="@title"/>
               <fo:leader leader-pattern="dots"/>
@@ -91,7 +94,6 @@
           </xsl:if>
         </fo:block>
       </xsl:template>
-
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/layout-master-set.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/layout-master-set.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/layout-master-set.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/layout-master-set.ft Mon Apr  9 22:26:50 2007
@@ -20,10 +20,12 @@
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="layout-master-set">
   <description>
-    <p>layout master set generate the ...</p>
+    <p>
+      layout master set generate the ...
+    </p>
   </description>
   <usage>
-    <![CDATA[<forrest:contract name="layout-master-set">
+<![CDATA[<forrest:contract name="layout-master-set">
       <forrest:property name="config">
         <!-- Settings specific to PDF output. -->
         <!-- 
@@ -60,42 +62,34 @@
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
       <xsl:param name="config"/>
-      
-      <!-- The page size to be used -->
+<!-- The page size to be used -->
       <xsl:variable name="pagesize"
         select="string($config/page/@size)"/>
-      
-      <!-- The page orientation ("portrait" or "landscape") -->
+<!-- The page orientation ("portrait" or "landscape") -->
       <xsl:variable name="pageorientation"
         select="string($config/page/@orientation)"/>
-      
-      <!-- Double-sided printing toggle -->
+<!-- Double-sided printing toggle -->
       <xsl:variable name="doublesided"
         select="string($config/margins/@double-sided)"/>
-      
-      <!-- The top page margin -->
+<!-- The top page margin -->
       <xsl:variable name="topmargin"
         select="string($config/margins/top)"/>
-      
-      <!-- The bottom page margin -->
+<!-- The bottom page margin -->
       <xsl:variable name="bottommargin"
         select="string($config/margins/bottom)"/>
-      
-      <!-- The inner page margin (always the left margin if
+<!-- The inner page margin (always the left margin if
       double-sided printing is off, alternating between left and right if
       it's on) -->
       <xsl:variable name="innermargin"
         select="string($config/margins/inner)"/>
-      
-      <!-- The outer page margin (always the right margin if
+<!-- The outer page margin (always the right margin if
       double-sided printing is off, alternating between right and left if
       it's on)-->
       <xsl:variable name="outermargin"
         select="string($config/margins/outer)"/>
-      
-      <!-- Determine page height for various page sizes (US Letter portrait
+<!-- Determine page height for various page sizes (US Letter portrait
       is the default) -->
-      <!-- FIXME: JJP:would this be better of a file? -->
+<!-- FIXME: JJP:would this be better of a file? -->
       <xsl:variable name="pageheight">
         <xsl:choose>
           <xsl:when test="$pageorientation = 'landscape'">
@@ -160,8 +154,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
-      
-      <!-- Determine page width for various page sizes (US Letter portrait
+<!-- Determine page width for various page sizes (US Letter portrait
       is the default) -->
       <xsl:variable name="pagewidth">
         <xsl:choose>
@@ -227,7 +220,6 @@
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
-      
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/layout-master-set">
@@ -244,7 +236,6 @@
               <fo:region-after region-name="first-footer"
                 extent=".5in" display-align="before"/>
             </fo:simple-page-master>
-                
             <fo:simple-page-master
               master-name="even-page"
               page-height="{$pageheight}"
@@ -277,7 +268,6 @@
               <fo:region-after region-name="even-footer"
                 extent=".5in" display-align="before"/>
             </fo:simple-page-master>
-            
             <fo:simple-page-master master-name="odd-page"
               page-height="{$pageheight}"
               page-width="{$pagewidth}"
@@ -293,26 +283,22 @@
               <fo:region-after region-name="odd-footer"
                 extent=".5in" display-align="before"/>
             </fo:simple-page-master>
-                
-                <fo:page-sequence-master master-name="book">
-                  <fo:repeatable-page-master-alternatives>
-                    <fo:conditional-page-master-reference
+            <fo:page-sequence-master master-name="book">
+              <fo:repeatable-page-master-alternatives>
+                <fo:conditional-page-master-reference
                       page-position="first"
                       master-reference="first-page"/>
-                    <fo:conditional-page-master-reference
+                <fo:conditional-page-master-reference
                       odd-or-even="odd"
                       master-reference="odd-page"/>
-                    <fo:conditional-page-master-reference
+                <fo:conditional-page-master-reference
                       odd-or-even="even"
                       master-reference="even-page"/>
-                  </fo:repeatable-page-master-alternatives>
-                </fo:page-sequence-master>
-              
+              </fo:repeatable-page-master-alternatives>
+            </fo:page-sequence-master>
           </forrest:part>
         </forrest:content>
-        
       </xsl:template>
-      
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/noFt.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/noFt.ft?view=diff&rev=527035&r1=527034&r2=527035
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/noFt.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/noFt.ft Mon Apr  9 22:26:50 2007
@@ -17,22 +17,28 @@
 -->
 <forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0" 
   name="noFt" >
-  <description> 
-    <p>Error 440<br/> Template not found. This functions is a fallback 
-    when no ft is found. This is just a dummy, it will output *nothing*.</p>
+  <description>
+    <p>
+      Error 440
+      <br/>
+      Template not found. This functions is a fallback when no ft is found. This
+      is just a dummy, it will output *nothing*.
+    </p>
   </description>
-  <usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
+  <usage>
+<![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]>
+  </usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
     format="html" name="noFt" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:template name="/"> 
+      <xsl:template name="/">
         <forrest:content>
           <forrest:part>
             Error 440 - Template not found. 
           </forrest:part>
         </forrest:content>
-        </xsl:template>
+      </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>



Mime
View raw message