Move linkAnnotation inside Block-elements kids list in tag hierarchy

DEVSIX-1229

Author: LodrKumquat

layout/src/main/java/com/itextpdf/layout/renderer/BlockRenderer.java

@@ -468,7 +468,6 @@ public void draw(DrawContext drawContext) {
             logger.error(LogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED);
             return;
         }
-        applyDestinationsAndAnnotation(drawContext);
 
         PdfDocument document = drawContext.getDocument();
         boolean isTagged = drawContext.isTaggingEnabled() && getModelElement() instanceof IAccessibleElement;
@@ -500,6 +499,8 @@ public void draw(DrawContext drawContext) {
             }
         }
 
+        applyDestinationsAndAnnotation(drawContext);
+
         boolean isRelativePosition = isRelativePosition();
         if (isRelativePosition) {
             applyRelativePositioningTranslation(false);

layout/src/main/java/com/itextpdf/layout/renderer/TableRenderer.java

@@ -890,7 +890,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
      */
     @Override
     public void draw(DrawContext drawContext) {
-        applyDestinationsAndAnnotation(drawContext);
         PdfDocument document = drawContext.getDocument();
         boolean isTagged = drawContext.isTaggingEnabled() && getModelElement() instanceof IAccessibleElement;
         boolean ignoreTag = false;
@@ -915,47 +914,16 @@ public void draw(DrawContext drawContext) {
                 applyGeneratedAccessibleAttributes(tagPointer, layoutAttributes);
             }
 
-            boolean relativePosition = isRelativePosition();
-            if (relativePosition) {
-                applyRelativePositioningTranslation(false);
-            }
-
-            beginElementOpacityApplying(drawContext);
-            drawBackground(drawContext);
-            drawBorder(drawContext);
-            drawChildren(drawContext);
-            drawPositionedChildren(drawContext);
-            endElementOpacityApplying(drawContext);
-
-            if (relativePosition) {
-                applyRelativePositioningTranslation(true);
-            }
+            super.draw(drawContext);
 
             tagPointer.moveToParent();
 
             boolean toRemoveConnectionsWithTag = isLastRendererForModelElement && ((Table) getModelElement()).isComplete();
             if (toRemoveConnectionsWithTag) {
                 tagPointer.removeElementConnectionToTag(accessibleElement);
             }
-            flushed = true;
         } else {
-            boolean relativePosition = isRelativePosition();
-            if (relativePosition) {
-                applyRelativePositioningTranslation(false);
-            }
-
-            beginElementOpacityApplying(drawContext);
-            drawBackground(drawContext);
-            drawBorder(drawContext);
-            drawChildren(drawContext);
-            drawPositionedChildren(drawContext);
-            endElementOpacityApplying(drawContext);
-
-            if (relativePosition) {
-                applyRelativePositioningTranslation(true);
-            }
-
-            flushed = true;
+            super.draw(drawContext);
         }
     }