Use tag repairing mechanism

DEVSIX-8862

Author: guustysebie

src/main/java/com/itextpdf/html2pdf/attach/impl/tags/UlOlTagWorker.java

@@ -29,7 +29,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.css.CssConstants;
 import com.itextpdf.html2pdf.html.AttributeConstants;
 import com.itextpdf.layout.IPropertyContainer;
-import com.itextpdf.layout.element.AnonymousBox;
+import com.itextpdf.layout.element.AnonymousInlineBox;
 import com.itextpdf.layout.element.IBlockElement;
 import com.itextpdf.layout.element.ILeafElement;
 import com.itextpdf.layout.element.List;
@@ -139,11 +139,12 @@ public IPropertyContainer getElementResult() {
      * Processes an unlabeled list item.
      */
     private void processUnlabeledListItem() {
-        AnonymousBox ab = new AnonymousBox();
+        AnonymousInlineBox ab = new AnonymousInlineBox();
         inlineHelper.flushHangingLeaves(ab);
-        if (ab.getChildren().size() > 0) {
-            addUnlabeledListItem(ab);
+        if (ab.getChildren().isEmpty()) {
+            return;
         }
+        addUnlabeledListItem(ab);
     }
 
     /**

src/main/java/com/itextpdf/html2pdf/attach/util/WaitingInlineElementsHelper.java

@@ -29,7 +29,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.tagging.StandardRoles;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.IPropertyContainer;
-import com.itextpdf.layout.element.AnonymousBox;
+import com.itextpdf.layout.element.AnonymousInlineBox;
 import com.itextpdf.layout.element.Cell;
 import com.itextpdf.layout.element.Div;
 import com.itextpdf.layout.element.IBlockElement;
@@ -135,7 +135,7 @@ public void addAll(Collection<ILeafElement> collection) {
      * @param container a container element
      */
     public void flushHangingLeaves(IPropertyContainer container) {
-        AnonymousBox ab = createLeavesContainer();
+        AnonymousInlineBox ab = createLeavesContainer();
         if (ab != null) {
             Map<String, String> map = new HashMap<>();
             map.put(CssConstants.OVERFLOW, CommonCssConstants.VISIBLE);
@@ -173,34 +173,34 @@ public void flushHangingLeaves(IPropertyContainer container) {
     /**
      * Creates the leaves container.
      *
-     * @return an {@link AnonymousBox}
+     * @return an {@link AnonymousInlineBox}
      */
-    private AnonymousBox createLeavesContainer() {
+    private AnonymousInlineBox createLeavesContainer() {
         if (collapseSpaces) {
             waitingLeaves = TrimUtil.trimLeafElementsAndSanitize(waitingLeaves);
         }
         capitalize(waitingLeaves);
 
-        if (waitingLeaves.size() > 0) {
-            AnonymousBox ab = new AnonymousBox();
-            boolean runningElementsOnly = true;
-            for (IElement leaf : waitingLeaves) {
-                if (leaf instanceof ILeafElement) {
-                    runningElementsOnly = false;
-                    ab.add((ILeafElement) leaf);
-                } else if (leaf instanceof IBlockElement) {
-                    runningElementsOnly = runningElementsOnly && leaf instanceof RunningElement;
-                    ab.add((IBlockElement) leaf);
-                }
-            }
-            if (runningElementsOnly) {
-                // TODO DEVSIX-7008 Remove completely empty tags from logical structure of resultant PDF documents
-                ab.getAccessibilityProperties().setRole(StandardRoles.ARTIFACT);
-            }
-            return ab;
-        } else {
+        if (waitingLeaves.isEmpty()) {
             return null;
         }
+        AnonymousInlineBox ab = new AnonymousInlineBox();
+        ab.getAccessibilityProperties().setRole(StandardRoles.P);
+        boolean runningElementsOnly = true;
+        for (IElement leaf : waitingLeaves) {
+            if (leaf instanceof ILeafElement) {
+                runningElementsOnly = false;
+                ab.add((ILeafElement) leaf);
+            } else if (leaf instanceof IBlockElement) {
+                runningElementsOnly = runningElementsOnly && leaf instanceof RunningElement;
+                ab.add((IBlockElement) leaf);
+            }
+        }
+        if (runningElementsOnly) {
+            // TODO DEVSIX-7008 Remove completely empty tags from logical structure of resultant PDF documents
+            ab.getAccessibilityProperties().setRole(StandardRoles.ARTIFACT);
+        }
+        return ab;
     }
 
     /**

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

@@ -129,26 +129,26 @@ public void langAttrEmptyTagTest() throws IOException {
                 .moveToRoot()
                 .moveToKid(1)
                 .moveToKid(0)
-                .moveToKid(StandardRoles.P);
+                .moveToKid(StandardRoles.LBL);
         Assertions.assertEquals("", tagPointer.getProperties().getLanguage());
 
         tagPointer
                 .moveToRoot()
-                .moveToKid(3)
-                .moveToKid(0)
-                .moveToKid(StandardRoles.P);
+                .moveToKid(1)
+                .moveToKid(2)
+                .moveToKid(StandardRoles.LBL);
         Assertions.assertEquals("", tagPointer.getProperties().getLanguage());
 
         tagPointer
                 .moveToRoot()
-                .moveToKid(4)
+                .moveToKid(2)
                 .moveToKid(0)
                 .moveToKid(StandardRoles.TD);
         Assertions.assertEquals("", tagPointer.getProperties().getLanguage());
 
         tagPointer
                 .moveToRoot()
-                .moveToKid(4)
+                .moveToKid(2)
                 .moveToKid(1)
                 .moveToKid(StandardRoles.TD);
         Assertions.assertEquals("", tagPointer.getProperties().getLanguage());
@@ -254,7 +254,7 @@ public void langAttrInSvgForTaggedPdfTest() throws IOException {
 
         tagPointer
                 .moveToRoot()
-                .moveToKid(2, StandardRoles.P)
+                .moveToKid(3, StandardRoles.P)
                 .moveToKid(StandardRoles.FIGURE);
         Assertions.assertEquals("ru", tagPointer.getProperties().getLanguage());
 
@@ -324,6 +324,7 @@ public void langAttrInListWithBeforeStyleForTaggedPdfTest() throws IOException {
                 .moveToKid(0, StandardRoles.LBODY);
         Assertions.assertEquals("de", tagPointer.getProperties().getLanguage());
 
+        tagPointer.moveToKid(0, StandardRoles.P);
         List<String> kidsRoles = tagPointer.getKidsRoles();
         Assertions.assertTrue(StandardRoles.SPAN.equals(kidsRoles.get(0))
                 && StandardRoles.SPAN.equals(kidsRoles.get(1)));