forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [8/14] - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher: ./ resources/stylesheets/ resources/stylesheets/fo/ resources/stylesheets/helper/ resources/stylesheets/html/ resources/styleshe...
Date Thu, 27 Aug 2009 12:07:47 GMT
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/branding-theme-profiler.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,29 +15,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract 
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="branding-theme-profiler" type="nugget">
+<forrest:contract 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).
-    </p>
+    <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
 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>
+    <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"/>
@@ -65,321 +61,292 @@
  <color name="warning" value="#990000"/>
  <color name="code" value="#CFDCED"/>
  <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.
-    </p>
+
+
+    
+</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.</p>
     <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
-          the "pelt" theme uses them, other themes might use these elements in a different way or do not support them at all.<br/>
-          Tip: temporarily change the value of an element to red (#ff0000) and see the effect.
-      </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 the "pelt" theme uses them, other themes might use these
+      elements in a different way or do not support them at all. 
+      <br />Tip: temporarily change the value of an element to red (#ff0000)
+      and see the effect.</div>
     </div>
     <div class="note">
       <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/>
-        </p>
+        <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 /></p>
       </div>
     </div>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="branding-theme-profiler">
+    <![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>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-   name="branding-theme-profiler" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="branding-theme-profiler"/>
-      <xsl:param name="branding-theme-profiler-theme"/>
-      <xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
-      <xsl:variable name="header-input" 
-        select="substring-after($branding-theme-profiler/color[@name='header']/@value, '#')"/>
+  name="branding-theme-profiler" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="branding-theme-profiler" />
+      <xsl:param name="branding-theme-profiler-theme" />
+      <xsl:variable name="skin-img-dir"
+      select="$defaultVariables/*[@name='skin-img-dir']/@value" />
+      <xsl:variable name="header-input"
+      select="substring-after($branding-theme-profiler/color[@name='header']/@value, '#')" />
       <xsl:variable name="header">
         <xsl:if test="$header-input=''">294563</xsl:if>
         <xsl:if test="not($header-input='')">
-          <xsl:value-of select="$header-input"/>
+          <xsl:value-of select="$header-input" />
         </xsl:if>
       </xsl:variable>
-      <xsl:variable name="body-input" 
-        select="substring-after($branding-theme-profiler/color[@name='body']/@value, '#')"/>
+      <xsl:variable name="body-input"
+      select="substring-after($branding-theme-profiler/color[@name='body']/@value, '#')" />
       <xsl:variable name="body">
         <xsl:if test="$body-input=''">FFFFFF</xsl:if>
         <xsl:if test="not($body-input='')">
-          <xsl:value-of select="$body-input"/>
+          <xsl:value-of select="$body-input" />
         </xsl:if>
       </xsl:variable>
-      <xsl:variable name="searchbox-input" 
-        select="substring-after($branding-theme-profiler/color[@name='searchbox']/@value, '#')"/>
+      <xsl:variable name="searchbox-input"
+      select="substring-after($branding-theme-profiler/color[@name='searchbox']/@value, '#')" />
       <xsl:variable name="searchbox">
         <xsl:if test="$searchbox-input=''">4A6D8C</xsl:if>
         <xsl:if test="not($searchbox-input='')">
-          <xsl:value-of select="$searchbox-input"/>
+          <xsl:value-of select="$searchbox-input" />
         </xsl:if>
       </xsl:variable>
-      <xsl:variable name="tab-selected-input" 
-        select="substring-after($branding-theme-profiler/color[@name='tab-selected']/@value, '#')"/>
+      <xsl:variable name="tab-selected-input"
+      select="substring-after($branding-theme-profiler/color[@name='tab-selected']/@value, '#')" />
       <xsl:variable name="tab-selected">
         <xsl:if test="$tab-selected-input=''">4A6D8C</xsl:if>
         <xsl:if test="not($tab-selected-input='')">
-          <xsl:value-of select="$tab-selected-input"/>
+          <xsl:value-of select="$tab-selected-input" />
         </xsl:if>
       </xsl:variable>
-      <xsl:variable name="tab-unselected-input" 
-        select="substring-after($branding-theme-profiler/color[@name='tab-unselected']/@value, '#')"/>
+      <xsl:variable name="tab-unselected-input"
+      select="substring-after($branding-theme-profiler/color[@name='tab-unselected']/@value, '#')" />
       <xsl:variable name="tab-unselected">
         <xsl:if test="$tab-unselected-input=''">B5C7E7</xsl:if>
         <xsl:if test="not($tab-unselected-input='')">
-          <xsl:value-of select="$tab-unselected-input"/>
+          <xsl:value-of select="$tab-unselected-input" />
         </xsl:if>
       </xsl:variable>
-      <xsl:variable name="menu-input" 
-        select="substring-after($branding-theme-profiler/color[@name='menu']/@value, '#')"/>
+      <xsl:variable name="menu-input"
+      select="substring-after($branding-theme-profiler/color[@name='menu']/@value, '#')" />
       <xsl:variable name="menu">
         <xsl:if test="$menu-input=''">4A6D8C</xsl:if>
         <xsl:if test="not($menu-input='')">
-          <xsl:value-of select="$menu-input"/>
+          <xsl:value-of select="$menu-input" />
         </xsl:if>
       </xsl:variable>
       <xsl:template match="/">
         <forrest:content>
-          <forrest:part>
-/* branding-theme-profiler-theme: <xsl:value-of select="normalize-space($branding-theme-profiler-theme)"/> */ 
-#header .round-top-left-small {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($searchbox)"/>-fg<xsl:value-of select="normalize-space($searchbox)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-}
-#header .round-top-right-small {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($searchbox)"/>-fg<xsl:value-of select="normalize-space($searchbox)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-#nav-main li {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-unselected)"/>-fg<xsl:value-of select="normalize-space($tab-unselected)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-#nav-main li a {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-unselected)"/>-fg<xsl:value-of select="normalize-space($tab-unselected)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-}
-#nav-main .current {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-r-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-selected)"/>-fg<xsl:value-of select="normalize-space($tab-selected)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top right;
-}
-#nav-main .current a {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-t-l-5-bg<xsl:value-of select="normalize-space($header)"/>-stroke<xsl:value-of select="normalize-space($tab-selected)"/>-fg<xsl:value-of select="normalize-space($tab-selected)"/>.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-}
-#roundbottom {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-b-r-15-bg<xsl:value-of select="normalize-space($body)"/>-stroke<xsl:value-of select="normalize-space($menu)"/>-fg<xsl:value-of select="normalize-space($menu)"/>.png);
-    background-repeat: no-repeat;
-    background-position: bottom right;
-}
-#roundbottomLeft {
-    background-image: url(<xsl:value-of select="$skin-img-dir"/>/roundcorner-b-l-15-bg<xsl:value-of select="normalize-space($body)"/>-stroke<xsl:value-of select="normalize-space($menu)"/>-fg<xsl:value-of select="normalize-space($menu)"/>.png);
-    background-repeat: no-repeat;
-    background-position: bottom left;
-}
-            <xsl:apply-templates select="$branding-theme-profiler/color"/>
-          </forrest:part>
+          <forrest:part>/* branding-theme-profiler-theme: 
+          <xsl:value-of select="normalize-space($branding-theme-profiler-theme)" />*/
+          #header .round-top-left-small { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-l-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($searchbox)" />-fg 
+          <xsl:value-of select="normalize-space($searchbox)" />.png);
+          background-repeat: no-repeat; background-position: top left; }
+          #header .round-top-right-small { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-r-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($searchbox)" />-fg 
+          <xsl:value-of select="normalize-space($searchbox)" />.png);
+          background-repeat: no-repeat; background-position: top right; }
+          #nav-main li { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-r-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($tab-unselected)" />-fg 
+          <xsl:value-of select="normalize-space($tab-unselected)" />.png);
+          background-repeat: no-repeat; background-position: top right; }
+          #nav-main li a { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-l-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($tab-unselected)" />-fg 
+          <xsl:value-of select="normalize-space($tab-unselected)" />.png);
+          background-repeat: no-repeat; background-position: top left; }
+          #nav-main .current { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-r-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($tab-selected)" />-fg 
+          <xsl:value-of select="normalize-space($tab-selected)" />.png);
+          background-repeat: no-repeat; background-position: top right; }
+          #nav-main .current a { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-t-l-5-bg 
+          <xsl:value-of select="normalize-space($header)" />-stroke 
+          <xsl:value-of select="normalize-space($tab-selected)" />-fg 
+          <xsl:value-of select="normalize-space($tab-selected)" />.png);
+          background-repeat: no-repeat; background-position: top left; }
+          #roundbottom { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-b-r-15-bg 
+          <xsl:value-of select="normalize-space($body)" />-stroke 
+          <xsl:value-of select="normalize-space($menu)" />-fg 
+          <xsl:value-of select="normalize-space($menu)" />.png);
+          background-repeat: no-repeat; background-position: bottom right; }
+          #roundbottomLeft { background-image: url( 
+          <xsl:value-of select="$skin-img-dir" />/roundcorner-b-l-15-bg 
+          <xsl:value-of select="normalize-space($body)" />-stroke 
+          <xsl:value-of select="normalize-space($menu)" />-fg 
+          <xsl:value-of select="normalize-space($menu)" />.png);
+          background-repeat: no-repeat; background-position: bottom left; } 
+          <xsl:apply-templates select="$branding-theme-profiler/color" /></forrest:part>
         </forrest:content>
       </xsl:template>
