forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r628588 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes: common/fo/ common/panels/ pelt/panels/
Date Mon, 18 Feb 2008 00:42:18 GMT
Author: thorsten
Date: Sun Feb 17 16:42:16 2008
New Revision: 628588

URL: http://svn.apache.org/viewvc?rev=628588&view=rev
Log:
Adopting new fo stylesheets by using helper stylesheets whereever possible. Still some error to fix but the fresh site builds again

Modified:
    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-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/page-footer-numbering.ft
    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/pelt/panels/pelt-html.nav-main.panel.xml

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -34,14 +34,14 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
+      <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="serif" font-style="italic">
-<!-- FIXME - Don't know how to manage the insertPageBreaks... -->
-<!--xsl:call-template name="insertPageBreaks"/-->
+            <fo:block font-size="12pt" text-align="center" space-before="20pt"
+              space-after="25pt" width="7.5in" font-family="serif"
+              font-style="italic">
+              <xsl:call-template name="insertPageBreaks"/>
               <xsl:apply-templates select="//div[@class='abstract']"/>
             </fo:block>
           </forrest:part>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -35,20 +35,18 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
+      <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
       <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
+                <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 test="not(position() = last())">, </xsl:if>
+                </xsl:for-each> </fo:block>
             </xsl:if>
           </forrest:part>
         </forrest:content>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -31,24 +31,34 @@
     <xsl:stylesheet
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       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">
+          <forrest:part xpath="/fo/bookmark-tree">
             <xsl:apply-templates select="/tocitems"/>
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="tocitem">
-        <fox:outline internal-destination="{@href}">
-          <fox:label>
+        <fo:bookmark>
+          <xsl:attribute name="internal-destination">
+            <xsl:choose>
+              <xsl:when test="normalize-space(@id)!=''">
+                <xsl:value-of select="@id"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="generate-id()"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </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="@title"/>
-          </fox:label>
+            <xsl:text>
+            </xsl:text>
+            <xsl:value-of select="normalize-space(@title)"/>
+          </fo:bookmark-title>
           <xsl:apply-templates select="tocitem"/>
-        </fox:outline>
+        </fo:bookmark>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -60,606 +60,43 @@
   <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: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"/>
-<!-- left, justify, right -->
-      <xsl:variable name="text-align"
-        select="string($config/page/@text-align)"/>
-<!-- print URL of external links -->
+      <!-- left, justify, right -->
+      <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'"/>
-<!-- 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 -->
+      <!-- page breaks after TOC and each page if an aggregate document -->
+      <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)"/>
+      <!-- print URL of external links -->
+      <xsl:variable name="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="imagesdir" select="."/>
       <xsl:param name="xmlbasedir"/>
+      <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"/>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/body">
-            <fo:block text-align="{$text-align}" padding-before="18pt" padding-after="18pt">
+            <fo:block text-align="{$text-align}" padding-before="18pt"
+              padding-after="18pt">
               <xsl:apply-templates select="/document/body"/>
             </fo:block>
           </forrest:part>
         </forrest:content>
