feat: set svg image in element content #580

fugerit79 · fugerit79 · commit 8f6fde2c5583 · 2025-11-20T09:48:33.000+01:00
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Background.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Background.kt
@@ -10,8 +10,8 @@ class Background : HelperDSL.TagWithText( "background" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
 
 
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Body.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Body.kt
@@ -31,8 +31,8 @@ class Body : HelperDSL.TagWithText( "body" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Cell.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Cell.kt
@@ -24,8 +24,8 @@ class Cell : HelperDSL.TagWithText( "cell" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Footer.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Footer.kt
@@ -17,8 +17,8 @@ class Footer : HelperDSL.TagWithText( "footer" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/FooterExt.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/FooterExt.kt
@@ -24,8 +24,8 @@ class FooterExt : HelperDSL.TagWithText( "footer-ext" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Header.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Header.kt
@@ -17,8 +17,8 @@ class Header : HelperDSL.TagWithText( "header" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/HeaderExt.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/HeaderExt.kt
@@ -24,8 +24,8 @@ class HeaderExt : HelperDSL.TagWithText( "header-ext" ) {
      * Creates a new default Image instance.
      * @return the new instance.
      */
-   fun image( init: Image.() -> Unit = {} ): Image {
-       return initTag(Image(), init);
+   fun image( text: String = "", init: Image.() -> Unit = {} ): Image {
+       return initTag(Image(text), init);
    }
     /**
      * Creates a new default Phrase instance.
diff --git a/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Image.kt b/fj-doc-base-kotlin/src/main/java/org/fugerit/java/doc/base/kotlin/dsl/Image.kt
@@ -5,7 +5,15 @@ package org.fugerit.java.doc.base.kotlin.dsl
  *
  * This class will provide function to handle all image attributes and kids 
  */
-class Image : HelperDSL.TagWithText( "image" ) {
+class Image( text: String = "" ) : HelperDSL.TagWithText( "image" ) {
+
+   init { setText(text) }
+    /**
+     * Function to set text content for this element.
+     */
+
+   fun setText( value: String ) { addKid( HelperDSL.TextElement( value ) ) }
+
 
     /**
      * Function handling url attribute of the Image with specific check on type.
diff --git a/fj-doc-base/src/main/docs/doc_xsd_config_ref.html b/fj-doc-base/src/main/docs/doc_xsd_config_ref.html
@@ -410,6 +410,7 @@ <h1  style="font-weight: bold;">Reference xsd documentation for Venus - Fugerit
 		<span >An image to include in the document (roughly comparable to a HTML 'image' element)</span>
 				</td>
 				<td id="cell_19_2"  style=" width: 40%; border-top: 1px solid black; border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black; padding: 2px;">
+		<span >mixed </span>
 				</td>
 		</tr>				
 		<tr>
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocImage.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/model/DocImage.java
@@ -31,6 +31,7 @@ The Apache Software Foundation (http://www.apache.org/).
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -82,7 +83,9 @@ public static Collection<String> getAcceptedImageTypes() {
 	@Getter @Setter private String alt;
 	
 	@Getter @Setter private int align;
-	
+
+	@Getter @Setter private String content = "";
+
 	public String getResolvedBase64() {
 		return SafeFunction.get( () -> {
 			String res = this.getBase64();
@@ -94,7 +97,13 @@ public String getResolvedBase64() {
 	}
 
 	public String getResolvedText() {
-		return SafeFunction.get( () -> new String( resolveImage( this ) ) );
+		return SafeFunction.get( () -> {
+			if ( StringUtils.isEmpty( this.content ) ) {
+				return new String( resolveImage( this ) );
+			} else {
+				return this.content;
+			}
+		});
 	}
 	
 	public String getResolvedType() {
@@ -134,6 +143,8 @@ public static byte[] resolveImage( DocImage img ) throws IOException {
 				data = Base64Helper.decodeBase64String( base64 );
 			} else if ( path != null ) {
 				data = byteResolverHelper( path );
+			} else if ( StringUtils.isNotEmpty( img.getContent() ) ) {
+				data = img.getContent().getBytes( StandardCharsets.UTF_8 );
 			} else {
 				throw new IOException( "Null path provided!" );
 			}
diff --git a/fj-doc-base/src/main/java/org/fugerit/java/doc/base/parser/DocParserContext.java b/fj-doc-base/src/main/java/org/fugerit/java/doc/base/parser/DocParserContext.java
@@ -120,6 +120,9 @@ public void handleText( String text ) {
 			} else if ( this.currentElement instanceof DocInfo ) {
 				DocInfo docInfo = (DocInfo)this.currentElement;
 				docInfo.getContent().append( text );
+			} else if ( this.currentElement instanceof DocImage ) {
+				DocImage docImage = (DocImage)this.currentElement;
+				docImage.setContent( docImage.getContent()+text );
 			}
 		}
 	}
diff --git a/fj-doc-base/src/main/resources/META-INF/native-image/org.fugerit.java/fj-doc-base/reflect-config.json b/fj-doc-base/src/main/resources/META-INF/native-image/org.fugerit.java/fj-doc-base/reflect-config.json
@@ -1140,6 +1140,9 @@
   }, {
     "name" : "getClass",
     "parameterTypes" : [ ]
+  }, {
+    "name" : "getContent",
+    "parameterTypes" : [ ]
   }, {
     "name" : "getId",
     "parameterTypes" : [ ]
@@ -1188,6 +1191,9 @@
   }, {
     "name" : "setBase64",
     "parameterTypes" : [ "java.lang.String" ]
+  }, {
+    "name" : "setContent",
+    "parameterTypes" : [ "java.lang.String" ]
   }, {
     "name" : "setId",
     "parameterTypes" : [ "java.lang.String" ]
diff --git a/fj-doc-base/src/main/resources/config/doc-2-1.xsd b/fj-doc-base/src/main/resources/config/doc-2-1.xsd
@@ -6,7 +6,7 @@
 	 *
 	 * @project    : fj-doc-base
 	 * @creation   : 2023-08-18
-	 * @version    : 2.1.0-rc.3 (2025-03-22)
+	 * @version    : 2.1.0-rc.4 (2025-11-19)
 	 *
 	 * XSD for fugerit doc configuration
 	 */
@@ -408,7 +408,7 @@
 			<xsd:documentation>An image to include in the document</xsd:documentation>
 			<xsd:documentation>(roughly comparable to a HTML 'image' element)</xsd:documentation>
 		</xsd:annotation>
-		<xsd:complexType>
+		<xsd:complexType mixed="true">
 			<xsd:attribute name='url' type='doc:urlType' use='optional'/>
 			<xsd:attribute name='type' type='doc:imageType' use='optional' />
 			<xsd:attribute name='scaling' type='doc:scalingType' use='optional' />
diff --git a/fj-doc-base/src/test/resources/coverage/template/macro/html_element.ftl b/fj-doc-base/src/test/resources/coverage/template/macro/html_element.ftl
@@ -55,8 +55,8 @@
 		<#if docImage.align = 2>
 			<#assign imageAlign="style='display: block; margin-left: auto; margin-right: auto;'"/>
 		</#if>
-	</#if>	
-	<img <@handleId element=docImage/> ${imageAlign!''} <#if (docImage.alt)??> alt="${docImage.alt}" </#if> ${imageScaling} src="data:image/png;base64, ${docImage.resolvedBase64}" />
+	</#if>
+	<img <@handleId element=docImage/> ${imageAlign!''} <#if (docImage.alt)??> alt="${docImage.alt}" </#if> ${imageScaling} src="data:image/png;base64, <#if docImage.content?has_content>${docImage.content}<#else>${docImage.resolvedBase64}</#if>" />
 </#macro>
 
 <#macro handleList docList>
diff --git a/fj-doc-base/src/test/resources/coverage/xml/default_doc.xml b/fj-doc-base/src/test/resources/coverage/xml/default_doc.xml
@@ -40,7 +40,7 @@
   		<image scaling="100" url="cl://test/img_test_teal.jpg"/>
   		<br/>
   		<page-break/>
-    	<table columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
+	   <table columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
     		<row>
     			<cell align="center" border-color="#000000" border-width="1"><para style="bold">Name</para></cell>
     			<cell align="center"><para style="bold">Surname</para></cell>
diff --git a/fj-doc-base/src/test/resources/coverage/xml/default_doc_alt.xml b/fj-doc-base/src/test/resources/coverage/xml/default_doc_alt.xml
@@ -2,7 +2,7 @@
 <doc
 	xmlns="http://javacoredoc.fugerit.org"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-2-0.xsd" > 
+    xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-2-1.xsd" >
 
   <metadata>
   	<!-- Margin for document : left;right;top;bottom -->
@@ -29,7 +29,9 @@
   <body>
   		<image scaling="100" url="cl://test/img_test_teal.jpg"/>
   		<phrase leading="3">My sample title</phrase>
-    	<table columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
+	  <image type="svg" alt="blank square"><![CDATA[<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="10px" height="10px" viewBox="0 0 24 24"><path d="M21,2H3A1,1,0,0,0,2,3V21a1,1,0,0,0,1,1H21a1,1,0,0,0,1-1V3A1,1,0,0,0,21,2ZM20,20H4V4H20Z"/></svg>]]></image>
+
+	  <table columns="3" colwidths="30;30;40"  width="100" id="excel-table" padding="2">
     		<row>
     			<cell align="center" border-color="#000000" border-width="1"><para style="bold">Name</para></cell>
     			<cell align="center"><para fore-color="#ffffff" style="bold">Surname</para></cell>
diff --git a/fj-doc-freemarker/src/main/resources/META-INF/native-image/org.fugerit.java/fj-doc-freemarker/reflect-config.json b/fj-doc-freemarker/src/main/resources/META-INF/native-image/org.fugerit.java/fj-doc-freemarker/reflect-config.json
@@ -2029,6 +2029,42 @@
     "name" : "wait",
     "parameterTypes" : [ "long", "int" ]
   } ]
+}, {
+  "name" : "org.fugerit.java.doc.freemarker.fun.StringToBase64Fun",
+  "methods" : [ {
+    "name" : "<init>",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "equals",
+    "parameterTypes" : [ "java.lang.Object" ]
+  }, {
+    "name" : "exec",
+    "parameterTypes" : [ "java.util.List" ]
+  }, {
+    "name" : "getClass",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "hashCode",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "notify",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "notifyAll",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "toString",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "wait",
+    "parameterTypes" : [ ]
+  }, {
+    "name" : "wait",
+    "parameterTypes" : [ "long" ]
+  }, {
+    "name" : "wait",
+    "parameterTypes" : [ "long", "int" ]
+  } ]
 }, {
   "name" : "org.fugerit.java.doc.freemarker.fun.TextWrapFun",
   "methods" : [ {
diff --git a/fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/macro/html_element.ftl b/fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/macro/html_element.ftl
@@ -65,7 +65,7 @@
 				<#assign imageAlign="style='display: block; margin-left: auto; margin-right: auto;'"/>
 			</#if>
 		</#if>
-		<img <@handleId element=docImage/> ${imageAlign!''} <#if (docImage.alt)??> alt="${docImage.alt}" </#if> ${imageScaling} src="data:image/png;base64, ${docImage.resolvedBase64}" />
+		<img <@handleId element=docImage/> ${imageAlign!''} <#if (docImage.alt)??> alt="${docImage.alt}" </#if> ${imageScaling} src="data:image/png;base64, <#if docImage.content?has_content>${docImage.content}<#else>${docImage.resolvedBase64}</#if>" />
 	</#if>
 </#macro>
 
diff --git a/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/fm-fop-process-config.xml b/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/fm-fop-process-config.xml
@@ -26,6 +26,7 @@
 		</chainStep>
 		<chainStep stepType="function">
 			<function name="base64ToString" value="org.fugerit.java.doc.freemarker.fun.Base64ToStringFun"/>
+            <function name="stringToBase64" value="org.fugerit.java.doc.freemarker.fun.StringToBase64Fun"/>
 		</chainStep>
 		<chainStep stepType="map">
 			<map name="docBase" value="docBase"/>
diff --git a/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl b/fj-doc-mod-fop/src/main/resources/fj_doc_mod_fop_config/template/macro/doc_element.ftl
@@ -56,7 +56,7 @@
 <#macro handleImage docImage>
 	<fo:block <@handleAlign alignValue=docImage.align/>>
 		<#if docImage.svg>
-			<fo:instream-foreign-object <#if (docImage.alt)??> fox:alt-text="${docImage.alt}" </#if> xmlns:svg="http://www.w3.org/2000/svg">${base64ToString(docImage.resolvedBase64)}</fo:instream-foreign-object>
+			<fo:instream-foreign-object <#if (docImage.alt)??> fox:alt-text="${docImage.alt}" </#if> xmlns:svg="http://www.w3.org/2000/svg"><#if docImage.content?has_content>${docImage.content}<#else>${base64ToString(docImage.resolvedBase64)}</#if></fo:instream-foreign-object>
 		<#else>
 			<#if (docImage.scaling)??>
 				<#assign imageScaling="height='${docImage.scaling}%' content-height='${docImage.scaling}%' content-width='scale-to-fit' scaling='uniform' width='${docImage.scaling}%'"/>
diff --git a/fj-doc-mod-fop/src/test/resources/issue/gh580/sample-gh580.xml b/fj-doc-mod-fop/src/test/resources/issue/gh580/sample-gh580.xml
@@ -15,7 +15,7 @@
     <body>
         <para>Sample special characters reproducer ■ □ &#x25A0; &#x25A1;</para>
         <phrase>Working POC with SVG : </phrase>
-        <image type="svg" alt="blank square" base64="PHN2ZyBmaWxsPSIjMDAwMDAwIiB3aWR0aD0iMTBweCIgaGVpZ2h0PSIxMHB4IiB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTIxLDJIM0ExLDEsMCwwLDAsMiwzVjIxYTEsMSwwLDAsMCwxLDFIMjFhMSwxLDAsMCwwLDEtMVYzQTEsMSwwLDAsMCwyMSwyWk0yMCwyMEg0VjRIMjBaIi8+PC9zdmc+"/>
+        <image type="svg" alt="blank square"><![CDATA[<svg xmlns="http://www.w3.org/2000/svg" fill="#000000" width="10px" height="10px" viewBox="0 0 24 24"><path d="M21,2H3A1,1,0,0,0,2,3V21a1,1,0,0,0,1,1H21a1,1,0,0,0,1-1V3A1,1,0,0,0,21,2ZM20,20H4V4H20Z"/></svg>]]></image>
     </body>
 
 </doc>

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ class Background : HelperDSL.TagWithText( "background" ) {`
`10`	`10`	`* Creates a new default Image instance.`
`11`	`11`	`* @return the new instance.`
`12`	`12`	`*/`
`13`		`- fun image( init: Image.() -> Unit = {} ): Image {`
`14`		`- return initTag(Image(), init);`
	`13`	`+ fun image( text: String = "", init: Image.() -> Unit = {} ): Image {`
	`14`	`+ return initTag(Image(text), init);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`