Fix PDF/UA property prefix and improve the bad XML generation fix

danfickle · Mar 4, 2021 · 19e9ec7 · 19e9ec7
1 parent 1437eb8
commit 19e9ec7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxRenderer.java b/openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxRenderer.java
@@ -804,7 +804,8 @@ private void addPdfASchema(PDDocument document, PdfAConformance pdfAConformance,
                 XMPSchema pdfUa = createPdfaSchema("PDF/UA Universal Accessibility Schema", "http://www.aiim.org/pdfua/ns/id/", "pdfuaid" , pdfUaProperties);
                 pdfAExt.addBagValue("schemas", pdfUa);
                 pdfAExt.addNamespace("http://www.aiim.org/pdfua/ns/id/", "pdfuaid");
-                pdfAExt.setTextPropertyValue("pdfuaid:part", "1");
+                pdfAExt.setPrefix("pdfuaid");
+                pdfAExt.setTextPropertyValue("part", "1");
             }
 
             PDMetadata metadataStream = new PDMetadata(document);
@@ -825,9 +826,8 @@ private void addPdfASchema(PDDocument document, PdfAConformance pdfAConformance,
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             serializer.serialize(metadata, baos, true);
             String xmp = baos.toString("UTF-8");
-            // Fixes for bad XML generation
-            xmp = xmp.replace("lang=", "xml:lang=");
-            xmp = xmp.replace("pdfaExtension:pdfuaid:part", "pdfuaid:part");
+            // Fix for bad XML generation by some transformers
+            xmp = xmp.replace(" lang=\"x-default\"", " xml:lang=\"x-default\"");
             metadataStream.importXMPMetadata(xmp.getBytes(StandardCharsets.UTF_8));
 
             if (_colorProfile != null) {