From 90c59363e5dd9756060a8aaf5b4af5cbf99e5bbb Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Sat, 25 Apr 2026 14:54:49 +0300 Subject: [PATCH 1/2] Add constant SUBSET_REGEX --- src/main/java/org/verapdf/pd/font/PDFont.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/verapdf/pd/font/PDFont.java b/src/main/java/org/verapdf/pd/font/PDFont.java index 20edf321..d2ca6987 100644 --- a/src/main/java/org/verapdf/pd/font/PDFont.java +++ b/src/main/java/org/verapdf/pd/font/PDFont.java @@ -47,6 +47,8 @@ public abstract class PDFont extends PDResource { private static final Logger LOGGER = Logger.getLogger(PDFont.class.getCanonicalName()); + public static final String SUBSET_REGEX = "^[A-Z]{6}+.+"; + protected COSDictionary dictionary; protected PDFontDescriptor fontDescriptor; protected PDCMap toUnicodeCMap; @@ -78,7 +80,7 @@ public PDFont(COSDictionary dictionary) { fontDescriptor = new PDFontDescriptor(null); } this.fontName = this.dictionary.getNameKeyUnicodeValue(ASAtom.BASE_FONT); - this.fontNameWithoutSubset = fontName != null ? (fontName.matches("^[A-Z]{6}+.+") ? fontName.substring(7) : fontName) : null; + this.fontNameWithoutSubset = fontName != null ? (fontName.matches(SUBSET_REGEX) ? fontName.substring(7) : fontName) : null; if (!(this instanceof PDType3Font)) { this.boundingBox = fontDescriptor.getFontBoundingBox(); if (this.boundingBox == null) { From 08c27a3d6e464cfa180d876fb6dd43c6986c89b7 Mon Sep 17 00:00:00 2001 From: Kakhnovich Raman Date: Sat, 25 Apr 2026 15:03:14 +0300 Subject: [PATCH 2/2] Update PDFont.java --- src/main/java/org/verapdf/pd/font/PDFont.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/verapdf/pd/font/PDFont.java b/src/main/java/org/verapdf/pd/font/PDFont.java index d2ca6987..70e386f8 100644 --- a/src/main/java/org/verapdf/pd/font/PDFont.java +++ b/src/main/java/org/verapdf/pd/font/PDFont.java @@ -47,7 +47,7 @@ public abstract class PDFont extends PDResource { private static final Logger LOGGER = Logger.getLogger(PDFont.class.getCanonicalName()); - public static final String SUBSET_REGEX = "^[A-Z]{6}+.+"; + public static final String SUBSET_REGEX = "^[A-Z]{6}\\+.+"; protected COSDictionary dictionary; protected PDFontDescriptor fontDescriptor;