-<!-- ==================== 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']"> 
-#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']"> 
-#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']">
-#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 match="color[@name='subtab-unselected']">
+      <!-- ==================== 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']">#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']">#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']">#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 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']">
-.heading { background-color: <xsl:value-of select="@value"/>;} 
-</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"/>;}
-table caption { 
-background-color: <xsl:value-of select="@value"/>; 
-color: <xsl:value-of select="@font"/>;
-}
-</xsl:template>
-      <xsl:template match="color[@name='feedback']">    
-#feedback {
-color: <xsl:value-of select="@font"/>;
-background: <xsl:value-of select="@value"/>;
-text-align: <xsl:value-of select="@align"/>;
-}
-#feedback #feedbackto {
-color: <xsl:value-of select="@font"/>;
-}   
-</xsl:template>
-      <xsl:template match="color[@name='breadtrail']">
-.breadtrail {
-background: <xsl:value-of select="@value"/>; 
-color: <xsl:value-of select="@font"/>;
-}
-.breadtrail a:link {  color: <xsl:value-of select="@link"/>;  }
-.breadtrail a:visited { color: <xsl:value-of select="@vlink"/>; }
-.breadtrail a:hover { color: <xsl:value-of select="@hlink"/>; }
-</xsl:template>
-<!--Fix for other (old) profiles-->
-      <xsl:template match="color[@name='navstrip']">
-#publishedStrip { 
-color: <xsl:value-of select="@font"/>;
-background: <xsl:value-of select="@value"/>; 
-}
-</xsl:template>
-<!--has to go after the nav-strip (no 'navstrip')-->
-      <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']">
-#nav-section .menupagetitle  { background-color: <xsl:value-of select="@value"/>}
-</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']">
-#leftbar      { background-color: <xsl:value-of select="@value"/>;} 
-#leftbar  {  color: <xsl:value-of select="@font"/>;} 
-#leftbar a:link {  color: <xsl:value-of select="@link"/>;} 
-#leftbar a:visited {  color: <xsl:value-of select="@vlink"/>;} 
-#leftbar a:hover {  
-background-color: <xsl:value-of select="@value"/>;
-color: <xsl:value-of select="@hlink"/>;} 
-</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"/>;
-}
-#nav-section .menupageitem {
-color: <xsl:value-of select="@font"/>;
-} 
-#nav-section .menupageitem a:link {  color: <xsl:value-of select="@link"/>;} 
-#nav-section .menupageitem a:visited {  color: <xsl:value-of select="@vlink"/>;} 
-#nav-section .menupageitem a:hover {  
-background-color: <xsl:value-of select="@value"/>;
-color: <xsl:value-of select="@hlink"/>;
-}
-</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']"> 
-#header .searchbox { 
-background-color: <xsl:value-of select="@value"/> ;
-color: <xsl:value-of select="@font"/>; 
-} 
-</xsl:template>
-      <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"/>} 
-a:visited { color:<xsl:value-of select="@vlink"/>} 
-a:hover { color:<xsl:value-of select="@hlink"/>} 
-
-</xsl:template>
-      <xsl:template match="color[@name='footer']"> 
-#footer       { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-<!-- ==================== other colors ============================ -->
-      <xsl:template match="color[@name='highlight']"> 
-.highlight        { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-      <xsl:template match="color[@name='fixme']"> 
-.fixme        { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-      <xsl:template match="color[@name='note']"> 
-.note         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-      <xsl:template match="color[@name='warning']"> 
-.warning         { border-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-      <xsl:template match="color[@name='code']"> 
-.code         { border-color: <xsl:value-of select="@value"/>;} 
-</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']"> 
-.ForrestTable td   { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
+      <xsl:template match="color[@name='heading']">.heading { background-color:
+      
+      <xsl:value-of select="@value" />;}</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" />;} table caption { background-color: 
+      <xsl:value-of select="@value" />; color: 
+      <xsl:value-of select="@font" />; }</xsl:template>
+      <xsl:template match="color[@name='feedback']">#feedback { color: 
+      <xsl:value-of select="@font" />; background: 
+      <xsl:value-of select="@value" />; text-align: 
+      <xsl:value-of select="@align" />; } #feedback #feedbackto { color: 
+      <xsl:value-of select="@font" />; }</xsl:template>
+      <xsl:template match="color[@name='breadtrail']">.breadtrail { background:
+      
+      <xsl:value-of select="@value" />; color: 
+      <xsl:value-of select="@font" />; } .breadtrail a:link { color: 
+      <xsl:value-of select="@link" />; } .breadtrail a:visited { color: 
+      <xsl:value-of select="@vlink" />; } .breadtrail a:hover { color: 
+      <xsl:value-of select="@hlink" />; }</xsl:template>
+      <!--Fix for other (old) profiles-->
+      <xsl:template match="color[@name='navstrip']">#publishedStrip { color: 
+      <xsl:value-of select="@font" />; background: 
+      <xsl:value-of select="@value" />; }</xsl:template>
+      <!--has to go after the nav-strip (no 'navstrip')-->
+      <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']">#nav-section .menupagetitle
+      { background-color: 
+      <xsl:value-of select="@value" />}</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']">#leftbar { background-color: 
+      <xsl:value-of select="@value" />;} #leftbar { color: 
+      <xsl:value-of select="@font" />;} #leftbar a:link { color: 
+      <xsl:value-of select="@link" />;} #leftbar a:visited { color: 
+      <xsl:value-of select="@vlink" />;} #leftbar a:hover { background-color: 
+      <xsl:value-of select="@value" />; color: 
+      <xsl:value-of select="@hlink" />;}</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" />; } #nav-section .menupageitem { color: 
+      <xsl:value-of select="@font" />; } #nav-section .menupageitem a:link {
+      color: 
+      <xsl:value-of select="@link" />;} #nav-section .menupageitem a:visited {
+      color: 
+      <xsl:value-of select="@vlink" />;} #nav-section .menupageitem a:hover {
+      background-color: 
+      <xsl:value-of select="@value" />; color: 
+      <xsl:value-of select="@hlink" />; }</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']">#header .searchbox {
+      background-color: 
+      <xsl:value-of select="@value" />; color: 
+      <xsl:value-of select="@font" />; }</xsl:template>
+      <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" />} a:visited { color: 
+      <xsl:value-of select="@vlink" />} a:hover { color: 
+      <xsl:value-of select="@hlink" />}</xsl:template>
+      <xsl:template match="color[@name='footer']">#footer { background-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
+      <!-- ==================== other colors ============================ -->
+      <xsl:template match="color[@name='highlight']">.highlight {
+      background-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
+      <xsl:template match="color[@name='fixme']">.fixme { border-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
+      <xsl:template match="color[@name='note']">.note { border-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
+      <xsl:template match="color[@name='warning']">.warning { border-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
+      <xsl:template match="color[@name='code']">.code { border-color: 
+      <xsl:value-of select="@value" />;}</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']">.ForrestTable td {
+      background-color: 
+      <xsl:value-of select="@value" />;}</xsl:template>
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/css/profiling.css.xslt Thu Aug 27 12:07:38 2009
@@ -16,63 +16,60 @@
   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 
+  <xsl:import href="../../common/css/forrest.css.xslt" />
+  <!-- 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']">
-#branding {
-background-color: <xsl:value-of select="@value"/>;
-}  
-</xsl:template>
-  <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']"> 
-#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']">
-#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 match="color[@name='subtab-unselected']">
+  <xsl:output method="text" omit-xml-declaration="yes" />
+  <!-- ==================== main block colors ============================ -->
+  <xsl:template match="color[@name='header']">#branding { background-color: 
+  <xsl:value-of select="@value" />; }</xsl:template>
+  <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']">#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']">#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 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']">
 .heading { background-color: <xsl:value-of select="@value"/>;} 
 </xsl:template> 
 -->
