From Arnaud Heritier :

- XML reformatting


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114608 13f79535-47bb-0310-9956-ffa450edef68

pdf/src/plugin-resources/fo-cover.xslt

@@ -1,24 +1,18 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
-
     <xsl:template name="fo-cover">
         <fo:page-sequence master-reference="cover-page">
             <fo:flow flow-name="xsl-region-body">
-              <fo:block xsl:use-attribute-sets="body.title"
+                <fo:block xsl:use-attribute-sets="body.title" text-align="end">
-                  text-align="end">
                     <xsl:value-of select="$coverProjectName"/> v.<xsl:value-of select="$coverVersion"/>
                 </fo:block>
-              <fo:block xsl:use-attribute-sets="body.h1"
+                <fo:block xsl:use-attribute-sets="body.h1" text-align="end" space-before="24pt" space-after="36pt">
-                  text-align="end" space-before="24pt" space-after="36pt">
                     <xsl:value-of select="$coverProjectCompany"/>
                 </fo:block>
-              <fo:block xsl:use-attribute-sets="body.h1"
+                <fo:block xsl:use-attribute-sets="body.h1" text-align="end">
-                  text-align="end">
                     <xsl:value-of select="$coverType"/>
                 </fo:block>
             </fo:flow>
         </fo:page-sequence>
     </xsl:template>
-
 </xsl:stylesheet>

pdf/src/plugin-resources/fo-layouts.xslt

@@ -1,7 +1,5 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
-
     <!-- Set the default page width, in inches -->
     <xsl:variable name="pageWidth">
         <xsl:choose>
@@ -16,58 +14,25 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
     <xsl:variable name="bodySideMargins">1</xsl:variable>
     <xsl:variable name="maxBodyWidth" select="$pageWidth - (2 * $bodySideMargins)"/>
     <xsl:variable name="maxTableWidth" select="$maxBodyWidth"/>
-
     <xsl:template name="fo-layouts">
-
         <!-- Defines the layout set -->
         <fo:layout-master-set>
-
+            <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}in" page-height="{$pageHeight}in" margin-top="0.2in" margin-bottom="0.2in" margin-left="0.4in" margin-right="0.2in">
-      <fo:simple-page-master master-name="cover-page"
-        page-width="{$pageWidth}in"
-        page-height="{$pageHeight}in"
-        margin-top="0.2in"
-        margin-bottom="0.2in"
-        margin-left="0.4in"
-        margin-right="0.2in">
                 <fo:region-body margin-top="4.72in"/>
             </fo:simple-page-master>
-
+            <fo:simple-page-master master-name="cover-inside" page-width="{$pageWidth}in" page-height="{$pageHeight}in" margin-top="0in" margin-bottom="0in" margin-left="0in" margin-right="0in">
-      <fo:simple-page-master master-name="cover-inside"
-        page-width="{$pageWidth}in"
-        page-height="{$pageHeight}in"
-        margin-top="0in"
-        margin-bottom="0in"
-        margin-left="0in"
-        margin-right="0in">
                 <fo:region-body margin-top="0in"/>
             </fo:simple-page-master>
-
+            <fo:simple-page-master master-name="toc" page-width="{$pageWidth}in" page-height="{$pageHeight}in" margin-top="0.625in" margin-bottom="0.6in" margin-left="{$bodySideMargins}in" margin-right="{$bodySideMargins}in">
-      <fo:simple-page-master master-name="toc"
-        page-width="{$pageWidth}in"
-        page-height="{$pageHeight}in"
-        margin-top="0.625in"
-        margin-bottom="0.6in"
-        margin-left="{$bodySideMargins}in"
-        margin-right="{$bodySideMargins}in">
                 <fo:region-before extent="0.35in"/>
                 <fo:region-body margin-top="0.7in" margin-bottom="0.8in"/>
                 <fo:region-after extent="0.125in"/>
             </fo:simple-page-master>
-
+            <fo:simple-page-master master-name="body" page-width="{$pageWidth}in" page-height="{$pageHeight}in" margin-top="0.625in" margin-bottom="0.6in" margin-left="{$bodySideMargins}in" margin-right="{$bodySideMargins}in">
-      <fo:simple-page-master master-name="body"
-        page-width="{$pageWidth}in"
-        page-height="{$pageHeight}in"
-        margin-top="0.625in"
-        margin-bottom="0.6in"
-        margin-left="{$bodySideMargins}in"
-        margin-right="{$bodySideMargins}in">
                 <fo:region-before extent="0.35in"/>
                 <fo:region-body margin-top="0.7in" margin-bottom="0.8in"/>
                 <fo:region-after extent="0.125in"/>
             </fo:simple-page-master>
