Support several flavours

veraPDF · Jul 30, 2024 · fe9d0f4 · fe9d0f4
1 parent 70095f5
commit fe9d0f4
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/src/main/java/org/verapdf/parser/PDFFlavour.java b/src/main/java/org/verapdf/parser/PDFFlavour.java
@@ -1,5 +1,7 @@
 package org.verapdf.parser;
 
+import java.util.List;
+
 public enum PDFFlavour {
 	NO_FLAVOUR(Specification.NO_STANDARD),
 	PDFA_1_A(Specification.ISO_19005_1),
@@ -73,11 +75,29 @@ public enum PDFSpecification {
 		ISO_32000_1_7,
 		ISO_32000_2_0
 	}
+
+	public static boolean isFlavourPDFSpecification(List<PDFFlavour> flavours, PDFSpecification pdfSpecification) {
+		for (PDFFlavour flavour : flavours) {
+			if (isFlavourPDFSpecification(flavour, pdfSpecification)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	public static boolean isFlavourPDFSpecification(PDFFlavour flavour, PDFSpecification pdfSpecification) {
 		return flavour != null && flavour.getSpecification().getPdfSpecification() == pdfSpecification;
 	}
 
+	public static boolean isFlavourFamily(List<PDFFlavour> flavours, SpecificationFamily specificationFamily) {
+		for (PDFFlavour flavour : flavours) {
+			if (isFlavourFamily(flavour, specificationFamily)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public static boolean isFlavourFamily(PDFFlavour flavour, SpecificationFamily specificationFamily) {
 		return flavour != null && flavour.getSpecification().getFamily() == specificationFamily;
 	}
@@ -86,10 +106,28 @@ public static boolean isFlavour(PDFFlavour currentFlavour, PDFFlavour flavour) {
 		return currentFlavour != null && currentFlavour == flavour;
 	}
 
+	public static boolean isFlavourPart(List<PDFFlavour> flavours, Specification specificationPart) {
+		for (PDFFlavour flavour : flavours) {
+			if (isFlavourPart(flavour, specificationPart)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public static boolean isFlavourPart(PDFFlavour flavour, Specification specificationPart) {
 		return flavour != null && flavour.getSpecification() == specificationPart;
 	}
 
+	public static boolean isPDFUA2RelatedFlavour(List<PDFFlavour> flavours) {
+		for (PDFFlavour flavour : flavours) {
+			if (isPDFUA2RelatedFlavour(flavour)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public static boolean isPDFUA2RelatedFlavour(PDFFlavour flavour) {
 		return isFlavour(flavour, PDFFlavour.PDFUA_2) || isFlavourPart(flavour, Specification.WTPDF_1_0);
 	}

diff --git a/src/main/java/org/verapdf/pd/font/cmap/CharacterCollections.java b/src/main/java/org/verapdf/pd/font/cmap/CharacterCollections.java
@@ -4,6 +4,7 @@
 import org.verapdf.tools.StaticResources;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class CharacterCollections {
@@ -138,7 +139,7 @@ public class CharacterCollections {
 	public static CIDSystemInfo getCIDSystemInfo(String cmapName) {
 		CIDSystemInfo[] cidSystemInfos = map.get(cmapName);
 		if (cidSystemInfos != null) {
-			PDFFlavour flavour = StaticResources.getFlavour();
+			List<PDFFlavour> flavour = StaticResources.getFlavour();
 			if (PDFFlavour.isFlavourPDFSpecification(flavour, PDFFlavour.PDFSpecification.PDF_REFERENCE_1_4)) {
 				return cidSystemInfos[0];
 			} else if (PDFFlavour.isFlavourPDFSpecification(flavour, PDFFlavour.PDFSpecification.ISO_32000_2_0)) {

diff --git a/src/main/java/org/verapdf/pd/structure/PDStructElem.java b/src/main/java/org/verapdf/pd/structure/PDStructElem.java
@@ -32,6 +32,8 @@
 import org.verapdf.tools.TaggedPDFHelper;
 import org.verapdf.tools.TaggedPDFRoleMapHelper;
 
+import java.util.List;
+
 /**
  * @author Maksim Bezrukov
  */
@@ -126,7 +128,7 @@ public static StructureType getStructureElementStandardStructureType(PDStructEle
 	}
 
 	public static StructureType getStructureTypeStandardStructureType(StructureType type) {
-		PDFFlavour flavour = StaticResources.getFlavour();
+		List<PDFFlavour> flavour = StaticResources.getFlavour();
 		if (PDFFlavour.isFlavourPDFSpecification(flavour, PDFFlavour.PDFSpecification.ISO_32000_2_0)) {
 			StructureType defaultStructureType = PDStructElem.getDefaultStructureType(type);
 			if (defaultStructureType != null) {
@@ -153,7 +155,7 @@ public static String getStructureElementStandardType(PDStructElem pdStructElem)
 	}
 
 	public static boolean isStandardStructureType(StructureType type) {
-		PDFFlavour flavour = StaticResources.getFlavour();
+		List<PDFFlavour> flavour = StaticResources.getFlavour();
 		boolean isStandard = false;
 		if (PDFFlavour.isFlavourPDFSpecification(flavour, PDFFlavour.PDFSpecification.ISO_32000_2_0)) {
 			isStandard = TaggedPDFHelper.isStandardType(type);

diff --git a/src/main/java/org/verapdf/tools/StaticResources.java b/src/main/java/org/verapdf/tools/StaticResources.java
@@ -31,6 +31,8 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -45,7 +47,7 @@ public class StaticResources {
 
 	private static final Logger LOGGER = Logger.getLogger(StaticResources.class.getCanonicalName());
 
-	private static final ThreadLocal<PDFFlavour> flavour = new ThreadLocal<>();
+	private static final ThreadLocal<List<PDFFlavour>> flavour = new ThreadLocal<>();
 	private static final ThreadLocal<PDDocument> document = new ThreadLocal<>();
 
 	private static final ThreadLocal<TaggedPDFRoleMapHelper> roleMapHelper = new ThreadLocal<>();
@@ -149,7 +151,7 @@ public static void clear() {
 		StaticResources.cMapCache.set(new HashMap<>());
 		StaticResources.structureNameSpaceCache.set(new HashMap<>());
 		StaticResources.cachedFonts.set(new HashMap<>());
-		StaticResources.flavour.set(null);
+		StaticResources.flavour.set(new LinkedList<>());
 		StaticResources.document.set(null);
 		StaticResources.setPassword(null);
 		StaticResources.roleMapHelper.set(null);
@@ -185,11 +187,11 @@ public static void setCachedFonts(Map<String, FontProgram> cachedFonts) {
 		StaticResources.cachedFonts.set(cachedFonts);
 	}
 
-	public static PDFFlavour getFlavour() {
+	public static List<PDFFlavour> getFlavour() {
 		return flavour.get();
 	}
 
-	public static void setFlavour(PDFFlavour flavour) {
+	public static void setFlavour(List<PDFFlavour> flavour) {
 		StaticResources.flavour.set(flavour);
 	}