-      </xsl:template>
-      <xsl:template match="anchor">
-          <xsl:copy-of select="@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 -->
-          <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:if>
-<!-- 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: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 block won't be rendered at all. -->
-          <fo:block font-family="serif"
-            font-size="{10 div (number($level) +1 )}pt"
-            background-color="{$heading-color}">&#160;
-          </fo:block>
-        </xsl:if>
-        <fo:block background-color="{$background-color}">
-          <xsl:apply-templates>
-            <xsl:with-param name="level"
-              select="number($level)+1"/>
-          </xsl:apply-templates>
-        </fo:block>
-      </xsl:template>
-<!-- Already taken into account with sections -->
-      <xsl:template match="title"/>
-      <xsl:template match="p">
-          <xsl:copy-of select="@id"/>
-        <xsl:choose>
-          <xsl:when
-            test="ancestor::li and not(preceding-sibling::*)">
-            <fo:block space-after="4pt" font-family="serif">
-              <xsl:call-template name="insertPageBreaks"/>
-              <xsl:apply-templates/>
-            </fo:block>
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:block space-before="4pt" space-after="4pt"
-              font-family="serif">
-              <xsl:call-template name="insertPageBreaks"/>
-              <xsl:apply-templates/>
-            </fo:block>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:template>
-      <xsl:template match="source">
-          <xsl:copy-of select="@id"/>
-        <xsl:variable name="color"
-          select="$config/colors/color[@name='code']/@value"/>
-        <fo:block font-family="monospace" font-size="10pt"
-          background-color="{$color}"
-          white-space-collapse="false"
-          linefeed-treatment="preserve"
-          white-space-treatment="preserve" wrap-option="wrap"
-          text-align="start">
-          <xsl:call-template name="insertPageBreaks"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:template>
-      <xsl:template match="ol|ul">
-        <fo:list-block
-          provisional-distance-between-starts="18pt"
-          provisional-label-separation="3pt"
-          text-align="start">
-            <xsl:copy-of select="@id"/>
-          <xsl:apply-templates/>
-        </fo:list-block>
-      </xsl:template>
-      <xsl:template match="ol/li">
-        <fo:list-item>
-            <xsl:copy-of select="@id"/>
-          <xsl:if test="not(following-sibling::li[1])">
-            <xsl:attribute name="space-after">
-              6pt</xsl:attribute>
-          </xsl:if>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block>
-              <xsl:number format="1."/>
-            </fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <fo:block font-family="serif">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-        </fo:list-item>
-      </xsl:template>
-<!-- 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>
-            <xsl:copy-of select="@id"/>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block></fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <fo:block font-family="serif">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-        </fo:list-item>
-      </xsl:template>
-      <xsl:template match="ul/li">
-        <fo:list-item>
-            <xsl:copy-of select="@id"/>
-          <xsl:if test="not(following-sibling::li[1])">
-            <xsl:attribute name="space-after">
-              6pt</xsl:attribute>
-          </xsl:if>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block>&#x2022;
-            </fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <fo:block font-family="serif">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-        </fo:list-item>
-      </xsl:template>
-      <xsl:template match="dl">
-        <fo:list-block
-          provisional-distance-between-starts="18pt"
-          provisional-label-separation="3pt"
-          text-align="start">
-            <xsl:copy-of select="@id"/>
-          <xsl:apply-templates/>
-        </fo:list-block>
-      </xsl:template>
-      <xsl:template match="dt">
-        <fo:list-item>
-            <xsl:copy-of select="@id"/>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block></fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <fo:block font-weight="bold">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-        </fo:list-item>
-      </xsl:template>
-      <xsl:template match="dd">
-        <fo:list-item>
-            <xsl:copy-of select="@id"/>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block></fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <fo:block>
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-        </fo:list-item>
-      </xsl:template>
-      <xsl:template match="strong">
-          <xsl:copy-of select="@id"/>
-        <fo:inline font-weight="bold">
-          <xsl:apply-templates/>
-        </fo:inline>
-      </xsl:template>
-      <xsl:template match="em">
-          <xsl:copy-of select="@id"/>
-        <fo:inline font-style="italic">
-          <xsl:apply-templates/>
-        </fo:inline>
-      </xsl:template>
-      <xsl:template match="code">
-          <xsl:copy-of select="@id"/>
-        <fo:inline font-family="monospace">
-          <xsl:apply-templates/>
-        </fo:inline>
-      </xsl:template>
-      <xsl:template match="warning">
-          <xsl:copy-of select="@id"/>
-        <xsl:variable name="color"
-          select="$config/colors/color[@name='warning']/@value"/>
-        <fo:block margin-left="0.25in" margin-right="0.25in"
-          font-weight="bold" font-size="10pt"
-          font-family="serif" space-before="10pt"
-          border-before-style="solid"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}" background-color="{$color}"
-          color="#ffffff">
-          <xsl:call-template name="insertPageBreaks"/>
-          <xsl:choose>
-            <xsl:when test="@label">
-              <xsl:value-of select="@label"/>
-            </xsl:when>
-            <xsl:otherwise>Warning: </xsl:otherwise>
-          </xsl:choose>
-          <xsl:value-of select="title"/>
-        </fo:block>
-        <fo:block margin-left="0.25in" margin-right="0.25in"
-          font-family="serif" font-size="8pt"
-          border-after-style="solid"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}" background-color="#fff0f0"
-          padding-start="3pt" padding-end="3pt"
-          padding-before="3pt" padding-after="3pt"
-          space-after="10pt">
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:template>
-      <xsl:template match="note">
-        <xsl:variable name="color"
-          select="$config/colors/color[@name='note']/@value"/>
-        <fo:block margin-left="0.25in" margin-right="0.25in"
-          font-weight="bold" font-size="10pt" color="#ffffff"
-          font-family="serif" space-before="10pt"
-          border-before-style="solid"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}"
-          background-color="{$color}">
-            <xsl:copy-of select="@id"/>
-          <xsl:call-template name="insertPageBreaks"/>
-          <xsl:choose>
-            <xsl:when test="@label">
-              <xsl:value-of select="@label"/>
-            </xsl:when>
-<!-- insert i18n stuff here -->
-            <xsl:otherwise>Note: </xsl:otherwise>
-          </xsl:choose>
-          <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"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}" background-color="#F0F0FF"
-          padding-start="3pt" padding-end="3pt"
-          padding-before="3pt" padding-after="3pt">
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:template>
-      <xsl:template match="fixme">
-        <xsl:variable name="color"
-          select="$config/colors/color[@name='fixme']/@value"/>
-        <fo:block margin-left="0.25in" margin-right="0.25in"
-          font-weight="bold" font-size="10pt" color="#FFFFFF"
-          font-family="serif" space-before="10pt"
-          border-before-style="solid"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}"
-          background-color="{$color}">
-            <xsl:copy-of select="@id"/>
-          <xsl:call-template name="insertPageBreaks"/>
-<!-- insert i18n stuff here --> FIXME (
-          <xsl:value-of select="@author"/>):
-          <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"
-          border-start-style="solid" border-end-style="solid"
-          border-color="{$color}" background-color="#FFF0F0"
-          padding-start="3pt" padding-end="3pt"
-          padding-before="3pt" padding-after="3pt">
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:template>
-      <xsl:template match="link|fork|jump">
-        <xsl:variable name="color"
-          select="$config/colors/color[@name = 'body']/@link"/>
-        <xsl:choose>
-          <xsl:when test="starts-with(@href, '#')">
-            <fo:basic-link color="{$color}"
-              text-decoration="underline"
-              internal-destination="{substring(@href,2)}">
-                <xsl:copy-of select="@id"/>
-              <xsl:apply-templates/>
-            </fo:basic-link>
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:basic-link color="{$color}"
-              text-decoration="underline"
-              external-destination="{@href}">
-                <xsl:copy-of select="@id"/>
-              <xsl:apply-templates/>
-            </fo:basic-link>
-            <xsl:if
-              test="$show-external-urls = 'true' and @href != string(.)">
-              (
-              <xsl:value-of select="@href"/>) </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:template>
-      <xsl:template match="figure|img">
-        <fo:block text-align="center">
-          <xsl:call-template name="insertPageBreaks"/>
-          <xsl:if test="normalize-space(@id)!=''">
-            <xsl:attribute name="id">
-              <xsl:value-of select="@id"/>
-            </xsl:attribute>
-          </xsl:if>
-<!-- Make relative paths absolute -->
-          <xsl:variable name="imgpath">
-            <xsl:choose>
-<!-- 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 -->
-              <xsl:when
-                test="contains(string(@src),':') or starts-with(string(@src),'/')">
-                <xsl:value-of select="@src"/>
-              </xsl:when>
-<!-- relative to document -->
-              <xsl:otherwise>
-                <xsl:value-of
-                  select="concat($xmlbasedir,@src)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          <fo:external-graphic src="{$imgpath}">
-            <xsl:if test="@height">
-              <xsl:attribute name="height">
-                <xsl:value-of select="@height"/>
-              </xsl:attribute>
-               <xsl:attribute
-                    name="content-height">scale-to-fit</xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@width">
-              <xsl:attribute name="width">
-                <xsl:value-of select="@width"/>
-              </xsl:attribute>
-                <xsl:attribute
-                    name="content-width">scale-to-fit</xsl:attribute>
-            </xsl:if>
-              <!-- Work around for fop094 not supporting 
-                  scale-down-to-fit, to be replaces as soon as fop095 is released
-              -->
-              <xsl:if
-                  test=" not((@width|@height))">
-                  <xsl:attribute
-                      name="width">100%</xsl:attribute>
-                  <xsl:attribute
-                      name="content-width">scale-to-fit</xsl:attribute>
-                  <xsl:attribute
-                      name="content-height">100%</xsl:attribute>
-              </xsl:if>
-          </fo:external-graphic>
-<!-- alt text -->
-          <xsl:if test="$config/show-image-alt-text='true'">
-            <xsl:if test="normalize-space(@alt)!=''">
-              <fo:block>
-                <xsl:value-of select="@alt"/>
-              </fo:block>
-            </xsl:if>
-          </xsl:if>
-        </fo:block>
-      </xsl:template>
-      <xsl:template match="table">
-<!-- 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"
-              order="descending"/>
-            <xsl:if test="position() = 1">
-              <xsl:value-of select="count(td|th)"/>
-            </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"
-              order="descending"/>
-            <xsl:if test="position() = 1">
-              <xsl:value-of select="sum(td/@colspan|th/@colspan)"/>
-            </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">
-              <xsl:value-of select="$max-number-columns-colspan"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$max-number-columns-td"/>
-            </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 table-layout="fixed" width="100%">
-            <xsl:copy-of select="@id"/>
-          <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
-          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.
-        
-        
-        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
-            <xsl:text>
-            </xsl:text>
-            <xsl:number count="table" level="multiple"/>
-<xsl:text>: </xsl:text>
-            <xsl:value-of select="caption"/>
-          </fo:block>
-        </xsl:if>
-      </xsl:template>
-      <xsl:template match="tr">
-        <fo:table-row>
-            <xsl:copy-of select="@id"/>
-          <xsl:apply-templates/>
-        </fo:table-row>
-      </xsl:template>
-      <xsl:template match="th">
-        <xsl:variable name="border-color"
-          select="$config/colors/color[@name = 'table']/@value"/>
-        <xsl:variable name="background-color"
-          select="$border-color"/>
-        <fo:table-cell padding-before="4pt"
-          padding-after="4pt" padding-start="4pt"
-          padding-end="4pt" color="#FFFFFF"
-          background-color="{$background-color}"
-          border="1pt solid {$border-color}">
-            <xsl:copy-of select="@id"/>
-            <xsl:if
-                test="@colspan!=''">
-                <xsl:attribute
-                    name="number-columns-spanned">
-                    <xsl:value-of
-                        select="@colspan" />
-                </xsl:attribute>
-            </xsl:if>
-            <xsl:if
-                test="@rowspan!=''">
-                <xsl:attribute
-                    name="number-rows-spanned">
-                    <xsl:value-of
-                        select="@rowspan" />
-                </xsl:attribute>
-            </xsl:if>
-          <fo:block text-align="center">
-            <xsl:apply-templates/>
-          </fo:block>
-        </fo:table-cell>
-      </xsl:template>
-      <xsl:template match="td">
-        <xsl:variable name="border-color"
-          select="$config/colors/color[@name = 'table']/@value"/>
-        <xsl:variable name="background-color"
-          select="$config/colors/color[@name = 'table-cell']/@value"/>
-        <fo:table-cell padding-before="4pt"
-          padding-after="4pt" padding-start="4pt"
-          padding-end="4pt"
-          background-color="{$background-color}"
-          border="1pt solid {$border-color}">
-            <xsl:copy-of select="@id"/>
-            <xsl:if
-                test="@colspan!=''">
-                <xsl:attribute
-                    name="number-columns-spanned">
-                    <xsl:value-of
-                        select="@colspan" />
-                </xsl:attribute>
-            </xsl:if>
-            <xsl:if
-                test="@rowspan!=''">
-                <xsl:attribute
-                    name="number-rows-spanned">
-                    <xsl:value-of
-                        select="@rowspan" />
-                </xsl:attribute>
-            </xsl:if>
-          <fo:block>
-            <xsl:apply-templates/>
-          </fo:block>
-        </fo:table-cell>
-      </xsl:template>
-      <xsl:template match="br">
-          <fo:block> <xsl:copy-of select="@id"/></fo:block>
-      </xsl:template>
-      <xsl:template match="legal">
-        <fo:inline font-size="8pt">
-          <xsl:apply-templates/>
-        </fo:inline>
-      </xsl:template>
-<!-- ====================================================================== -->
-<!-- Local Extensions section -->
-<!-- ====================================================================== -->
-      <xsl:template match="citation">
-          <fo:inline><xsl:copy-of select="@id"/>[
-          <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"
-          font-family="monospace">
-          <xsl:call-template name="insertPageBreaks"/>
-          <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 -->
-        <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 -->
-        <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  -->
-<!-- ====================================================================== -->
-      <xsl:template match="//style">
-<!-- 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>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -34,6 +34,7 @@
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
+      <xsl:include href="lm://pdf.transform.helper.pageBreaks" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/xsl-region-body/title">
@@ -41,8 +42,8 @@
               <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"/-->
+                <xsl:copy-of select="@id"/>
+                <xsl:call-template name="insertPageBreaks"/>
 <!-- FIXME - insert i18n stuff here --> NOTICE:
                 <xsl:apply-templates/>
               </fo:block>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -44,20 +44,19 @@
       version="1.0">
       <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="serif" font-size="14pt"
-              font-weight="bold" space-after="5pt"
-              space-before="5pt" text-align="justify"
+            <fo:block font-family="sans-serif" font-size="12pt" 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"/>
+              <!-- 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"
-              text-align="justify" width="7.5in">
+            <fo:block font-family="serif" 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>
@@ -67,29 +66,37 @@
         </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">
+        <fo:block space-before="5pt" text-align-last="justify" start-indent=".5em"
+          text-indent=".5em">
           <fo:inline>
-            <fo:basic-link internal-destination="{@href}">
+            <xsl:variable name="id">
+              <xsl:choose>
+                <xsl:when test="normalize-space(@id)!=''">
+                  <xsl:value-of select="@id"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="generate-id()"/>
+                </xsl:otherwise>
+              </xsl:choose>
+            </xsl:variable>
+            <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)"/>
-              <fo:inline font-size="10pt">
-                <xsl:number count="tocitem"
-                  format="1.1.1.1.1.1.1" level="multiple"/>
+              <fo:inline font-size="11pt">
+                <xsl:number count="tocitem" format="1.1.1.1.1.1.1"
+                  level="multiple"/>
               </fo:inline>
