Fix issues with multi flavours

Author: MaximPlusov

validation-model/src/main/java/org/verapdf/gf/model/impl/operator/markedcontent/GFOpMarkedContent.java

@@ -217,7 +217,7 @@ public int hashCode() {
 
 	private List<CosActualText> getactualText() {
 		COSString actualText = getActualText();
-		if (actualText != null && (isRealContent || !PDFFlavours.isPDFUARelatedFlavour(StaticContainers.getFlavour()))) {
+		if (actualText != null && (isRealContent || !PDFFlavours.isOnlyPDFUARelatedFlavour(StaticContainers.getFlavour()))) {
 			List<CosActualText> list = new ArrayList<>(MAX_NUMBER_OF_ELEMENTS);
 			list.add(new GFCosActualText(actualText));
 			return list;
@@ -227,7 +227,7 @@ private List<CosActualText> getactualText() {
 
 	private List<CosAlt> getalt() {
 		COSString alt = getAlt();
-		if (alt != null && (isRealContent || !PDFFlavours.isPDFUARelatedFlavour(StaticContainers.getFlavour()))) {
+		if (alt != null && (isRealContent || !PDFFlavours.isOnlyPDFUARelatedFlavour(StaticContainers.getFlavour()))) {
 			List<CosAlt> list = new ArrayList<>(MAX_NUMBER_OF_ELEMENTS);
 			list.add(new GFCosAlt(alt));
 			return list;

validation-model/src/main/java/org/verapdf/gf/model/impl/operator/textshow/GFGlyph.java

@@ -108,9 +108,9 @@ protected GFGlyph(PDFont font, int glyphCode, int renderingMode, String id,
             }
         }
         List<PDFAFlavour> flavour = StaticContainers.getFlavour();
-        if (!PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFA_1_B) && 
-                !PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFA_2_B) && 
-                !PDFFlavours.isFlavour(flavour, PDFAFlavour.PDFA_3_B)) {
+        if (!PDFFlavours.isOnlyFlavour(flavour, PDFAFlavour.PDFA_1_B) && 
+                !PDFFlavours.isOnlyFlavour(flavour, PDFAFlavour.PDFA_2_B) && 
+                !PDFFlavours.isOnlyFlavour(flavour, PDFAFlavour.PDFA_3_B)) {
             if (PDFFlavours.isPDFSpecification(flavour, PDFAFlavour.PDFSpecification.PDF_REFERENCE_1_4)) {
                 this.toUnicode = getToUnicodePDFA1(font, glyphCode);
             } else {