diff --git a/docgen/parameters.json b/docgen/parameters.json index edb59624e..491a8851e 100644 --- a/docgen/parameters.json +++ b/docgen/parameters.json @@ -1,8 +1,8 @@ { "title" : "Venus (Fugerit Document Generation Framework)", "name": "Venus", - "version" : "1.4.3-rc.001", - "date" : "02/08/2023", + "version" : "1.4.4-rc.001", + "date" : "10/08/2023", "organization" : { "name" : "Fugerit Org", "url" : "https://www.fugerit.org" diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt index 4110579d2..28619866b 100644 --- a/docgen/release-notes.txt +++ b/docgen/release-notes.txt @@ -1,4 +1,9 @@ -1.4.3-rc.001 (2023-08-02) +1.4.4-rc.001 (2023-08-10) +------------------ ++ [fj-doc-lib-simpletable] Fix on simple table special characters ++ [fj-doc-lib-simpletable] Fix DocTypeHandlerXML rendering for simple table + +1.4.3-rc.001 (2023-08-02) ------------------ + Updated freemarker version to 2.3.32 diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml index 4b228ad7c..e54b45f12 100644 --- a/fj-doc-base-json/pom.xml +++ b/fj-doc-base-json/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-base-json diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml index f9ebce3c6..9f2a956d7 100644 --- a/fj-doc-base-yaml/pom.xml +++ b/fj-doc-base-yaml/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-base-yaml diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml index de4a3f428..67b6c73da 100644 --- a/fj-doc-base/pom.xml +++ b/fj-doc-base/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-base diff --git a/fj-doc-bom-core/pom.xml b/fj-doc-bom-core/pom.xml index e33e6877c..2fb8bb028 100644 --- a/fj-doc-bom-core/pom.xml +++ b/fj-doc-bom-core/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-bom-core diff --git a/fj-doc-bom-fop/pom.xml b/fj-doc-bom-fop/pom.xml index 07fb675fe..c624823ba 100644 --- a/fj-doc-bom-fop/pom.xml +++ b/fj-doc-bom-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-bom-fop diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml index dedbde359..c730e4464 100644 --- a/fj-doc-freemarker/pom.xml +++ b/fj-doc-freemarker/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-freemarker diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml index c395bf26d..a21f95ace 100644 --- a/fj-doc-lib-autodoc/pom.xml +++ b/fj-doc-lib-autodoc/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-lib-autodoc diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml index 1b3e6ee3b..b145c3da3 100644 --- a/fj-doc-lib-simpletable-import/pom.xml +++ b/fj-doc-lib-simpletable-import/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-lib-simpletable-import diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml index 0e8aebd0d..d11f6bb73 100644 --- a/fj-doc-lib-simpletable/pom.xml +++ b/fj-doc-lib-simpletable/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-lib-simpletable diff --git a/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java b/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java index d6d3e5944..c97ef8e75 100644 --- a/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java +++ b/fj-doc-lib-simpletable/src/main/java/org/fugerit/java/doc/lib/simpletable/SimpleTableDocConfig.java @@ -48,8 +48,7 @@ public void processSimpleTable( SimpleTable simpleTableModel, DocTypeHandler ha DocProcessData data = new DocProcessData(); DocProcessContext context = DocProcessContext.newContext( SimpleTable.ATT_NAME, simpleTableModel ); process( CHAIN_ID_SIMPLE_TABLE , context, data ); - DocBase docBase = DocFacade.parse( data.getCurrentXmlReader() ); - DocInput docInput = DocInput.newInput( handler.getType() , docBase ); + DocInput docInput = DocInput.newInput( handler.getType() , data.getCurrentXmlReader() ); DocOutput docOutput = DocOutput.newOutput( os ); handler.handle( docInput , docOutput ); } catch (Exception e) { diff --git a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl b/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl index dad18a6a0..4e7c74a0c 100644 --- a/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl +++ b/fj-doc-lib-simpletable/src/main/resources/fj_doc_lib_simpletable/template/simple_table.ftl @@ -23,7 +23,7 @@ <#list simpleTableModel.rows as simpleRow> <#list simpleRow.cells as simpleCell> - align="${simpleCell.align}" border-width="${simpleCell.borderWidth}"> style="${simpleCell.style}" ><#if (simpleCell.content)??>${simpleCell.content} + align="${simpleCell.align}" border-width="${simpleCell.borderWidth}"> style="${simpleCell.style}" ><#if (simpleCell.content)??> diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml index 69b51940b..cee292243 100644 --- a/fj-doc-mod-fop/pom.xml +++ b/fj-doc-mod-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-mod-fop diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml index 1ecf5483d..861a0dd41 100644 --- a/fj-doc-mod-opencsv/pom.xml +++ b/fj-doc-mod-opencsv/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-mod-opencsv diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index 5d62fec60..2f5e54d19 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-mod-poi diff --git a/fj-doc-mod-poi5/pom.xml b/fj-doc-mod-poi5/pom.xml index b0e0481d2..2cfb1fe38 100644 --- a/fj-doc-mod-poi5/pom.xml +++ b/fj-doc-mod-poi5/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-mod-poi5 diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml index edf6cfc1a..d49d8fb36 100644 --- a/fj-doc-playground-quarkus/pom.xml +++ b/fj-doc-playground-quarkus/pom.xml @@ -4,7 +4,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-playground-quarkus diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index 850976af1..0a16aa1f5 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-sample diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java index 4c9be82c3..03d9e5af3 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/simpletable/TestSimpleTable.java @@ -8,6 +8,7 @@ import org.fugerit.java.core.cfg.ConfigException; import org.fugerit.java.core.lang.helpers.BooleanUtils; import org.fugerit.java.doc.base.config.DocTypeHandler; +import org.fugerit.java.doc.base.config.DocTypeHandlerXML; import org.fugerit.java.doc.lib.simpletable.SimpleTableDocConfig; import org.fugerit.java.doc.lib.simpletable.SimpleTableFacade; import org.fugerit.java.doc.lib.simpletable.model.SimpleCell; @@ -25,7 +26,7 @@ @Slf4j public class TestSimpleTable { - private static final DocTypeHandler[] HANDLERS = { XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() }; + private static final DocTypeHandler[] HANDLERS = { DocTypeHandlerXML.HANDLER_UTF8, XlsxPoiTypeHandler.HANDLER, OpenCSVTypeHandler.HANDLER, new PdfFopTypeHandler() }; private SimpleTableDocConfig docConfig; @@ -58,7 +59,11 @@ public void testSimpleTable01() { thorinRow.addCell( "Thorin" ); thorinRow.addCell( "Oakshield" ); thorinRow.addCell( SimpleCell.newCell( "King" ).bold().center() ); - simpleTableModel.addRow( thorinRow ); + SimpleRow lastRow = new SimpleRow(); + lastRow.addCell( "Bilbo" ); + lastRow.addCell( "Baggins" ); + lastRow.addCell( SimpleCell.newCell( "" ).bold().center() ); + simpleTableModel.addRow( lastRow ); for ( int k=0; k org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-tool diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml index 7c8bdb79e..938bfbf19 100644 --- a/fj-doc-val-core/pom.xml +++ b/fj-doc-val-core/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-val-core diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml index 5c0b8fe94..f0fe12f61 100644 --- a/fj-doc-val-pdfbox/pom.xml +++ b/fj-doc-val-pdfbox/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-val-pdfbox diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml index 009620fe3..8222d8462 100644 --- a/fj-doc-val-poi/pom.xml +++ b/fj-doc-val-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-val-poi diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml index 23191ba17..1b41a70c8 100644 --- a/fj-doc-val/pom.xml +++ b/fj-doc-val/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 fj-doc-val diff --git a/pom.xml b/pom.xml index 233362916..cd0f5707b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ fj-doc - 1.4.3-rc.001 + 1.4.4-rc.001 pom fj-doc