diff --git a/docgen/parameters.json b/docgen/parameters.json index 5f3239c88..5e07864f4 100644 --- a/docgen/parameters.json +++ b/docgen/parameters.json @@ -1,8 +1,8 @@ { "title" : "Venus (Fugerit Document Generation Framework)", "name": "Venus", - "version" : "0.3.8.7", - "date" : "05/03/2022", + "version" : "0.3.8.8", + "date" : "06/03/2022", "organization" : { "name" : "Fugerit Org", "url" : "https://www.fugerit.org" diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt index 0f925ae85..aa621c78a 100644 --- a/docgen/release-notes.txt +++ b/docgen/release-notes.txt @@ -1,6 +1,6 @@ -0.3.8.7 (2022-03-05) +0.3.8.7 / 0.3.8.8 (2022-03-06) -------------------- -+ Added support for different symbols on FOP rendered list (dash, minus, letters, numbers) ++ Added support for different symbols on FOP/HTML rendered list (dash, minus, letters, numbers) 0.3.8.5 / 0.3.8.6 (2022-02-16) -------------------- diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml index 26d9f1140..43101f5e6 100644 --- a/fj-doc-base/pom.xml +++ b/fj-doc-base/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-base diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java index f8550f756..90d3c7bc5 100644 --- a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java +++ b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocList.java @@ -41,5 +41,18 @@ public String getClt() { } return clt; } + + /* + * Return html list type + */ + public String getHtmlType() { + String clt = this.getListType(); + if ( clt.equalsIgnoreCase( LIST_TYPE_ULM ) || clt.equalsIgnoreCase( LIST_TYPE_ULD ) ) { + clt = LIST_TYPE_UL; + } else if ( clt == null || clt.equalsIgnoreCase( LIST_TYPE_OLN ) || clt.equalsIgnoreCase( LIST_TYPE_OLL ) ) { + clt = LIST_TYPE_OL; + } + return clt; + } } diff --git a/fj-doc-ent/pom.xml b/fj-doc-ent/pom.xml index 6175d3708..99ff19dc2 100644 --- a/fj-doc-ent/pom.xml +++ b/fj-doc-ent/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-ent diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml index 31fdd30c9..a482eb356 100644 --- a/fj-doc-freemarker/pom.xml +++ b/fj-doc-freemarker/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-freemarker diff --git a/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl b/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl index 7834fb761..873ad36c1 100644 --- a/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl +++ b/fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl @@ -55,11 +55,13 @@ <#macro handleList docList> - <${docList.listType}> + <#if docList.elementList?size gt 0> + <${docList.htmlType}> <#list docList.elementList as li> -
  • <#list li.elementList as element><@handleElement current=element/>
    • +
  • style="list-style-type: none;"<#elseif docList.listType = 'oll'>style="list-style-type: lower-alpha;"<#elseif docList.listType = 'ulm'>style="list-style-type: square;"<#elseif docList.listType = 'uld'>style="list-style-type: circle;"> <#list li.elementList as element><@handleElement current=element/>
    • - + + <#macro handleRowList docTable rowList cellType> diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml index e6fdd58ac..5945023a8 100644 --- a/fj-doc-mod-fop/pom.xml +++ b/fj-doc-mod-fop/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-mod-fop diff --git a/fj-doc-mod-itext/pom.xml b/fj-doc-mod-itext/pom.xml index 5b29edfe3..b3c30fa19 100644 --- a/fj-doc-mod-itext/pom.xml +++ b/fj-doc-mod-itext/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-mod-itext diff --git a/fj-doc-mod-jxl/pom.xml b/fj-doc-mod-jxl/pom.xml index 89a45de37..fa9a62eeb 100644 --- a/fj-doc-mod-jxl/pom.xml +++ b/fj-doc-mod-jxl/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-mod-jxl diff --git a/fj-doc-mod-pdfbox/pom.xml b/fj-doc-mod-pdfbox/pom.xml index 98f836735..f261715b6 100644 --- a/fj-doc-mod-pdfbox/pom.xml +++ b/fj-doc-mod-pdfbox/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-mod-pdfbox diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml index 8af7d608d..50a6ceb31 100644 --- a/fj-doc-mod-poi/pom.xml +++ b/fj-doc-mod-poi/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-mod-poi diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml index 301984c29..f895fe294 100644 --- a/fj-doc-sample/pom.xml +++ b/fj-doc-sample/pom.xml @@ -7,7 +7,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 fj-doc-sample diff --git a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java index 9ed991630..8a24b3688 100644 --- a/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java +++ b/fj-doc-sample/src/test/java/test/org/fugerit/java/doc/sample/dev/TestXml01.java @@ -4,6 +4,7 @@ import java.util.Locale; import org.fugerit.java.doc.base.config.DocTypeHandler; +import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlTypeHandler; import org.fugerit.java.doc.mod.fop.PdfFopTypeHandler; import org.junit.Assert; import org.junit.Test; @@ -23,7 +24,7 @@ public void test01() throws Exception { } @Test - public void test01Alt() throws Exception { + public void test01FoPdf() throws Exception { Locale.setDefault( Locale.UK ); String testCase = "test-xml-01"; DocTypeHandler handler = PdfFopTypeHandler.HANDLER; @@ -33,4 +34,14 @@ public void test01Alt() throws Exception { Assert.assertTrue( res ); } + @Test + public void test01Html() throws Exception { + Locale.setDefault( Locale.UK ); + String testCase = "test-xml-01"; + DocTypeHandler handler = FreeMarkerHtmlTypeHandler.HANDLER; + boolean res = this.workerXmlToHandler( new File( "src/test/resources/dev/"+testCase+".xml" ), + new File( BasicFacadeTest.BASIC_OUTPUT_PATH, testCase+"."+handler.getType() ), handler ); + Assert.assertTrue( res ); + } + } diff --git a/pom.xml b/pom.xml index 318200b79..0e159aaf8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.fugerit.java fj-doc - 0.3.8.7 + 0.3.8.8 pom fj-doc