Support structure destinations for outlines

DEVSIX-7956

Author: vitali-pr

src/main/java/com/itextpdf/html2pdf/attach/impl/OutlineHandler.java

@@ -22,14 +22,15 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf.attach.impl;
 
+import com.itextpdf.commons.datastructures.Tuple2;
 import com.itextpdf.html2pdf.html.TagConstants;
 import com.itextpdf.html2pdf.logs.Html2PdfLogMessageConstant;
 import com.itextpdf.html2pdf.attach.ITagWorker;
 import com.itextpdf.html2pdf.attach.ProcessorContext;
 import com.itextpdf.commons.utils.MessageFormatUtil;
+import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfOutline;
-import com.itextpdf.kernel.pdf.PdfString;
-import com.itextpdf.kernel.pdf.navigation.PdfDestination;
+import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.layout.element.IElement;
 import com.itextpdf.layout.properties.Property;
 import com.itextpdf.styledxmlparser.node.IElementNode;
@@ -72,7 +73,7 @@ public class OutlineHandler {
     /**
      * The destinations in process.
      */
-    private Deque<String> destinationsInProcess = new LinkedList<String>();
+    private Deque<Tuple2<String, PdfDictionary>> destinationsInProcess = new LinkedList<Tuple2<String, PdfDictionary>>();
 
     /**
      * The levels in process.
@@ -241,9 +242,9 @@ OutlineHandler addOutlineAndDestToDocument(ITagWorker tagWorker, IElementNode el
             }
             PdfOutline outline = parent.addOutline(generateOutlineName(element));
             String destination = generateUniqueDestinationName(element);
-            outline.addDestination(PdfDestination.makeDestination(new PdfString(destination)));
-
-            destinationsInProcess.push(destination);
+            PdfAction action = PdfAction.createGoTo(destination);
+            outline.addAction(action);
+            destinationsInProcess.push(new Tuple2<String, PdfDictionary>(destination, action.getPdfObject()));
 
             levelsInProcess.push(level);
             currentOutline = outline;
@@ -264,7 +265,7 @@ OutlineHandler addOutlineAndDestToDocument(ITagWorker tagWorker, IElementNode el
     OutlineHandler setDestinationToElement(ITagWorker tagWorker, IElementNode element) {
         String tagName = element.name();
         if (null != tagWorker && hasTagPriorityMapping(tagName) && destinationsInProcess.size() > 0) {
-            String content = destinationsInProcess.pop();
+            Tuple2<String, PdfDictionary> content = destinationsInProcess.pop();
             if (tagWorker.getElementResult() instanceof IElement) {
                 tagWorker.getElementResult().setProperty(Property.DESTINATION, content);
             } else {

src/test/java/com/itextpdf/html2pdf/HtmlConverterPdfUA2Test.java

@@ -22,6 +22,7 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.html2pdf;
 
+import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
 import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfDocumentInfo;
@@ -108,6 +109,25 @@ public void backwardLinkTest() throws IOException, InterruptedException, XMPExce
         compareAndCheckCompliance(destinationPdf, cmpPdf, false);
     }
 
+    @Test
+    public void simpleOutlineTest() throws IOException, InterruptedException, XMPException {
+        String sourceHtml = SOURCE_FOLDER + "simpleOutline.html";
+        String destinationPdf = DESTINATION_FOLDER + "simpleOutline.pdf";
+        String cmpPdf = SOURCE_FOLDER + "cmp_simpleOutline.pdf";
+
+        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationPdf, new WriterProperties().setPdfVersion(
+                PdfVersion.PDF_2_0)));
+        createSimplePdfUA2Document(pdfDocument);
+
+        ConverterProperties converterProperties = new ConverterProperties();
+        FontProvider fontProvider = new DefaultFontProvider(false, true, false);
+        converterProperties.setFontProvider(fontProvider);
+        converterProperties.setOutlineHandler(OutlineHandler.createStandardHandler());
+        HtmlConverter.convertToPdf(new FileInputStream(sourceHtml), pdfDocument, converterProperties);
+
+        compareAndCheckCompliance(destinationPdf, cmpPdf, true);
+    }
+
     private void createSimplePdfUA2Document(PdfDocument pdfDocument) throws IOException, XMPException {
         byte[] bytes = Files.readAllBytes(Paths.get(SOURCE_FOLDER + "simplePdfUA2.xmp"));
         XMPMeta xmpMeta = XMPMetaFactory.parse(new ByteArrayInputStream(bytes));

src/test/resources/com/itextpdf/html2pdf/HtmlConverterPdfUA2Test/cmp_simpleOutline.pdf

@@ -0,0 +1,20 @@
+<html>
+<head>
+</head>
+<body>
+<H1>Top level</H1>
+<div>text</div>
+<H2>Sublevel 1</H2>
+<div>text</div>
+<H4>Sublevel 1.1</H4>
+<div>text</div>
+<H4>Sublevel 1.2</H4>
+<div>text</div>
+<H2>Sublevel 2</H2>
+<div>text</div>
+<H4>Sublevel 2.1</H4>
+<div>text</div>
+<H4>Sublevel 2.2</H4>
+<div>text</div>
+</body>
+</html>