0.3.3.6 (2021-02-03)

-------------------- + fremarker html support now print style attribute only if has values
fugerit-org · Feb 3, 2021 · fb71e3c · fb71e3c
1 parent 50d6df1
commit fb71e3c
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 19 deletions.
diff --git a/docgen/parameters.json b/docgen/parameters.json
@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.3.3.5",
-	"date" : "02/02/2021",
+	"version" : "0.3.3.6",
+	"date" : "03/02/2021",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-0.3.3.5 (2021-02-02)
+0.3.3.6 (2021-02-03)
+--------------------
++ fremarker html support now print style attribute only if has values
+
+0.3.3.5 (2021-02-02)
 --------------------
 + Added support for italic and bold italic style in freemarker html
 

diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-base</name>

diff --git a/fj-doc-ent/pom.xml b/fj-doc-ent/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-ent</name>

diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>

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
@@ -5,21 +5,21 @@
 	<#assign elementType="${current.class.simpleName}"/>
 	<#if elementType = 'DocPhrase'>
 		<#if (current.link)??>
-		<a style="<@handleStyle styleValue=current.style/>" href="${current.link}">${current.text}</a>
+		<a <@handleStyleOnly styleValue=current.style/> href="${current.link}">${current.text}</a>
 		<#elseif (current.anchor)??>
-		<a style="<@handleStyle styleValue=current.style/>" name="${current.anchor}">${current.text}</a>
+		<a <@handleStyleOnly styleValue=current.style/> name="${current.anchor}">${current.text}</a>
 		<#else>
-		<span style="<@handleStyle styleValue=current.style/>">${current.text}</span>
+		<span <@handleStyleOnly styleValue=current.style/>>${current.text}</span>
 		</#if>
 	<#elseif elementType = 'DocNbsp'>
 		&nbsp;
 	<#elseif elementType = 'DocBr'>
 		<br/>		
 	<#elseif elementType = 'DocPara'>
 		<#if current.headLevel == 0>
-			<p style="<@handleAlign alignValue=current.align/> <@handleStyle styleValue=current.style/>">${current.text}</p>
+			<p <@handleStyleComplete styleValue=current.style alignValue=current.align/>>${current.text}</p>
 		<#else>
-			<h${current.headLevel} style="<@handleAlign alignValue=current.align/> <@handleStyle styleValue=current.style/>">${current.text}</h${current.headLevel}>
+			<h${current.headLevel} <@handleStyleComplete styleValue=current.style alignValue=current.align/>>${current.text}</h${current.headLevel}>
 		</#if>
 	<#elseif elementType = 'DocTable'>
 		<@handleTable docTable=current/>			
@@ -63,5 +63,9 @@
 
 <#macro handleAlign alignValue><#if alignValue = 1>text-align: left;<#elseif alignValue = 2>text-align: center;<#elseif alignValue = 3>text-align: right;</#if></#macro>
 
-<#macro handleStyle styleValue><#if styleValue = 2>font-weight: bold;<#elseif styleValue = 3>font-weight: underline;<#elseif styleValue = 4>font-style: italic;<#elseif styleValue = 5>font-weight: bold; font-style: italic;</#if> </#macro>
+<#macro handleStyle styleValue><#if styleValue = 2>font-weight: bold;<#elseif styleValue = 3>font-weight: underline;<#elseif styleValue = 4>font-style: italic;<#elseif styleValue = 5>font-weight: bold; font-style: italic;</#if></#macro>
+
+<#macro handleStyleOnly styleValue><#assign cStyle><@handleStyle styleValue=styleValue/></#assign><#if cStyle != '' >style="${cStyle}"</#if></#macro>
+
+<#macro handleStyleComplete styleValue alignValue><#assign cStyle><@handleStyle styleValue=styleValue/></#assign><#assign cAlign><@handleAlign alignValue=alignValue/></#assign><#if cStyle != '' || cAlign != '' >style="${cStyle} ${cAlign}"</#if></#macro>
 
diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>

diff --git a/fj-doc-mod-itext/pom.xml b/fj-doc-mod-itext/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-mod-itext</name>

diff --git a/fj-doc-mod-jxl/pom.xml b/fj-doc-mod-jxl/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-mod-jxl</name>

diff --git a/fj-doc-mod-pdfbox/pom.xml b/fj-doc-mod-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-mod-pdfbox</name>

diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>

diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.3.5</version>
+		<version>0.3.3.6</version>
 	</parent>
 
 	<name>fj-doc-sample</name>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>fj-doc</artifactId>
 
-	<version>0.3.3.5</version>
+	<version>0.3.3.6</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>