diff --git a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/HtmlTypeHandler.java b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/HtmlTypeHandler.java index fb60b9c8e..57da45c8c 100644 --- a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/HtmlTypeHandler.java +++ b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/HtmlTypeHandler.java @@ -12,10 +12,10 @@ import org.fugerit.java.doc.base.model.DocBase; import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPDFConfigHelper; import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler; +import org.w3c.dom.Element; import com.lowagie.text.Document; import com.lowagie.text.html.HtmlWriter; -import org.w3c.dom.Element; public class HtmlTypeHandler extends DocTypeHandlerDefault { diff --git a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/PdfTypeHandler.java b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/PdfTypeHandler.java index 4a3f29d5e..4264c2ee3 100644 --- a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/PdfTypeHandler.java +++ b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/PdfTypeHandler.java @@ -12,11 +12,11 @@ import org.fugerit.java.doc.base.model.DocBase; import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPDFConfigHelper; import org.fugerit.java.doc.mod.openpdf.ext.helpers.OpenPpfDocHandler; +import org.w3c.dom.Element; import com.lowagie.text.Document; import com.lowagie.text.PageSize; import com.lowagie.text.pdf.PdfWriter; -import org.w3c.dom.Element; public class PdfTypeHandler extends DocTypeHandlerDefault { diff --git a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPDFConfigHelper.java b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPDFConfigHelper.java index cbd64545e..d7af531d4 100644 --- a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPDFConfigHelper.java +++ b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPDFConfigHelper.java @@ -1,10 +1,11 @@ package org.fugerit.java.doc.mod.openpdf.ext.helpers; -import lombok.extern.slf4j.Slf4j; import org.fugerit.java.core.cfg.ConfigException; import org.w3c.dom.Element; import org.w3c.dom.NodeList; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class OpenPDFConfigHelper { diff --git a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPdfFontHelper.java b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPdfFontHelper.java index bd221e6f4..0744dd2a5 100644 --- a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPdfFontHelper.java +++ b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPdfFontHelper.java @@ -62,8 +62,7 @@ protected static Font createFont( String fontName, String fontPath, int fontSize } else { bf = OpenPpfDocHandler.findFont( fontName ); if ( bf == null) { - bf = BaseFont.createFont( fontPath, BaseFont.CP1252, true ); - OpenPpfDocHandler.registerFont( fontName, bf ); + bf = OpenPpfDocHandler.registerFont( fontName , fontPath ); } } Color c = Color.BLACK; diff --git a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPpfDocHandler.java b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPpfDocHandler.java index c8fcd9b62..908afdcea 100644 --- a/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPpfDocHandler.java +++ b/fj-doc-mod-openpdf-ext/src/main/java/org/fugerit/java/doc/mod/openpdf/ext/helpers/OpenPpfDocHandler.java @@ -11,7 +11,6 @@ import org.fugerit.java.core.cfg.ConfigRuntimeException; import org.fugerit.java.core.function.SafeFunction; import org.fugerit.java.core.lang.helpers.StringUtils; -import org.fugerit.java.core.log.LogFacade; import org.fugerit.java.core.util.regex.ParamFinder; import org.fugerit.java.doc.base.config.DocConfig; import org.fugerit.java.doc.base.helper.SourceResolverHelper; @@ -69,9 +68,10 @@ public class OpenPpfDocHandler { private static HashMap fonts = new HashMap<>(); - public static void registerFont( String name, String path ) throws DocumentException, IOException { + public static BaseFont registerFont( String name, String path ) throws DocumentException, IOException { BaseFont font = BaseFont.createFont( path, BaseFont.CP1252, true ); registerFont( name, font ); + return font; } public static void registerFont( String name, BaseFont font ) { @@ -414,11 +414,7 @@ private void handleHeaderFooterElement( DocElement docElement, float leading, Op } Font f = new Font( Font.HELVETICA, docPara.getSize() ); if ( docPara.getForeColor() != null ) { - try { - f.setColor( DocModelUtils.parseHtmlColor( docPara.getForeColor() ) ); - } catch (Exception fe) { - LogFacade.getLog().warn( "Error setting fore color on footer : "+docPara.getForeColor(), fe ); - } + SafeFunction.applySilent( () -> f.setColor( DocModelUtils.parseHtmlColor( docPara.getForeColor() ) ) ); } Chunk ck = new Chunk( docPara.getText(), f ); phrase.add( ck ); diff --git a/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDefaultDoc.java b/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDefaultDoc.java index e5d770700..7b36f597a 100644 --- a/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDefaultDoc.java +++ b/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDefaultDoc.java @@ -15,6 +15,8 @@ public class TestDefaultDoc extends TestDocBase { private static final String DEFAULT_DOC_ALT = "default_doc_alt"; + private static final String DEFAULT_DOC_SIMPLE = "default_doc_simple"; + private static final String DEFAULT_DOC_PDFA = "default_doc_pdfa"; @Test @@ -52,6 +54,12 @@ public void testOpenAltHTML() { Assert.assertTrue(ok); } + @Test + public void testOpenSimple() { + boolean ok = this.testDocWorker( DEFAULT_DOC_SIMPLE , DocConfig.TYPE_PDF ); + Assert.assertTrue(ok); + } + @Test public void testOpenPDFA() { // still working on font embedding diff --git a/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDocBase.java b/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDocBase.java index f901cd263..73397eb60 100644 --- a/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDocBase.java +++ b/fj-doc-mod-openpdf-ext/src/test/java/test/org/fugerit/java/doc/mod/openpdf/ext/TestDocBase.java @@ -11,11 +11,11 @@ import org.fugerit.java.doc.base.config.DocInput; import org.fugerit.java.doc.base.config.DocOutput; import org.fugerit.java.doc.base.config.DocTypeHandler; - -import lombok.extern.slf4j.Slf4j; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfig; import org.fugerit.java.doc.freemarker.process.FreemarkerDocProcessConfigFacade; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class TestDocBase { diff --git a/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc.xml b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc.xml index ee7845c41..7e293e90b 100644 --- a/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc.xml +++ b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://javacoredoc.fugerit.org https://www.fugerit.org/data/java/doc/xsd/doc-2-1.xsd" > @@ -32,16 +32,16 @@ Symbol Symbol Test default font - +
Name Surname Title - - - + + + diff --git a/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_alt.xml b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_alt.xml index 1908770f3..21765c2a1 100644 --- a/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_alt.xml +++ b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_alt.xml @@ -52,10 +52,16 @@
- + + + + + + - - - + + + +
\ No newline at end of file diff --git a/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_simple.xml b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_simple.xml new file mode 100644 index 000000000..6e058f19b --- /dev/null +++ b/fj-doc-mod-openpdf-ext/src/test/resources/xml/default_doc_simple.xml @@ -0,0 +1,17 @@ + + + + + TitilliumWeb +
+ +
+
+ + Test PDFA + + +
\ No newline at end of file