-
         </fo:layout-master-set>
-
     </xsl:template>
-
 </xsl:stylesheet>

pdf/src/plugin-resources/fo-table-column-widths.xslt

@@ -228,7 +228,6 @@
             </xsl:when>
         </xsl:choose>
     </xsl:template>
-    
     <!-- Calculate column widths for tables without thead -->
     <xsl:template name="html-calculate-column-widths">
         <xsl:param name="row">1</xsl:param>
@@ -369,5 +368,4 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
 </xsl:stylesheet>

pdf/src/plugin-resources/fo-tables.xslt

@@ -1,65 +1,52 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
-xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
-
     <!-- These attribute-sets are treated as 'styles,'
        and are referenced in the templates below -->
-
     <!-- Style 'primitives' from which all others are descended -->
     <xsl:attribute-set name="base.cell">
         <xsl:attribute name="padding-start">2.5pt</xsl:attribute>
         <xsl:attribute name="padding-end">5pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="base.block">
         <xsl:attribute name="font-family">Helvetica,sans-serif</xsl:attribute>
         <xsl:attribute name="line-height">1.2em</xsl:attribute>
     </xsl:attribute-set>
-
     <!-- Table styles -->
     <!-- Bumped padding down by 6 pts before & after -->
     <xsl:attribute-set name="table.padding">
         <xsl:attribute name="padding-before">9pt</xsl:attribute>
         <xsl:attribute name="padding-after">12pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.title.row">
         <xsl:attribute name="keep-together">always</xsl:attribute>
         <xsl:attribute name="keep-with-next">always</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.title.cell" use-attribute-sets="base.cell">
         <xsl:attribute name="border-after-style">solid</xsl:attribute>
         <xsl:attribute name="border-after-width">0.5pt</xsl:attribute>
         <xsl:attribute name="border-after-color">black</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.title.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">9.5pt</xsl:attribute>
         <xsl:attribute name="font-weight">bold</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.footer.cell" use-attribute-sets="base.cell">
         <xsl:attribute name="padding-before">5pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.footer.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
         <xsl:attribute name="font-style">italic</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.heading.cell" use-attribute-sets="base.cell">
         <xsl:attribute name="padding-before">7pt</xsl:attribute>
         <xsl:attribute name="display-align">after</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.heading.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
-<!--    
+        <!--    
     <xsl:attribute name="font-weight">bold</xsl:attribute>
 -->
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.heading.rule">
         <xsl:attribute name="leader-length.optimum">100%</xsl:attribute>
         <xsl:attribute name="leader-pattern">rule</xsl:attribute>
@@ -69,21 +56,17 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
         <xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
         <xsl:attribute name="color">black</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.number.cell" use-attribute-sets="base.cell">
         <xsl:attribute name="padding-before">6pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.number.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
         <xsl:attribute name="font-style">italic</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.subheading.row">
         <xsl:attribute name="keep-together">always</xsl:attribute>
         <xsl:attribute name="keep-with-next">always</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.subheading.cell" use-attribute-sets="base.cell">
         <xsl:attribute name="padding-after">1pt</xsl:attribute>
         <xsl:attribute name="background-color"><xsl:value-of select="$colorLightGray"/></xsl:attribute>
