From 5c779906d627f28cc77b1fa3bbff24c111b2fcb4 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Thu, 22 Oct 2026 19:22:04 +0200 Subject: [PATCH 1/2] [FOP-3365] Update endDocument to manage ParentTreeNextKey Add support for updating ParentTreeNextKey in logical structure. --- .../org/apache/fop/render/pdf/PDFDocumentHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java index c81bbc50bea..0d8f20126e7 100644 --- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java +++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFDocumentHandler.java @@ -206,6 +206,16 @@ public void endDocumentHeader() throws IFException { public void endDocument() throws IFException { documentNavigationHandler.registerIncompleteActions(); pdfDoc.getResources().addFonts(pdfDoc, fontInfo); + + if (logicalStructureHandler != null) { + int nextParentTreeKey = logicalStructureHandler.getNextParentTreeKey(); + if (nextParentTreeKey != -1) { + PDFStructTreeRoot structTreeRoot = pdfDoc.getRoot().getStructTreeRoot(); + if (structTreeRoot != null) { + structTreeRoot.put("ParentTreeNextKey", nextParentTreeKey); + } + } + } try { if (pdfDoc.isLinearizationEnabled()) { generator.flushPDFDoc(); From fe45a14f125e6e7cdbdec7e53d920afcb94db040 Mon Sep 17 00:00:00 2001 From: Tilman Hausherr Date: Thu, 22 Oct 2026 19:24:06 +0200 Subject: [PATCH 2/2] Add assertion for parent tree next key Add assertion to verify parent tree next key in PDF document. --- .../fop/accessibility/fo/FO2StructureTreeConverterTestCase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java index 5350fb560c7..a671c226b9b 100644 --- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java @@ -327,6 +327,8 @@ public void testMultipleStaticContentArtifact() throws FOPException, assertEquals("P", markedContents.get(3).getTag()); assertEquals("B", markedContents.get(3).getContents().get(0).toString()); + + assertEquals(2, pdfDocument.getDocumentCatalog().getStructureTreeRoot().getParentTreeNextKey()); } }