0.3.9.2 (2022-03-17)

+ Added external link support in mod-fop

Author: daneeldeveloper

docgen/parameters.json

@@ -1,7 +1,7 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.3.9.1",
+	"version" : "0.3.9.2",
 	"date" : "17/03/2022",
 	"organization" : {
 		"name" : "Fugerit Org",

docgen/release-notes.txt

@@ -1,4 +1,8 @@
-0.3.9.1 (2022-03-17)
+0.3.9.2 (2022-03-17)
+--------------------
++ Added external link support in mod-fop
+
+0.3.9.1 (2022-03-17)
 --------------------
 + Added page-widht and page-height support in mod-fop
 

fj-doc-base/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.9.1</version>
+		<version>0.3.9.2</version>
 	</parent>
 
 	<name>fj-doc-base</name>

fj-doc-base/src/main/java/org/fugerit/java/doc/base/xml/DocContentHandler.java

@@ -78,6 +78,7 @@ public class DocContentHandler implements ContentHandler {
 														"cell",
 														"list",
 														"li",
+														"pl",
 														"body", 
 														"meta", 
 														"metadata", 
@@ -428,7 +429,10 @@ public void startElement(String uri, String localName, String qName, Attributes
 			}
 			String align = props.getProperty( "align" );
 			docImage.setAlign( getAlign( align ) );
-			this.currentElement = docImage;			
+			this.currentElement = docImage;		
+		} else if ( "pl".equalsIgnoreCase( qName ) ) {
+			DocContainer container = new DocContainer();
+			this.currentElement = container;
 		} else if ( DocPara.TAG_NAME.equalsIgnoreCase( qName ) ) {
 			DocPara docPara = new DocPara();
 			valuePara(docPara, props, false);

fj-doc-base/src/main/resources/config/doc-1-9.xsd

@@ -6,7 +6,7 @@
 	 *
 	 * @project    : org.fugerit.java.doc.base
 	 * @creation   : 2022-03-07
-	 * @version    : 1.9.0 (2022-03-07)
+	 * @version    : 1.9.1 (2022-03-17)
 	 *
 	 * XSD for fugerit doc configuration
 	 */
@@ -23,6 +23,7 @@
 	
 	changelog 
 	1-9 - deep change to list handling
+	1-9-1 - added phrase list option to list item
 	
 -->
 <xsd:schema xmlns='http://www.w3.org/2000/10/XMLSchema'
@@ -291,13 +292,22 @@
 				<xsd:choice minOccurs='1' maxOccurs='1'>
 					<xsd:element ref='doc:para' />
 					<xsd:element ref='doc:h' />
+					<xsd:element ref='doc:pl' />
 				</xsd:choice>
 				<xsd:element ref='doc:list' minOccurs="0" maxOccurs="1"/>
 			</xsd:sequence>
 			<xsd:attribute name='id' type='xsd:string' use='optional' />
 		</xsd:complexType>
 	</xsd:element>
 
+	<xsd:element name='pl' type="doc:plType"/>
+
+	<xsd:complexType name="plType">
+		<xsd:sequence minOccurs='1' maxOccurs="unbounded">
+			<xsd:element ref="doc:phrase" />
+		</xsd:sequence>
+	</xsd:complexType>
+
 	<xsd:simpleType name="listType">
 		<xsd:restriction base="xsd:string">
 			<!-- default unordered list, same asd 'uld' -->

fj-doc-ent/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.9.1</version>
+		<version>0.3.9.2</version>
 	</parent>
 
 	<name>fj-doc-ent</name>

fj-doc-freemarker/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.9.1</version>
+		<version>0.3.9.2</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>

fj-doc-mod-fop/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.9.1</version>
+		<version>0.3.9.2</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>

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

@@ -22,6 +22,8 @@
 		<@handleImage docImage=current/>
 	<#elseif elementType = 'DocList'>
 		<@handleList docList=current/>
+	<#elseif elementType = 'DocContainer'>
+		<#list current.elementList as currentChild><@handleElement current=currentChild/></#list>		
 	<#elseif elementType = 'DocPageBreak'>
 		<fo:block page-break-before="always"></fo:block>																			
 	<#else>
@@ -31,7 +33,11 @@
 
 <#macro handlePhrase current>
 	<#if (current.link)??>
-		<fo:basic-link internal-destination="${current.internalLink}">${current.text}</fo:basic-link>
+		<#if (current.internal)>
+			<fo:basic-link 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>
+		</#if>
 	<#elseif (current.anchor)??>
 		<fo:block id="${current.anchor}"><@handleWhiteSpace element=current/><@handleStyle styleValue=current.originalStyle/> <@handleFont element=current/>${current.text}</fo:block>
 	<#else>

fj-doc-mod-itext/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>0.3.9.1</version>
+		<version>0.3.9.2</version>
 	</parent>
 
 	<name>fj-doc-mod-itext</name>