Skip to content

Commit 3ca4b4b

Browse files
fugerit79fugerit79
authored
Merge pull request #36 from fugerit-org/feature/issue_35_amp
Feature/issue 35 amp
2 parents a339081 + 62bd27a commit 3ca4b4b

File tree

20 files changed

+33
-27
lines changed

20 files changed

+33
-27
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" : "1.0.2-rc.001",
5-
"date" : "05/04/2023",
4+
"version" : "1.0.3-rc.001",
5+
"date" : "08/06/2023",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.fugerit.org"

‎docgen/release-notes.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
1.0.2-rc.001 (2023-04-05)
1+
1.0.3-rc.001 (2023-06-08)
2+
------------------
3+
+ [[fj-doc-mod-fop] inccorect handling of &](https://github.com/fugerit-org/fj-bom/issues/35)
4+
+ update fj-bom version 1.1.0
5+
+ update fj-core version 8.0.10-rc.003
6+
7+
1.0.2-rc.001 (2023-04-05)
28
------------------
39
+ Upgrade playground to quarkus 3.0.0.CR1
410

‎fj-doc-base-json/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-base-yaml/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-base</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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-lib-autodoc/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-autodoc</name>

‎fj-doc-lib-simpletable/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-lib-simpletable</name>

‎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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
<#macro handlePhrase current>
3535
<#if (current.link)??>
3636
<#if (current.internal)>
37-
<fo:basic-link <@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/> internal-destination="${current.internalLink}">${current.text}</fo:basic-link>
37+
<fo:basic-link <@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/> internal-destination="${current.internalLink}"><![CDATA[${current.text}]]></fo:basic-link>
3838
<#else>
39-
<fo:basic-link <@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/> external-destination="url('${current.link}')" color="blue" text-decoration="underline">${current.text}</fo:basic-link>
39+
<fo:basic-link <@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/> external-destination="url('${current.link}')" color="blue" text-decoration="underline"><![CDATA[${current.text}]]></fo:basic-link>
4040
</#if>
4141
<#elseif (current.anchor)??>
42-
<fo:block id="${current.anchor}"><@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/>${current.text}</fo:block>
42+
<fo:block id="${current.anchor}"><@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/><![CDATA[${current.text}]]></fo:block>
4343
<#else>
44-
<fo:inline <@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/>>${current.text}</fo:inline>
44+
<fo:inline <@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/>><![CDATA[${current.text}]]></fo:inline>
4545
</#if>
4646
</#macro>
4747

4848
<#macro handleParaRole current role>
49-
<fo:block <#if (current.id)??> id="${current.id}" </#if> <@handleFormat formatValue=current.format!''/><@handleWhiteSpace element=current/><@handleRole role=role element=current/><@handleStyle styleValue=current.originalStyle/><@handleParaSpacing textIndent=current.textIndent!0 spaceBefore=current.spaceBefore!0 spaceAfter=current.spaceAfter!0 spaceLeft=current.spaceLeft!0 spaceRight=current.spaceRight!0/><@handleAlign alignValue=current.align/><@handleFont element=current/>>${current.text?replace(r"${currentPage}","<fo:page-number/>")}<#list current.elementList as currentChild><@handleElement current=currentChild/></#list></fo:block>
49+
<fo:block <#if (current.id)??> id="${current.id}" </#if> <@handleFormat formatValue=current.format!''/><@handleWhiteSpace element=current/><@handleRole role=role element=current/><@handleStyle styleValue=current.originalStyle/><@handleParaSpacing textIndent=current.textIndent!0 spaceBefore=current.spaceBefore!0 spaceAfter=current.spaceAfter!0 spaceLeft=current.spaceLeft!0 spaceRight=current.spaceRight!0/><@handleAlign alignValue=current.align/><@handleFont element=current/>><![CDATA[${current.text?replace(r"${currentPage}","<fo:page-number/>")}]]><#list current.elementList as currentChild><@handleElement current=currentChild/></#list></fo:block>
5050
</#macro>
5151

5252
<#macro handlePara current>

‎fj-doc-mod-opencsv/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-mod-poi/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-playground-quarkus/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.fugerit.java</groupId>
66
<artifactId>fj-doc</artifactId>
7-
<version>1.0.2-rc.001</version>
7+
<version>1.0.3-rc.001</version>
88
</parent>
99
<artifactId>fj-doc-playground-quarkus</artifactId>
1010
<properties>

‎fj-doc-sample/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-sample/src/test/resources/dev/test-xml-01.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<cell align="center"><para style="bold">Title</para></cell>
2626
</row>
2727
<row>
28-
<cell><para>Luthien</para></cell>
28+
<cell><para><![CDATA[Luthien &]]></para></cell>
2929
<cell><para>Tinuviel</para></cell>
3030
<cell><para>Queen</para></cell>
3131
</row>

‎fj-doc-val-core/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-val-core</name>

‎fj-doc-val-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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎fj-doc-val-poi/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

1313
<name>fj-doc-val-poi</name>

‎fj-doc-val/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>1.0.2-rc.001</version>
10+
<version>1.0.3-rc.001</version>
1111
</parent>
1212

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

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<groupId>org.fugerit.java</groupId>
77
<artifactId>fj-bom</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.1.0</version>
99
<relativePath></relativePath>
1010
</parent>
1111

1212
<artifactId>fj-doc</artifactId>
1313

14-
<version>1.0.2-rc.001</version>
14+
<version>1.0.3-rc.001</version>
1515
<packaging>pom</packaging>
1616

1717
<name>fj-doc</name>
@@ -25,7 +25,7 @@
2525
<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
2626
<maven.compiler.release>${java-version-compliance}</maven.compiler.release>
2727
<!-- fj java versions -->
28-
<fj-version>8.0.4</fj-version>
28+
<fj-version>8.0.10-rc.003</fj-version>
2929
<fj-doc-version>${project.version}</fj-doc-version>
3030
<jackson-version>2.14.2</jackson-version>
3131
</properties>

0 commit comments

Comments
 (0)