From 8233cbd41a3aa41236ec505ab173437995287637 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Fri, 6 Jun 2014 15:31:09 +0200 Subject: Visual Block changes + Configuration updates --- .../profiles/AMTSSIGNATURBLOCK_DE_SMALL.properties | 2 +- .../profiles/AMTSSIGNATURBLOCK_EN_SMALL.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_DE.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties | 3 +- .../profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_EN.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_EN_PDFA.properties | 3 +- .../profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties | 2 +- .../profiles/SIGNATURBLOCK_MINIMAL_DE.properties | 2 +- .../profiles/SIGNATURBLOCK_MINIMAL_EN.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_SMALL_DE.properties | 2 +- .../SIGNATURBLOCK_SMALL_DE_NOTE.properties | 2 +- .../cfg/profiles/SIGNATURBLOCK_SMALL_EN.properties | 2 +- .../SIGNATURBLOCK_SMALL_EN_NOTE.properties | 2 +- .../cfg/profiles/justizsignatur.properties | 4 +- pdf-as-lib/src/configuration/fonts/arial.ttf | Bin 0 -> 296712 bytes .../pdfbox/PDFAsVisualSignatureBuilder.java | 15 +++--- .../lib/impl/stamping/pdfbox/PDFBoxTable.java | 58 ++++++++++++++++++--- 20 files changed, 80 insertions(+), 31 deletions(-) create mode 100644 pdf-as-lib/src/configuration/fonts/arial.ttf diff --git a/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_DE_SMALL.properties b/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_DE_SMALL.properties index 3a5c0932..0e60afb3 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_DE_SMALL.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_DE_SMALL.properties @@ -11,7 +11,7 @@ sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.key.SIG_DATE=Datum/Zeit-UTC sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.value.SIG_LABEL=./images/amtsignatur-logo_demo.png sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.value.SIG_NOTE=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E- Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. -sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.value.SIG_SUBJECT=Demo Amtssignatur +sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.pos=f:80;w:230 sig_obj.AMTSSIGNATURBLOCK_DE_SMALL.adobeSignFieldValue=PDF-AS Signatur diff --git a/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_EN_SMALL.properties b/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_EN_SMALL.properties index fdf5cba3..52c51fc9 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_EN_SMALL.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/AMTSSIGNATURBLOCK_EN_SMALL.properties @@ -10,7 +10,7 @@ sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.key.SIG_DATE=Date/Time-UTC sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of theprintout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.value.SIG_LABEL=./images/amtsignatur-logo_demo.png sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.value.SIG_NOTE=This document was signed with an official signature. According to \u00a7 20 Austrian E-Government-Act a printout of this document is assumed to be authentic. -sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.value.SIG_SUBJECT=Demo Official Signature +sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.pos=f:80;w:230 sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.adobeSignFieldValue=PDF-AS Signature sig_obj.AMTSSIGNATURBLOCK_EN_SMALL.adobeSignReasonValue=Signature verification at: http://www.signature-verification.gv.at diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE.properties index 6a0b8b6d..e67b230b 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE.properties @@ -43,7 +43,7 @@ sig_obj.SIGNATURBLOCK_DE.key.SIG_NOTE=Hinweis sig_obj.SIGNATURBLOCK_DE.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.SIGNATURBLOCK_DE.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_DE.value.SIG_NUMBER=${sn} -sig_obj.SIGNATURBLOCK_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_DE.value.SIG_NOTE=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E-Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. ## Profilspezifische Festlegung der Position des Signaturblocks # diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties index dd918db5..f92f62bc 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_NOTE.properties @@ -24,7 +24,7 @@ sig_obj.SIGNATURBLOCK_DE_NOTE.verifyURL=http://www.signaturpruefung.gv.at # WAI sig_obj.SIGNATURBLOCK_DE_NOTE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke. -sig_obj.SIGNATURBLOCK_DE_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_DE_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_DE_NOTE.value.SIG_LABEL=./images/signatur-logo_de.png sig_obj.SIGNATURBLOCK_DE_NOTE.value.SIG_NOTE=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument ist gem\u00e4\u00df \u00a7\u00A04 Abs.\u00A01 Signaturgesetz einem handschriftlich unterschriebenen Dokument grunds\u00e4tzlich rechtlich gleichgestellt. diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties index e9cc19de..67180e8a 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA.properties @@ -20,6 +20,7 @@ sig_obj.SIGNATURBLOCK_DE_PDFA.legacy.pos=true sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_NUMBER=${sn} +sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_NOTE=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E-Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. sig_obj.SIGNATURBLOCK_DE_PDFA.pos=f:80 sig_obj.SIGNATURBLOCK_DE_PDFA.adobeSignFieldValue=PDF-AS Signatur @@ -29,7 +30,7 @@ sig_obj.SIGNATURBLOCK_DE_PDFA.verifyURL=http://www.signaturpruefung.gv.at # WAI sig_obj.SIGNATURBLOCK_DE_PDFA.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke. -sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_DE_PDFA.value.SIG_LABEL=./images/signatur-logo_de.png #---------------------- MAIN TABLE ------------------------- diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties index 3b2cb917..bbe4b094 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_DE_PDFA_NOTE.properties @@ -27,7 +27,7 @@ sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.verifyURL=http://www.signaturpruefung.gv.at # WAI sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.sigLogoAltText=Abgebildet ist eine Standard-Signaturbildmarke. -sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.value.SIG_LABEL=./images/signatur-logo_de.png sig_obj.SIGNATURBLOCK_DE_PDFA_NOTE.value.SIG_NOTE=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument ist gem\u00e4\u00df \u00a7\u00A04 Abs.\u00A01 Signaturgesetz einem handschriftlich unterschriebenen Dokument grunds\u00e4tzlich rechtlich gleichgestellt. diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN.properties index 48b1b4a9..4421a7bb 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN.properties @@ -16,7 +16,7 @@ sig_obj.SIGNATURBLOCK_EN.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " sig_obj.SIGNATURBLOCK_EN.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_EN.value.SIG_NUMBER=${sn} -sig_obj.SIGNATURBLOCK_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_EN.value.SIG_NOTE=This document is signed with a qualified electronic signature. According to \u00a7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to an handwritten signature. sig_obj.SIGNATURBLOCK_EN.value.SIG_LABEL=./images/signatur-logo_en.png diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties index 167c233f..81e54be4 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_NOTE.properties @@ -24,7 +24,7 @@ sig_obj.SIGNATURBLOCK_EN_NOTE.verifyURL=http://www.signature-verification.gv.at # WAI sig_obj.SIGNATURBLOCK_EN_NOTE.sigLogoAltText=A standard signature logo is shown. -sig_obj.SIGNATURBLOCK_EN_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_EN_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_EN_NOTE.value.SIG_LABEL=./images/signatur-logo_en.png sig_obj.SIGNATURBLOCK_EN_NOTE.value.SIG_NOTE=This document is signed with a qualified electronic signature. According to \u00a7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to an handwritten signature. diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA.properties index feb412bb..7c04a953 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA.properties @@ -18,6 +18,7 @@ sig_obj.SIGNATURBLOCK_EN_PDFA.key.SIG_NOTE=Note sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_NUMBER=${sn} +sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_NOTE=This document is signed with a qualified electronic signature. According to \u00a7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to an handwritten signature. sig_obj.SIGNATURBLOCK_EN_PDFA.pos=f:80 sig_obj.SIGNATURBLOCK_EN_PDFA.adobeSignFieldValue=PDF-AS Signature @@ -27,7 +28,7 @@ sig_obj.SIGNATURBLOCK_EN_PDFA.verifyURL=http://www.signature-verification.gv.at # WAI sig_obj.SIGNATURBLOCK_EN_PDFA.sigLogoAltText=A standard signature logo is shown. -sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_EN_PDFA.value.SIG_LABEL=./images/signatur-logo_en.png #---------------------- MAIN TABLE ------------------------- diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties index 25c1bcc0..e71b403c 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_EN_PDFA_NOTE.properties @@ -27,7 +27,7 @@ sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.verifyURL=http://www.signature-verification.g # WAI sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.sigLogoAltText=A standard signature logo is shown. -sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.value.SIG_LABEL=./images/signatur-logo_en.png sig_obj.SIGNATURBLOCK_EN_PDFA_NOTE.value.SIG_NOTE=This document is signed with a qualified electronic signature. According to \u00a7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to an handwritten signature. diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_DE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_DE.properties index 6f8eb060..4b7b54da 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_DE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_DE.properties @@ -11,7 +11,7 @@ sig_obj.SIGNATURBLOCK_MINIMAL_DE.adobeSignFieldValue=PDF-AS Signatur sig_obj.SIGNATURBLOCK_MINIMAL_DE.adobeSignReasonValue=Signaturpruefung unter http://www.signaturpruefung.gv.at sig_obj.SIGNATURBLOCK_MINIMAL_DE.verifyURL=http://www.signaturpruefung.gv.at -sig_obj.SIGNATURBLOCK_MINIMAL_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_MINIMAL_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_MINIMAL_DE.value.SIG_LABEL=./images/signatur-logo_de.png sig_obj.SIGNATURBLOCK_MINIMAL_DE.table.main.Style.imagescaletofit=65.0;65.0 diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_EN.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_EN.properties index 340d7451..1b63ae4e 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_EN.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_MINIMAL_EN.properties @@ -11,7 +11,7 @@ sig_obj.SIGNATURBLOCK_MINIMAL_EN.adobeSignFieldValue=PDF-AS Signature sig_obj.SIGNATURBLOCK_MINIMAL_EN.adobeSignReasonValue=Information about the verification can be found at http://www.signature-verification.gv.at sig_obj.SIGNATURBLOCK_MINIMAL_EN.verifyURL=http://www.signature-verification.gv.at -sig_obj.SIGNATURBLOCK_MINIMAL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_MINIMAL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_MINIMAL_EN.value.SIG_LABEL=./images/signatur-logo_en.png sig_obj.SIGNATURBLOCK_MINIMAL_EN.table.main.Style.imagescaletofit=65.0;65.0 diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE.properties index abfd21e6..9a8f1016 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE.properties @@ -23,7 +23,7 @@ sig_obj.SIGNATURBLOCK_SMALL_DE.sigLogoAltText=Abgebildet ist eine Standard-Signa sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_NUMBER=${sn} -sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_NOTE=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E-Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. sig_obj.SIGNATURBLOCK_SMALL_DE.value.SIG_LABEL=./images/signatur-logo_de.png diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties index 434110c8..7caa4d80 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_DE_NOTE.properties @@ -15,7 +15,7 @@ sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.key.SIG_NOTE=Hinweis sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_SUBJECT=${subject.T != null ? (subject.T + " ") : ""}${subject.CN} sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_ISSUER=${issuer.T != null ? (issuer.T + " ") : ""}${issuer.CN} sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_NUMBER=${sn} -sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at\n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_META=Informationen zur Pr\u00FCfung der elektronischen Signatur finden Sie unter: https://www.signaturpruefung.gv.at \n\nInformationen zur Pr\u00FCfung des Ausdrucks finden Sie unter: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.value.SIG_NOTE=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gem\u00e4\u00df \u00A7 20 E-Government-Gesetz die Beweiskraft einer \u00f6ffentlichen Urkunde. sig_obj.SIGNATURBLOCK_SMALL_DE_NOTE.pos=f:80;w:230 diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN.properties index 82d5f42f..fab86686 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN.properties @@ -22,7 +22,7 @@ sig_obj.SIGNATURBLOCK_SMALL_EN.adobeSignFieldValue=PDF-AS Signature sig_obj.SIGNATURBLOCK_SMALL_EN.adobeSignReasonValue=Signature verification at: http://www.signature-verification.gv.at sig_obj.SIGNATURBLOCK_SMALL_EN.verifyURL=http://www.signature-verification.gv.at -sig_obj.SIGNATURBLOCK_SMALL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_SMALL_EN.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_SMALL_EN.value.SIG_LABEL=./images/signatur-logo_en.png # WAI diff --git a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties index a7c469d4..754cc082 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/SIGNATURBLOCK_SMALL_EN_NOTE.properties @@ -22,7 +22,7 @@ sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.adobeSignFieldValue=PDF-AS Signature sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.adobeSignReasonValue=Signature verification at: http://www.signature-verification.gv.at sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.verifyURL=http://www.signature-verification.gv.at -sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at\n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ +sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.value.SIG_META=Information about the verification of the electronic signature can be found at: https://www.signaturpruefung.gv.at \n\nInformation about the verification of the printout can be found at: https://www.behoerde.gv.at/el_signatur/ sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.value.SIG_LABEL=./images/signatur-logo_en.png sig_obj.SIGNATURBLOCK_SMALL_EN_NOTE.value.SIG_NOTE=This document is signed with a qualified electronic signature. According to \u00a7\u00A04 art.\u00A01 of the Signature Act it in principle is legally equivalent to an handwritten signature. diff --git a/pdf-as-lib/src/configuration/cfg/profiles/justizsignatur.properties b/pdf-as-lib/src/configuration/cfg/profiles/justizsignatur.properties index 572567b4..57fd435c 100644 --- a/pdf-as-lib/src/configuration/cfg/profiles/justizsignatur.properties +++ b/pdf-as-lib/src/configuration/cfg/profiles/justizsignatur.properties @@ -18,8 +18,8 @@ sig_obj.justizsignatur.table.main.Style.padding=4 sig_obj.justizsignatur.table.main.Style.border=0.1 sig_obj.justizsignatur.table.main.Style.halign=center sig_obj.justizsignatur.table.main.Style.valign=middle -sig_obj.justizsignatur.table.main.Style.font=ARIAL,11,BOLD -sig_obj.justizsignatur.table.main.Style.valuefont=ARIAL,11,NORMAL +sig_obj.justizsignatur.table.main.Style.font=TTF:arial.ttf,11 +sig_obj.justizsignatur.table.main.Style.valuefont=TTF:arial.ttf,11 sig_obj.justizsignatur.table.subtable.ColsWidth=1 2 sig_obj.justizsignatur.table.subtable.1=SIG_DATE-cv diff --git a/pdf-as-lib/src/configuration/fonts/arial.ttf b/pdf-as-lib/src/configuration/fonts/arial.ttf new file mode 100644 index 00000000..12cc15c8 Binary files /dev/null and b/pdf-as-lib/src/configuration/fonts/arial.ttf differ diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureBuilder.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureBuilder.java index e64d735a..cd3fd716 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureBuilder.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFAsVisualSignatureBuilder.java @@ -209,7 +209,7 @@ public class PDFAsVisualSignatureBuilder extends PDVisibleSigBuilder { } String text = (String) cell.getValue(); - float ttexty = texty - padding - fontSize; + float ttexty = texty - fontSize - padding * 0.5f; // COSName name = COSName.getPDFName("ANDI_TAG!"); // contentStream.beginMarkedContentSequence(COSName.ALT, // name); @@ -260,17 +260,18 @@ public class PDFAsVisualSignatureBuilder extends PDVisibleSigBuilder { float columnWidth = (colsSizes != null) ? colsSizes[j] : colWidth; float maxWidth = 0; for (int k = 0; k < tlines.length; k++) { - - float fwidth; + float lineWidth; if (textFont instanceof PDType1Font) { - fwidth = textFont.getFontDescriptor().getFontBoundingBox().getWidth() - / 1000.0f * fontSize; + lineWidth = textFont.getStringWidth(tlines[k]) / 1000.0f * fontSize; + //fwidth = textFont.getFontDescriptor().getFontBoundingBox().getWidth() + // / 1000.0f * fontSize; } else { - fwidth = textFont.getStringWidth("abcdefghijklmnopqrstuvwxyz ") / 1000.0f * fontSize; + float fwidth = textFont.getStringWidth("abcdefghijklmnopqrstuvwxyz ") / 1000.0f * fontSize; fwidth = fwidth / (float)"abcdefghijklmnopqrstuvwxyz".length(); + lineWidth = tlines[k].length() * fwidth; } - float lineWidth = tlines[k].length() * fwidth; + //float w = textFont.getStringWidth(tlines[k]) / 1000 * fontSize; if (maxWidth < lineWidth) { diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFBoxTable.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFBoxTable.java index da228dae..31c68ebf 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFBoxTable.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/stamping/pdfbox/PDFBoxTable.java @@ -6,7 +6,9 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; +import org.apache.fontbox.ttf.TrueTypeFont; import org.apache.pdfbox.pdmodel.font.PDFont; +import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -308,6 +310,47 @@ public class PDFBoxTable { } return v; } + + private String[] breakString(String value, float maxwidth, PDFont font, float fontSize) throws IOException { + String[] words = value.split(" "); + List lines = new ArrayList(); + String cLineValue = ""; + for (int i = 0; i < words.length; i++) { + String word = words[i]; + String[] lineBreaks = word.split("\n"); + if (lineBreaks.length > 1) { + for (int j = 0; j < lineBreaks.length; j++) { + String subword = lineBreaks[j]; + // if (cLine + subword.length() > maxline) { + if(j == 0 && word.startsWith("\n")) { + lines.add(cLineValue.trim()); + cLineValue = ""; + } else if(j != 0) { + lines.add(cLineValue.trim()); + cLineValue = ""; + } + // } + String tmpLine = cLineValue + subword; + float size = font.getStringWidth(tmpLine) / 1000.0f * fontSize; + if (size > maxwidth && cLineValue.length() != 0) { + lines.add(cLineValue.trim()); + cLineValue = ""; + } + cLineValue += subword + " "; + } + } else { + String tmpLine = cLineValue + word; + float size = font.getStringWidth(tmpLine) / 1000.0f * fontSize; + if (size > maxwidth && cLineValue.length() != 0) { + lines.add(cLineValue.trim()); + cLineValue = ""; + } + cLineValue += word + " "; + } + } + lines.add(cLineValue.trim()); + return lines.toArray(new String[0]); + } private String[] breakString(String value, int maxline) { String[] words = value.split(" "); @@ -393,11 +436,14 @@ public class PDFBoxTable { c = font.getFont(null); fontSize = font.getFontSize(); } - + /* float fwidth; if (c instanceof PDType1Font) { fwidth = c.getFontDescriptor().getFontBoundingBox().getWidth() - / 1000.0f * fontSize; + / 1000.0f * fontSize * 0.9f; + } else if (c instanceof PDTrueTypeFont) { + PDTrueTypeFont t = (PDTrueTypeFont)c; + fwidth = t.getAverageFontWidth() / 1000.0f * fontSize; } else { fwidth = c.getStringWidth("abcdefghijklmnopqrstuvwxyz ") / 1000.0f * fontSize; fwidth = fwidth / (float)"abcdefghijklmnopqrstuvwxyz".length(); @@ -405,14 +451,14 @@ public class PDFBoxTable { logger.debug("Font Width: {}", fwidth); int maxcharcount = (int) ((width - padding * 2) / fwidth) - 1; - logger.debug("Max {} chars per line!", maxcharcount); + logger.debug("Max {} chars per line!", maxcharcount); */ float fheight = c.getFontDescriptor().getFontBoundingBox() .getHeight() - / 1000 * fontSize; + / 1000 * fontSize * 0.9f; - String[] lines = breakString(string, maxcharcount); + String[] lines = breakString(string, (width - padding * 2.0f), c, fontSize); cell.setValue(concatLines(lines)); - return fheight * lines.length; + return fheight * lines.length;// - padding; case Entry.TYPE_IMAGE: if(style != null && style.getImageScaleToFit() != null) { if( style.getImageScaleToFit().getHeight() < width) { -- cgit v1.2.3