Add Annot structure for markup annotations

DEVSIX-7966

Author: Dmitry Radchuk

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfPage.java

@@ -31,6 +31,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
+import com.itextpdf.kernel.pdf.annot.PdfMarkupAnnotation;
 import com.itextpdf.kernel.pdf.filespec.PdfFileSpec;
 import com.itextpdf.kernel.pdf.tagging.PdfStructTreeRoot;
 import com.itextpdf.kernel.pdf.tagging.StandardRoles;
@@ -857,6 +858,10 @@ public PdfPage addAnnotation(int index, PdfAnnotation annotation, boolean tagAnn
         if (getDocument().isTagged()) {
             if (tagAnnotation) {
                 TagTreePointer tagPointer = getDocument().getTagStructureContext().getAutoTaggingPointer();
+                if (annotation instanceof PdfMarkupAnnotation && StandardRoles.DOCUMENT.equals(tagPointer.getRole())
+                        && PdfVersion.PDF_1_4.compareTo(getDocument().getPdfVersion()) < 0) {
+                    tagPointer.addTag(StandardRoles.ANNOT);
+                }
                 PdfPage prevPage = tagPointer.getCurrentPage();
                 tagPointer.setPageForTagging(this).addAnnotationTag(annotation);
                 if (prevPage != null) {

kernel/src/test/resources/com/itextpdf/kernel/pdf/PdfDocumentTest/cmp_add_associated_files01.pdf

@@ -144,8 +144,6 @@ public void pdfUA2FileAttachmentAnnotTest() throws IOException, XMPException, In
             PdfPage pdfPage = pdfDocument.addNewPage();
             Rectangle rect = new Rectangle(100, 650, 400, 100);
             createSimplePdfUA2Document(pdfDocument);
-            TagTreePointer tagPointer = pdfDocument.getTagStructureContext().getAutoTaggingPointer();
-            tagPointer.addTag(StandardRoles.ANNOT);
             PdfFileSpec fs = PdfFileSpec.createEmbeddedFileSpec(
                     pdfDocument, "file".getBytes(StandardCharsets.UTF_8), "description", "file.txt", null, null, null);
             PdfFileAttachmentAnnotation annot = new PdfFileAttachmentAnnotation(rect, fs);
@@ -189,8 +187,6 @@ public void pdfUA2RubberStampAnnotationsTest() throws IOException, XMPException,
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
             createSimplePdfUA2Document(pdfDocument);
-            TagTreePointer tagPointer = pdfDocument.getTagStructureContext().getAutoTaggingPointer();
-            tagPointer.addTag(StandardRoles.ANNOT);
             PdfPage pdfPage = pdfDocument.addNewPage();
             PdfStampAnnotation stamp = new PdfStampAnnotation(new Rectangle(0, 0, 100, 50));
             stamp.setStampName(PdfName.Approved);
@@ -257,8 +253,6 @@ public void pdfUA2InkAnnotationsTest() throws IOException, XMPException, Interru
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
             createSimplePdfUA2Document(pdfDocument);
-            TagTreePointer tagPointer = pdfDocument.getTagStructureContext().getAutoTaggingPointer();
-            tagPointer.addTag(StandardRoles.ANNOT);
             PdfPage pdfPage = pdfDocument.addNewPage();
             PdfInkAnnotation ink = createInkAnnotation();
             pdfPage.addAnnotation(ink);
@@ -293,8 +287,6 @@ public void pdfUA2RedactionAnnotationsTest() throws IOException, XMPException, I
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
             createSimplePdfUA2Document(pdfDocument);
-            TagTreePointer tagPointer = pdfDocument.getTagStructureContext().getAutoTaggingPointer();
-            tagPointer.addTag(StandardRoles.ANNOT);
             PdfPage pdfPage = pdfDocument.addNewPage();
             PdfRedactAnnotation redact = createRedactionAnnotation();
             pdfPage.addAnnotation(redact);

kernel/src/test/resources/com/itextpdf/kernel/pdf/annot/AddMiscTypesAnnotationsTest/cmp_defaultAppearance.pdf

@@ -33,7 +33,9 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfStream;
 import com.itextpdf.kernel.pdf.PdfString;
+import com.itextpdf.kernel.pdf.PdfVersion;
 import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.pdf.WriterProperties;
 import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
 import com.itextpdf.kernel.pdf.annot.PdfFileAttachmentAnnotation;
 import com.itextpdf.kernel.pdf.annot.PdfMarkupAnnotation;
@@ -215,7 +217,7 @@ public void annotationCheckTest08() throws IOException, InterruptedException {
         String outPdf = destinationFolder + "pdfA1a_annotationCheckTest08.pdf";
         String cmpPdf = cmpFolder + "cmp_pdfA1a_annotationCheckTest08.pdf";
 
-        PdfWriter writer = new PdfWriter(outPdf);
+        PdfWriter writer = new PdfWriter(outPdf, new WriterProperties().setPdfVersion(PdfVersion.PDF_1_4));
         InputStream is = new FileInputStream(sourceFolder + "sRGB Color Space Profile.icm");
         PdfADocument doc = new PdfADocument(writer, PdfAConformanceLevel.PDF_A_1A, new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", is));
         doc.setTagged();