@@ -92,56 +75,46 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
         <xsl:attribute name="border-before-color"><xsl:value-of select="$colorLightGray"/></xsl:attribute>
         <xsl:attribute name="display-align">after</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.subheading.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
         <xsl:attribute name="font-weight">bold</xsl:attribute>
         <xsl:attribute name="vertical-align">bottom</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.row">
         <xsl:attribute name="keep-together">always</xsl:attribute>
         <xsl:attribute name="keep-with-next">always</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.norule">
         <xsl:attribute name="leader-length.optimum">100%</xsl:attribute>
         <xsl:attribute name="leader-pattern">rule</xsl:attribute>
         <xsl:attribute name="rule-thickness">1pt</xsl:attribute>
         <xsl:attribute name="color">white</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.rule">
         <xsl:attribute name="leader-length.optimum">100%</xsl:attribute>
         <xsl:attribute name="leader-pattern">dots</xsl:attribute>
         <xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
         <xsl:attribute name="color"><xsl:value-of select="$colorMediumGray"/></xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.lastrule">
         <xsl:attribute name="leader-length.optimum">100%</xsl:attribute>
         <xsl:attribute name="leader-pattern">rule</xsl:attribute>
         <xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
         <xsl:attribute name="color">black</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.cell" use-attribute-sets="base.cell">
         <!-- Bumped both down by 3 pts -->
         <xsl:attribute name="padding-before">4pt</xsl:attribute>
         <xsl:attribute name="padding-after">1.5pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.body.block" use-attribute-sets="base.block">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
     </xsl:attribute-set>
-
     <xsl:attribute-set name="table.pre" use-attribute-sets="base.pre.style">
         <xsl:attribute name="font-size">7pt</xsl:attribute>
     </xsl:attribute-set>
-
-
     <!-- Table rendering -->
-<!--
+    <!--
   <xsl:template match="table[count(thead)=0]">
     <fo:block xsl:use-attribute-sets="error.block">
       Warning: the supplied &lt;table&gt; did not contain a &lt;thead&gt; element. It was excluded from the generated XSL:FO file.
@@ -149,9 +122,7 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
     
   </xsl:template>
 -->
-
     <!-- HTML tables generation without THEAD and TBODY -->
-  
     <xsl:template match="table[count(thead)=0]" name="html-find-max-columns">
         <!-- Before we do anything, we need to scan the table to find the maximum span -->
         <xsl:param name="row">1</xsl:param>
@@ -167,8 +138,12 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
         <xsl:variable name="nColumns" select="count($currentRow/th) + count($currentRow/tr) + sum($currentRow/th/@colspan) + sum($currentRow/tr/@colspan) - count($currentRow/th/@colspan) - count($currentRow/tr/@colspan)"/>
         <xsl:variable name="newMaxColumns">
             <xsl:choose>
-        <xsl:when test="$nColumns &gt; $maxColumns"><xsl:value-of select="$nColumns"/></xsl:when>
+                <xsl:when test="$nColumns &gt; $maxColumns">
-        <xsl:otherwise><xsl:value-of select="$maxColumns"/></xsl:otherwise>
+                    <xsl:value-of select="$nColumns"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$maxColumns"/>
+                </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
         <!-- Iterate through the template again if there are more rows -->
@@ -186,7 +161,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
     <xsl:template match="table3" name="html-print-table">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:comment> :::::: New table :::::: </xsl:comment>
@@ -196,14 +170,16 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
           <fo:table-column column-width="1.25in"/>
           <fo:table-column column-width="5.0in"/>
         -->
-        <xsl:call-template name="html-calculate-column-widths" />
+                <xsl:call-template name="html-calculate-column-widths"/>
                 <fo:table-header>
                     <!-- If there is a 'title' attribute, output a title row -->
                     <xsl:if test="@title">
                         <xsl:comment> This table has a @title, so add a row for it </xsl:comment>
                         <fo:table-row keep-together="always" keep-with-next="always">
                             <fo:table-cell number-columns-spanned="{$spacerSpanColumns}" xsl:use-attribute-sets="table.title.cell">
-                <fo:block xsl:use-attribute-sets="table.title.block"><xsl:value-of select="@title"/></fo:block>
+                                <fo:block xsl:use-attribute-sets="table.title.block">
+                                    <xsl:value-of select="@title"/>
+                                </fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                     </xsl:if>
@@ -241,9 +217,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table>
         </fo:block>
     </xsl:template>
-
-
-
     <xsl:template match="tr[th]" mode="html-table">
         <xsl:comment> ::: Subheading row ::: </xsl:comment>
         <!-- Changed from table.body.row (a bug!) -->
@@ -251,7 +224,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             <xsl:apply-templates select="th|td" mode="html-table"/>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="tr[last()]" mode="html-table">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:variable name="nColumns" select="count(th|td) + sum(th/@colspan|td/@colspan) - count(th/@colspan|td/@colspan)"/>
@@ -271,7 +243,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="tr" mode="html-table">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:param name="nextRow" select="following-sibling::tr[1]"/>
@@ -317,7 +288,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="th" mode="html-table">
         <xsl:comment> : Table subheading cell : </xsl:comment>
         <fo:table-cell xsl:use-attribute-sets="table.subheading.cell">
