handle alt text for svg in mod-fop #339 (#340)

fugerit79 · web-flow · commit a2c80b9a2f7e · 2025-03-23T01:03:43.000+01:00
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 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">${base64ToString(docImage.resolvedBase64)}</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/sample/doc_alt_01.xml b/fj-doc-mod-fop/src/test/resources/sample/doc_alt_01.xml
@@ -1,6 +1,6 @@
 <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-1-10.xsd">
+	xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-2-1.xsd">
   <metadata>
     <info name="margins">10;10;10;30</info>
     <info name="table-border-collapse">collapse</info>
@@ -10,7 +10,7 @@
   </metadata>
   <body>
     <h head-level="1">Alternative sample doc</h>
-    <para><image type="svg" scaling="50" alt="Test SGV"
+    <para><image type="svg" alt="Test SGV"
                  base64="PHN2ZyBoZWlnaHQ9IjEwMHB4IiB3aWR0aD0iMTAwcHgiIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIAoJIHZpZXdCb3g9IjAgMCA1MTIuMDAxIDUxMi4wMDEiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8Zz4KCTxwYXRoIHN0eWxlPSJmaWxsOiNGRkM4NTU7IiBkPSJNMjU2Ljk1NSwwLjA1bC03MS41Niw0NTguOTQ1TDEyLjA2OSw0ODIuNjNjLTguNjMxLDEuMTc3LTE0LjkyNi03Ljk3MS0xMC43NDMtMTUuNjExTDI1Ni45NTUsMC4wNXoKCQkiLz4KCTxwYXRoIHN0eWxlPSJmaWxsOiNGRkM4NTU7IiBkPSJNMjU2Ljk1NSwwLjA1bDc4LjQ4LDQ1OC45NDVsMTY0LjQzLDIzLjQ5YzguNjM5LDEuMjM1LDE0Ljk5Mi03LjkwNiwxMC44MjUtMTUuNTczTDI1Ni45NTUsMC4wNXoiLz4KPC9nPgo8cG9seWdvbiBzdHlsZT0iZmlsbDojRkFBRjUwOyIgcG9pbnRzPSIyNTYuOTU1LDAuMDUgMjU2Ljk1NSw1MTEuOTUxIDMzNS40MzQsNDU4Ljk5NiAiLz4KPHBvbHlnb24gc3R5bGU9ImZpbGw6I0ZGRTE4MjsiIHBvaW50cz0iMjU2Ljk1NSwwLjA1IDE4NS4zOTQsNDU4Ljk5NiAyNTYuOTU1LDUxMS45NTEgIi8+Cjwvc3ZnPg=="/>
     </para>
     <table space-before="30" columns="3" colwidths="30;30;40" id="excel-table" padding="2" width="100">
