Add page numbers in marked content and set PDF as marked

Kozea · Oct 10, 2022 · d275dac · d275dac
1 parent ab914a5
commit d275dac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/docs/first_steps.rst b/docs/first_steps.rst
@@ -11,7 +11,7 @@ WeasyPrint |version| depends on:
 
 * Python_ ≥ 3.7.0
 * Pango_ ≥ 1.44.0
-* pydyf_ ≥ 0.3.0
+* pydyf_ ≥ 0.4.0
 * CFFI_ ≥ 0.6
 * html5lib_ ≥ 1.1
 * tinycss2_ ≥ 1.0.0

diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ requires-python = '>=3.7'
 readme = {file = 'README.rst', content-type = 'text/x-rst'}
 license = {file = 'LICENSE'}
 dependencies = [
-  'pydyf >=0.3.0',
+  'pydyf >=0.4.0',
   'cffi >=0.6',
   'html5lib >=1.1',
   'tinycss2 >=1.0.0',

diff --git a/weasyprint/pdf/__init__.py b/weasyprint/pdf/__init__.py
@@ -208,8 +208,7 @@ def _create_bookmarks(bookmarks, pdf, parent=None):
     count = len(bookmarks)
     outlines = []
     for title, (page, x, y), children, state in bookmarks:
-        destination = pydyf.Array((
-            pdf.objects[pdf.pages['Kids'][page*3]].reference, '/XYZ', x, y, 0))
+        destination = pydyf.Array((pdf.pages['Kids'][page], '/XYZ', x, y, 0))
         outline = pydyf.Dictionary({
             'Title': pydyf.String(title), 'Dest': destination})
         pdf.add_object(outline)

diff --git a/weasyprint/pdf/pdfua.py b/weasyprint/pdf/pdfua.py
@@ -62,6 +62,7 @@ def pdfua(pdf, metadata, document, page_streams):
                         'Type': '/StructElem',
                         'S': f'/{key}',
                         'K': pydyf.Array(kids),
+                        'Pg': pdf.pages['Kids'][page_number],
                     })
                     pdf.add_object(child)
                     if key == 'LI':
@@ -73,6 +74,7 @@ def pdfua(pdf, metadata, document, page_streams):
                             'Type': '/StructElem',
                             'S': f'/{sub_key}',
                             'K': pydyf.Array(kids),
+                            'Pg': pdf.pages['Kids'][page_number],
                             'P': child.reference,
                         })
                         pdf.add_object(real_child)
@@ -115,6 +117,7 @@ def pdfua(pdf, metadata, document, page_streams):
     pdf.catalog['ViewerPreferences'] = pydyf.Dictionary({
         'DisplayDocTitle': 'true',
     })
+    pdf.catalog['MarkInfo'] = pydyf.Dictionary({'Marked': 'true'})
 
 
 VARIANTS = {'pdf/ua-1': (pdfua, {'mark': True})}