louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #622 from Adrian-Devries/fix-fop

Browse Source 
Fix FOP config
This commit is contained in:
Jochen Staerk
2024-12-20 08:55:53 +01:00
committed by GitHub
parent d4b88e15e3 fd7f26edd5
commit 8f06ecfeb9
11 changed files with 327 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
library/pom.xml
View File

@@ -200,21 +200,51 @@
</manifest> </manifest>
<manifestSections> <manifestSections>
<manifestSection> <manifestSection>
<name>FreeSans.ttf</name> <name>SourceSansPro-Regular.ttf</name>
<manifestEntries> <manifestEntries>
<Content-Type>font/ttf</Content-Type> <Content-Type>font/ttf</Content-Type>
</manifestEntries> </manifestEntries>
</manifestSection> </manifestSection>
<manifestSection> <manifestSection>
<name>FreeSerif.ttf</name> <name>SourceSansPro-It.ttf</name>
<manifestEntries> <manifestEntries>
<Content-Type>application/x-font</Content-Type> <Content-Type>font/ttf</Content-Type>
</manifestEntries> </manifestEntries>
</manifestSection> </manifestSection>
<manifestSection> <manifestSection>
<name>Times-Bold.ttf</name> <name>SourceSansPro-Bold.ttf</name>
<manifestEntries> <manifestEntries>
<Content-Type>application/x-font</Content-Type> <Content-Type>font/ttf</Content-Type>
</manifestEntries>
</manifestSection>
<manifestSection>
<name>SourceSansPro-BoldIt.ttf</name>
<manifestEntries>
<Content-Type>font/ttf</Content-Type>
</manifestEntries>
</manifestSection>
<manifestSection>
<name>SourceSerifPro-Regular.ttf</name>
<manifestEntries>
<Content-Type>font/ttf</Content-Type>
</manifestEntries>
</manifestSection>
<manifestSection>
<name>SourceSerifPro-It.ttf</name>
<manifestEntries>
<Content-Type>font/ttf</Content-Type>
</manifestEntries>
</manifestSection>
<manifestSection>
<name>SourceSerifPro-Bold.ttf</name>
<manifestEntries>
<Content-Type>font/ttf</Content-Type>
</manifestEntries>
</manifestSection>
<manifestSection>
<name>SourceSerifPro-BoldIt.ttf</name>
<manifestEntries>
<Content-Type>font/ttf</Content-Type>
</manifestEntries> </manifestEntries>
</manifestSection> </manifestSection>
</manifestSections> </manifestSections>

BIN
library/src/main/resources/fonts/SourceSansPro-Bold.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSansPro-BoldIt.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSansPro-It.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSansPro-Regular.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSerifPro-Bold.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSerifPro-BoldIt.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSerifPro-It.ttf Normal file
View File

Binary file not shown.

BIN
library/src/main/resources/fonts/SourceSerifPro-Regular.ttf Normal file
View File

Binary file not shown.

44
library/src/main/resources/fop-config.xconf
View File

@@ -22,16 +22,36 @@
<!-- etc. etc..... --> <!-- etc. etc..... -->
<renderers> <renderers>
<renderer mime="application/pdf"> <renderer mime="application/pdf">
<fonts><!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed --> <fonts>
<auto-detect/> <!-- https://xmlgraphics.apache.org/fop/1.1/fonts.html auto-embed -->
<font kerning="no" embed-url="classpath:FreeSans.ttf" embedding-mode="subset"> <auto-detect/>
<font-triplet name="SourceSerifPro" style="normal" weight="normal" /> <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-Regular.ttf" embedding-mode="subset">
<font-triplet name="Times-Bold" style="normal" weight="normal" /> <font-triplet name="SourceSansPro" style="normal" weight="400"/>
</font> </font>
</fonts> <font kerning="yes" embed-url="classpath:fonts/SourceSansPro-It.ttf" embedding-mode="subset">
<output-profile>classpath:AdobeCompat-v2.icc</output-profile> <font-triplet name="SourceSansPro" style="italic" weight="400"/>
</renderer> </font>
</renderers> <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> </fop>

2
library/src/main/resources/stylesheets/xr-pdf/lib/konstanten.xsl
View File

@@ -12,7 +12,7 @@
== Schriften == Schriften
=========================================================================== --> =========================================================================== -->
<xsl:variable name="fontSans">SourceSerifPro</xsl:variable> <xsl:variable name="fontSans">SourceSansPro</xsl:variable>
<xsl:variable name="fontSerif">SourceSerifPro</xsl:variable> <xsl:variable name="fontSerif">SourceSerifPro</xsl:variable>
<xsl:variable name="amount-picture" select="xrf:_('amount-format')"/> <xsl:variable name="amount-picture" select="xrf:_('amount-format')"/>