Skip to content

Commit 5faec8b

Browse files
daneeldeveloperdaneeldeveloper
committed
0.3.7.2 (2021-12-22)
+ Added metadata info doc-title, doc-author, doc-subject, doc-creator, doc-version (currently only supported by fop renderer)
1 parent 36f221f commit 5faec8b

File tree

16 files changed

+72
-13
lines changed

16 files changed

+72
-13
lines changed

‎docgen/parameters.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"title" : "Venus (Fugerit Document Generation Framework)",
33
"name": "Venus",
4-
"version" : "0.3.7.1",
5-
"date" : "22/12/2021",
4+
"version" : "0.3.7.2",
5+
"date" : "26/01/2022",
66
"organization" : {
77
"name" : "Fugerit Org",
88
"url" : "https://www.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.1 (2021-12-22)
1+
0.3.7.2 (2021-12-22)
2+
--------------------
3+
+ Added metadata info doc-title, doc-author, doc-subject, doc-creator, doc-version (currently only supported by fop renderer)
4+
5+
0.3.7.1 (2021-12-22)
26
--------------------
37
+ Added bookmark tree support (currently only work with 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.1</version>
10+
<version>0.3.7.2</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: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,36 @@ public Properties getInfo() {
181181
return info;
182182
}
183183

184+
private Properties stableInfo;
185+
186+
public Properties getStableInfo() {
187+
return stableInfo;
188+
}
189+
190+
public void setStableInfo(Properties stableInfo) {
191+
this.stableInfo = stableInfo;
192+
}
193+
194+
public String getInfoDocVersion() {
195+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_VERSION );
196+
}
197+
198+
public String getInfoDocTitle() {
199+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_TITLE );
200+
}
201+
202+
public String getInfoDocSubject() {
203+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_SUBJECT );
204+
}
205+
206+
public String getInfoDocAuthor() {
207+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_AUTHOR );
208+
}
209+
210+
public String getInfoDocCreator() {
211+
return this.getStableInfo().getProperty( DocInfo.INFO_DOC_CREATOR );
212+
}
213+
184214
private static int getMargin( Properties props, int position ) {
185215
String margins = props.getProperty( GenericConsts.INFO_KEY_MARGINS, "10;10;10;10" );
186216
return Integer.parseInt( margins.split( ";")[position] );

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public class DocInfo extends DocElement {
4646

4747
public static final String INFO_NAME_PDF_FORMAT = "pdf-format";
4848

49+
public static final String INFO_DOC_TITLE = "doc-title";
50+
public static final String INFO_DOC_AUTHOR = "doc-author";
51+
public static final String INFO_DOC_SUBJECT = "doc-subject";
52+
public static final String INFO_DOC_VERSION = "doc-version";
53+
public static final String INFO_DOC_CREATOR = "doc-creator";
54+
4955
private String name;
5056

5157
private StringBuffer content = new StringBuffer();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ public void characters(char[] ch, int start, int length) throws SAXException {
141141
* @see org.xml.sax.ContentHandler#endDocument()
142142
*/
143143
public void endDocument() throws SAXException {
144+
this.docBase.setStableInfo( this.docBase.getInfo() );
144145
}
145146

146147
/* (non-Javadoc)

‎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.1</version>
10+
<version>0.3.7.2</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.1</version>
10+
<version>0.3.7.2</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.1</version>
10+
<version>0.3.7.2</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: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,24 @@
3535
</fo:simple-page-master>
3636
</fo:layout-master-set>
3737

38+
<#if (docBase.infoDocTitle)?? || (docBase.infoDocSubject)?? || (docBase.infoDocAuthor)??>
39+
<fo:declarations>
40+
<x:xmpmeta xmlns:x="adobe:ns:meta/">
41+
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
42+
<rdf:Description rdf:about=""
43+
xmlns:dc="http://purl.org/dc/elements/1.1/">
44+
<#if (docBase.infoDocTitle)??><dc:title>${docBase.infoDocTitle}</dc:title></#if>
45+
<#if (docBase.infoDocAuthor)??><dc:creator>${docBase.infoDocAuthor}</dc:creator></#if>
46+
<#if (docBase.infoDocSubject)??><dc:description>${docBase.infoDocSubject}</dc:description></#if>
47+
</rdf:Description>
48+
<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/">
49+
<xmp:CreatorTool><#if (docBase.infoDocCreator)??>${docBase.infoDocCreator}<#else>Apache FOP over Fugerit DOC</#if></xmp:CreatorTool>
50+
</rdf:Description>
51+
</rdf:RDF>
52+
</x:xmpmeta>
53+
</fo:declarations>
54+
</#if>
55+
3856
<#if (docBase.docBookmarkTree)??>
3957
<fo:bookmark-tree>
4058
<#list docBase.docBookmarkTree.elementList as docBookmark>

0 commit comments

Comments
 (0)