-<!--xsl:template match="color[@name='subheading']">
+  <!--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"/>;}
+.underlined_5   {border-bottom: solid 5px <xsl:value-of select="@value"/>;}
+.underlined_10  {border-bottom: solid 10px <xsl:value-of select="@value"/>;}
 table caption { 
-	background-color: <xsl:value-of select="@value"/>; 
-	color: <xsl:value-of select="@font"/>;
+        background-color: <xsl:value-of select="@value"/>; 
+        color: <xsl:value-of select="@font"/>;
 }
 </xsl:template> 
 <xsl:template match="color[@name='feedback']">    
 #feedback {
-	color: <xsl:value-of select="@font"/>;
-	background: <xsl:value-of select="@value"/>;
-	text-align: <xsl:value-of select="@align"/>;
+        color: <xsl:value-of select="@font"/>;
+        background: <xsl:value-of select="@value"/>;
+        text-align: <xsl:value-of select="@align"/>;
 }
 #feedback #feedbackto {
-	color: <xsl:value-of select="@font"/>;
+        color: <xsl:value-of select="@font"/>;
 }   
 </xsl:template>
 <xsl:template match="color[@name='published']">
@@ -84,15 +81,15 @@
 
 <xsl:template match="color[@name='navstrip']">
 #main .breadtrail {
