new 'table-border-collapse'

document info to setup default border collapse behaviour
fugerit-org · Nov 30, 2023 · 36d6d4c · 36d6d4c
1 parent 67305b2
commit 36d6d4c
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- [mod-fop] supporto for table cell back-color attribute
+- [mod-fop] new 'table-border-collapse' document info to setup default border collapse behaviour
+- [mod-fop] support for table cell back-color attribute
 - [playground-quarkus] quarkus-version set to 3.6.0
 
 ## [3.2.1] - 2023-11-22

diff --git a/docs/html/doc_meta_info.html b/docs/html/doc_meta_info.html
@@ -13,7 +13,7 @@
 		<div>
 		<span  id="top"></span>
 		<h1  style="font-weight: bold;">Documentation for Venus Doc Format standard meta informations</h1>
-		<p>Version : 3 (2023-08-17)</p>
+		<p>Version : 4 (2023-11-30)</p>
 		<p>This section contains documentation for most &lt;info name="key"&gt;value&lt;/info&gt; of Venus Doc Format</p>
 	<ol >
 				<li > 		<a  href="#meta_general">Properties for generic metadata</a>
@@ -197,19 +197,37 @@ <h2  style="font-weight: bold;">Properties for generic metadata</h2>
 		</tr>				
 		<tr>
 				<td id="cell_8_0"  style="width: 20%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+		<p style="font-style: italic;">table-border-collapse</p>
+		<span  id="table-border-collapse"></span>
+				</td>
+				<td id="cell_8_1"  style="width: 40%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+		<p>Set the default table-border-collapse mode, possible values are 'separate' or 'collapse'</p>
+				</td>
+				<td id="cell_8_2"  style="width: 25%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+		<p>fj-doc-mod-fop(pdf), </p>
+				</td>
+				<td id="cell_8_3"  style="width: 10%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+		<p>separate</p>
+				</td>
+				<td id="cell_8_4"  style="width: 5%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+		<p>3.2.2</p>
+				</td>
+		</tr>				
+		<tr>
+				<td id="cell_9_0"  style="width: 20%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
 		<p style="font-style: italic;">default-cell-border-width</p>
 		<span  id="default-cell-border-width"></span>
 				</td>
-				<td id="cell_8_1"  style="width: 40%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+				<td id="cell_9_1"  style="width: 40%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
 		<p>Set default cell border width for all table cells, default '-1' means 'unset'</p>
 				</td>
-				<td id="cell_8_2"  style="width: 25%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+				<td id="cell_9_2"  style="width: 25%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
 		<p>fj-doc-freemarker(html), fj-doc-poi(xls), fj-doc-poi(xlsx), fj-doc-mod-fop(pdf), fj-doc-mod-openpdf(pdf), fj-doc-mod-itext(pdf), </p>
 				</td>
-				<td id="cell_8_3"  style="width: 10%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+				<td id="cell_9_3"  style="width: 10%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
 		<p>-1</p>
 				</td>
-				<td id="cell_8_4"  style="width: 5%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
+				<td id="cell_9_4"  style="width: 5%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;"> 
 		<p>1.5.0</p>
 				</td>
 		</tr>				

diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehelper/generic/GenericConsts.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehelper/generic/GenericConsts.java
@@ -163,4 +163,22 @@ private GenericConsts() {}
 	 */
 	public static final String INFO_DEFAULT_TABLE_SPACING_DEF = INFO_VALUE_DEFAULT_TABLE_PADDING;
 
+	/**
+	 * <a href="https://venusdocs.fugerit.org/docs/html/doc_meta_info.html#table-border-collapse">See 'table-border-collapse' documentation</a>
+	 */
+	public static final String INFO_TABLE_BORDER_COLLAPSE = "table-border-collapse";
+
+	/**
+	 * <a href="https://venusdocs.fugerit.org/docs/html/doc_meta_info.html#table-border-collapse">See 'table-border-collapse' documentation, value for border 'separate' mode</a>
+	 */
+	public static final String TABLE_BORDER_COLLAPSE_SEPARATE = "separate";
+
+	/**
+	 * <a href="https://venusdocs.fugerit.org/docs/html/doc_meta_info.html#table-border-collapse">See 'table-border-collapse' documentation, value for border 'collapse' mode</a>
+	 */
+	public static final String TABLE_BORDER_COLLAPSE_COLLAPSE = "collapse";
+
+
+
+
 }
diff --git a/fj-doc-lib-autodoc/src/test/resources/docs/meta_xml/adm_standard_meta_info.xml b/fj-doc-lib-autodoc/src/test/resources/docs/meta_xml/adm_standard_meta_info.xml
@@ -13,7 +13,7 @@
   </admeta:admProperty>
   <admeta:admProperty>
     <admeta:name>doc-version</admeta:name>
-    <admeta:description>3 (2023-08-17)</admeta:description>
+    <admeta:description>4 (2023-11-30)</admeta:description>
   </admeta:admProperty>
   <admeta:admProperty>
     <admeta:name>doc-subject</admeta:name>
@@ -132,6 +132,14 @@
       <admeta:supportedHandler>fj-doc-mod-openpdf(pdf)</admeta:supportedHandler>
       <admeta:supportedHandler>fj-doc-mod-itext(pdf)</admeta:supportedHandler>
     </admeta:admMetaInfo>
+    <admeta:admMetaInfo>
+      <admeta:name>table-border-collapse</admeta:name>
+      <admeta:description>Set the default table-border-collapse mode, possible values are 'separate' or 'collapse'</admeta:description>
+      <admeta:defaultValue>separate</admeta:defaultValue>
+      <admeta:since>3.2.2</admeta:since>
+      <admeta:supportedType>pdf</admeta:supportedType>
+      <admeta:supportedHandler>fj-doc-mod-fop(pdf)</admeta:supportedHandler>
+    </admeta:admMetaInfo>
     <admeta:admMetaInfo>
       <admeta:name>default-cell-border-width</admeta:name>
       <admeta:description>Set default cell border width for all table cells, default '-1' means 'unset'</admeta:description>

diff --git a/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl b/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="separate" width="${docTable.width}%" table-layout="fixed"  <#if (docTable.spacing)??>border-separation="${docTable.spacing}px"</#if>>
+		<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>>
 			<#list docTable.colWithds as currentColWidth>
 			<fo:table-column column-width="${currentColWidth}%" />	
 			</#list>

diff --git a/fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml b/fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml
@@ -3,8 +3,7 @@
 	xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-1-10.xsd">
   <metadata>
     <info name="margins">10;10;10;30</info>
-    <info name="excel-table-id">excel-table=print</info>
-    <info name="excel-width-multiplier">450</info>
+    <info name="table-border-collapse">collapse</info>
     <footer-ext>
       <para align="center">Page ${currentPage}</para>
     </footer-ext>