Skip to content

Commit 36d6d4c

Browse files
fugerit79fugerit79
committed
new 'table-border-collapse'
 document info to setup default border collapse behaviour
1 parent 67305b2 commit 36d6d4c

File tree

6 files changed

+54
-10
lines changed

6 files changed

+54
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Changed
1111

12-
- [mod-fop] supporto for table cell back-color attribute
12+
- [mod-fop] new 'table-border-collapse' document info to setup default border collapse behaviour
13+
- [mod-fop] support for table cell back-color attribute
1314
- [playground-quarkus] quarkus-version set to 3.6.0
1415

1516
## [3.2.1] - 2023-11-22

‎docs/html/doc_meta_info.html‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div>
1414
<span id="top"></span>
1515
<h1 style="font-weight: bold;">Documentation for Venus Doc Format standard meta informations</h1>
16-
<p>Version : 3 (2023-08-17)</p>
16+
<p>Version : 4 (2023-11-30)</p>
1717
<p>This section contains documentation for most &lt;info name="key"&gt;value&lt;/info&gt; of Venus Doc Format</p>
1818
<ol >
1919
<li > <a href="#meta_general">Properties for generic metadata</a>
@@ -197,19 +197,37 @@ <h2 style="font-weight: bold;">Properties for generic metadata</h2>
197197
</tr>
198198
<tr>
199199
<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;">
200+
<p style="font-style: italic;">table-border-collapse</p>
201+
<span id="table-border-collapse"></span>
202+
</td>
203+
<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;">
204+
<p>Set the default table-border-collapse mode, possible values are 'separate' or 'collapse'</p>
205+
</td>
206+
<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;">
207+
<p>fj-doc-mod-fop(pdf), </p>
208+
</td>
209+
<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;">
210+
<p>separate</p>
211+
</td>
212+
<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;">
213+
<p>3.2.2</p>
214+
</td>
215+
</tr>
216+
<tr>
217+
<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;">
200218
<p style="font-style: italic;">default-cell-border-width</p>
201219
<span id="default-cell-border-width"></span>
202220
</td>
203-
<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;">
221+
<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;">
204222
<p>Set default cell border width for all table cells, default '-1' means 'unset'</p>
205223
</td>
206-
<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;">
224+
<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;">
207225
<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>
208226
</td>
209-
<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;">
227+
<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;">
210228
<p>-1</p>
211229
</td>
212-
<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;">
230+
<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;">
213231
<p>1.5.0</p>
214232
</td>
215233
</tr>

‎fj-doc-base/src/main/java/org/fugerit/java/doc/base/typehelper/generic/GenericConsts.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,22 @@ private GenericConsts() {}
163163
*/
164164
public static final String INFO_DEFAULT_TABLE_SPACING_DEF = INFO_VALUE_DEFAULT_TABLE_PADDING;
165165

166+
/**
167+
* <a href="https://venusdocs.fugerit.org/docs/html/doc_meta_info.html#table-border-collapse">See 'table-border-collapse' documentation</a>
168+
*/
169+
public static final String INFO_TABLE_BORDER_COLLAPSE = "table-border-collapse";
170+
171+
/**
172+
* <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>
173+
*/
174+
public static final String TABLE_BORDER_COLLAPSE_SEPARATE = "separate";
175+
176+
/**
177+
* <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>
178+
*/
179+
public static final String TABLE_BORDER_COLLAPSE_COLLAPSE = "collapse";
180+
181+
182+
183+
166184
}

‎fj-doc-lib-autodoc/src/test/resources/docs/meta_xml/adm_standard_meta_info.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</admeta:admProperty>
1414
<admeta:admProperty>
1515
<admeta:name>doc-version</admeta:name>
16-
<admeta:description>3 (2023-08-17)</admeta:description>
16+
<admeta:description>4 (2023-11-30)</admeta:description>
1717
</admeta:admProperty>
1818
<admeta:admProperty>
1919
<admeta:name>doc-subject</admeta:name>
@@ -132,6 +132,14 @@
132132
<admeta:supportedHandler>fj-doc-mod-openpdf(pdf)</admeta:supportedHandler>
133133
<admeta:supportedHandler>fj-doc-mod-itext(pdf)</admeta:supportedHandler>
134134
</admeta:admMetaInfo>
135+
<admeta:admMetaInfo>
136+
<admeta:name>table-border-collapse</admeta:name>
137+
<admeta:description>Set the default table-border-collapse mode, possible values are 'separate' or 'collapse'</admeta:description>
138+
<admeta:defaultValue>separate</admeta:defaultValue>
139+
<admeta:since>3.2.2</admeta:since>
140+
<admeta:supportedType>pdf</admeta:supportedType>
141+
<admeta:supportedHandler>fj-doc-mod-fop(pdf)</admeta:supportedHandler>
142+
</admeta:admMetaInfo>
135143
<admeta:admMetaInfo>
136144
<admeta:name>default-cell-border-width</admeta:name>
137145
<admeta:description>Set default cell border width for all table cells, default '-1' means 'unset'</admeta:description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<@handleRowInline docTable=docTable row=row docTableUtil=docTableUtil/>
125125
</#list>
126126
<#else>
127-
<fo:table border-collapse="separate" width="${docTable.width}%" table-layout="fixed" <#if (docTable.spacing)??>border-separation="${docTable.spacing}px"</#if>>
127+
<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>>
128128
<#list docTable.colWithds as currentColWidth>
129129
<fo:table-column column-width="${currentColWidth}%" />
130130
</#list>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-1-10.xsd">
44
<metadata>
55
<info name="margins">10;10;10;30</info>
6-
<info name="excel-table-id">excel-table=print</info>
7-
<info name="excel-width-multiplier">450</info>
6+
<info name="table-border-collapse">collapse</info>
87
<footer-ext>
98
<para align="center">Page ${currentPage}</para>
109
</footer-ext>

0 commit comments

Comments
 (0)