-	background: <xsl:value-of select="@value"/>; 
-	color: <xsl:value-of select="@font"/>;
+        background: <xsl:value-of select="@value"/>; 
+        color: <xsl:value-of select="@font"/>;
 }
 #main .breadtrail a:link {  color: <xsl:value-of select="@link"/>;  }
 #main .breadtrail a:visited { color: <xsl:value-of select="@vlink"/>; }
 #main .breadtrail a:hover { color: <xsl:value-of select="@hlink"/>; }
 #top .breadtrail {
-	background: <xsl:value-of select="@value"/>; 
-	color: <xsl:value-of select="@font"/>;
+        background: <xsl:value-of select="@value"/>; 
+        color: <xsl:value-of select="@font"/>;
 }
 #top .breadtrail a:link {  color: <xsl:value-of select="@link"/>;  }
 #top .breadtrail a:visited { color: <xsl:value-of select="@vlink"/>; }
@@ -109,65 +106,49 @@
 #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']">
-#nav-section {
-background-color: <xsl:value-of select="@value"/>;
-color: <xsl:value-of select="@font"/>;
-} 
-#nav-section a:link {  color: <xsl:value-of select="@link"/>;} 
-#nav-section a:visited {  color: <xsl:value-of select="@vlink"/>;} 
-#nav-section a:hover {
-background-color: <xsl:value-of select="@value"/>;
-color: <xsl:value-of select="@hlink"/>;
-} 
-#nav-section .menupagetitle  { color: <xsl:value-of select="@hlink"/>;}     
-</xsl:template>
-<!--xsl:template match="color[@name='dialog']"> 
+  <xsl:template match="color[@name='menu']">#nav-section { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@font" />; } #nav-section a:link { color: 
+  <xsl:value-of select="@link" />;} #nav-section a:visited { color: 
+  <xsl:value-of select="@vlink" />;} #nav-section a:hover { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@hlink" />; } #nav-section .menupagetitle { color: 
+  <xsl:value-of select="@hlink" />;}</xsl:template>
+  <!--xsl:template match="color[@name='dialog']"> 
 #menu .menupageitemgroup     { 