-<xsl:text>
-              </xsl:text>
+              <xsl:text> </xsl:text>
               <xsl:value-of select="@title"/>
               <fo:leader leader-pattern="dots"/>
-              <fo:page-number-citation ref-id="{@href}"/>
+              <fo:page-number-citation ref-id="{$id}"/>
             </fo:basic-link>
           </fo:inline>
           <xsl:if test="$max-depth > $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>

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?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- 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 Sun Feb 17 16:42:16 2008
@@ -62,6 +62,7 @@
       xmlns:fo="http://www.w3.org/1999/XSL/Format"
       version="1.0">
       <xsl:param name="config"/>
+      <xsl:include href="lm://pdf.transform.helper.layout" />
 <!-- The page size to be used -->
       <xsl:variable name="pagesize"
         select="string($config/page/@size)"/>
@@ -87,139 +88,6 @@
       it's on)-->
       <xsl:variable name="outermargin"
         select="string($config/margins/outer)"/>
-<!-- Determine page height for various page sizes (US Letter portrait
-      is the default) -->
-<!-- FIXME: JJP:would this be better of a file? -->
-      <xsl:variable name="pageheight">
-        <xsl:choose>
-          <xsl:when test="$pageorientation = 'landscape'">
-            <xsl:choose>
-              <xsl:when test="$pagesize = 'a0'">
-                841mm</xsl:when>
-              <xsl:when test="$pagesize = 'a1'">
-                594mm</xsl:when>
-              <xsl:when test="$pagesize = 'a2'">
-                420mm</xsl:when>
-              <xsl:when test="$pagesize = 'a3'">
-                297mm</xsl:when>
-              <xsl:when test="$pagesize = 'a4'">
-                210mm</xsl:when>
-              <xsl:when test="$pagesize = 'a5'">
-                148mm</xsl:when>
-              <xsl:when test="$pagesize = 'executive'">
-                7.25in</xsl:when>
-              <xsl:when test="$pagesize = 'folio'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'ledger'">
-                11in</xsl:when>
-              <xsl:when test="$pagesize = 'legal'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'letter'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'quarto'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'tabloid'">
-                11in</xsl:when>
-              <xsl:otherwise>8.5in</xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="$pagesize = 'a0'">
-                1189mm</xsl:when>
-              <xsl:when test="$pagesize = 'a1'">
-                841mm</xsl:when>
-              <xsl:when test="$pagesize = 'a2'">
-                594mm</xsl:when>
-              <xsl:when test="$pagesize = 'a3'">
-                420mm</xsl:when>
-              <xsl:when test="$pagesize = 'a4'">
-                297mm</xsl:when>
-              <xsl:when test="$pagesize = 'a5'">
-                210mm</xsl:when>
-              <xsl:when test="$pagesize = 'executive'">
-                10.5in</xsl:when>
-              <xsl:when test="$pagesize = 'folio'">
-                13in</xsl:when>
-              <xsl:when test="$pagesize = 'ledger'">
-                17in</xsl:when>
-              <xsl:when test="$pagesize = 'legal'">
-                14in</xsl:when>
-              <xsl:when test="$pagesize = 'quarto'">
-                10.83in</xsl:when>
-              <xsl:when test="$pagesize = 'tabloid'">
-                17in</xsl:when>
-              <xsl:otherwise>11in</xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-<!-- Determine page width for various page sizes (US Letter portrait
-      is the default) -->
-      <xsl:variable name="pagewidth">
-        <xsl:choose>
-          <xsl:when test="$pageorientation = 'landscape'">
-            <xsl:choose>
-              <xsl:when test="$pagesize = 'a0'">
-                1189mm</xsl:when>
-              <xsl:when test="$pagesize = 'a1'">
-                841mm</xsl:when>
-              <xsl:when test="$pagesize = 'a2'">
-                594mm</xsl:when>
-              <xsl:when test="$pagesize = 'a3'">
-                420mm</xsl:when>
-              <xsl:when test="$pagesize = 'a4'">
-                297mm</xsl:when>
-              <xsl:when test="$pagesize = 'a5'">
-                210mm</xsl:when>
-              <xsl:when test="$pagesize = 'executive'">
-                10.5in</xsl:when>
-              <xsl:when test="$pagesize = 'folio'">
-                13in</xsl:when>
-              <xsl:when test="$pagesize = 'ledger'">
-                17in</xsl:when>
-              <xsl:when test="$pagesize = 'legal'">
-                14in</xsl:when>
-              <xsl:when test="$pagesize = 'quarto'">
-                10.83in</xsl:when>
-              <xsl:when test="$pagesize = 'tabloid'">
-                17in</xsl:when>
-              <xsl:otherwise>11in</xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="$pagesize = 'a0'">
-                841mm</xsl:when>
-              <xsl:when test="$pagesize = 'a1'">
-                594mm</xsl:when>
-              <xsl:when test="$pagesize = 'a2'">
-                420mm</xsl:when>
-              <xsl:when test="$pagesize = 'a3'">
-                297mm</xsl:when>
-              <xsl:when test="$pagesize = 'a4'">
-                210mm</xsl:when>
-              <xsl:when test="$pagesize = 'a5'">
-                148mm</xsl:when>
-              <xsl:when test="$pagesize = 'executive'">
-                7.25in</xsl:when>
-              <xsl:when test="$pagesize = 'folio'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'ledger'">
-                11in</xsl:when>
-              <xsl:when test="$pagesize = 'legal'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'letter'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'quarto'">
-                8.5in</xsl:when>
-              <xsl:when test="$pagesize = 'tabloid'">
-                11in</xsl:when>
-              <xsl:otherwise>8.5in</xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/layout-master-set">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/page-footer-numbering.ft Sun Feb 17 16:42:16 2008
@@ -52,6 +52,7 @@
       version="1.0">
       <xsl:param name="skip-first-page-numbering" select="'true'"/>
       <xsl:param name="page-numbering-format" select="'Page 1'"/>
