From a5ca2ad72d07e16ad511309ffeb0b7b4c571a164 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <cwendling@hypra.fr>
Date: Wed, 12 Sep 2018 17:06:15 +0200
Subject: [PATCH] Try and make stripped paragraphs around frames not take
 vertical space

We cannot remove them entirely because their style will sometimes
affect more than just the paragraph, but we should make sure it
doesn't account for vertical space as it was likely to align with
the frames.
---
 strip-frames.xsl | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/strip-frames.xsl b/strip-frames.xsl
index 06def1d..27c28ad 100644
--- a/strip-frames.xsl
+++ b/strip-frames.xsl
@@ -29,6 +29,27 @@
         <xsl:attribute name="fo:line-height">0</xsl:attribute>
       </xsl:element>
     </xsl:element>
+    <!-- create a derived style for each paragraph we strip from around a frame,
+         which should be identical but for having a 0 line height -->
+    <xsl:for-each select="//text:p[draw:frame]">
+      <xsl:element name="style:style">
+        <xsl:variable name="style-name" select="@text:style-name"/>
+
+        <xsl:attribute name="style:family">paragraph</xsl:attribute>
+        <xsl:attribute name="style:name">
+          <xsl:value-of select="concat('Placeholder', $style-name)"/>
+        </xsl:attribute>
+        <xsl:attribute name="style:parent-style-name">
+          <xsl:value-of select="$style-name"/>
+        </xsl:attribute>
+        <!-- copy the original style:master-page-name attribute -->
+        <xsl:copy-of select="//office:automatic-styles/style:style[@style:name=$style-name]/@style:master-page-name"/>
+
+        <xsl:element name="style:paragraph-properties">
+          <xsl:attribute name="fo:line-height">0</xsl:attribute>
+        </xsl:element>
+      </xsl:element>
+    </xsl:for-each>
   </xsl:copy>
 </xsl:template>
 
@@ -48,7 +69,19 @@
 <xsl:template match="text:p[draw:frame]">
   <xsl:comment>Removed outer text:p</xsl:comment>
   <xsl:copy>
-    <xsl:apply-templates select="@*"/>
+    <!-- FIXME: there's probably a better way to do that -->
+    <xsl:for-each select="@*">
+      <xsl:choose>
+        <xsl:when test="../@text:style-name = .">
+          <xsl:attribute name="text:style-name">
+            <xsl:value-of select="concat('Placeholder', .)"/>
+          </xsl:attribute>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="."/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:for-each>
   </xsl:copy>
   <xsl:apply-templates/>
 </xsl:template>
-- 
GitLab