-	background-color: <xsl:value-of select="@value"/>;
+        background-color: <xsl:value-of select="@value"/>;
 }
 #menu .menupageitem {
-	color: <xsl:value-of select="@font"/>;
+        color: <xsl:value-of select="@font"/>;
 } 
 </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']">
-#nav-section .currentmenuitemgroup {
-    color: <xsl:value-of select="@font"/>;
-    background-color: <xsl:value-of select="@value"/>;
-}   
-</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']">
-body         { background-color: <xsl:value-of select="@value"/>;
-               color: <xsl:value-of select="@font"/>;} 
-a:link { color:<xsl:value-of select="@link"/>} 
-a:visited { color:<xsl:value-of select="@vlink"/>} 
-a:hover { color:<xsl:value-of select="@hlink"/>} 
-/*
-.menupage a:link { background-color: <xsl:value-of select="@value"/>;
-                                color:<xsl:value-of select="@link"/>} 
-.menupage a:visited { background-color: <xsl:value-of select="@value"/>;
-                                color:<xsl:value-of select="@vlink"/>} 
-.menupage a:hover { background-color: <xsl:value-of select="@value"/>;
-                                color:<xsl:value-of select="@hlink"/>} 
-*/
-</xsl:template>
-  <xsl:template match="color[@name='footer']"> 
-#footer       { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template>
-<!-- ==================== other colors ============================ -->
-<!--xsl:template match="color[@name='highlight']"> 
+  <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']">#nav-section
+  .currentmenuitemgroup { color: 
+  <xsl:value-of select="@font" />; background-color: 
+  <xsl:value-of select="@value" />; }</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']">body { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@font" />;} a:link { color: 
+  <xsl:value-of select="@link" />} a:visited { color: 
+  <xsl:value-of select="@vlink" />} a:hover { color: 
+  <xsl:value-of select="@hlink" />} /* .menupage a:link { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@link" />} .menupage a:visited { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@vlink" />} .menupage a:hover { background-color: 
+  <xsl:value-of select="@value" />; color: 
+  <xsl:value-of select="@hlink" />} */</xsl:template>
+  <xsl:template match="color[@name='footer']">#footer { background-color: 
+  <xsl:value-of select="@value" />;}</xsl:template>
+  <!-- ==================== other colors ============================ -->
+  <!--xsl:template match="color[@name='highlight']"> 
 .highlight        { background-color: <xsl:value-of select="@value"/>;} 
 </xsl:template> 
 

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-abstract.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,49 +15,42 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-abstract">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="content-abstract">
   <description>