+      <xsl:include href="lm://pdf.transform.helper.pageNumber" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/fo/static-content">
@@ -92,41 +93,7 @@
           </forrest:part>
         </forrest:content>
       </xsl:template>
-<!-- Display the document numerotation -->
-      <xsl:template name="insertPageNumber">
-        <xsl:param name="text-align" select="'start'"/>
-        <xsl:variable name="prefixe"
-          select="substring-before($page-numbering-format,'1')"/>
-        <xsl:variable name="sep"
-          select="substring-before(substring-after($page-numbering-format,'1'),'1')"/>
-        <xsl:variable name="postfixe">
-          <xsl:choose>
-            <xsl:when
-              test="contains(substring-after($page-numbering-format,'1'),'1')">
-              <xsl:value-of
-                select="substring-after(substring-after($page-numbering-format,'1'),'1')"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of
-                select="substring-after($page-numbering-format,'1')"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-<!-- if 'page-numbering-format' contains 1 digits, the page number is displayed in the footer -->
-        <xsl:if test="contains($page-numbering-format,'1')">
-          <fo:block font-size="70%"
-            text-align="{$text-align}">
-<!-- if the separator is not found, the total page number is skipped -->
-            <xsl:value-of select="$prefixe"/>
-            <fo:page-number/>
-            <xsl:if test="$sep != ''">
-              <xsl:value-of select="$sep"/>
-              <fo:page-number-citation ref-id="term"/>
-            </xsl:if>
-            <xsl:value-of select="$postfixe"/>
-          </fo:block>
-        </xsl:if>
-      </xsl:template>
+
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/panels/common-fo.panel.xml Sun Feb 17 16:42:16 2008
@@ -45,8 +45,8 @@
   </forrest:contract>
   <forrest:contract name="content-title" dataURI="cocoon://#{$getRequest}.title.xml"/>
   <forrest:contract name="page-header" dataURI="cocoon://#{$getRequest}.title.xml"/>
