Skip to content

Commit fb71e3c

Browse files
fugerit79fugerit79
committed
0.3.3.6 (2021-02-03)
-------------------- + fremarker html support now print style attribute only if has values
1 parent 50d6df1 commit fb71e3c

File tree

13 files changed

+27
-19
lines changed

13 files changed

+27
-19
lines changed

‎docgen/parameters.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "0.3.3.5",
5-
"date" : "02/02/2021",
4+
"version" : "0.3.3.6",
5+
"date" : "03/02/2021",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
0.3.3.5 (2021-02-02)
1+
0.3.3.6 (2021-02-03)
2+
--------------------
3+
+ fremarker html support now print style attribute only if has values
4+
5+
0.3.3.5 (2021-02-02)
26
--------------------
37
+ Added support for italic and bold italic style in freemarker html
48

‎fj-doc-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-base</name>

‎fj-doc-ent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-ent</name>

‎fj-doc-freemarker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-freemarker</name>

‎fj-doc-freemarker/src/main/resources/fm_doc/template/macro/html_element.ftl‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
<#assign elementType="${current.class.simpleName}"/>
66
<#if elementType = 'DocPhrase'>
77
<#if (current.link)??>
8-
<a style="<@handleStyle styleValue=current.style/>" href="${current.link}">${current.text}</a>
8+
<a <@handleStyleOnly styleValue=current.style/> href="${current.link}">${current.text}</a>
99
<#elseif (current.anchor)??>
10-
<a style="<@handleStyle styleValue=current.style/>" name="${current.anchor}">${current.text}</a>
10+
<a <@handleStyleOnly styleValue=current.style/> name="${current.anchor}">${current.text}</a>
1111
<#else>
12-
<span style="<@handleStyle styleValue=current.style/>">${current.text}</span>
12+
<span <@handleStyleOnly styleValue=current.style/>>${current.text}</span>
1313
</#if>
1414
<#elseif elementType = 'DocNbsp'>
1515
&nbsp;
1616
<#elseif elementType = 'DocBr'>
1717
<br/>
1818
<#elseif elementType = 'DocPara'>
1919
<#if current.headLevel == 0>
20-
<p style="<@handleAlign alignValue=current.align/> <@handleStyle styleValue=current.style/>">${current.text}</p>
20+
<p <@handleStyleComplete styleValue=current.style alignValue=current.align/>>${current.text}</p>
2121
<#else>
22-
<h${current.headLevel} style="<@handleAlign alignValue=current.align/> <@handleStyle styleValue=current.style/>">${current.text}</h${current.headLevel}>
22+
<h${current.headLevel} <@handleStyleComplete styleValue=current.style alignValue=current.align/>>${current.text}</h${current.headLevel}>
2323
</#if>
2424
<#elseif elementType = 'DocTable'>
2525
<@handleTable docTable=current/>
@@ -63,5 +63,9 @@
6363

6464
<#macro handleAlign alignValue><#if alignValue = 1>text-align: left;<#elseif alignValue = 2>text-align: center;<#elseif alignValue = 3>text-align: right;</#if></#macro>
6565

66-
<#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>
66+
<#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>
67+
68+
<#macro handleStyleOnly styleValue><#assign cStyle><@handleStyle styleValue=styleValue/></#assign><#if cStyle != '' >style="${cStyle}"</#if></#macro>
69+
70+
<#macro handleStyleComplete styleValue alignValue><#assign cStyle><@handleStyle styleValue=styleValue/></#assign><#assign cAlign><@handleAlign alignValue=alignValue/></#assign><#if cStyle != '' || cAlign != '' >style="${cStyle} ${cAlign}"</#if></#macro>
6771

‎fj-doc-mod-fop/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-fop</name>

‎fj-doc-mod-itext/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-itext</name>

‎fj-doc-mod-jxl/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-jxl</name>

‎fj-doc-mod-pdfbox/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.fugerit.java</groupId>
99
<artifactId>fj-doc</artifactId>
10-
<version>0.3.3.5</version>
10+
<version>0.3.3.6</version>
1111
</parent>
1212

1313
<name>fj-doc-mod-pdfbox</name>

0 commit comments

Comments
 (0)