diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cb8c085a..0b44d605a 100644 --- 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 index e17ec7265..3cb98a949 100644 --- a/docs/html/doc_meta_info.html +++ b/docs/html/doc_meta_info.html @@ -13,7 +13,7 @@

Documentation for Venus Doc Format standard meta informations

-

Version : 3 (2023-08-17)

+

Version : 4 (2023-11-30)

This section contains documentation for most <info name="key">value</info> of Venus Doc Format

  1. Properties for generic metadata @@ -197,19 +197,37 @@

    Properties for generic metadata

    +

    table-border-collapse

    + + + +

    Set the default table-border-collapse mode, possible values are 'separate' or 'collapse'

    + + +

    fj-doc-mod-fop(pdf),

    + + +

    separate

    + + +

    3.2.2

    + + + +

    default-cell-border-width

    - +

    Set default cell border width for all table cells, default '-1' means 'unset'

    - +

    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),

    - +

    -1

    - +

    1.5.0

    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 index f84b0c344..43ff448a5 100644 --- 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; + /** + * See 'table-border-collapse' documentation + */ + public static final String INFO_TABLE_BORDER_COLLAPSE = "table-border-collapse"; + + /** + * See 'table-border-collapse' documentation, value for border 'separate' mode + */ + public static final String TABLE_BORDER_COLLAPSE_SEPARATE = "separate"; + + /** + * See 'table-border-collapse' documentation, value for border 'collapse' mode + */ + 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 index dda0cbe0d..51e0bb895 100644 --- 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 @@ doc-version - 3 (2023-08-17) + 4 (2023-11-30) doc-subject @@ -132,6 +132,14 @@ fj-doc-mod-openpdf(pdf) fj-doc-mod-itext(pdf) + + table-border-collapse + Set the default table-border-collapse mode, possible values are 'separate' or 'collapse' + separate + 3.2.2 + pdf + fj-doc-mod-fop(pdf) + default-cell-border-width Set default cell border width for all table cells, default '-1' means 'unset' 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 index d46095bd2..3b0e4fb0f 100644 --- 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/> <#else> - border-separation="${docTable.spacing}px"> + border-separation="${docTable.spacing}px"> <#list docTable.colWithds as currentColWidth> 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 index e0c004975..2fc70a453 100644 --- 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"> 10;10;10;30 - excel-table=print - 450 + collapse Page ${currentPage}