From 59c29c757f5c53d75fdab8703e64a1e7baea4954 Mon Sep 17 00:00:00 2001
From: Quang Truong <truong.quang@scheidt-bachmann-st.de>
Date: Fri, 3 Jul 2026 10:07:09 +0200
Subject: [PATCH 1/2] PDF-Export: set table border separate

---
 .../set/utils/export/xsl/AbstractTransformTableHeader.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/AbstractTransformTableHeader.java b/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/AbstractTransformTableHeader.java
index 416109dfd0..b0641fbde9 100644
--- a/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/AbstractTransformTableHeader.java
+++ b/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/AbstractTransformTableHeader.java
@@ -139,6 +139,7 @@ protected Element transformTable() {
 		final Element table = doc.createElement(FO_TABLE);
 		table.setAttribute(TABLE_LAYOUT, LAYOUT_FIXED);
 		table.setAttribute(TABLE_WIDTH, "100%"); //$NON-NLS-1$
+		table.setAttribute("border-collapse", "separate");
 		final Set<Element> tableColumns = transformColumns();
 		tableColumns.forEach(table::appendChild);
 

From 72eb30076eade10da1d5fe7b8265ce7b89e8793c Mon Sep 17 00:00:00 2001
From: Quang Truong <truong.quang@scheidt-bachmann-st.de>
Date: Fri, 3 Jul 2026 14:29:32 +0200
Subject: [PATCH 2/2] Update stylesheet reference

---
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssbb-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssit-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sska-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskf-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskg-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssko-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskp-fop.xsl | 2 +-
 .../res/xsl/sskp_dm-fop.xsl                                     | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssks-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskt-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskw-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskx-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sskz-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssla-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sslb-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssld-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sslf-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssli-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssln-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sslr-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssls-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sslw-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sslz-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssvu-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/ssza-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sszs-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sszw-fop.xsl | 2 +-
 .../org.eclipse.set.feature.table.pt1.test/res/xsl/sxxx-fop.xsl | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssbb-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssbb-fop.xsl
index 57773b018d..d22b65c958 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssbb-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssbb-fop.xsl
@@ -97,5 +97,5 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="3.62cm"/><fo:table-column column-number="3" column-width="2.25cm"/><fo:table-column column-number="4" column-width="2.33cm"/><fo:table-column column-number="5" column-width="1.9cm"/><fo:table-column column-number="6" column-width="1.3cm"/><fo:table-column column-number="7" column-width="1.72cm"/><fo:table-column column-number="8" column-width="2.86cm"/><fo:table-column column-number="9" column-width="2.67cm"/><fo:table-column column-number="10" column-width="2.67cm"/><fo:table-column column-number="11" column-width="17.01000213623047cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Wirkung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zugehörige Außenelement-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="3.62cm"/><fo:table-column column-number="3" column-width="2.25cm"/><fo:table-column column-number="4" column-width="2.33cm"/><fo:table-column column-number="5" column-width="1.9cm"/><fo:table-column column-number="6" column-width="1.3cm"/><fo:table-column column-number="7" column-width="1.72cm"/><fo:table-column column-number="8" column-width="2.86cm"/><fo:table-column column-number="9" column-width="2.67cm"/><fo:table-column column-number="10" column-width="2.67cm"/><fo:table-column column-number="11" column-width="17.01000213623047cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Wirkung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zugehörige Außenelement-
 ansteuerung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bauart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Befestigung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">BÜ-Anlage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">BÜ-Einschaltung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">BÜ-Ausschaltung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 10 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 10 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 6 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 9 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 9 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 6 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssit-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssit-fop.xsl
index 9528fc5445..a531e2eafa 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssit-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssit-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.38cm"/><fo:table-column column-number="3" column-width="2.22cm"/><fo:table-column column-number="4" column-width="2.33cm"/><fo:table-column column-number="5" column-width="1.9cm"/><fo:table-column column-number="6" column-width="1.3cm"/><fo:table-column column-number="7" column-width="1.24cm"/><fo:table-column column-number="8" column-width="2.7cm"/><fo:table-column column-number="9" column-width="2.7cm"/><fo:table-column column-number="10" column-width="2.7cm"/><fo:table-column column-number="11" column-width="1.53cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.43cm"/><fo:table-column column-number="14" column-width="1.67cm"/><fo:table-column column-number="15" column-width="1.69cm"/><fo:table-column column-number="16" column-width="1.69cm"/><fo:table-column column-number="17" column-width="1.9cm"/><fo:table-column column-number="18" column-width="1.85cm"/><fo:table-column column-number="19" column-width="5.5699968338012695cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="11" text-align="center"><fo:block start-indent="0mm">Bedien- und Anzeigeelemente</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zugehörige Außenelement-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.38cm"/><fo:table-column column-number="3" column-width="2.22cm"/><fo:table-column column-number="4" column-width="2.33cm"/><fo:table-column column-number="5" column-width="1.9cm"/><fo:table-column column-number="6" column-width="1.3cm"/><fo:table-column column-number="7" column-width="1.24cm"/><fo:table-column column-number="8" column-width="2.7cm"/><fo:table-column column-number="9" column-width="2.7cm"/><fo:table-column column-number="10" column-width="2.7cm"/><fo:table-column column-number="11" column-width="1.53cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.43cm"/><fo:table-column column-number="14" column-width="1.67cm"/><fo:table-column column-number="15" column-width="1.69cm"/><fo:table-column column-number="16" column-width="1.69cm"/><fo:table-column column-number="17" column-width="1.9cm"/><fo:table-column column-number="18" column-width="1.85cm"/><fo:table-column column-number="19" column-width="5.5699968338012695cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="11" text-align="center"><fo:block start-indent="0mm">Bedien- und Anzeigeelemente</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zugehörige Außenelement-
 ansteuerung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bauart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Befestigung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Melder</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Schalter</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Taste</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Nahstellbereich</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Anforderung Nb</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Fertig-
 meldung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Weichen-
 gruppe</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Umstellung Weiche</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Umstellung Gleissperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Umstellung Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Freigabe Schlüsselsperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Anschaltzeit Hupe</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">s</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 6 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 18 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 6 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 17 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 17 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 18 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sska-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sska-fop.xsl
index 187aec5391..537f4b3b64 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sska-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sska-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.72cm"/><fo:table-column column-number="3" column-width="1.85cm"/><fo:table-column column-number="4" column-width="1.64cm"/><fo:table-column column-number="5" column-width="1.88cm"/><fo:table-column column-number="6" column-width="1.61cm"/><fo:table-column column-number="7" column-width="1.08cm"/><fo:table-column column-number="8" column-width="1.08cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="2.12cm"/><fo:table-column column-number="11" column-width="2.12cm"/><fo:table-column column-number="12" column-width="2.12cm"/><fo:table-column column-number="13" column-width="2.41cm"/><fo:table-column column-number="14" column-width="0.95cm"/><fo:table-column column-number="15" column-width="1.14cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="1.27cm"/><fo:table-column column-number="19" column-width="1.16cm"/><fo:table-column column-number="20" column-width="1.59cm"/><fo:table-column column-number="21" column-width="1.98cm"/><fo:table-column column-number="22" column-width="1.59cm"/><fo:table-column column-number="23" column-width="1.8cm"/><fo:table-column column-number="24" column-width="3.6200008392333984cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Verknüpfungen</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">IP-Adressangaben (DSTW)</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bauart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Unterbringung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Information</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Energie</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Bedienung (ZE)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">GFK-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.72cm"/><fo:table-column column-number="3" column-width="1.85cm"/><fo:table-column column-number="4" column-width="1.64cm"/><fo:table-column column-number="5" column-width="1.88cm"/><fo:table-column column-number="6" column-width="1.61cm"/><fo:table-column column-number="7" column-width="1.08cm"/><fo:table-column column-number="8" column-width="1.08cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="2.12cm"/><fo:table-column column-number="11" column-width="2.12cm"/><fo:table-column column-number="12" column-width="2.12cm"/><fo:table-column column-number="13" column-width="2.41cm"/><fo:table-column column-number="14" column-width="0.95cm"/><fo:table-column column-number="15" column-width="1.14cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="1.27cm"/><fo:table-column column-number="19" column-width="1.16cm"/><fo:table-column column-number="20" column-width="1.59cm"/><fo:table-column column-number="21" column-width="1.98cm"/><fo:table-column column-number="22" column-width="1.59cm"/><fo:table-column column-number="23" column-width="1.8cm"/><fo:table-column column-number="24" column-width="3.6200008392333984cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Verknüpfungen</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">IP-Adressangaben (DSTW)</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bauart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Unterbringung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Information</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Energie</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Bedienung (ZE)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">GFK-
 Kategorie</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Regional-
 bereich</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Adressblock Blau</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Adressblock Grau</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Ort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Türanschlag</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">primär</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">sekundär</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">primär</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">sekundär</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">lokal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezirk
 </fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zentrale</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Not-BP</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv4</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv6</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv4</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">IPv6</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 23 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 16 22 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 23 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 16 22 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskf-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskf-fop.xsl
index 0b220e1380..f8f535dcaf 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskf-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskf-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.83cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="1.22cm"/><fo:table-column column-number="6" column-width="2.59cm"/><fo:table-column column-number="7" column-width="1.69cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="3.25cm"/><fo:table-column column-number="11" column-width="1.14cm"/><fo:table-column column-number="12" column-width="1.14cm"/><fo:table-column column-number="13" column-width="1.14cm"/><fo:table-column column-number="14" column-width="1.14cm"/><fo:table-column column-number="15" column-width="1.14cm"/><fo:table-column column-number="16" column-width="1.14cm"/><fo:table-column column-number="17" column-width="1.43cm"/><fo:table-column column-number="18" column-width="1.69cm"/><fo:table-column column-number="19" column-width="1.69cm"/><fo:table-column column-number="20" column-width="1.69cm"/><fo:table-column column-number="21" column-width="1.69cm"/><fo:table-column column-number="22" column-width="1.43cm"/><fo:table-column column-number="23" column-width="1.43cm"/><fo:table-column column-number="24" column-width="3.7199978828430176cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Auswertung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">FTGS</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">NF-/TF-GSK</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Sonstiges</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung Freimeldeabschnitt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Teilabschnitt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Typ</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AEA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Übertragung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bettungs-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.83cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="1.22cm"/><fo:table-column column-number="6" column-width="2.59cm"/><fo:table-column column-number="7" column-width="1.69cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="3.25cm"/><fo:table-column column-number="11" column-width="1.14cm"/><fo:table-column column-number="12" column-width="1.14cm"/><fo:table-column column-number="13" column-width="1.14cm"/><fo:table-column column-number="14" column-width="1.14cm"/><fo:table-column column-number="15" column-width="1.14cm"/><fo:table-column column-number="16" column-width="1.14cm"/><fo:table-column column-number="17" column-width="1.43cm"/><fo:table-column column-number="18" column-width="1.69cm"/><fo:table-column column-number="19" column-width="1.69cm"/><fo:table-column column-number="20" column-width="1.69cm"/><fo:table-column column-number="21" column-width="1.69cm"/><fo:table-column column-number="22" column-width="1.43cm"/><fo:table-column column-number="23" column-width="1.43cm"/><fo:table-column column-number="24" column-width="3.7199978828430176cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Auswertung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">FTGS</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">NF-/TF-GSK</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Sonstiges</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung Freimeldeabschnitt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Teilabschnitt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Typ</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AEA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Übertragung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bettungs-
 widerstand Rb'min</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Weiche, Kreuzung, Gleissperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Zuordnung Oberleitungsanlage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">zul. Geschwindig-
 keit</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Hilfs- 
 frei- 
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskg-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskg-fop.xsl
index 1b0efae199..7ac15e31b4 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskg-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskg-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="4.26cm"/><fo:table-column column-number="3" column-width="2.99cm"/><fo:table-column column-number="4" column-width="2.83cm"/><fo:table-column column-number="5" column-width="1.72cm"/><fo:table-column column-number="6" column-width="1.43cm"/><fo:table-column column-number="7" column-width="1.3cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="2.83cm"/><fo:table-column column-number="10" column-width="1.43cm"/><fo:table-column column-number="11" column-width="1.43cm"/><fo:table-column column-number="12" column-width="1.43cm"/><fo:table-column column-number="13" column-width="3.55cm"/><fo:table-column column-number="14" column-width="11.699997901916504cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Achszählpunkte</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Standortmerkmale</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Funktion</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung Gleisschaltmittel</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Typ</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Anschluss Achszähl-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="4.26cm"/><fo:table-column column-number="3" column-width="2.99cm"/><fo:table-column column-number="4" column-width="2.83cm"/><fo:table-column column-number="5" column-width="1.72cm"/><fo:table-column column-number="6" column-width="1.43cm"/><fo:table-column column-number="7" column-width="1.3cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="2.83cm"/><fo:table-column column-number="10" column-width="1.43cm"/><fo:table-column column-number="11" column-width="1.43cm"/><fo:table-column column-number="12" column-width="1.43cm"/><fo:table-column column-number="13" column-width="3.55cm"/><fo:table-column column-number="14" column-width="11.699997901916504cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Achszählpunkte</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Standortmerkmale</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Funktion</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung Gleisschaltmittel</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Typ</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Anschluss Achszähl-
 rechner</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Anschluss Energie-
 versorgung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Schienen-
 profil</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezugspunkt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AEA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AEA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Separate Adern</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Abstand</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 11 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 12 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 12 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 11 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssko-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssko-fop.xsl
index 81cd3ee04c..b41bbd0451 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssko-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssko-fop.xsl
@@ -97,6 +97,6 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="1.67cm"/><fo:table-column column-number="3" column-width="1.08cm"/><fo:table-column column-number="4" column-width="2.06cm"/><fo:table-column column-number="5" column-width="1.69cm"/><fo:table-column column-number="6" column-width="1.16cm"/><fo:table-column column-number="7" column-width="1.06cm"/><fo:table-column column-number="8" column-width="1.98cm"/><fo:table-column column-number="9" column-width="1.98cm"/><fo:table-column column-number="10" column-width="1.69cm"/><fo:table-column column-number="11" column-width="1.59cm"/><fo:table-column column-number="12" column-width="1.59cm"/><fo:table-column column-number="13" column-width="1.46cm"/><fo:table-column column-number="14" column-width="2.41cm"/><fo:table-column column-number="15" column-width="1.64cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="2.06cm"/><fo:table-column column-number="18" column-width="1.61cm"/><fo:table-column column-number="19" column-width="1.14cm"/><fo:table-column column-number="20" column-width="1.14cm"/><fo:table-column column-number="21" column-width="1.98cm"/><fo:table-column column-number="22" column-width="1.98cm"/><fo:table-column column-number="23" column-width="4.350000858306885cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Schlüssel</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Weiche/Gleissperre/BÜ</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Schlosskombination/Schlüsselsperre</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Sonderanlage</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Schlüssel bei Technisch Berechtigtem</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung Schloss</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Schloss an</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">In Grundstellung
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="1.67cm"/><fo:table-column column-number="3" column-width="1.08cm"/><fo:table-column column-number="4" column-width="2.06cm"/><fo:table-column column-number="5" column-width="1.69cm"/><fo:table-column column-number="6" column-width="1.16cm"/><fo:table-column column-number="7" column-width="1.06cm"/><fo:table-column column-number="8" column-width="1.98cm"/><fo:table-column column-number="9" column-width="1.98cm"/><fo:table-column column-number="10" column-width="1.69cm"/><fo:table-column column-number="11" column-width="1.59cm"/><fo:table-column column-number="12" column-width="1.59cm"/><fo:table-column column-number="13" column-width="1.46cm"/><fo:table-column column-number="14" column-width="2.41cm"/><fo:table-column column-number="15" column-width="1.64cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="2.06cm"/><fo:table-column column-number="18" column-width="1.61cm"/><fo:table-column column-number="19" column-width="1.14cm"/><fo:table-column column-number="20" column-width="1.14cm"/><fo:table-column column-number="21" column-width="1.98cm"/><fo:table-column column-number="22" column-width="1.98cm"/><fo:table-column column-number="23" column-width="4.350000858306885cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Schlüssel</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Weiche/Gleissperre/BÜ</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Schlosskombination/Schlüsselsperre</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Sonderanlage</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Schlüssel bei Technisch Berechtigtem</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung Schloss</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Schloss an</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">In Grundstellung
 eingeschlossen</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bartform</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gruppe</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Verschlossenes Element</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Schlossart</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Haupt-
 schloss</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Unterbringung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zug</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Rangier</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Anbaulage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Ort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Ort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 22 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 6 13 20 21 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 6 13 20 21 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 22 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 19 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 19 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp-fop.xsl
index 8cbff00d72..1d57966f8d 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.82cm"/><fo:table-column column-number="2" column-width="1.35cm"/><fo:table-column column-number="3" column-width="1.35cm"/><fo:table-column column-number="4" column-width="1.8cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="0.9cm"/><fo:table-column column-number="7" column-width="0.9cm"/><fo:table-column column-number="8" column-width="1.3cm"/><fo:table-column column-number="9" column-width="2.01cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.16cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="1.01cm"/><fo:table-column column-number="15" column-width="1.01cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="1.32cm"/><fo:table-column column-number="18" column-width="1.64cm"/><fo:table-column column-number="19" column-width="0.79cm"/><fo:table-column column-number="20" column-width="0.79cm"/><fo:table-column column-number="21" column-width="0.79cm"/><fo:table-column column-number="22" column-width="1.06cm"/><fo:table-column column-number="23" column-width="1.14cm"/><fo:table-column column-number="24" column-width="1.11cm"/><fo:table-column column-number="25" column-width="1.61cm"/><fo:table-column column-number="26" column-width="1.48cm"/><fo:table-column column-number="27" column-width="6.039994239807129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezug</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">PZB-Schutzstrecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Gleismagnete</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">INA</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsüberwachung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezugs-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.82cm"/><fo:table-column column-number="2" column-width="1.35cm"/><fo:table-column column-number="3" column-width="1.35cm"/><fo:table-column column-number="4" column-width="1.8cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="0.9cm"/><fo:table-column column-number="7" column-width="0.9cm"/><fo:table-column column-number="8" column-width="1.3cm"/><fo:table-column column-number="9" column-width="2.01cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.16cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="1.01cm"/><fo:table-column column-number="15" column-width="1.01cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="1.32cm"/><fo:table-column column-number="18" column-width="1.64cm"/><fo:table-column column-number="19" column-width="0.79cm"/><fo:table-column column-number="20" column-width="0.79cm"/><fo:table-column column-number="21" column-width="0.79cm"/><fo:table-column column-number="22" column-width="1.06cm"/><fo:table-column column-number="23" column-width="1.14cm"/><fo:table-column column-number="24" column-width="1.11cm"/><fo:table-column column-number="25" column-width="1.61cm"/><fo:table-column column-number="26" column-width="1.48cm"/><fo:table-column column-number="27" column-width="6.039994239807129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezug</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">PZB-Schutzstrecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Gleismagnete</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">INA</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsüberwachung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezugs-
 element</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Wirk-
 frequenz</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">PZB-
 Schutzpunkt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Geschw.-
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp_dm-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp_dm-fop.xsl
index 33fa23cb8c..96a2e60bf6 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp_dm-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskp_dm-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.82cm"/><fo:table-column column-number="2" column-width="1.35cm"/><fo:table-column column-number="3" column-width="1.35cm"/><fo:table-column column-number="4" column-width="1.8cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="0.9cm"/><fo:table-column column-number="7" column-width="0.9cm"/><fo:table-column column-number="8" column-width="1.3cm"/><fo:table-column column-number="9" column-width="2.01cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.16cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="1.01cm"/><fo:table-column column-number="15" column-width="1.01cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="1.32cm"/><fo:table-column column-number="18" column-width="1.64cm"/><fo:table-column column-number="19" column-width="0.79cm"/><fo:table-column column-number="20" column-width="0.79cm"/><fo:table-column column-number="21" column-width="0.79cm"/><fo:table-column column-number="22" column-width="1.06cm"/><fo:table-column column-number="23" column-width="1.14cm"/><fo:table-column column-number="24" column-width="1.11cm"/><fo:table-column column-number="25" column-width="1.61cm"/><fo:table-column column-number="26" column-width="1.48cm"/><fo:table-column column-number="27" column-width="6.039994239807129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezug</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">PZB-Schutzstrecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Gleismagnete</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">INA</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsüberwachung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezugs-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.82cm"/><fo:table-column column-number="2" column-width="1.35cm"/><fo:table-column column-number="3" column-width="1.35cm"/><fo:table-column column-number="4" column-width="1.8cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="0.9cm"/><fo:table-column column-number="7" column-width="0.9cm"/><fo:table-column column-number="8" column-width="1.3cm"/><fo:table-column column-number="9" column-width="2.01cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.16cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="1.01cm"/><fo:table-column column-number="15" column-width="1.01cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="1.32cm"/><fo:table-column column-number="18" column-width="1.64cm"/><fo:table-column column-number="19" column-width="0.79cm"/><fo:table-column column-number="20" column-width="0.79cm"/><fo:table-column column-number="21" column-width="0.79cm"/><fo:table-column column-number="22" column-width="1.06cm"/><fo:table-column column-number="23" column-width="1.14cm"/><fo:table-column column-number="24" column-width="1.11cm"/><fo:table-column column-number="25" column-width="1.61cm"/><fo:table-column column-number="26" column-width="1.48cm"/><fo:table-column column-number="27" column-width="6.039994239807129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezug</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">PZB-Schutzstrecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Gleismagnete</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">INA</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsüberwachung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezugs-
 element</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Wirk-
 frequenz</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">PZB-
 Schutzpunkt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Geschw.-
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssks-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssks-fop.xsl
index 88e05ee00b..5980ec0125 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssks-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssks-fop.xsl
@@ -153,7 +153,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:block><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.9cm"/><fo:table-column column-number="3" column-width="0.95cm"/><fo:table-column column-number="4" column-width="1.16cm"/><fo:table-column column-number="5" column-width="1.11cm"/><fo:table-column column-number="6" column-width="1.19cm"/><fo:table-column column-number="7" column-width="1.32cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.35cm"/><fo:table-column column-number="10" column-width="1.06cm"/><fo:table-column column-number="11" column-width="1.4cm"/><fo:table-column column-number="12" column-width="1.4cm"/><fo:table-column column-number="13" column-width="1.06cm"/><fo:table-column column-number="14" column-width="1.06cm"/><fo:table-column column-number="15" column-width="1.06cm"/><fo:table-column column-number="16" column-width="1.35cm"/><fo:table-column column-number="17" column-width="1.51cm"/><fo:table-column column-number="18" column-width="2.17cm"/><fo:table-column column-number="19" column-width="2.62cm"/><fo:table-column column-number="20" column-width="1.32cm"/><fo:table-column column-number="21" column-width="0.71cm"/><fo:table-column column-number="22" column-width="1.14cm"/><fo:table-column column-number="23" column-width="2.62cm"/><fo:table-column column-number="24" column-width="1.16cm"/><fo:table-column column-number="25" column-width="1.56cm"/><fo:table-column column-number="26" column-width="1.35cm"/><fo:table-column column-number="27" column-width="1.69cm"/><fo:table-column column-number="28" column-width="1.6900063cm"/><fo:table-column column-number="29" column-width="0.66cm"/><fo:table-column column-number="30" column-width="1.9cm"/><fo:table-column column-number="31" column-width="0.85cm"/><fo:table-column column-number="32" column-width="0.85cm"/><fo:table-column column-number="33" column-width="0.85cm"/><fo:table-column column-number="34" column-width="0.93cm"/><fo:table-column column-number="35" column-width="0.85cm"/><fo:table-column column-number="36" column-width="0.85cm"/><fo:table-column column-number="37" column-width="0.85cm"/><fo:table-column column-number="38" column-width="0.85cm"/><fo:table-column column-number="39" column-width="0.85cm"/><fo:table-column column-number="40" column-width="0.85cm"/><fo:table-column column-number="41" column-width="0.85cm"/><fo:table-column column-number="42" column-width="1.69cm"/><fo:table-column column-number="43" column-width="1.69cm"/><fo:table-column column-number="44" column-width="1.46cm"/><fo:table-column column-number="45" column-width="2.65cm"/><fo:table-column column-number="46" column-width="1.67cm"/><fo:table-column column-number="47" column-width="1.43cm"/><fo:table-column column-number="48" column-width="1.43cm"/><fo:table-column column-number="49" column-width="1.22cm"/><fo:table-column column-number="50" column-width="1.43cm"/><fo:table-column column-number="51" column-width="0.93cm"/><fo:table-column column-number="52" column-width="1.24cm"/><fo:table-column column-number="53" column-width="10.159998893737793cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AG</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AH</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AI</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AJ</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AK</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AL</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AM</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AN</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AP</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AQ</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AR</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AS</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AT</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AU</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AV</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AW</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AX</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Signal-Art</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="12" text-align="center"><fo:block start-indent="0mm">Standortmerkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Konstruktive Merkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Anschluss</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="15" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Sonstiges</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Reales Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Funktion ohne Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Fiktives Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Sonstige zulässige Anordnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lichtraum-
+<xsl:template match="Table[Rows/Row]"><fo:block><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.9cm"/><fo:table-column column-number="3" column-width="0.95cm"/><fo:table-column column-number="4" column-width="1.16cm"/><fo:table-column column-number="5" column-width="1.11cm"/><fo:table-column column-number="6" column-width="1.19cm"/><fo:table-column column-number="7" column-width="1.32cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.35cm"/><fo:table-column column-number="10" column-width="1.06cm"/><fo:table-column column-number="11" column-width="1.4cm"/><fo:table-column column-number="12" column-width="1.4cm"/><fo:table-column column-number="13" column-width="1.06cm"/><fo:table-column column-number="14" column-width="1.06cm"/><fo:table-column column-number="15" column-width="1.06cm"/><fo:table-column column-number="16" column-width="1.35cm"/><fo:table-column column-number="17" column-width="1.51cm"/><fo:table-column column-number="18" column-width="2.17cm"/><fo:table-column column-number="19" column-width="2.62cm"/><fo:table-column column-number="20" column-width="1.32cm"/><fo:table-column column-number="21" column-width="0.71cm"/><fo:table-column column-number="22" column-width="1.14cm"/><fo:table-column column-number="23" column-width="2.62cm"/><fo:table-column column-number="24" column-width="1.16cm"/><fo:table-column column-number="25" column-width="1.56cm"/><fo:table-column column-number="26" column-width="1.35cm"/><fo:table-column column-number="27" column-width="1.69cm"/><fo:table-column column-number="28" column-width="1.6900063cm"/><fo:table-column column-number="29" column-width="0.66cm"/><fo:table-column column-number="30" column-width="1.9cm"/><fo:table-column column-number="31" column-width="0.85cm"/><fo:table-column column-number="32" column-width="0.85cm"/><fo:table-column column-number="33" column-width="0.85cm"/><fo:table-column column-number="34" column-width="0.93cm"/><fo:table-column column-number="35" column-width="0.85cm"/><fo:table-column column-number="36" column-width="0.85cm"/><fo:table-column column-number="37" column-width="0.85cm"/><fo:table-column column-number="38" column-width="0.85cm"/><fo:table-column column-number="39" column-width="0.85cm"/><fo:table-column column-number="40" column-width="0.85cm"/><fo:table-column column-number="41" column-width="0.85cm"/><fo:table-column column-number="42" column-width="1.69cm"/><fo:table-column column-number="43" column-width="1.69cm"/><fo:table-column column-number="44" column-width="1.46cm"/><fo:table-column column-number="45" column-width="2.65cm"/><fo:table-column column-number="46" column-width="1.67cm"/><fo:table-column column-number="47" column-width="1.43cm"/><fo:table-column column-number="48" column-width="1.43cm"/><fo:table-column column-number="49" column-width="1.22cm"/><fo:table-column column-number="50" column-width="1.43cm"/><fo:table-column column-number="51" column-width="0.93cm"/><fo:table-column column-number="52" column-width="1.24cm"/><fo:table-column column-number="53" column-width="10.159998893737793cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AG</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AH</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AI</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AJ</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AK</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AL</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AM</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AN</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AP</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AQ</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AR</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AS</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AT</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AU</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AV</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AW</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AX</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Signal-Art</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="12" text-align="center"><fo:block start-indent="0mm">Standortmerkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Konstruktive Merkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Anschluss</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="15" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Sonstiges</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Reales Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Funktion ohne Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Fiktives Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Sonstige zulässige Anordnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lichtraum-
 profil</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Über-
 höhung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Abstand
 Mastmitte - Gleismitte
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskt-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskt-fop.xsl
index 9f3ca43cd1..062cb95210 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskt-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskt-fop.xsl
@@ -97,5 +97,5 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="2.35cm"/><fo:table-column column-number="3" column-width="1.93cm"/><fo:table-column column-number="4" column-width="1.85cm"/><fo:table-column column-number="5" column-width="1.88cm"/><fo:table-column column-number="6" column-width="2.91cm"/><fo:table-column column-number="7" column-width="1.08cm"/><fo:table-column column-number="8" column-width="1.14cm"/><fo:table-column column-number="9" column-width="1.19cm"/><fo:table-column column-number="10" column-width="2.49cm"/><fo:table-column column-number="11" column-width="2.99cm"/><fo:table-column column-number="12" column-width="2.49cm"/><fo:table-column column-number="13" column-width="2.99cm"/><fo:table-column column-number="14" column-width="1.93cm"/><fo:table-column column-number="15" column-width="2.99cm"/><fo:table-column column-number="16" column-width="2.99cm"/><fo:table-column column-number="17" column-width="5.179997444152832cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">IP-Adressangaben</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung TSO/BSO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">BSO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Unterbringung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Regional-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="2.35cm"/><fo:table-column column-number="3" column-width="1.93cm"/><fo:table-column column-number="4" column-width="1.85cm"/><fo:table-column column-number="5" column-width="1.88cm"/><fo:table-column column-number="6" column-width="2.91cm"/><fo:table-column column-number="7" column-width="1.08cm"/><fo:table-column column-number="8" column-width="1.14cm"/><fo:table-column column-number="9" column-width="1.19cm"/><fo:table-column column-number="10" column-width="2.49cm"/><fo:table-column column-number="11" column-width="2.99cm"/><fo:table-column column-number="12" column-width="2.49cm"/><fo:table-column column-number="13" column-width="2.99cm"/><fo:table-column column-number="14" column-width="1.93cm"/><fo:table-column column-number="15" column-width="2.99cm"/><fo:table-column column-number="16" column-width="2.99cm"/><fo:table-column column-number="17" column-width="5.179997444152832cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">IP-Adressangaben</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung TSO/BSO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">BSO</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Unterbringung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Regional-
 bereich</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Blau</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Grau</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Teilsystem</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Ort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv4</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv6</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv4</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">IPv6</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Blau</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Grau</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 15 16 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 15 16 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskw-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskw-fop.xsl
index aa32e267fc..cea56a3fbc 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskw-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskw-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.71cm"/><fo:table-column column-number="2" column-width="1.9cm"/><fo:table-column column-number="3" column-width="1.03cm"/><fo:table-column column-number="4" column-width="2.65cm"/><fo:table-column column-number="5" column-width="1.43cm"/><fo:table-column column-number="6" column-width="1.43cm"/><fo:table-column column-number="7" column-width="1.43cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.11cm"/><fo:table-column column-number="10" column-width="1.11cm"/><fo:table-column column-number="11" column-width="1.19cm"/><fo:table-column column-number="12" column-width="1.88cm"/><fo:table-column column-number="13" column-width="1.43cm"/><fo:table-column column-number="14" column-width="1.19cm"/><fo:table-column column-number="15" column-width="1.11cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="1.11cm"/><fo:table-column column-number="19" column-width="1.88cm"/><fo:table-column column-number="20" column-width="1.11cm"/><fo:table-column column-number="21" column-width="1.11cm"/><fo:table-column column-number="22" column-width="1.11cm"/><fo:table-column column-number="23" column-width="1.11cm"/><fo:table-column column-number="24" column-width="2.38cm"/><fo:table-column column-number="25" column-width="0.82cm"/><fo:table-column column-number="26" column-width="1.98cm"/><fo:table-column column-number="27" column-width="3.1299960613250732cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung/Gleissperre/Sonderanlage</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Freimeldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Vorzugslage/
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.71cm"/><fo:table-column column-number="2" column-width="1.9cm"/><fo:table-column column-number="3" column-width="1.03cm"/><fo:table-column column-number="4" column-width="2.65cm"/><fo:table-column column-number="5" column-width="1.43cm"/><fo:table-column column-number="6" column-width="1.43cm"/><fo:table-column column-number="7" column-width="1.43cm"/><fo:table-column column-number="8" column-width="1.43cm"/><fo:table-column column-number="9" column-width="1.11cm"/><fo:table-column column-number="10" column-width="1.11cm"/><fo:table-column column-number="11" column-width="1.19cm"/><fo:table-column column-number="12" column-width="1.88cm"/><fo:table-column column-number="13" column-width="1.43cm"/><fo:table-column column-number="14" column-width="1.19cm"/><fo:table-column column-number="15" column-width="1.11cm"/><fo:table-column column-number="16" column-width="1.11cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="1.11cm"/><fo:table-column column-number="19" column-width="1.88cm"/><fo:table-column column-number="20" column-width="1.11cm"/><fo:table-column column-number="21" column-width="1.11cm"/><fo:table-column column-number="22" column-width="1.11cm"/><fo:table-column column-number="23" column-width="1.11cm"/><fo:table-column column-number="24" column-width="2.38cm"/><fo:table-column column-number="25" column-width="0.82cm"/><fo:table-column column-number="26" column-width="1.98cm"/><fo:table-column column-number="27" column-width="3.1299960613250732cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung/Gleissperre/Sonderanlage</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Freimeldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Vorzugslage/
 Grundstellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Weiche</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Kreuzung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Herzstück</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Gleissperre</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Sonstiges</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Sonderanlage</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Form</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">FMA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">nicht grenzzeichenfrei</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Isolierfall</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lage/
 Stellung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Auto-
 matik</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Auffahr-
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskx-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskx-fop.xsl
index db0be33749..ce15a999ad 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskx-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskx-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.65cm"/><fo:table-column column-number="3" column-width="1.19cm"/><fo:table-column column-number="4" column-width="1.32cm"/><fo:table-column column-number="5" column-width="1.19cm"/><fo:table-column column-number="6" column-width="1.35cm"/><fo:table-column column-number="7" column-width="1.06cm"/><fo:table-column column-number="8" column-width="1.35cm"/><fo:table-column column-number="9" column-width="1.4cm"/><fo:table-column column-number="10" column-width="3.84cm"/><fo:table-column column-number="11" column-width="2.65cm"/><fo:table-column column-number="12" column-width="2.67cm"/><fo:table-column column-number="13" column-width="1.16cm"/><fo:table-column column-number="14" column-width="2.09cm"/><fo:table-column column-number="15" column-width="2.65cm"/><fo:table-column column-number="16" column-width="11.75999927520752cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="2.65cm"/><fo:table-column column-number="3" column-width="1.19cm"/><fo:table-column column-number="4" column-width="1.32cm"/><fo:table-column column-number="5" column-width="1.19cm"/><fo:table-column column-number="6" column-width="1.35cm"/><fo:table-column column-number="7" column-width="1.06cm"/><fo:table-column column-number="8" column-width="1.35cm"/><fo:table-column column-number="9" column-width="1.4cm"/><fo:table-column column-number="10" column-width="3.84cm"/><fo:table-column column-number="11" column-width="2.65cm"/><fo:table-column column-number="12" column-width="2.67cm"/><fo:table-column column-number="13" column-width="1.16cm"/><fo:table-column column-number="14" column-width="2.09cm"/><fo:table-column column-number="15" column-width="2.65cm"/><fo:table-column column-number="16" column-width="11.75999927520752cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bezeichnung
 Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Standortmerkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Konstruktive Merkmale</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lichtraum-profil</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Über-höhung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Abstand
 Mastmitte - Gleismitte
 (Gleisabstand)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Anordnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Fundament</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Signalbegriff</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Gleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Links</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Rechts</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Befestigung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Regelzeichnung
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskz-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskz-fop.xsl
index 6d8f6a977d..55b31c73bd 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskz-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sskz-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="4.76cm"/><fo:table-column column-number="3" column-width="4.76cm"/><fo:table-column column-number="4" column-width="5.0cm"/><fo:table-column column-number="5" column-width="2.35cm"/><fo:table-column column-number="6" column-width="2.38cm"/><fo:table-column column-number="7" column-width="2.35cm"/><fo:table-column column-number="8" column-width="3.1cm"/><fo:table-column column-number="9" column-width="1.8cm"/><fo:table-column column-number="10" column-width="11.929998397827148cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Betrieblicher Bezeichner 
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="4.76cm"/><fo:table-column column-number="3" column-width="4.76cm"/><fo:table-column column-number="4" column-width="5.0cm"/><fo:table-column column-number="5" column-width="2.35cm"/><fo:table-column column-number="6" column-width="2.38cm"/><fo:table-column column-number="7" column-width="2.35cm"/><fo:table-column column-number="8" column-width="3.1cm"/><fo:table-column column-number="9" column-width="1.8cm"/><fo:table-column column-number="10" column-width="11.929998397827148cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Betrieblicher Bezeichner 
 FEAx</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Betrieblicher Bezeichner 
 Feldelement</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Technischer Bezeichner 
 Object Controller</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Türanschlag</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Montage</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Überhöhung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Abstand 
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssla-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssla-fop.xsl
index 1915864d89..3e7d0c3dcc 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssla-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssla-fop.xsl
@@ -97,6 +97,6 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="2.99cm"/><fo:table-column column-number="3" column-width="1.48cm"/><fo:table-column column-number="4" column-width="1.48cm"/><fo:table-column column-number="5" column-width="1.06cm"/><fo:table-column column-number="6" column-width="0.95cm"/><fo:table-column column-number="7" column-width="9.26cm"/><fo:table-column column-number="8" column-width="21.21000099182129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Unterwegssignal
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="2.99cm"/><fo:table-column column-number="3" column-width="1.48cm"/><fo:table-column column-number="4" column-width="1.48cm"/><fo:table-column column-number="5" column-width="1.06cm"/><fo:table-column column-number="6" column-width="0.95cm"/><fo:table-column column-number="7" column-width="9.26cm"/><fo:table-column column-number="8" column-width="21.21000099182129cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Unterwegssignal
 (bei Zugstraßen mit D-Weg)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">D-Weg
 Ziel</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Start</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Ziel</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-bottom="{$small-border-style}" border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="left"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 6 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 3 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 5 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 6 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 5 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 3 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslb-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslb-fop.xsl
index dd24df31a3..a423465c44 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslb-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslb-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.22cm"/><fo:table-column column-number="3" column-width="0.87cm"/><fo:table-column column-number="4" column-width="1.46cm"/><fo:table-column column-number="5" column-width="1.32cm"/><fo:table-column column-number="6" column-width="1.93cm"/><fo:table-column column-number="7" column-width="1.32cm"/><fo:table-column column-number="8" column-width="1.72cm"/><fo:table-column column-number="9" column-width="1.53cm"/><fo:table-column column-number="10" column-width="1.32cm"/><fo:table-column column-number="11" column-width="1.72cm"/><fo:table-column column-number="12" column-width="1.48cm"/><fo:table-column column-number="13" column-width="1.08cm"/><fo:table-column column-number="14" column-width="1.43cm"/><fo:table-column column-number="15" column-width="1.06cm"/><fo:table-column column-number="16" column-width="1.22cm"/><fo:table-column column-number="17" column-width="1.59cm"/><fo:table-column column-number="18" column-width="2.22cm"/><fo:table-column column-number="19" column-width="1.64cm"/><fo:table-column column-number="20" column-width="1.64cm"/><fo:table-column column-number="21" column-width="1.64cm"/><fo:table-column column-number="22" column-width="1.64cm"/><fo:table-column column-number="23" column-width="1.24cm"/><fo:table-column column-number="24" column-width="1.4cm"/><fo:table-column column-number="25" column-width="1.9cm"/><fo:table-column column-number="26" column-width="2.7899999618530273cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Erlaubnis</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Blockmeldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Akustische Meldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Awanst</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Nummer</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Regel-/
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.22cm"/><fo:table-column column-number="3" column-width="0.87cm"/><fo:table-column column-number="4" column-width="1.46cm"/><fo:table-column column-number="5" column-width="1.32cm"/><fo:table-column column-number="6" column-width="1.93cm"/><fo:table-column column-number="7" column-width="1.32cm"/><fo:table-column column-number="8" column-width="1.72cm"/><fo:table-column column-number="9" column-width="1.53cm"/><fo:table-column column-number="10" column-width="1.32cm"/><fo:table-column column-number="11" column-width="1.72cm"/><fo:table-column column-number="12" column-width="1.48cm"/><fo:table-column column-number="13" column-width="1.08cm"/><fo:table-column column-number="14" column-width="1.43cm"/><fo:table-column column-number="15" column-width="1.06cm"/><fo:table-column column-number="16" column-width="1.22cm"/><fo:table-column column-number="17" column-width="1.59cm"/><fo:table-column column-number="18" column-width="2.22cm"/><fo:table-column column-number="19" column-width="1.64cm"/><fo:table-column column-number="20" column-width="1.64cm"/><fo:table-column column-number="21" column-width="1.64cm"/><fo:table-column column-number="22" column-width="1.64cm"/><fo:table-column column-number="23" column-width="1.24cm"/><fo:table-column column-number="24" column-width="1.4cm"/><fo:table-column column-number="25" column-width="1.9cm"/><fo:table-column column-number="26" column-width="2.7899999618530273cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Erlaubnis</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Blockmeldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Akustische Meldung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Awanst</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Nummer</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Regel-/
 Gegengleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Strecken-
 ziel</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Betriebsführung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Von</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Nach</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Block-
 schaltung
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssld-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssld-fop.xsl
index edfbec5bcd..0ddec6ed95 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssld-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssld-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.27cm"/><fo:table-column column-number="3" column-width="1.59cm"/><fo:table-column column-number="4" column-width="1.59cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="1.69cm"/><fo:table-column column-number="7" column-width="1.11cm"/><fo:table-column column-number="8" column-width="0.63cm"/><fo:table-column column-number="9" column-width="0.63cm"/><fo:table-column column-number="10" column-width="1.3cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.51cm"/><fo:table-column column-number="13" column-width="1.51cm"/><fo:table-column column-number="14" column-width="1.27cm"/><fo:table-column column-number="15" column-width="1.51cm"/><fo:table-column column-number="16" column-width="1.35cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="2.2cm"/><fo:table-column column-number="19" column-width="2.2cm"/><fo:table-column column-number="20" column-width="2.28cm"/><fo:table-column column-number="21" column-width="10.349996566772461cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Eigenschaften</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Auflösung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">von
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.61cm"/><fo:table-column column-number="2" column-width="1.27cm"/><fo:table-column column-number="3" column-width="1.59cm"/><fo:table-column column-number="4" column-width="1.59cm"/><fo:table-column column-number="5" column-width="1.59cm"/><fo:table-column column-number="6" column-width="1.69cm"/><fo:table-column column-number="7" column-width="1.11cm"/><fo:table-column column-number="8" column-width="0.63cm"/><fo:table-column column-number="9" column-width="0.63cm"/><fo:table-column column-number="10" column-width="1.3cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.51cm"/><fo:table-column column-number="13" column-width="1.51cm"/><fo:table-column column-number="14" column-width="1.27cm"/><fo:table-column column-number="15" column-width="1.51cm"/><fo:table-column column-number="16" column-width="1.35cm"/><fo:table-column column-number="17" column-width="1.11cm"/><fo:table-column column-number="18" column-width="2.2cm"/><fo:table-column column-number="19" column-width="2.2cm"/><fo:table-column column-number="20" column-width="2.28cm"/><fo:table-column column-number="21" column-width="10.349996566772461cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Eigenschaften</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Auflösung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">von
 (Signal)</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">bis 
 (markanter Punkt)</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gefahrpunkt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">PZB-
 Schutzpunkt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">v Ziel
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslf-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslf-fop.xsl
index ab9af4c917..b03f09c1f8 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslf-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslf-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="1.8cm"/><fo:table-column column-number="3" column-width="1.48cm"/><fo:table-column column-number="4" column-width="1.69cm"/><fo:table-column column-number="5" column-width="0.77cm"/><fo:table-column column-number="6" column-width="1.56cm"/><fo:table-column column-number="7" column-width="1.69cm"/><fo:table-column column-number="8" column-width="1.64cm"/><fo:table-column column-number="9" column-width="1.69cm"/><fo:table-column column-number="10" column-width="1.56cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="19.799999237060547cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzanforderer</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Unmittelbarer Flankenschutz</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzweitergabe</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Technischer
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="1.8cm"/><fo:table-column column-number="3" column-width="1.48cm"/><fo:table-column column-number="4" column-width="1.69cm"/><fo:table-column column-number="5" column-width="0.77cm"/><fo:table-column column-number="6" column-width="1.56cm"/><fo:table-column column-number="7" column-width="1.69cm"/><fo:table-column column-number="8" column-width="1.64cm"/><fo:table-column column-number="9" column-width="1.69cm"/><fo:table-column column-number="10" column-width="1.56cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.53cm"/><fo:table-column column-number="13" column-width="1.53cm"/><fo:table-column column-number="14" column-width="19.799999237060547cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzanforderer</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Unmittelbarer Flankenschutz</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzweitergabe</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Technischer
 Verzicht</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzraum</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung Weiche/Nb</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">W-Lage/
 Nb-Grenze</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Gleissperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">freigemeldet</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">nicht freigemeldet</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zwieschutz</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Rangierziel-
 sperre</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">wie Fahrt über</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 2 7 9 10 12 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 7 9 10 12 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssli-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssli-fop.xsl
index e853813003..506d39df31 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssli-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssli-fop.xsl
@@ -97,4 +97,4 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="1.98cm"/><fo:table-column column-number="3" column-width="1.69cm"/><fo:table-column column-number="4" column-width="1.85cm"/><fo:table-column column-number="5" column-width="1.85cm"/><fo:table-column column-number="6" column-width="2.12cm"/><fo:table-column column-number="7" column-width="1.93cm"/><fo:table-column column-number="8" column-width="1.93cm"/><fo:table-column column-number="9" column-width="25.159997940063477cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Ausschluss gleichzeitiger Fahrten</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung Inselgleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Begrenzende Signale</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zugausfahrt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Rangierfahrt</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P/Y-Richtung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">N/X-Richtung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Einfahrt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Ausfahrt</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 4 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 4 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="1.98cm"/><fo:table-column column-number="3" column-width="1.69cm"/><fo:table-column column-number="4" column-width="1.85cm"/><fo:table-column column-number="5" column-width="1.85cm"/><fo:table-column column-number="6" column-width="2.12cm"/><fo:table-column column-number="7" column-width="1.93cm"/><fo:table-column column-number="8" column-width="1.93cm"/><fo:table-column column-number="9" column-width="25.159997940063477cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Ausschluss gleichzeitiger Fahrten</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung Inselgleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Begrenzende Signale</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zugausfahrt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Rangierfahrt</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P/Y-Richtung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">N/X-Richtung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Einfahrt</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Ausfahrt</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 4 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 4 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssln-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssln-fop.xsl
index 3193298a52..7d6581023f 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssln-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssln-fop.xsl
@@ -97,6 +97,6 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.88cm"/><fo:table-column column-number="3" column-width="0.95cm"/><fo:table-column column-number="4" column-width="1.4cm"/><fo:table-column column-number="5" column-width="1.56cm"/><fo:table-column column-number="6" column-width="2.3cm"/><fo:table-column column-number="7" column-width="4.6cm"/><fo:table-column column-number="8" column-width="3.25cm"/><fo:table-column column-number="9" column-width="1.72cm"/><fo:table-column column-number="10" column-width="3.25cm"/><fo:table-column column-number="11" column-width="1.32cm"/><fo:table-column column-number="12" column-width="3.02cm"/><fo:table-column column-number="13" column-width="2.28cm"/><fo:table-column column-number="14" column-width="2.65cm"/><fo:table-column column-number="15" column-width="8.150001525878906cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Unterstellungsverhältnis</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Grenze</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Element</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Nahstellbereich R</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bereich/Zone</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">unterge-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.88cm"/><fo:table-column column-number="3" column-width="0.95cm"/><fo:table-column column-number="4" column-width="1.4cm"/><fo:table-column column-number="5" column-width="1.56cm"/><fo:table-column column-number="6" column-width="2.3cm"/><fo:table-column column-number="7" column-width="4.6cm"/><fo:table-column column-number="8" column-width="3.25cm"/><fo:table-column column-number="9" column-width="1.72cm"/><fo:table-column column-number="10" column-width="3.25cm"/><fo:table-column column-number="11" column-width="1.32cm"/><fo:table-column column-number="12" column-width="3.02cm"/><fo:table-column column-number="13" column-width="2.28cm"/><fo:table-column column-number="14" column-width="2.65cm"/><fo:table-column column-number="15" column-width="8.150001525878906cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Unterstellungsverhältnis</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Grenze</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Element</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Nahstellbereich R</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bereich/Zone</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">unterge-
 ordnet zu</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Rang der Zuschaltung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Auflösung Grenze zu übergeordneter Zone</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung
 (Element innen, außen)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Weiche/Gleissperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Schlüsselsperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Bedieneinrichtung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Bedienungshandlung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">frei stellbar (Rückgabevoraussetzung)</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">verschlossen</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">frei stellbar (Rückgabevoraussetzung)</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Kennlicht</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 2 5 6 12 13 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 14 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 5 6 12 13 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 14 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslr-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslr-fop.xsl
index 3968b86a54..3923a41e6a 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslr-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslr-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="2.73cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="0.56cm"/><fo:table-column column-number="6" column-width="2.75cm"/><fo:table-column column-number="7" column-width="0.63cm"/><fo:table-column column-number="8" column-width="1.75cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.72cm"/><fo:table-column column-number="12" column-width="1.43cm"/><fo:table-column column-number="13" column-width="2.33cm"/><fo:table-column column-number="14" column-width="2.35cm"/><fo:table-column column-number="15" column-width="1.51cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="2.33cm"/><fo:table-column column-number="18" column-width="11.669999122619629cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Einstellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Autom.
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="2.73cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="0.56cm"/><fo:table-column column-number="6" column-width="2.75cm"/><fo:table-column column-number="7" column-width="0.63cm"/><fo:table-column column-number="8" column-width="1.75cm"/><fo:table-column column-number="9" column-width="1.43cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.72cm"/><fo:table-column column-number="12" column-width="1.43cm"/><fo:table-column column-number="13" column-width="2.33cm"/><fo:table-column column-number="14" column-width="2.35cm"/><fo:table-column column-number="15" column-width="1.51cm"/><fo:table-column column-number="16" column-width="1.32cm"/><fo:table-column column-number="17" column-width="2.33cm"/><fo:table-column column-number="18" column-width="11.669999122619629cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Einstellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Autom.
 Einstellung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">F-
 Bedienung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Inselgleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gleisfrei-
 meldung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Fahrwegweichen
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssls-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssls-fop.xsl
index 31aad65f03..2c05b827bf 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssls-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssls-fop.xsl
@@ -97,6 +97,6 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.63cm"/><fo:table-column column-number="2" column-width="5.24cm"/><fo:table-column column-number="3" column-width="0.45cm"/><fo:table-column column-number="4" column-width="0.45cm"/><fo:table-column column-number="5" column-width="0.45cm"/><fo:table-column column-number="6" column-width="0.45cm"/><fo:table-column column-number="7" column-width="0.45cm"/><fo:table-column column-number="8" column-width="0.45cm"/><fo:table-column column-number="9" column-width="29.820003509521484cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Signalisierungs-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.63cm"/><fo:table-column column-number="2" column-width="5.24cm"/><fo:table-column column-number="3" column-width="0.45cm"/><fo:table-column column-number="4" column-width="0.45cm"/><fo:table-column column-number="5" column-width="0.45cm"/><fo:table-column column-number="6" column-width="0.45cm"/><fo:table-column column-number="7" column-width="0.45cm"/><fo:table-column column-number="8" column-width="0.45cm"/><fo:table-column column-number="9" column-width="29.820003509521484cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Signalisierungs-
 abschnitt(e)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Signal /
 Signalisierung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Ks / Hp / Hl / Ra / Sh</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Kenn- / Zusatzlicht</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsanzeiger</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Geschwindigkeitsvoranzeiger</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Richtungsanzeiger</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Richtungsvoranzeiger</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Zs _</fo:block></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 3 4 5 6 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 0 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-left="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 0 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-left="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 3 4 5 6 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslw-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslw-fop.xsl
index 4387f60ef9..8d9443d121 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslw-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslw-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.43cm"/><fo:table-column column-number="3" column-width="0.85cm"/><fo:table-column column-number="4" column-width="0.71cm"/><fo:table-column column-number="5" column-width="1.61cm"/><fo:table-column column-number="6" column-width="1.69cm"/><fo:table-column column-number="7" column-width="0.77cm"/><fo:table-column column-number="8" column-width="1.56cm"/><fo:table-column column-number="9" column-width="1.69cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.24cm"/><fo:table-column column-number="13" column-width="1.72cm"/><fo:table-column column-number="14" column-width="1.56cm"/><fo:table-column column-number="15" column-width="1.8cm"/><fo:table-column column-number="16" column-width="1.98cm"/><fo:table-column column-number="17" column-width="15.569999694824219cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung 
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.43cm"/><fo:table-column column-number="3" column-width="0.85cm"/><fo:table-column column-number="4" column-width="0.71cm"/><fo:table-column column-number="5" column-width="1.61cm"/><fo:table-column column-number="6" column-width="1.69cm"/><fo:table-column column-number="7" column-width="0.77cm"/><fo:table-column column-number="8" column-width="1.56cm"/><fo:table-column column-number="9" column-width="1.69cm"/><fo:table-column column-number="10" column-width="1.64cm"/><fo:table-column column-number="11" column-width="1.69cm"/><fo:table-column column-number="12" column-width="1.24cm"/><fo:table-column column-number="13" column-width="1.72cm"/><fo:table-column column-number="14" column-width="1.56cm"/><fo:table-column column-number="15" column-width="1.8cm"/><fo:table-column column-number="16" column-width="1.98cm"/><fo:table-column column-number="17" column-width="15.569999694824219cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung 
 in angeforderter Stellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Verschluss</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Ersatzschutz unmittelbar</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Ersatzschutz Weitergabe</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Technischer
 Verzicht</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Flankenschutzraum</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Nachlauf-
 verhinderung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Eigen</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Echt</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Weiche/Gleissperre</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Signal</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">freigemeldet</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">nicht freigemeldet</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Lage</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Zwieschutz</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Rangier-
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslz-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslz-fop.xsl
index 7b8f696444..13192b2364 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslz-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sslz-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.83cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="0.56cm"/><fo:table-column column-number="6" column-width="1.93cm"/><fo:table-column column-number="7" column-width="1.27cm"/><fo:table-column column-number="8" column-width="0.69cm"/><fo:table-column column-number="9" column-width="1.06cm"/><fo:table-column column-number="10" column-width="0.93cm"/><fo:table-column column-number="11" column-width="1.27cm"/><fo:table-column column-number="12" column-width="1.56cm"/><fo:table-column column-number="13" column-width="1.32cm"/><fo:table-column column-number="14" column-width="1.51cm"/><fo:table-column column-number="15" column-width="1.32cm"/><fo:table-column column-number="16" column-width="1.72cm"/><fo:table-column column-number="17" column-width="0.77cm"/><fo:table-column column-number="18" column-width="0.82cm"/><fo:table-column column-number="19" column-width="0.87cm"/><fo:table-column column-number="20" column-width="1.01cm"/><fo:table-column column-number="21" column-width="0.95cm"/><fo:table-column column-number="22" column-width="1.51cm"/><fo:table-column column-number="23" column-width="0.56cm"/><fo:table-column column-number="24" column-width="0.61cm"/><fo:table-column column-number="25" column-width="0.66cm"/><fo:table-column column-number="26" column-width="0.63cm"/><fo:table-column column-number="27" column-width="0.66cm"/><fo:table-column column-number="28" column-width="0.63cm"/><fo:table-column column-number="29" column-width="1.61cm"/><fo:table-column column-number="30" column-width="1.24cm"/><fo:table-column column-number="31" column-width="1.24cm"/><fo:table-column column-number="32" column-width="1.24cm"/><fo:table-column column-number="33" column-width="3.2499942779541016cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Einstellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="16" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D-Weg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Autom. Einstel-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.83cm"/><fo:table-column column-number="3" column-width="1.14cm"/><fo:table-column column-number="4" column-width="1.14cm"/><fo:table-column column-number="5" column-width="0.56cm"/><fo:table-column column-number="6" column-width="1.93cm"/><fo:table-column column-number="7" column-width="1.27cm"/><fo:table-column column-number="8" column-width="0.69cm"/><fo:table-column column-number="9" column-width="1.06cm"/><fo:table-column column-number="10" column-width="0.93cm"/><fo:table-column column-number="11" column-width="1.27cm"/><fo:table-column column-number="12" column-width="1.56cm"/><fo:table-column column-number="13" column-width="1.32cm"/><fo:table-column column-number="14" column-width="1.51cm"/><fo:table-column column-number="15" column-width="1.32cm"/><fo:table-column column-number="16" column-width="1.72cm"/><fo:table-column column-number="17" column-width="0.77cm"/><fo:table-column column-number="18" column-width="0.82cm"/><fo:table-column column-number="19" column-width="0.87cm"/><fo:table-column column-number="20" column-width="1.01cm"/><fo:table-column column-number="21" column-width="0.95cm"/><fo:table-column column-number="22" column-width="1.51cm"/><fo:table-column column-number="23" column-width="0.56cm"/><fo:table-column column-number="24" column-width="0.61cm"/><fo:table-column column-number="25" column-width="0.66cm"/><fo:table-column column-number="26" column-width="0.63cm"/><fo:table-column column-number="27" column-width="0.66cm"/><fo:table-column column-number="28" column-width="0.63cm"/><fo:table-column column-number="29" column-width="1.61cm"/><fo:table-column column-number="30" column-width="1.24cm"/><fo:table-column column-number="31" column-width="1.24cm"/><fo:table-column column-number="32" column-width="1.24cm"/><fo:table-column column-number="33" column-width="3.2499942779541016cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Einstellung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="6" text-align="center"><fo:block start-indent="0mm">Abhängigkeiten</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="16" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Fahrweg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D-Weg</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Autom. Einstel-
 lung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">F-
 Bedie-
 nung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Inselgleis</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Überwachte Ssp</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Abhän-
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssvu-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssvu-fop.xsl
index e7e7cb1895..5d9346ed83 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssvu-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssvu-fop.xsl
@@ -97,4 +97,4 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.91cm"/><fo:table-column column-number="3" column-width="2.91cm"/><fo:table-column column-number="4" column-width="2.91cm"/><fo:table-column column-number="5" column-width="2.91cm"/><fo:table-column column-number="6" column-width="2.91cm"/><fo:table-column column-number="7" column-width="2.91cm"/><fo:table-column column-number="8" column-width="2.91cm"/><fo:table-column column-number="9" column-width="18.139999389648438cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Technik</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">von</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">nach</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Verwendung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Netzart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Technikart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Schnittstelle</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bandbreite</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="2.91cm"/><fo:table-column column-number="3" column-width="2.91cm"/><fo:table-column column-number="4" column-width="2.91cm"/><fo:table-column column-number="5" column-width="2.91cm"/><fo:table-column column-number="6" column-width="2.91cm"/><fo:table-column column-number="7" column-width="2.91cm"/><fo:table-column column-number="8" column-width="2.91cm"/><fo:table-column column-number="9" column-width="18.139999389648438cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Grundsatzangaben</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Technik</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">von</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">nach</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Verwendung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Netzart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Technikart</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Schnittstelle</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bandbreite</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 7 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssza-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssza-fop.xsl
index ecebc9ab14..7e3b55639f 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssza-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/ssza-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.3cm"/><fo:table-column column-number="3" column-width="1.88cm"/><fo:table-column column-number="4" column-width="1.08cm"/><fo:table-column column-number="5" column-width="1.22cm"/><fo:table-column column-number="6" column-width="1.22cm"/><fo:table-column column-number="7" column-width="2.12cm"/><fo:table-column column-number="8" column-width="2.12cm"/><fo:table-column column-number="9" column-width="1.9cm"/><fo:table-column column-number="10" column-width="1.9cm"/><fo:table-column column-number="11" column-width="2.28cm"/><fo:table-column column-number="12" column-width="2.28cm"/><fo:table-column column-number="13" column-width="1.83cm"/><fo:table-column column-number="14" column-width="1.98cm"/><fo:table-column column-number="15" column-width="2.04cm"/><fo:table-column column-number="16" column-width="13.179997444152832cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Datenpunkt (DP)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Bezugspunkt (BP)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">DP-Standort (Balise a)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Rel. Lage
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.3cm"/><fo:table-column column-number="3" column-width="1.88cm"/><fo:table-column column-number="4" column-width="1.08cm"/><fo:table-column column-number="5" column-width="1.22cm"/><fo:table-column column-number="6" column-width="1.22cm"/><fo:table-column column-number="7" column-width="2.12cm"/><fo:table-column column-number="8" column-width="2.12cm"/><fo:table-column column-number="9" column-width="1.9cm"/><fo:table-column column-number="10" column-width="1.9cm"/><fo:table-column column-number="11" column-width="2.28cm"/><fo:table-column column-number="12" column-width="2.28cm"/><fo:table-column column-number="13" column-width="1.83cm"/><fo:table-column column-number="14" column-width="1.98cm"/><fo:table-column column-number="15" column-width="2.04cm"/><fo:table-column column-number="16" column-width="13.179997444152832cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">Datenpunkt (DP)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Bezugspunkt (BP)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="5" text-align="center"><fo:block start-indent="0mm">DP-Standort (Balise a)</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Rel. Lage
 b zu a</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">NID_C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">NID_BG</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Gesteuert</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Anzahl Balisen</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Typ</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Rel. Lage 
 zu BP</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">
 Stellbereich</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">ETCS-Gleiskante</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Km</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Km</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 5 8 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 9 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 15 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 4 7 12 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 14 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 0 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-left="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 4 7 12 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 2 6 10 11 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 15 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 2 6 10 11 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 0 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-left="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 5 8 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 14 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 9 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-bottom="{$small-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszs-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszs-fop.xsl
index 37a738dcc8..d84aedede2 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszs-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszs-fop.xsl
@@ -97,7 +97,7 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="1.96cm"/><fo:table-column column-number="3" column-width="0.56cm"/><fo:table-column column-number="4" column-width="1.08cm"/><fo:table-column column-number="5" column-width="1.27cm"/><fo:table-column column-number="6" column-width="0.71cm"/><fo:table-column column-number="7" column-width="0.71cm"/><fo:table-column column-number="8" column-width="0.71cm"/><fo:table-column column-number="9" column-width="0.71cm"/><fo:table-column column-number="10" column-width="0.71cm"/><fo:table-column column-number="11" column-width="0.71cm"/><fo:table-column column-number="12" column-width="1.22cm"/><fo:table-column column-number="13" column-width="0.53cm"/><fo:table-column column-number="14" column-width="0.4cm"/><fo:table-column column-number="15" column-width="0.63cm"/><fo:table-column column-number="16" column-width="2.49cm"/><fo:table-column column-number="17" column-width="1.06cm"/><fo:table-column column-number="18" column-width="1.14cm"/><fo:table-column column-number="19" column-width="1.14cm"/><fo:table-column column-number="20" column-width="1.14cm"/><fo:table-column column-number="21" column-width="1.14cm"/><fo:table-column column-number="22" column-width="1.16cm"/><fo:table-column column-number="23" column-width="0.71cm"/><fo:table-column column-number="24" column-width="1.08cm"/><fo:table-column column-number="25" column-width="1.06cm"/><fo:table-column column-number="26" column-width="0.95cm"/><fo:table-column column-number="27" column-width="1.35cm"/><fo:table-column column-number="28" column-width="0.85cm"/><fo:table-column column-number="29" column-width="0.95cm"/><fo:table-column column-number="30" column-width="1.22cm"/><fo:table-column column-number="31" column-width="1.08cm"/><fo:table-column column-number="32" column-width="1.01cm"/><fo:table-column column-number="33" column-width="1.14cm"/><fo:table-column column-number="34" column-width="1.06cm"/><fo:table-column column-number="35" column-width="4.870002746582031cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AG</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AH</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="10" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">ETCS-Gefahrpunkt</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Kürzester Durchrutschweg</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Sonstige Funktionen</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Tunnelbegegnungs-
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.48cm"/><fo:table-column column-number="2" column-width="1.96cm"/><fo:table-column column-number="3" column-width="0.56cm"/><fo:table-column column-number="4" column-width="1.08cm"/><fo:table-column column-number="5" column-width="1.27cm"/><fo:table-column column-number="6" column-width="0.71cm"/><fo:table-column column-number="7" column-width="0.71cm"/><fo:table-column column-number="8" column-width="0.71cm"/><fo:table-column column-number="9" column-width="0.71cm"/><fo:table-column column-number="10" column-width="0.71cm"/><fo:table-column column-number="11" column-width="0.71cm"/><fo:table-column column-number="12" column-width="1.22cm"/><fo:table-column column-number="13" column-width="0.53cm"/><fo:table-column column-number="14" column-width="0.4cm"/><fo:table-column column-number="15" column-width="0.63cm"/><fo:table-column column-number="16" column-width="2.49cm"/><fo:table-column column-number="17" column-width="1.06cm"/><fo:table-column column-number="18" column-width="1.14cm"/><fo:table-column column-number="19" column-width="1.14cm"/><fo:table-column column-number="20" column-width="1.14cm"/><fo:table-column column-number="21" column-width="1.14cm"/><fo:table-column column-number="22" column-width="1.16cm"/><fo:table-column column-number="23" column-width="0.71cm"/><fo:table-column column-number="24" column-width="1.08cm"/><fo:table-column column-number="25" column-width="1.06cm"/><fo:table-column column-number="26" column-width="0.95cm"/><fo:table-column column-number="27" column-width="1.35cm"/><fo:table-column column-number="28" column-width="0.85cm"/><fo:table-column column-number="29" column-width="0.95cm"/><fo:table-column column-number="30" column-width="1.22cm"/><fo:table-column column-number="31" column-width="1.08cm"/><fo:table-column column-number="32" column-width="1.01cm"/><fo:table-column column-number="33" column-width="1.14cm"/><fo:table-column column-number="34" column-width="1.06cm"/><fo:table-column column-number="35" column-width="4.870002746582031cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">P</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Q</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">R</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">S</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">T</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">U</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">V</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">W</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">X</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Y</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Z</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AA</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AB</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AC</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AD</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AE</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AF</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AG</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">AH</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Signal</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="10" text-align="center"><fo:block start-indent="0mm">Signalisierung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">ETCS-Gefahrpunkt</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Kürzester Durchrutschweg</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="8" text-align="center"><fo:block start-indent="0mm">Sonstige Funktionen</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Tunnelbegegnungs-
 verbot (TBV)</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="3" text-align="center"><fo:block start-indent="0mm">Ansteuerung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 1</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 2</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 3</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 6</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 7</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 8</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Löschg. Zs 1/7/8</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Zs 13</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Kl</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Ne 14</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" number-rows-spanned="2" text-align="center"><fo:block start-indent="0mm">Ab-
 stand
 vom
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszw-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszw-fop.xsl
index 2e3245ebd1..5db5c39cb6 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszw-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sszw-fop.xsl
@@ -97,6 +97,6 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.98cm"/><fo:table-column column-number="3" column-width="0.93cm"/><fo:table-column column-number="4" column-width="4.95cm"/><fo:table-column column-number="5" column-width="1.98cm"/><fo:table-column column-number="6" column-width="1.98cm"/><fo:table-column column-number="7" column-width="1.98cm"/><fo:table-column column-number="8" column-width="1.98cm"/><fo:table-column column-number="9" column-width="1.98cm"/><fo:table-column column-number="10" column-width="1.98cm"/><fo:table-column column-number="11" column-width="1.98cm"/><fo:table-column column-number="12" column-width="1.98cm"/><fo:table-column column-number="13" column-width="1.98cm"/><fo:table-column column-number="14" column-width="1.98cm"/><fo:table-column column-number="15" column-width="1.98cm"/><fo:table-column column-number="16" column-width="8.6900053024292cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Zulässige Geschwindigkeit</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Ansteuerung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">keine
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.66cm"/><fo:table-column column-number="2" column-width="1.98cm"/><fo:table-column column-number="3" column-width="0.93cm"/><fo:table-column column-number="4" column-width="4.95cm"/><fo:table-column column-number="5" column-width="1.98cm"/><fo:table-column column-number="6" column-width="1.98cm"/><fo:table-column column-number="7" column-width="1.98cm"/><fo:table-column column-number="8" column-width="1.98cm"/><fo:table-column column-number="9" column-width="1.98cm"/><fo:table-column column-number="10" column-width="1.98cm"/><fo:table-column column-number="11" column-width="1.98cm"/><fo:table-column column-number="12" column-width="1.98cm"/><fo:table-column column-number="13" column-width="1.98cm"/><fo:table-column column-number="14" column-width="1.98cm"/><fo:table-column column-number="15" column-width="1.98cm"/><fo:table-column column-number="16" column-width="8.6900053024292cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">E</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">F</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">G</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">H</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">I</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">J</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">K</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">L</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">M</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">N</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">O</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="7" text-align="center"><fo:block start-indent="0mm">Weiche/Kreuzung</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="4" text-align="center"><fo:block start-indent="0mm">Zulässige Geschwindigkeit</fo:block></fo:table-cell><fo:table-cell border-bottom="{$small-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Ansteuerung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" number-rows-spanned="3" text-align="center"><fo:block start-indent="0mm">keine
 Übertrag.
 an RBC</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" font-weight="blod" text-align="center"><fo:block start-indent="0mm">Bemerkung</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Bezeichnung</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Grundform</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Standort</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Länge</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Weiche</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" border-top="{$small-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Kreuzung</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">ESTW-Zentraleinheit</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Stellbereich</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" font-weight="blod" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Art</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Form</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Strecke</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Links</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Rechts</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Links</fo:block></fo:table-cell><fo:table-cell border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Rechts</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Links</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Rechts</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">m</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km/h</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km/h</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">km/h</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">km/h</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="left"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 1 2 3 12 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 5 6 8 9 10 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 14 15 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 14 15 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 7 11 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 13 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 5 6 8 9 10 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 7 11 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="right" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 2 3 12 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
diff --git a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sxxx-fop.xsl b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sxxx-fop.xsl
index 932afb5289..799f763312 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sxxx-fop.xsl
+++ b/java/bundles/org.eclipse.set.feature.table.pt1.test/res/xsl/sxxx-fop.xsl
@@ -97,4 +97,4 @@ http://www.eclipse.org/legal/epl-v20.html
             </fo:block>
         </fo:block-container>
     </xsl:template>
-<xsl:template match="Table[Rows/Row]"><fo:table table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="6.69cm"/><fo:table-column column-number="3" column-width="6.69cm"/><fo:table-column column-number="4" column-width="2.35cm"/><fo:table-column column-number="5" column-width="22.699996948242188cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bearbeitungsvermerk</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Referenziert von Objekt</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Ausgabe in Plan</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Kurztext</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Inhalt</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 4 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 4 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>
+<xsl:template match="Table[Rows/Row]"><fo:table border-collapse="separate" table-layout="fixed" width="100%"><fo:table-column column-number="1" column-width="0.56cm"/><fo:table-column column-number="2" column-width="6.69cm"/><fo:table-column column-number="3" column-width="6.69cm"/><fo:table-column column-number="4" column-width="2.35cm"/><fo:table-column column-number="5" column-width="22.699996948242188cm"/><fo:table-header xsl:use-attribute-sets="table-header-style"><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">A</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-right="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">B</fo:block></fo:table-cell><fo:table-cell border-left="{$small-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">C</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$small-border-style}" border-right="{$wide-border-style}" border-top="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">D</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" number-columns-spanned="2" text-align="center"><fo:block start-indent="0mm">Bearbeitungsvermerk</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Referenziert von Objekt</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" border-top="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Ausgabe in Plan</fo:block></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block start-indent="0mm">Kurztext</fo:block></fo:table-cell><fo:table-cell border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm">Inhalt</fo:block></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row><fo:table-row><fo:table-cell border-left="{$small-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$small-border-style}" text-align="center"><fo:block color="white" start-indent="0mm">.</fo:block></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell><fo:table-cell border-bottom="{$wide-border-style}" border-left="{$wide-border-style}" border-right="{$wide-border-style}" text-align="center"><fo:block start-indent="0mm"/></fo:table-cell></fo:table-row></fo:table-header><fo:table-body start-indent="0mm"><xsl:apply-templates select="Rows/Row"/></fo:table-body></fo:table><xsl:apply-templates select="Footnotes"/></xsl:template><xsl:template match="Table[not(Rows/Row)]"><fo:block>Die Tabelle ist leer</fo:block></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 1 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 4 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 2 4 ', concat(' ', @column-number, ' ')) and ../@group-number != count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="left" xsl:use-attribute-sets="default-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template><xsl:template match="Cell[contains(' 3 ', concat(' ', @column-number, ' ')) and ../@group-number = count(/Table/Rows/Row)]"><fo:table-cell border-right="{$wide-border-style}" number-rows-spanned="{@number-rows-spanned}" text-align="center" xsl:use-attribute-sets="last-row-cell-style"><xsl:call-template name="CompareCellContentStyle"/><xsl:apply-templates/></fo:table-cell></xsl:template></xsl:stylesheet>