pdf fixes

ZUGFeRD · Sep 11, 2023 · cdde3f2 · cdde3f2
1 parent 5ee488e
commit cdde3f2
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 8 deletions.
diff --git a/History.md b/History.md
@@ -2,6 +2,8 @@
 =======
 
 Improvement of included notes #331
+fixes #259 by Heavenfighter
+java -Ddisable-file-logging -jar ..\..\..\mustangproject\Mustang-CLI\target\Mustang-CLI-2.7.4-SNAPSHOT.jar --action validate --source Storno_A.xml
 
 2.7.3
 =======

diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml
@@ -97,6 +97,27 @@
                      <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                      <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                   </manifest>
+                   <manifestSections>
+                       <manifestSection>
+                           <name>FreeSans.ttf</name>
+                           <manifestEntries>
+                               <Content-Type>font/ttf</Content-Type>
+                           </manifestEntries>
+                       </manifestSection>
+                       <manifestSection>
+                           <name>FreeSerif.ttf</name>
+                           <manifestEntries>
+                               <Content-Type>application/x-font</Content-Type>
+                           </manifestEntries>
+                       </manifestSection>
+                       <manifestSection>
+                           <name>Times-Bold.ttf</name>
+                           <manifestEntries>
+                               <Content-Type>application/x-font</Content-Type>
+                           </manifestEntries>
+                       </manifestSection>
+                   </manifestSections>
+
                </archive>
             </configuration>
          </plugin>

diff --git a/library/pom.xml b/library/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.apache.xmlgraphics</groupId>
 			<artifactId>fop</artifactId>
-			<version>2.8</version>
+			<version>2.9</version>
 		</dependency>
 
 		<dependency>
@@ -170,6 +170,31 @@
 					<excludes>
 						<exclude>**/logback.xml</exclude>
 					</excludes>
+            <archive>
+                <manifest>
+                    <addClasspath>true</addClasspath>
+                </manifest>
+                <manifestSections>
+                    <manifestSection>
+                        <name>FreeSans.ttf</name>
+                        <manifestEntries>
+                            <Content-Type>font/ttf</Content-Type>
+                        </manifestEntries>
+                    </manifestSection>
+                    <manifestSection>
+                        <name>FreeSerif.ttf</name>
+                        <manifestEntries>
+                            <Content-Type>application/x-font</Content-Type>
+                        </manifestEntries>
+                    </manifestSection>
+                    <manifestSection>
+                        <name>Times-Bold.ttf</name>
+                        <manifestEntries>
+                            <Content-Type>application/x-font</Content-Type>
+                        </manifestEntries>
+                    </manifestSection>
+                </manifestSections>
+            </archive>
         </configuration>
       </plugin>
       <plugin>

diff --git a/library/src/main/resources/Times-Bold.ttf b/library/src/main/resources/Times-Bold.ttf
diff --git a/library/src/main/resources/fop-config.xconf b/library/src/main/resources/fop-config.xconf
@@ -7,15 +7,13 @@
   <strict-validation>true</strict-validation>
 
   <!-- Base URL for resolving relative URLs -->
-  <base>./</base>
 
   <!-- Font Base URL for resolving relative font URLs -->
-  <font-base>./</font-base>
 
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
-  <source-resolution>72</source-resolution>
+  <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>72</target-resolution>
+  <target-resolution>96</target-resolution>
 
   <!-- default page-height and page-width, in case
        value is specified as auto -->
@@ -25,11 +23,12 @@
 
   <renderers>
    <renderer mime="application/pdf">
-   <fonts><!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed-->
-       <font kerning="no" embed-url="file:src/main/resources/FreeSans.ttf" embedding-mode="subset">
+   <fonts><!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed -->
+       <auto-detect/>
+       <font kerning="no" embed-url="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>

diff --git a/library/src/main/resources/src/main/FreeSans.ttf b/library/src/main/resources/src/main/FreeSans.ttf