@@ -327,7 +297,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:block>
         </fo:table-cell>
     </xsl:template>
-
     <xsl:template match="td" mode="html-table">
         <xsl:comment> : Table body cell <xsl:value-of select="position()"/> : </xsl:comment>
         <fo:table-cell xsl:use-attribute-sets="table.body.cell">
@@ -338,25 +307,16 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:block>
         </fo:table-cell>
     </xsl:template>
-  
     <xsl:template match="@align" mode="html-table">
         <xsl:attribute name="text-align"><xsl:value-of select="."/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@colspan" mode="html-table">
         <xsl:attribute name="number-columns-spanned"><xsl:value-of select="number(.)"/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@rowspan" mode="html-table">
         <xsl:attribute name="number-rows-spanned"><xsl:value-of select="number(.)"/></xsl:attribute>
     </xsl:template>
-  
-  
-   
     <!-- HTML tables generation with THEAD and TBODY -->
-  
-  
-  
     <xsl:template match="table" name="find-max-columns">
         <!-- Before we do anything, we need to scan the table to find the maximum span -->
         <xsl:param name="row">1</xsl:param>
@@ -372,8 +332,12 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
         <xsl:variable name="nColumns" select="count($currentRow/th) + sum($currentRow/th/@colspan) - count($currentRow/th/@colspan)"/>
         <xsl:variable name="newMaxColumns">
             <xsl:choose>
-        <xsl:when test="$nColumns &gt; $maxColumns"><xsl:value-of select="$nColumns"/></xsl:when>
+                <xsl:when test="$nColumns &gt; $maxColumns">
-        <xsl:otherwise><xsl:value-of select="$maxColumns"/></xsl:otherwise>
+                    <xsl:value-of select="$nColumns"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$maxColumns"/>
+                </xsl:otherwise>
             </xsl:choose>
         </xsl:variable>
         <!-- Iterate through the template again if there are more rows -->
@@ -391,7 +355,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
     <xsl:template match="table2" name="print-table">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:comment> :::::: New table :::::: </xsl:comment>
@@ -401,14 +364,16 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
           <fo:table-column column-width="1.25in"/>
           <fo:table-column column-width="5.0in"/>
         -->
-        <xsl:call-template name="calculate-column-widths" />
+                <xsl:call-template name="calculate-column-widths"/>
                 <fo:table-header>
                     <!-- If there is a 'title' attribute, output a title row -->
                     <xsl:if test="@title">
                         <xsl:comment> This table has a @title, so add a row for it </xsl:comment>
                         <fo:table-row keep-together="always" keep-with-next="always">
                             <fo:table-cell number-columns-spanned="{$spacerSpanColumns}" xsl:use-attribute-sets="table.title.cell">
-                <fo:block xsl:use-attribute-sets="table.title.block"><xsl:value-of select="@title"/></fo:block>
+                                <fo:block xsl:use-attribute-sets="table.title.block">
+                                    <xsl:value-of select="@title"/>
+                                </fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                     </xsl:if>
@@ -450,7 +415,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table>
         </fo:block>
     </xsl:template>
-
     <xsl:template match="thead" mode="table-head">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <!-- Process any tr elements -->
@@ -465,7 +429,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="tr" mode="table-head">
         <xsl:comment> ::: Table heading row <xsl:value-of select="position()"/> ::: </xsl:comment>
         <fo:table-row xsl:use-attribute-sets="table.title.row">
@@ -473,7 +436,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             <xsl:apply-templates select="th|td" mode="table-head"/>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="th|td" mode="table-head">
         <xsl:comment> : Table heading cell <xsl:value-of select="position()"/> : </xsl:comment>
         <fo:table-cell xsl:use-attribute-sets="table.heading.cell">
@@ -488,7 +450,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:block>
         </fo:table-cell>
     </xsl:template>
-
     <xsl:template match="tr[th]" mode="table-body">
         <xsl:comment> ::: Subheading row ::: </xsl:comment>
         <!-- Changed from table.body.row (a bug!) -->