-    <p>
-      content-abstract will output the abstract of the document.
-    </p>
+    <p>content-abstract will output the abstract of the document.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
-  </usage>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-abstract" inputFormat="xsl">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
+    <![CDATA[<forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-abstract" inputFormat="xsl">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
       <xsl:param name="abstractFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.abstractFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.abstractFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.abstractFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
       <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="{$abstractFontFamily}"
-              font-style="italic">
-              <xsl:call-template name="insertPageBreaks"/>
-              <xsl:apply-templates select="//div[@class='abstract']"/>
+            <fo:block font-size="12pt" text-align="center" space-before="20pt"
+            space-after="25pt" width="7.5in"
+            font-family="{$abstractFontFamily}" font-style="italic">
+              <xsl:call-template name="insertPageBreaks" />
+              <xsl:apply-templates select="//div[@class='abstract']" />
             </fo:block>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-authors.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,34 +15,31 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-authors">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="content-authors">
   <description>
-    <p>
-      content-authors will output the authors of the document.
-    </p>
+    <p>content-authors will output the authors of the document.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="content-authors" 
+    <![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">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-authors" inputFormat="xsl">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="sans-serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
       <xsl:param name="authorsFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.authorsFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.authorsFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.authorsFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
@@ -50,17 +47,14 @@
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
             <xsl:if test="//div[@class='author']">
-              <fo:block
-                space-before="2em"
-                font-family="{$authorsFontFamily}"
-                font-weight="bold"
-                font-size="smaller">
-                <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())">, </xsl:if>
-                </xsl:for-each> </fo:block>
+              <fo:block space-before="2em" font-family="{$authorsFontFamily}"
+              font-weight="bold" font-size="smaller">
+              <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())">,</xsl:if>
+              </xsl:for-each></fo:block>
             </xsl:if>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main-outline.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,41 +15,39 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-main-outline">
-  <description>
-    content-main-outline will output the main content outline of the document.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="content-main-outline">
+  <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>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-main-outline" inputFormat="xsl">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
+    <![CDATA[<forrest:contract name="content-main-outline" dataURI="cocoon://#{$getRequest}.toc.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-main-outline" inputFormat="xsl">
+    <xsl:stylesheet 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/bookmark-tree">
-            <xsl:apply-templates select="/tocitems"/>
+            <xsl:apply-templates select="/tocitems" />
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="tocitem">
         <fo:bookmark>
           <xsl:attribute name="internal-destination">
-            <xsl:value-of select="substring(@href,2)"/>
+            <xsl:value-of select="substring(@href,2)" />
           </xsl:attribute>
           <fo:bookmark-title>
-            <xsl:number format="1.1.1.1.1.1.1" count="tocitem" level="multiple"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="normalize-space(@title)"/>
+            <xsl:number format="1.1.1.1.1.1.1" count="tocitem"
+            level="multiple" />
+            <xsl:text>
+ 
+</xsl:text>
+            <xsl:value-of select="normalize-space(@title)" />
           </fo:bookmark-title>
-          <xsl:apply-templates select="tocitem"/>
+          <xsl:apply-templates select="tocitem" />
         </fo:bookmark>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-main.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,15 +15,12 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-main">
-  <description>
-    content-main will output the main content of the document.
-  </description>
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="content-main">
+  <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">
+    <![CDATA[<forrest:contract name="content-main" dataURI="cocoon://#{$getRequest}.source.rewritten.xml">
        <forrest:property name="config">
         <!-- Settings specific to PDF output. -->
         <!-- 
@@ -56,99 +53,125 @@
         </colors>
       </forrest:property>
     </forrest:contract>]]>
-  </usage>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-main" inputFormat="xsl">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-main" inputFormat="xsl">
     <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-      <xsl:param name="config"/>
-      <xsl:param name="requestPath"/>
-      <xsl:variable name="path" select="concat($requestPath/@value,'/')"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="config" />
+      <xsl:param name="requestPath" />
+      <xsl:variable name="path" select="concat($requestPath/@value,'/')" />
+      <xsl:param name="defaultVariables" select="'test.html'" />
       <!-- left, justify, right -->
-      <xsl:variable name="text-align" select="string($config/page/@text-align)"/>
+      <xsl:variable name="text-align"
+      select="string($config/page/@text-align)" />
       <!-- print URL of external links -->
       <xsl:variable name="show-external-urls"
-        select="$config/show-external-urls"/>
-      <xsl:param name="numbersections" select="'true'"/>
+      select="$config/show-external-urls" />
+      <xsl:param name="numbersections" select="'true'" />
       <!-- page breaks after TOC and each page if an aggregate document -->
-      <xsl:variable name="page-break-top-sections" select="'true'"/>
+      <xsl:variable name="page-break-top-sections" select="'true'" />
       <!-- prefix which turns relative URLs into absolute ones, empty by default -->
-      <xsl:variable name="url-prefix" select="string($config/url-prefix)"/>
+      <xsl:variable name="url-prefix" select="string($config/url-prefix)" />
       <!-- print URL of external links -->
       <xsl:variable name="show-external-urls"
-        select="$config/show-external-urls"/>
+      select="$config/show-external-urls" />
       <!-- Section depth at which we stop numbering and just indent -->
-      <xsl:param name="numbering-max-depth" select="'3'"/>
+      <xsl:param name="numbering-max-depth" select="'3'" />
       <!-- Font-family parameters defined here: -->
-      <xsl:param name="serif"      select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
-      <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
-      <xsl:param name="monospace"  select="$defaultVariables/*[@name='output.pdf.fontFamily.monospace']/@value" />
-      <xsl:param name="imagesdir"  select="$defaultVariables/*[@name='resources.images']/@value"/>
-      <xsl:param name="xmlbasedir" select="$defaultVariables/*[@name='content.xdocs']/@value"/>
+      <xsl:param name="serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
+      <xsl:param name="sans-serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+      <xsl:param name="monospace"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.monospace']/@value" />
+      <xsl:param name="imagesdir"
+      select="$defaultVariables/*[@name='resources.images']/@value" />
+      <xsl:param name="xmlbasedir"
+      select="$defaultVariables/*[@name='content.xdocs']/@value" />
       <xsl:param name="sectionTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="sourceFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.sourceFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sourceFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.sourceFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$monospace" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="codeFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.codeFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.codeFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.codeFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$monospace" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="warningTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.warningTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.warningTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.warningTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="noteTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.noteTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noteTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noteTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="fixmeTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="rootFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.rootFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.rootFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.rootFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <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"/>
-      <xsl:include href="lm://pdf.transform.helper.pageBreaks"/>
-      <xsl:include href="lm://pdf.transform.helper.commonElements"/>
+      select="$config/page/@background-color" />
+      <xsl:variable name="heading-color" select="$config/headings/@color" />
+      <xsl:variable name="heading-type" select="$config/headings/@type" />
+      <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
+      <xsl:include href="lm://pdf.transform.helper.commonElements" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo">
@@ -156,8 +179,8 @@
           </forrest:part>
           <forrest:part xpath="/fo/xsl-region-body/body">
             <fo:block text-align="{$text-align}" padding-before="18pt"
-              padding-after="18pt">
-              <xsl:apply-templates select="//body/*"/>
+            padding-after="18pt">
+              <xsl:apply-templates select="//body/*" />
             </fo:block>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-notice.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,33 +15,30 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-notice">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+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"/>]]>
-  </usage>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-notice" inputFormat="xsl">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
+    <![CDATA[<forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>]]>
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-notice" inputFormat="xsl">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
       <xsl:param name="noticeFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.noticeFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noticeFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.noticeFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
@@ -49,21 +46,14 @@
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
             <xsl:if test="//div[class='notice']/*">
-              <fo:block
-                font-size="10pt"
-                font-family="{$noticeFontFamily}"
-                text-align="left"
-                space-before="20pt"
-                width="7.5in"
-                border-top="0.25pt solid"
-                border-bottom="0.25pt solid"
-                padding-before="6pt"
-                padding-after="6pt">
-                <xsl:copy-of select="@id"/>
-                <xsl:call-template name="insertPageBreaks"/>
-<!-- FIXME - insert i18n stuff here --> NOTICE:
-                <xsl:apply-templates/>
-              </fo:block>
+              <fo:block font-size="10pt" font-family="{$noticeFontFamily}"
+              text-align="left" space-before="20pt" width="7.5in"
+              border-top="0.25pt solid" border-bottom="0.25pt solid"
+              padding-before="6pt" padding-after="6pt">
+              <xsl:copy-of select="@id" />
+              <xsl:call-template name="insertPageBreaks" />
+              <!-- FIXME - insert i18n stuff here -->NOTICE: 
+              <xsl:apply-templates /></fo:block>
             </xsl:if>
           </forrest:part>
         </forrest:content>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-title.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,55 +15,48 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-title">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+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
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-title" inputFormat="xsl">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-title" inputFormat="xsl">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="sans-serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
       <xsl:param name="documentTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.documentTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.documentTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.documentTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/page-sequence">
             <fo:title>
-              <xsl:value-of select="title"/>
+              <xsl:value-of select="title" />
             </fo:title>
           </forrest:part>
           <forrest:part xpath="/fo/xsl-region-body/title">
-            <fo:block
-                padding-before="24pt"
-                padding-after="24pt"
-                font-family="{$documentTitleFontFamily}"
-                font-size="24pt"
-                font-weight="bold"
-                id="{generate-id()}">
-              <xsl:value-of select="title"/>
+            <fo:block padding-before="24pt" padding-after="24pt"
+            font-family="{$documentTitleFontFamily}" 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/>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common/fo/content-toc.contract.xml Thu Aug 27 12:07:38 2009
@@ -15,109 +15,100 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:contract
-  xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="content-toc">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+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>]]>
-  </usage>
-  <forrest:template
-    xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="content-toc" inputFormat="xsl">
-    <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xmlns:fo="http://www.w3.org/1999/XSL/Format"
-      version="1.0">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="sans-serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
-      <xsl:param name="serif" select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="content-toc" inputFormat="xsl">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="sans-serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.sansSerif']/@value" />
+      <xsl:param name="serif"
+      select="$defaultVariables/*[@name='output.pdf.fontFamily.serif']/@value" />
       <xsl:param name="TOCTitleFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$sans-serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
       <xsl:param name="TOCFontFamily">
         <xsl:choose>
           <xsl:when test="$defaultVariables/*[@name='output.pdf.fontFamily.TOCFontFamily']">
