Adding F flag to make links pdf/a-1a conform

flyingsaucerproject · Mar 7, 2024 · 78ea68b · 78ea68b
1 parent 80a757b
commit 78ea68b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/flying-saucer-pdf-itext5/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java b/flying-saucer-pdf-itext5/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java
@@ -31,6 +31,7 @@
 import com.itextpdf.text.pdf.PdfDestination;
 import com.itextpdf.text.pdf.PdfImportedPage;
 import com.itextpdf.text.pdf.PdfName;
+import com.itextpdf.text.pdf.PdfNumber;
 import com.itextpdf.text.pdf.PdfOutline;
 import com.itextpdf.text.pdf.PdfReader;
 import com.itextpdf.text.pdf.PdfTextArray;
@@ -272,12 +273,7 @@ private void processLink(RenderingContext c, Box box) {
                         targetArea.setBorder(0);
                         targetArea.setBorderWidth(0);
 
-                        PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(),
-                                targetArea.getRight(), targetArea.getTop(), action);
-                        annot.put(PdfName.SUBTYPE, PdfName.LINK);
-                        annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
-                        annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
-                        _writer.addAnnotation(annot);
+                        addLinkAnnotation(action, targetArea);
                     }
                 } else {
                     int boxTop = box.getAbsY();
@@ -292,19 +288,24 @@ private void processLink(RenderingContext c, Box box) {
                         if (targetArea == null) {
                             return;
                         }
-                        PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(), targetArea.getRight(),
-                            targetArea.getTop(), action);
-                        annot.put(PdfName.SUBTYPE, PdfName.LINK);
-
-                        annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
-                        annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
-                        _writer.addAnnotation(annot);
+                        addLinkAnnotation(action, targetArea);
                     }
                 }
             }
         }
     }
 
+    private void addLinkAnnotation(final PdfAction action, final com.itextpdf.text.Rectangle targetArea) {
+        PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(),
+                targetArea.getRight(), targetArea.getTop(), action);
+        annot.put(PdfName.SUBTYPE, PdfName.LINK);
+        annot.put(PdfName.F, new PdfNumber(PdfAnnotation.FLAGS_PRINT));
+
+        annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
+        annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
+        _writer.addAnnotation(annot);
+    }
+
     public com.itextpdf.text.Rectangle createLocalTargetArea(RenderingContext c, Box box) {
         return createLocalTargetArea(c, box, false);
     }

diff --git a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java
@@ -33,6 +33,7 @@
 import com.lowagie.text.pdf.PdfImportedPage;
 import com.lowagie.text.pdf.PdfIndirectReference;
 import com.lowagie.text.pdf.PdfName;
+import com.lowagie.text.pdf.PdfNumber;
 import com.lowagie.text.pdf.PdfOutline;
 import com.lowagie.text.pdf.PdfReader;
 import com.lowagie.text.pdf.PdfString;
@@ -277,12 +278,7 @@ private void processLink(RenderingContext c, Box box) {
                             targetArea.setBorder(0);
                             targetArea.setBorderWidth(0);
 
-                            PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(),
-                                    targetArea.getRight(), targetArea.getTop(), action);
-                            annot.put(PdfName.SUBTYPE, PdfName.LINK);
-                            annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
-                            annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
-                            _writer.addAnnotation(annot);
+                            addLinkAnnotation(action, targetArea);
                         }
                     }
                 } else {
@@ -292,18 +288,23 @@ private void processLink(RenderingContext c, Box box) {
                     if (targetArea == null) {
                         return;
                     }
-                    PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(), targetArea.getRight(),
-                            targetArea.getTop(), action);
-                    annot.put(PdfName.SUBTYPE, PdfName.LINK);
-
-                    annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
-                    annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
-                    _writer.addAnnotation(annot);
+                    addLinkAnnotation(action, targetArea);
                 }
             }
         }
     }
 
+    private void addLinkAnnotation(final PdfAction action, final com.lowagie.text.Rectangle targetArea) {
+        PdfAnnotation annot = new PdfAnnotation(_writer, targetArea.getLeft(), targetArea.getBottom(),
+                targetArea.getRight(), targetArea.getTop(), action);
+        annot.put(PdfName.SUBTYPE, PdfName.LINK);
+        annot.put(PdfName.F, new PdfNumber(PdfAnnotation.FLAGS_PRINT));
+
+        annot.setBorderStyle(new PdfBorderDictionary(0.0f, 0));
+        annot.setBorder(new PdfBorderArray(0.0f, 0.0f, 0));
+        _writer.addAnnotation(annot);
+    }
+
     public com.lowagie.text.Rectangle createLocalTargetArea(RenderingContext c, Box box) {
         return createLocalTargetArea(c, box, false);
     }