Skip to content

Commit 1d3e259

Browse files
daneeldeveloperdaneeldeveloper
committed
0.3.7.3 (2022-01-26)
+ Added metadata info doc-language for whole document (currently only supported by fop renderer)
1 parent 49dee44 commit 1d3e259

File tree

17 files changed

+27
-15
lines changed

17 files changed

+27
-15
lines changed

‎docgen/parameters.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "0.3.7.2",
4+
"version" : "0.3.7.3",
55
"date" : "26/01/2022",
66
"organization" : {
77
"name" : "Fugerit Org",

‎docgen/release-notes.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
0.3.7.2 (2021-12-22)
1+
0.3.7.3 (2022-01-26)
2+
--------------------
3+
+ Added metadata info doc-language for whole document (currently only supported by fop renderer)
4+
5+
0.3.7.2 (2022-01-26)
26
--------------------
37
+ Added metadata info doc-title, doc-author, doc-subject, doc-creator, doc-version (currently only supported by fop renderer)
48

‎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>0.3.7.2</version>
10+
<version>0.3.7.3</version>
1111
</parent>
1212

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@ public String getInfoDocCreator() {
211211
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_CREATOR );
212212
}
213213

214+
public String getInfoDocLanguage() {
215+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_LANGUAGE );
216+
}
217+
214218
private static int getMargin( Properties props, int position ) {
215219
String margins = props.getProperty( GenericConsts.INFO_KEY_MARGINS, "10;10;10;10" );
216220
return Integer.parseInt( margins.split( ";")[position] );

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public class DocInfo extends DocElement {
5151
public static final String INFO_DOC_SUBJECT = "doc-subject";
5252
public static final String INFO_DOC_VERSION = "doc-version";
5353
public static final String INFO_DOC_CREATOR = "doc-creator";
54+
public static final String INFO_DOC_LANGUAGE = "doc-language";
5455

5556
private String name;
5657

‎fj-doc-ent/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>0.3.7.2</version>
10+
<version>0.3.7.3</version>
1111
</parent>
1212

1313
<name>fj-doc-ent</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>0.3.7.2</version>
10+
<version>0.3.7.3</version>
1111
</parent>
1212

1313
<name>fj-doc-freemarker</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>0.3.7.2</version>
10+
<version>0.3.7.3</version>
1111
</parent>
1212

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

‎fj-doc-mod-fop/src/main/resources/fm_fop/template/fop_doc.ftl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<#import "/macro/doc_element.ftl" as doc_element>
33
<#import "/macro/doc_info.ftl" as doc_info>
44
<#assign docInfo=docBase.info/>
5-
<fo:root
5+
<fo:root <#if (docBase.infoDocLanguage)??>xml:lang="${docBase.infoDocLanguage}"</#if>
66
<@doc_info.checkDefaultFont info=docInfo/>
77
xmlns:fo="http://www.w3.org/1999/XSL/Format"
88
xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
@@ -35,7 +35,7 @@
3535
</fo:simple-page-master>
3636
</fo:layout-master-set>
3737

38-
<#if (docBase.infoDocTitle)?? || (docBase.infoDocSubject)?? || (docBase.infoDocAuthor)??>
38+
<#if (docBase.infoDocTitle)?? || (docBase.infoDocSubject)?? || (docBase.infoDocAuthor)?? || (docBase.infoDocLanguage)??>
3939
<fo:declarations>
4040
<x:xmpmeta xmlns:x="adobe:ns:meta/">
4141
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -44,6 +44,7 @@
4444
<#if (docBase.infoDocTitle)??><dc:title>${docBase.infoDocTitle}</dc:title></#if>
4545
<#if (docBase.infoDocAuthor)??><dc:creator>${docBase.infoDocAuthor}</dc:creator></#if>
4646
<#if (docBase.infoDocSubject)??><dc:description>${docBase.infoDocSubject}</dc:description></#if>
47+
<#if (docBase.infoDocLanguage)??><dc:language><rdf:Bag><rdf:li>${docBase.infoDocLanguage}</rdf:li></rdf:Bag></dc:language></#if>
4748
</rdf:Description>
4849
<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
4950
<xmp:CreatorTool><#if (docBase.infoDocCreator)??>${docBase.infoDocCreator}<#else>Apache FOP over Fugerit DOC</#if></xmp:CreatorTool>

‎fj-doc-mod-itext/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>0.3.7.2</version>
10+
<version>0.3.7.3</version>
1111
</parent>
1212

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

0 commit comments

Comments
 (0)