Merge pull request #105 from fugerit-org/104-mod-fop-fix-cell-vertifcal-align

104 mod fop fix cell vertifcal align

Author: fugerit79

CHANGELOG.md

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- [playground-quarkus] xsl-fo output (as of mod-fop format)
+
 ### Changed
 
 - [playground-quarkus] quarkus-version set to 3.6.1
 
+### Fixed
+
+- [mod-fop] fix cell vertifcal align #104
+
 ## [3.2.3] - 2023-12-05
 
 - [val-p7m] P7MContentValidator (validate p7m and possibly its content with a facade)

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

@@ -172,7 +172,7 @@ text-indent : text-indent
 
 <#macro handleCellSpan cell><#if cell.columnSpan != 1> number-columns-spanned="${cell.columnSpan}"</#if><#if cell.rowSpan != 1> number-rows-spanned="${cell.rowSpan}"</#if></#macro>
 
-<#macro handleVerticalAlign valignValue><#if valignValue = 5> vertical-align="middle"<#elseif valignValue = 4> vertical-align="top"<#elseif valignValue = 6> vertical-align="bottom"</#if></#macro>
+<#macro handleVerticalAlign valignValue><#if valignValue = 5> vertical-align="middle" display-align="center"<#elseif valignValue = 4> vertical-align="top"<#elseif valignValue = 6> vertical-align="bottom" display-align="after"</#if></#macro>
 
 <#macro handleStyle styleValue><#if styleValue = 2> font-weight="bold"<#elseif styleValue = 3> text-decoration="underline"<#elseif styleValue = 4> font-style="italic"<#elseif styleValue = 5> font-style="italic" font-weight="bold"<#elseif styleValue = 1> font-style="normal" font-weight="normal"</#if></#macro>
 

fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml

@@ -43,6 +43,17 @@
           <para>King</para>
         </cell>
       </row>
+      <row>
+        <cell valign="middle">
+          <para>Multi row text content to test vertical allign of other cells in the row</para>
+        </cell>
+        <cell valign="middle">
+          <para>Elrond</para>
+        </cell>
+        <cell valign="bottom">
+          <para>Gil-Galad</para>
+        </cell>
+      </row>
     </table>
   </body>
 </doc>

fj-doc-playground-quarkus/src/main/java/org/fugerit/java/doc/playground/doc/GenerateFacade.java

@@ -22,6 +22,7 @@
 import org.fugerit.java.doc.freemarker.config.FreeMarkerConfigStep;
 import org.fugerit.java.doc.freemarker.fun.SimpleMessageFun;
 import org.fugerit.java.doc.freemarker.html.FreeMarkerHtmlFragmentTypeHandlerEscapeUTF8;
+import org.fugerit.java.doc.mod.fop.FreeMarkerFopTypeHandler;
 import org.fugerit.java.doc.mod.opencsv.OpenCSVTypeHandler;
 import org.fugerit.java.doc.mod.poi.XlsxPoiTypeHandler;
 import org.fugerit.java.doc.playground.config.InitPlayground;