-  <forrest:contract name="page-footer-numbering">
-<!-- 
+  <!--<forrest:contract name="page-footer-numbering">
+<!-#- 
         Pattern of the page numbering in the footer - Default is "Page x".
         first occurrence of '1' digit represents the current page number,
         second occurrence of '1' digit represents the total page number,
@@ -57,20 +57,20 @@
         <page-numbering-format>p1.</page-numbering-format> Displays "px."
         <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y"
         <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)"
-        -->
+        -#->
     <forrest:property name="skip-first-page-numbering">true</forrest:property>
     <forrest:property name="page-numbering-format">1/1</forrest:property>
-  </forrest:contract>
-  <forrest:contract name="page-footer-copyright">
+  </forrest:contract>-->
+  <!--<forrest:contract name="page-footer-copyright">
     <forrest:property name="copyright">
-<!-- The following are used to construct a copyright statement as follows :
+<!-#- The following are used to construct a copyright statement as follows :
         <property> <symbol> <year> <vendor> <msg>
                          <url>
         ie. Copyright c 2002 ACME
 	      http://ACME.org
 	inception year option let you create a copyright with a range of date automaticalculated :
 	2002-2007
-       -->
+       -#->
       <year inception='true'>2002</year>
       <vendor>ACME</vendor>
       <url>http://ACME.org</url>
