diff --git a/History.md b/History.md index 2650dcbd..92175c47 100644 --- 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 index e477b6ba..03865762 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -97,6 +97,27 @@ true true + + + FreeSans.ttf + + font/ttf + + + + FreeSerif.ttf + + application/x-font + + + + Times-Bold.ttf + + application/x-font + + + + diff --git a/library/pom.xml b/library/pom.xml index b824ed90..960e678c 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -67,7 +67,7 @@ org.apache.xmlgraphics fop - 2.8 + 2.9 @@ -170,6 +170,31 @@ **/logback.xml + + + true + + + + FreeSans.ttf + + font/ttf + + + + FreeSerif.ttf + + application/x-font + + + + Times-Bold.ttf + + application/x-font + + + + diff --git a/library/src/main/resources/Times-Bold.ttf b/library/src/main/resources/Times-Bold.ttf deleted file mode 100644 index 889c594f..00000000 Binary files a/library/src/main/resources/Times-Bold.ttf and /dev/null differ diff --git a/library/src/main/resources/fop-config.xconf b/library/src/main/resources/fop-config.xconf index d9eddeb3..4dd29b6d 100644 --- a/library/src/main/resources/fop-config.xconf +++ b/library/src/main/resources/fop-config.xconf @@ -7,15 +7,13 @@ true - ./ - ./ - 72 + 96 - 72 + 96 @@ -25,11 +23,12 @@ - - + + + + - classpath:AdobeCompat-v2.icc diff --git a/library/src/main/resources/src/main/FreeSans.ttf b/library/src/main/resources/src/main/FreeSans.ttf new file mode 100644 index 00000000..2072cdaf Binary files /dev/null and b/library/src/main/resources/src/main/FreeSans.ttf differ