-            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCFontFamily']/@value"/>
+
+            <xsl:value-of select="$defaultVariables/*[@name='output.pdf.fontFamily.TOCFontFamily']/@value" />
           </xsl:when>
-          <xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
+          <xsl:otherwise>
+            <xsl:value-of select="$serif" />
+          </xsl:otherwise>
         </xsl:choose>
       </xsl:param>
-      <xsl:param name="max-depth" select="2"/>
-      <xsl:param name="page-break-after" select="'true'"/>
-      <xsl:include href="lm://pdf.transform.helper.pageBreaks"/>
+      <xsl:param name="max-depth" select="2" />
+      <xsl:param name="page-break-after" select="'true'" />
+      <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
-            <fo:block
-              font-family="{$TOCTitleFontFamily}"
-              font-size="12pt"
-              font-weight="bold"
-              space-after="0.5em"
-              space-before="1em"
-              text-align="justify"
-              width="7.5in"
-              id="__toc__">
-              <xsl:call-template name="insertPageBreaks"/>
+            <fo:block font-family="{$TOCTitleFontFamily}" font-size="12pt"
+            font-weight="bold" space-after="0.5em" space-before="1em"
+            text-align="justify" width="7.5in" id="__toc__">
+              <xsl:call-template name="insertPageBreaks" />
               <!-- insert i18n stuff here -->
