Merge branch 'develop' into docs

Author: daneeldeveloper

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '36 2 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

docgen/parameters.json

@@ -1,8 +1,8 @@
 {
 	"title" : "Venus (Fugerit Document Generation Framework)",
 	"name": "Venus",
-	"version" : "0.3.5.6",
-	"date" : "24/02/2021",
+	"version" : "0.3.9.4",
+	"date" : "06/04/2022",
 	"organization" : {
 		"name" : "Fugerit Org",
 		"url" : "https://www.fugerit.org"

docgen/release-notes.txt

@@ -1,7 +1,127 @@
-0.3.5.7 (2021-02-24)
+0.3.9.4 (2022-04-06)
+--------------------
++ para can now contains para and phrases (fop and freemarker mod)
++ Changed fj-core version to 0.7.6.8
+
+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
+
+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
+
+0.3.8.9 (2022-03-07)
+--------------------
++ Changed doc version to doc-1-9 (deep changes to list handling)
+
+0.3.8.7 / 0.3.8.8 (2022-03-06)
+--------------------
++ Added support for different symbols on FOP/HTML rendered list (dash, minus, letters, numbers)
+
+0.3.8.5 / 0.3.8.6 (2022-02-16)
+--------------------
++ Fix the current doc meta model supported version to 1.8
+
+0.3.8.3 / 0.3.8.4 (2022-02-14)
+--------------------
++ Fix in empty list handling for fop type handler
+
+0.3.8.2 (2022-02-10)
+--------------------
++ Added no comments configuration for Markdown handlers
+
+0.3.8.1 (2022-02-09)
+--------------------
++ Added constant for type markdown (md)
+
+0.3.8.0 (2022-02-09)
+--------------------
++ Added simple type handler for Markdown format (basic and extended
+syntax)
+
+0.3.7.4 (2022-02-03)
+--------------------
++ fj-mode-freemarker : fix in DocPhrase handling
+
+0.3.7.3 (2022-01-26)
+--------------------
++ Added metadata info doc-language for whole document (currently only supported by fop renderer) 
+
+0.3.7.2 (2022-01-26)
+--------------------
++ Added metadata info doc-title, doc-author, doc-subject, doc-creator, doc-version (currently only supported by fop renderer) 
+
+0.3.7.1 (2021-12-22)
+--------------------
++ Added bookmark tree support (currently only work with fop renderer) 
+
+0.3.7.0 (2021-11-21)
+--------------------
++ Better header handling for fop
+
+0.3.6.9 (2021-10-21)
+--------------------
++ Metadata for default-table-padding and default-table-spacing
+
+0.3.6.8 (2021-10-09)
+--------------------
++ Added meta/background to doc.xsd
+
+0.3.6.7 (2021-09-27)
+--------------------
++ Fix on doc-1-7.xsd for <h>
+
+0.3.6.6 (2021-09-27)
+--------------------
++ Added para.text-indent and para.spaceBefore to fop renderer
+
+0.3.6.5 (2021-09-27)
+--------------------
++ fix bug on fop renderer when space-after/before in inline container
+
+0.3.6.4 (2021-09-27)
+--------------------
++ fix bug on fop renderer when spacing and align both present
+
+0.3.6.3 (2021-09-27)
+--------------------
++ added para.space-left and para.space-right to fop renderer
+
+0.3.6.2 (2021-09-27)
+--------------------
++ added para.format="preserve-line" to fop renderer
+
+0.3.6.1 (2021-09-26)
+--------------------
++ added support for space-after / space-before in freemarker and fop renderer
+
+0.3.6.0 (2021-09-21)
+--------------------
++ doc-1-5.xsd : added 'render-mode' attribute to 'table' element (supported in freemarker fop)
++ doc-1-5.xsd : added 'align' attribute to 'image' element (supported in freemarker fop)
++ Changed fj-core version to 0.7.6.7
+
+0.3.5.9 (2021-02-24)
+--------------------
++ Corrections in link and list handling
+
+0.3.5.8 (2021-02-24)
+--------------------
++ Fix on list item for freemarker html and fop module
+
+0.3.5.7 (2021-02-24)
 --------------------
 + Upgraded fj-core version to 0.7.5.2
-+ Added FreeMarkerComplexProcessStep (providing a semplified chain step for freemarker, Process + Map Step)
++ Added FreeMarkerComplexProcessStep (providing a simplified chain step for freemarker, Process + Map Step)
 
 0.3.5.6 (2021-02-24)
 --------------------

fj-doc-base/pom.xml

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

fj-doc-base/src/main/java/org/fugerit/java/doc/base/config/DocConfig.java

@@ -20,4 +20,6 @@ public class DocConfig {
 
 	public static final String TYPE_FO = "fo";
 
+	public static final String TYPE_MD = "md";
+	
 }

fj-doc-base/src/main/java/org/fugerit/java/doc/base/facade/DocFacade.java

@@ -60,7 +60,7 @@ The Apache Software Foundation (http://www.apache.org/).
  */
 public class DocFacade {
 
-	public static final String CURRENT_VERSION = "1-4";
+	public static final String CURRENT_VERSION = "1-10";
 
 	private static Logger logger = LoggerFactory.getLogger( DocFacade.class );
 

fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocBackground.java

@@ -0,0 +1,46 @@
+/*****************************************************************
+<copyright>
+	Fugerit Java Library 
+
+	Copyright (c) 2007 Fugerit
+
+	All rights reserved. This program and the accompanying materials
+	are made available under the terms of the Apache License v2.0
+	which accompanies this distribution, and is available at
+	http://www.apache.org/licenses/
+	(txt version : http://www.apache.org/licenses/LICENSE-2.0.txt
+	html version : http://www.apache.org/licenses/LICENSE-2.0.html)
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+</copyright>
+*****************************************************************/
+package org.fugerit.java.doc.base.model;
+/*
+ * @(#)DocFooter.java
+ *
+ * @project     : org.fugerit.java.doc.base
+ * @package     : org.fugerit.java.doc.base
+ * @creation	: 16/lug/07
+ * @release		: xxxx.xx.xx
+ */
+
+/**
+ * 
+ *
+ * @author Fugerit
+ *
+ */
+public class DocBackground extends DocContainer {
+
+	public static final String TAG_NAME = "background";
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5220633704780951L;
+
+	public DocBackground() {
+	}
+	
+}

fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocBase.java

@@ -88,6 +88,10 @@ public DocBase() {
 
 	private DocContainer docMeta;
 
+	private DocBackground docBackground;
+	
+	private DocBookmarkTree docBookmarkTree;
+	
 	private HashMap<String, DocElement> idMap;
 
 	private String xsdVersion;
@@ -177,6 +181,48 @@ public Properties getInfo() {
 		return info;
 	}
 
+	private Properties stableInfo;
+	
+	public Properties getStableInfo() {
+		return stableInfo;
+	}
+
+	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 );
+	}
+	
+	public String getInfoDocTitle() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_TITLE );
+	}
+	
+	public String getInfoDocSubject() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_SUBJECT );
+	}
+	
+	public String getInfoDocAuthor() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_AUTHOR );
+	}
+	
+	public String getInfoDocCreator() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_CREATOR );
+	}
+
+	public String getInfoDocLanguage() {
+		return this.getStableInfo().getProperty( DocInfo.INFO_DOC_LANGUAGE );
+	}
+	
 	private static int getMargin( Properties props, int position ) {
 		String margins = props.getProperty( GenericConsts.INFO_KEY_MARGINS, "10;10;10;10" );
 		return Integer.parseInt( margins.split( ";")[position] );
@@ -206,4 +252,20 @@ public boolean isUseFooter() {
 		return this.getDocFooter() != null && this.getDocFooter().isUseFooter();
 	}
 
+	public DocBackground getDocBackground() {
+		return docBackground;
+	}
+
+	public void setDocBackground(DocBackground docBackground) {
+		this.docBackground = docBackground;
+	}
+
+	public DocBookmarkTree getDocBookmarkTree() {
+		return docBookmarkTree;
+	}
+
+	public void setDocBookmarkTree(DocBookmarkTree docBookmarkTree) {
+		this.docBookmarkTree = docBookmarkTree;
+	}
+	
 }