From fdce2c4371e6281f5da903be75d337f740a2958d Mon Sep 17 00:00:00 2001
From: Adrian-Devries <Adrian-Devries@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:03:15 +0100
Subject: [PATCH] Fix FOP config

Fix FOP config to use original Adobe fonts:
https://github.com/adobe-fonts/source-serif/releases/download/3.001R/source-serif-pro-3.001R.zip
https://github.com/adobe-fonts/source-sans/releases/download/3.006R/source-sans-pro-3.006R.zip
---
 library/src/main/resources/fop-config.xconf | 94 +++++++++++++--------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/library/src/main/resources/fop-config.xconf b/library/src/main/resources/fop-config.xconf
index cf01edd3..4d93f97e 100644
--- a/library/src/main/resources/fop-config.xconf
+++ b/library/src/main/resources/fop-config.xconf
@@ -1,37 +1,57 @@
-<fop version="1.0">
-
-  <!-- Strict user configuration -->
-  <strict-configuration>true</strict-configuration>
-
-  <!-- Strict FO validation -->
-  <strict-validation>true</strict-validation>
-
-  <!-- Base URL for resolving relative URLs -->
-
-  <!-- Font Base URL for resolving relative font URLs -->
-
-  <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
-  <source-resolution>96</source-resolution>
-  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
-  <target-resolution>96</target-resolution>
-
-  <!-- default page-height and page-width, in case
-       value is specified as auto -->
-  <default-page-settings height="297mm" width="210mm"/><!-- DIN A/4 -->
-
-  <!-- etc. etc..... -->
-  
-  <renderers>
-   <renderer mime="application/pdf">
-   <fonts><!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed -->
-       <auto-detect/>
-       <font kerning="no" embed-url="classpath:FreeSans.ttf" embedding-mode="subset">
-           <font-triplet name="SourceSerifPro" style="normal" weight="normal" />
-           <font-triplet name="Times-Bold" style="normal" weight="normal" />
-       </font>
-   </fonts>
-   <output-profile>classpath:AdobeCompat-v2.icc</output-profile>
-   </renderer>
-</renderers>
-
-</fop>
+<fop version="1.0">
+
+  <!-- Strict user configuration -->
+  <strict-configuration>true</strict-configuration>
+
+  <!-- Strict FO validation -->
+  <strict-validation>true</strict-validation>
+
+  <!-- Base URL for resolving relative URLs -->
+
+  <!-- Font Base URL for resolving relative font URLs -->
+
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
+  <source-resolution>96</source-resolution>
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
+  <target-resolution>96</target-resolution>
+
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
+  <default-page-settings height="297mm" width="210mm"/><!-- DIN A/4 -->
+
+  <!-- etc. etc..... -->
+  
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+        <!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed -->
+        <auto-detect/>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-Regular.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSansPro" style="normal" weight="400"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-It.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSansPro" style="italic" weight="400"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-Bold.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSansPro" style="normal" weight="700"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-BoldIt.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSansPro" style="italic" weight="700"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSerifPro-Regular.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSerifPro" style="normal" weight="400"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSerifPro-It.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSerifPro" style="italic" weight="400"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSerifPro-Bold.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSerifPro" style="normal" weight="700"/>
+        </font>
+        <font kerning="yes" embed-url="classpath:fonts/SourceSerifPro-BoldIt.ttf" embedding-mode="subset">
+          <font-triplet name="SourceSerifPro" style="italic" weight="700"/>
+        </font>
+      </fonts>
+      <output-profile>classpath:AdobeCompat-v2.icc</output-profile>
+    </renderer>
+  </renderers>
+</fop>