-              <xsl:text>Table of contents</xsl:text>
+              <xsl:text>
+Table of contents
+</xsl:text>
             </fo:block>
-            <fo:block
-              font-family="{$TOCFontFamily}"
-              font-size="12pt"
-              space-after="5pt"
-              space-before="0pt"
-              text-align="justify"
-              width="7.5in">
+            <fo:block font-family="{$TOCFontFamily}" font-size="12pt"
+            space-after="5pt" space-before="0pt" text-align="justify"
+            width="7.5in">
               <xsl:if test="$page-break-after">
                 <xsl:attribute name="break-after">page</xsl:attribute>
               </xsl:if>
-              <xsl:apply-templates select="/tocitems/tocitem"/>
+              <xsl:apply-templates select="/tocitems/tocitem" />
             </fo:block>
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="tocitem">
         <!-- 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">
+        <xsl:param name="depth" select="'1'" />
+        <fo:block space-before="5pt" text-align-last="justify"
+        start-indent=".5em" text-indent=".5em">
           <fo:inline>
-            <xsl:variable name="id" select="substring(@href,2)"/>
+            <xsl:variable name="id" select="substring(@href,2)" />
             <fo:basic-link internal-destination="{$id}">
-              <xsl:value-of
-                select="substring('&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;', 0, 2 * $depth - 1)"/>
+              <xsl:value-of select="substring('&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;', 0, 2 * $depth - 1)" />
               <fo:inline font-size="11pt">
                 <xsl:number count="tocitem" format="1.1.1.1.1.1.1"
-                  level="multiple"/>
+                level="multiple" />
               </fo:inline>
-              <xsl:text> </xsl:text>
-              <xsl:value-of select="@title"/>
-              <fo:leader leader-pattern="dots"/>
-              <fo:page-number-citation ref-id="{$id}"/>
+              <xsl:text>
+ 
+</xsl:text>
+              <xsl:value-of select="@title" />
+              <fo:leader leader-pattern="dots" />
+              <fo:page-number-citation ref-id="{$id}" />
             </fo:basic-link>
           </fo:inline>
-          <xsl:if test="$max-depth > $depth">
+          <xsl:if test="$max-depth &gt; $depth">
             <xsl:apply-templates select="tocitem">
-              <xsl:with-param name="depth" select="$depth + 1"/>
+              <xsl:with-param name="depth" select="$depth + 1" />
             </xsl:apply-templates>
           </xsl:if>
         </fo:block>



Mime
View raw message