@@ -151,6 +152,9 @@ public DocTypeHandler findHandler( BasicInput input ) {
 			case DocConfig.TYPE_MD:
 				handler = SimpleMarkdownExtTypeHandler.HANDLER_NOCOMMENTS_UTF8;
 				break;
+			case DocConfig.TYPE_FO:
+				handler = FreeMarkerFopTypeHandler.HANDLER_UTF8;
+				break;
 			case InitPlayground.OUTPUT_FORMAT_PDF_A:
 				handler = InitPlayground.PDFA_FOP_TYPE_HANDLER;
 				break;

fj-doc-playground-quarkus/src/main/react/src/playground/DocXmlEditor.jsx

@@ -190,7 +190,7 @@ class DocXmlEditor extends Component {
 			} else if ( this.state.docFormat === 'MD' ) {
 				let decodedStringAtoB = this.myAtob(this.state.docOutput);
 				outputData = <MarkdownEditor key={new Date().getTime()} value={decodedStringAtoB} />
-			} else if ( this.state.docFormat === 'XML' ) {
+			} else if ( this.state.docFormat === 'XML' || this.state.docFormat === 'FO' ) {
 				let decodedStringAtoB = this.myAtob(this.state.docOutput);
 				outputData = <AceEditor
 							mode='xml'
@@ -274,6 +274,7 @@ class DocXmlEditor extends Component {
 					    <MenuItem value='XLSX'>XLSX</MenuItem>
 					    <MenuItem value='MD'>Markdown (MD)</MenuItem>
 					    <MenuItem value='XML'>Venus XML Doc</MenuItem>
+					    <MenuItem value='FO'>XSL-FO</MenuItem>
 					    <MenuItem value='CSV'>CSV</MenuItem>
 					  </Select>
 					</FormControl>	

fj-doc-playground-quarkus/src/test/java/org/fugerit/java/doc/playground/GenerateRestTest.java

@@ -37,9 +37,10 @@ private void testWorker( String apiPath, String jsonPayloadPath ) {
 
     @Test
     void testGenerateDocument() {   	
-    	int[] testId = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+    	int[] testId = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
     	for ( int k=0; k<testId.length; k++ ) {
-    		this.testWorker( "/generate/document", "generate/test_generate_input_0"+testId[k]+".json" );
+    		String current = String.valueOf( testId[k]<10 ? "0"+testId[k] : testId[k] ); 
+    		this.testWorker( "/generate/document", "generate/test_generate_input_"+current+".json" );
     	}   
     }
 

fj-doc-playground-quarkus/src/test/resources/request/payload/generate/test_generate_input_10.json

@@ -0,0 +1,6 @@
+{
+	"inputFormat": "FTLX",
+	"outputFormat":"FO",
+	"freemarkerJsonData":"{\"docTitle\":\"My FreeMarker Template Sample Doc Title\"}",
+	"docContent":"<#outputformat \"XML\"><#-- automatically escape variables as XML : https://freemarker.apache.org/docs/dgui_misc_autoescaping.html -->\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<doc\n\txmlns=\"http://javacoredoc.fugerit.org\"\n\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n    xsi:schemaLocation=\"http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-2-1.xsd\" > \n\n  <#--\n  \tThis is a Venus Fugerit Doc (https://github.com/fugerit-org/fj-doc) FreeMarker Template XML (ftlx).\n  \t\n  \tFor consideration of Venus Fugerit Doc and Apache FreeMarker integration see :\n  \thttps://venusguides.fugerit.org/src/docs/common/doc_format_freemarker.html\n  \t\n  \tFor documentation on how to write a valid Venus Doc XML Meta Model refer to : \n  \thttps://venusguides.fugerit.org/src/docs/common/doc_format_summary.html\n  -->\n\n  <metadata>\n  \t<!-- Margin for document : left;right;top;bottom -->\n  \t<info name=\"margins\">10;10;10;30</info>  \n  \t<info name=\"excel-table-id\">excel-table=print</info>\n \t<!-- documenta meta information -->\n\t<info name=\"doc-title\">Basic example</info>\n\t<info name=\"doc-subject\">fj doc venus sample source FreeMarker Template XML - ftlx</info>\n\t<info name=\"doc-author\">fugerit79</info>\n\t<info name=\"doc-language\">en</info>\n\t<!-- font must be loaded -->\n\t<info name=\"default-font-name\">TitilliumWeb</info>\n\t<footer-ext>\n\t\t<para align=\"right\">${r\"${currentPage}\"} / ${r\"${pageCount}\"}</para>\n\t</footer-ext>\n  </metadata>\n  <body>\n  \t\t<para>${docTitleNotPresent}</para>\n    \t<table columns=\"3\" colwidths=\"30;30;40\"  width=\"100\" id=\"excel-table\" padding=\"2\">\n    \t\t<row>\n    \t\t\t<cell align=\"center\" border-color=\"#000000\" border-width=\"1\"><para style=\"bold\">Name</para></cell>\n    \t\t\t<cell align=\"center\"><para style=\"bold\">Surname</para></cell>\n    \t\t\t<cell align=\"center\"><para style=\"bold\">Title</para></cell>\n    \t\t</row>\n       \t\t<row>\n    \t\t\t<cell><para><![CDATA[Luthien]]></para></cell>\n    \t\t\t<cell><para><![CDATA[Tinuviel]]></para></cell>\n    \t\t\t<cell><para><![CDATA[Queen]]></para></cell>\n    \t\t</row>\n       \t\t<row>\n    \t\t\t<cell><para><![CDATA[Thorin]]></para></cell>\n    \t\t\t<cell><para><![CDATA[Oakshield]]></para></cell>\n    \t\t\t<cell><para><![CDATA[King]]></para></cell>\n    \t\t</row>     \t\n    \t</table>\n  </body>\n  \n</doc>\n</#outputformat>"
+}