Merge pull request #207 from fugerit-org/206-fj-doc-mod-fop-element-table-space-after-and-space-before-are-not-handled

206 fj doc mod fop element table space after and space before are not handled

Author: mttfranci

CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - [fj-doc-playground-quarkus] quarkus version set to 3.15.0
+- [fj-doc-maven-plugin] goal init, flavour springboot-3, default springboot version 3.3.4
+- [fj-doc-maven-plugin] goal init, flavour quarkus-3, default quarkus version 3.15.0
+
+### Fixed
+
+- [fj-doc-freemarker] handle space-before and space-after in table #206 [html]
+- [fj-doc-mod-fop] handle space-before and space-after in table #206 [pdf]
 
 ## [8.8.7] - 2024-09-16
 

fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/macro/html_element.ftl

@@ -111,7 +111,7 @@
 			<@handleRowInline docTable=docTable row=row docTableUtil=docTableUtil/>	
 		</#list>
 	<#else>	
-		<table style='width: ${docTable.width}%'<#if (docTable.alt)??> aria-describedby="${docTable.alt}"</#if>>
+		<table style='<@handleTableSpacing dc=docTable/> width: ${docTable.width}%'<#if (docTable.alt)??> aria-describedby="${docTable.alt}"</#if>>
 			<#if (docTableUtil.strictHeader)>
 				<thead>
 				<@handleRowList docTable=docTable rowList=docTableUtil.headerRows cellType='th'/>
@@ -156,6 +156,7 @@ white-space-collapse -> false : white-space-collapse: preserve; white-space: pre
 -->
 <#macro handlePadding amt dir><#if (amt > 0)> padding-${dir}: ${amt}px;</#if></#macro>
 <#macro handleSpacing dc><@handlePadding amt=dc.spaceBefore!0 dir='top'/><@handlePadding amt=((dc.leading!0)*10 + dc.spaceAfter!0) dir='bottom'/><@handlePadding amt=((dc.textIndent!0)*10 + dc.spaceLeft!0) dir='left'/><@handlePadding amt=dc.spaceRight!0 dir='right'/><#if dc.notWhiteSpaceCollapse> white-space-collapse: preserve; white-space: pre-wrap;</#if></#macro>
+<#macro handleTableSpacing dc><@handlePadding amt=dc.spaceBefore!0 dir='top'/><@handlePadding amt=((dc.leading!0)*10 + dc.spaceAfter!0) dir='bottom'/></#macro>
 
 <#macro handleAlign alignValue><#if alignValue = 1> text-align: left;<#elseif alignValue = 2> text-align: center;<#elseif alignValue = 3> text-align: right;<#elseif alignValue = 8 || alignValue = 9> text-align: justify;</#if></#macro>
 

fj-doc-freemarker/src/test/resources/coverage/xml/default_doc.xml

@@ -39,7 +39,7 @@
   		<para size="3" fore-color="#dddddd">Test default font</para>
   		<br/>
   		<page-break/>
-    	<table columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
+    	<table space-before="20" columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
     		<row>
     			<cell align="center" border-color="#000000" border-width="1"><para style="bold">Name</para></cell>
     			<cell align="center"><para style="bold">Surname</para></cell>

fj-doc-maven-plugin/src/main/resources/config/flavour/flavour_versions_default.properties

@@ -1,6 +1,6 @@
 # default flavour versions
-quarkus-3=3.14.3
+quarkus-3=3.15.0
 quarkus-2=2.16.12.Final
 micronaut-4=4.6.2
-springboot-3=3.3.3
+springboot-3=3.3.4
 openliberty=20.0.0.9

fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl

@@ -124,7 +124,7 @@
 			<@handleRowInline docTable=docTable row=row docTableUtil=docTableUtil/>	
 		</#list>
 	<#else>
-		<fo:table border-collapse="${docBase.stableInfo['table-border-collapse']!'separate'}" width="${docTable.width}%" table-layout="fixed"  <#if (docTable.spacing)??>border-separation="${docTable.spacing}px"</#if>>
+		<fo:table <@handleSpacing dc=docTable/> border-collapse="${docBase.stableInfo['table-border-collapse']!'separate'}" width="${docTable.width}%" table-layout="fixed"  <#if (docTable.spacing)??>border-separation="${docTable.spacing}px"</#if>>
 			<#list docTable.colWithds as currentColWidth>
 			<fo:table-column column-width="${currentColWidth}%" />	
 			</#list>

fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml

@@ -9,7 +9,8 @@
     </footer-ext>
   </metadata>
   <body>
-    <table columns="3" colwidths="30;30;40" id="excel-table" padding="2" width="100">
+    <h head-level="1">Alternative sample doc</h>
+    <table space-before="30" columns="3" colwidths="30;30;40" id="excel-table" padding="2" width="100">
       <row>
         <cell align="center" back-color="#99aaee">
           <para>Name</para>