0.3.9.1 (2022-03-17)

daneeldeveloper · daneeldeveloper · commit c91b26f141cd · 2022-03-17T16:31:09.000+01:00
+ Added page-widht and page-height support in mod-fop
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.9.0",
-	"date" : "10/03/2022",
+	"version" : "0.3.9.1",
+	"date" : "17/03/2022",
 	"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.9.0 (2022-03-10)
+﻿0.3.9.1 (2022-03-17)
+--------------------
++ Added page-widht and page-height support in mod-fop
+
+0.3.9.0 (2022-03-10)
 --------------------
 + Added support for page-break 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.0</version>
+		<version>0.3.9.1</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocBase.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocBase.java
@@ -191,6 +191,14 @@ public void setStableInfo(Properties stableInfo) {
 		this.stableInfo = stableInfo;
 	}
 	
+	public String getInfoPageWidth() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_NAME_PAGE_WIDTH );
+	}
+	
+	public String getInfoPageHeight() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_NAME_PAGE_HEIGHT );
+	}
+	
 	public String getInfoDocVersion() {
 		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_VERSION );
 	}
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocInfo.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocInfo.java
@@ -44,6 +44,10 @@ public class DocInfo extends DocElement {
 	
 	public static final String INFO_NAME_PAGE_ORIENT = "page-orient";
 	
+	public static final String INFO_NAME_PAGE_WIDTH = "page-width";
+	
+	public static final String INFO_NAME_PAGE_HEIGHT = "page-height";
+	
 	public static final String INFO_NAME_PDF_FORMAT = "pdf-format";
 	
 	public static final String INFO_DOC_TITLE = "doc-title";
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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>
diff --git a/fj-doc-mod-fop/src/main/resources/fm_fop/template/fop_doc.ftl b/fj-doc-mod-fop/src/main/resources/fm_fop/template/fop_doc.ftl
@@ -8,8 +8,8 @@
 	xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
 	<fo:layout-master-set>
 		<fo:simple-page-master
-			page-width="21cm" 
-			page-height="29.7cm" 
+			page-width="${docBase.infoPageWidth!'21cm'}" 
+			page-height="${docBase.infoPageHeight!'29.7cm'}" 
 			master-name="simpleA4" 
 			margin-left="${docBase.marginLeft!'10'}pt"
 			margin-right="${docBase.marginRight!'10'}pt"
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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</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.0</version>
+		<version>0.3.9.1</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.0</version>
+	<version>0.3.9.1</version>
 	<packaging>pom</packaging>
 
 	<name>fj-doc</name>

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,14 @@ public void setStableInfo(Properties stableInfo) {`
`191`	`191`	`this.stableInfo = stableInfo;`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ public String getInfoPageWidth() {`
	`195`	`+ return this.getStableInfo().getProperty( DocInfo.INFO_NAME_PAGE_WIDTH );`
	`196`	`+ }`
	`197`	`+`
	`198`	`+ public String getInfoPageHeight() {`
	`199`	`+ return this.getStableInfo().getProperty( DocInfo.INFO_NAME_PAGE_HEIGHT );`
	`200`	`+ }`
	`201`	`+`
`194`	`202`	`public String getInfoDocVersion() {`
`195`	`203`	`return this.getStableInfo().getProperty( DocInfo.INFO_DOC_VERSION );`
`196`	`204`	`}`