From 61e58cb3fd2acef92ec94e150612aeea7a8aef92 Mon Sep 17 00:00:00 2001 From: Maxim Date: Mon, 2 Mar 2026 17:20:26 +0300 Subject: [PATCH] PDF/A-4. Add new flavours --- .../metadata/fixer/gf/impl/model/MetadataImpl.java | 8 ++++---- .../main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java index 24059fbd3..254d83d38 100644 --- a/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java +++ b/metadata-fixer/src/main/java/org/verapdf/metadata/fixer/gf/impl/model/MetadataImpl.java @@ -168,7 +168,7 @@ public void checkAndFixPDFAPrefixes(MetadataFixerResultImpl.Builder resultBuilde if (!PDFFlavours.isFlavourPart(flavour, PDFAFlavour.Specification.ISO_19005_1)) { fixPropertyPrefix(resultBuilder, VeraPDFMeta.CORR, XMPConst.NS_PDFA_ID, VeraPDFMeta.PDFAID_PREFIX); } - } else if (PDFFlavours.isFlavourPart(flavour, PDFAFlavour.Specification.ISO_19005_4)) { + } else if (PDFFlavours.isPDFA4RelatedFlavour(flavour)) { fixPropertyPrefix(resultBuilder, VeraPDFMeta.PART, XMPConst.NS_PDFA_ID, VeraPDFMeta.PDFAID_PREFIX); fixPropertyPrefix(resultBuilder, VeraPDFMeta.REVISION_YEAR, XMPConst.NS_PDFA_ID, VeraPDFMeta.PDFAID_PREFIX); } @@ -278,7 +278,7 @@ private boolean addPropertyDefinition(MetadataFixerResultImpl.Builder resultBuil public void addPDFAIdentificationSchema(MetadataFixerResultImpl.Builder resultBuilder, PDFAFlavour flavour) { int part = flavour.getPart().getPartNumber(); - String conformance = !PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFA_4) ? flavour.getLevel().getCode().toUpperCase() : null; + String conformance = (!PDFFlavours.isPDFA4RelatedFlavour(flavour)) ? flavour.getLevel().getCode().toUpperCase() : null; boolean isBadPart = true; boolean isMissingPart = false; try { @@ -311,7 +311,7 @@ public void addPDFAIdentificationSchema(MetadataFixerResultImpl.Builder resultBu } private void fixRevProperty(MetadataFixerResultImpl.Builder resultBuilder, PDFAFlavour flavour) { - if (!PDFFlavours.isFlavourPart(flavour, PDFAFlavour.Specification.ISO_19005_4) && + if (!PDFFlavours.isPDFA4RelatedFlavour(flavour) && !PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFUA_2)) { return; } @@ -354,7 +354,7 @@ private static int confToInt(String conf) { private boolean isWrongPDFAIdentification(PDFAFlavour flavour) { try { int part = flavour.getPart().getPartNumber(); - String conformance = !PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFA_4) ? flavour.getLevel().getCode().toUpperCase() : null; + String conformance = (!PDFFlavours.isPDFA4RelatedFlavour(flavour)) ? flavour.getLevel().getCode().toUpperCase() : null; Integer schemaPart = this.metadata.getPDFAIdentificationPart(); String schemaConformance = this.metadata.getPDFAIdentificationConformance(); return schemaPart != part || diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java index 4bc096c7d..8e5af44bb 100644 --- a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java +++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDPage.java @@ -167,7 +167,7 @@ private List getOutputIntents() { } private OutputIntents parseOutputIntents() { - if (!PDFFlavours.isFlavourPart(StaticContainers.getFlavour(), PDFAFlavour.Specification.ISO_19005_4)) { + if (!PDFFlavours.isPDFA4RelatedFlavour(StaticContainers.getFlavour())) { return null; } List outInts = ((org.verapdf.pd.PDPage) this.simplePDObject).getOutputIntents();