0.3.9.3 (2022-03-18)

+ Fix to phrase link style in mod-fop
fugerit-org · Mar 18, 2022 · 2d9de31 · 2d9de31
1 parent 20173ac
commit 2d9de31
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/docgen/release-notes.txt b/docgen/release-notes.txt
@@ -1,4 +1,8 @@
-0.3.9.2 (2022-03-17)
+0.3.9.3 (2022-03-18)
+--------------------
++ Fix to phrase link style in mod-fop
+
+0.3.9.2 (2022-03-17)
 --------------------
 + Added external link support in mod-fop
 

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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>

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.9.2</version>
+		<version>0.3.9.3</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>

diff --git a/fj-doc-mod-fop/src/main/resources/fm_fop/template/macro/doc_element.ftl b/fj-doc-mod-fop/src/main/resources/fm_fop/template/macro/doc_element.ftl
@@ -34,9 +34,9 @@
 <#macro handlePhrase current>
 	<#if (current.link)??>
 		<#if (current.internal)>
-			<fo:basic-link internal-destination="${current.internalLink}">${current.text}</fo:basic-link>
+			<fo:basic-link <@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/> internal-destination="${current.internalLink}">${current.text}</fo:basic-link>
 		<#else>
-			<fo:basic-link external-destination="url('${current.link}')" color="blue" text-decoration="underline">${current.text}</fo:basic-link>
+			<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>
 		</#if>
 	<#elseif (current.anchor)??>
 		<fo:block id="${current.anchor}"><@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/>${current.text}</fo:block>

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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+		<version>0.3.9.3</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.9.2</version>
+	<version>0.3.9.3</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>