@@ -78,7 +78,7 @@
       <symbol></symbol>
       <property></property>
     </forrest:property>
-  </forrest:contract>
+  </forrest:contract>-->
   <forrest:contract name="content-abstract" dataURI="cocoon://#{$getRequest}.abstract.xml"/>
   <forrest:contract name="content-notice" dataURI="cocoon://#{$getRequest}.notice.xml"/>
   <forrest:contract name="content-authors" dataURI="cocoon://#{$getRequest}.authors.xml"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.nav-main.panel.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.nav-main.panel.xml?rev=628588&r1=628587&r2=628588&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.nav-main.panel.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/pelt/panels/pelt-html.nav-main.panel.xml Sun Feb 17 16:42:16 2008
@@ -28,9 +28,9 @@
   <forrest:hook name="nav-main-hook">
     <forrest:contract name="nav-main"
       dataURI="cocoon://#{$getRequest}.navigation.xml"/>
-    <forrest:hook name="publishedStrip" nbsp="true">
-      <forrest:contract name="nav-main-sub"
+<forrest:contract name="nav-main-sub"
         dataURI="cocoon://#{$getRequest}.navigation.xml"/>
+    <forrest:hook name="publishedStrip" nbsp="true">
       <forrest:contract name="siteinfo-last-published"/>
     </forrest:hook>
   </forrest:hook>



Mime
View raw message