@@ -496,7 +457,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             <xsl:apply-templates select="th|td" mode="table-body"/>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="tr[last()]" mode="table-body">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:variable name="nColumns" select="count(th|td) + sum(th/@colspan|td/@colspan) - count(th/@colspan|td/@colspan)"/>
@@ -516,7 +476,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="tr" mode="table-body">
         <xsl:param name="spacerSpanColumns">1</xsl:param>
         <xsl:param name="nextRow" select="following-sibling::tr[1]"/>
@@ -562,7 +521,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
-
     <xsl:template match="th" mode="table-body">
         <xsl:comment> : Table subheading cell : </xsl:comment>
         <fo:table-cell xsl:use-attribute-sets="table.subheading.cell">
@@ -572,7 +530,6 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:block>
         </fo:table-cell>
     </xsl:template>
-
     <xsl:template match="td" mode="table-body">
         <xsl:comment> : Table body cell <xsl:value-of select="position()"/> : </xsl:comment>
         <fo:table-cell xsl:use-attribute-sets="table.body.cell">
@@ -583,37 +540,27 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" version='1.0'>
             </fo:block>
         </fo:table-cell>
     </xsl:template>
-
     <xsl:template match="tt|code[ancestor::table]">
         <fo:inline xsl:use-attribute-sets="table.pre">
-      <xsl:apply-templates />
+            <xsl:apply-templates/>
         </fo:inline>
     </xsl:template>
-
     <xsl:template match="@align" mode="table-head">
         <xsl:attribute name="text-align"><xsl:value-of select="."/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@align" mode="table-body">
         <xsl:attribute name="text-align"><xsl:value-of select="."/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@colspan" mode="table-head">
         <xsl:attribute name="number-columns-spanned"><xsl:value-of select="number(.)"/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@rowspan" mode="table-head">
         <xsl:attribute name="number-rows-spanned"><xsl:value-of select="number(.)"/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@colspan" mode="table-body">
         <xsl:attribute name="number-columns-spanned"><xsl:value-of select="number(.)"/></xsl:attribute>
     </xsl:template>
-
     <xsl:template match="@rowspan" mode="table-body">
         <xsl:attribute name="number-rows-spanned"><xsl:value-of select="number(.) * 2 - 1"/></xsl:attribute>
     </xsl:template>
-  
-
-
 </xsl:stylesheet>

pdf/src/plugin-resources/project2fo.xslt

@@ -148,7 +148,9 @@
                         </xsl:if>
                         <xsl:if test="starts-with($href, 'http')">
                             <fo:basic-link external-destination="{@href}">
-                                    <fo:inline xsl:use-attribute-sets="href"><xsl:value-of select="$href"/></fo:inline>
+                                <fo:inline xsl:use-attribute-sets="href">
+                                    <xsl:value-of select="$href"/>
+                                </fo:inline>
                             </fo:basic-link>
                         </xsl:if>
                     </fo:block>

pdf/src/plugin-resources/userconfig.xml

@@ -6,47 +6,39 @@
      always use this file and *not* config.xml.
      Usage: java org.apache.fop.apps.Fop -c userconfig.xml -fo fo-file -pdf pdf-file
 -->
-
-
 <configuration>
-
+    <!--  NOT IMPLEMENTED
-<!--  NOT IMPLEMENTED
 basedir: normally the base directory is the directory where the fo file is
          located. if you want to specify your own, uncomment this entry
 -->
-<!--
+    <!--
   <entry>
     <key>baseDir</key>
     <value></value>
   </entry>
 -->
-
+    <!--
-<!--
 ************************************************************************
                         HYPHENATION
 ************************************************************************
 -->
-
+    <!--
-<!--
    hyphenation directory
    if you want to specify your own directory with hyphenation pattern
    then uncomment the next entry and add the directory name
 -->
-
+    <!--
-<!--
   <entry>
     <key>hyphenation-dir</key>
     <value>/java/xml-fop/hyph</value>
   </entry>
 -->
-
+    <!--
-<!--
 ************************************************************************
   Add fonts here
 ************************************************************************
 -->
-
+    <fonts>
-<fonts>
         <font metrics-file="fonts/ttf-gara.xml" kerning="yes" embed-file="fonts/gara.ttf">
             <font-triplet name="Garamond" style="normal" weight="normal"/>
         </font>
@@ -64,9 +56,4 @@ basedir: normally the base directory is the directory where the fo file is
  </font>
  -->
     </fonts>
-
-
 </configuration>
-
-
-