weasyprint 65.1__py3-none-any.whl → 67.0__py3-none-any.whl

weasyprint/layout/preferred.py

@@ -12,6 +12,9 @@ import sys
 from functools import cache
 from math import inf
 
+from ..css import resolve_math
+from ..css.functions import check_math
+from ..css.validation import validate_non_shorthand
 from ..formatting_structure import boxes
 from ..text.line_break import can_break_text, split_first_line
 from .replaced import default_image_sizing
@@ -90,7 +93,7 @@ def max_content_width(context, box, outer=True):
 def _block_content_width(context, box, function, outer):
     """Helper to create ``block_*_content_width.``"""
     width = box.style['width']
-    if width == 'auto' or width.unit == '%':
+    if width == 'auto' or check_math(width) or width.unit == '%':
         # "percentages on the following properties are treated instead as
         # though they were the following: width: auto"
         # https://dbaron.org/css/intrinsic/#outer-intrinsic
@@ -99,7 +102,7 @@ def _block_content_width(context, box, function, outer):
             if not child.is_absolutely_positioned()]
         width = max(children_widths) if children_widths else 0
     else:
-        assert width.unit == 'px'
+        assert width.unit.lower() == 'px'
         width = width.value
 
     return adjust(box, outer, width)
@@ -109,11 +112,13 @@ def min_max(box, width):
     """Get box width from given width and box min- and max-widths."""
     min_width = box.style['min_width']
     max_width = box.style['max_width']
-    if min_width == 'auto' or min_width.unit == '%':
+    min_pending = check_math(min_width)
+    max_pending = check_math(max_width)
+    if min_width == 'auto' or min_pending or min_width.unit == '%':
         min_width = 0
     else:
         min_width = min_width.value
-    if max_width == 'auto' or max_width.unit == '%':
+    if max_width == 'auto' or max_pending or max_width.unit == '%':
         max_width = inf
     else:
         max_width = max_width.value
@@ -123,10 +128,12 @@ def min_max(box, width):
             1, box.style['font_size'])
         if ratio is not None:
             min_height = box.style['min_height']
-            if min_height != 'auto' and min_height.unit != '%':
-                min_width = max(min_width, min_height.value * ratio)
             max_height = box.style['max_height']
-            if max_height != 'auto' and max_height.unit != '%':
+            min_pending = check_math(min_height)
+            max_pending = check_math(max_height)
+            if min_height != 'auto' and not min_pending and min_height.unit != '%':
+                min_width = max(min_width, min_height.value * ratio)
+            if max_height != 'auto' and not min_pending and max_height.unit != '%':
                 max_width = min(max_width, max_height.value * ratio)
 
     return max(min_width, min(width, max_width))
@@ -146,7 +153,7 @@ def margin_width(box, width, left=True, right=True):
     ):
         style_value = box.style[value]
         if style_value != 'auto':
-            if style_value.unit == 'px':
+            if style_value.unit.lower() == 'px':
                 width += style_value.value
             else:
                 assert style_value.unit == '%'
@@ -236,7 +243,7 @@ def column_group_content_width(context, box):
     if width == 'auto' or width.unit == '%':
         width = 0
     else:
-        assert width.unit == 'px'
+        assert width.unit.lower() == 'px'
         width = width.value
 
     return adjust(box, False, width)
@@ -270,37 +277,51 @@ def table_cell_min_max_content_width(context, box, outer=True):
 
 def inline_line_widths(context, box, outer, is_line_start, minimum, skip_stack=None,
                        first_line=False):
-    if isinstance(box, boxes.LineBox) and box.style['text_indent'].unit != '%':
-        text_indent = box.style['text_indent'].value
-    else:
-        text_indent = 0
-
+    """Yield line width for each line."""
+
+    # Set text indent.
+    text_indent = 0
+    if isinstance(box, boxes.LineBox):
+        indent_token = box.style['text_indent']
+        if check_math(indent_token):
+            # Ignore percentages by setting refer_to to 0.
+            result = resolve_math(indent_token, box.style, 'text_indent', refer_to=0)
+            value = validate_non_shorthand((result,), 'text-indent')[0][1]
+            if value and value.unit != '%':
+                text_indent = value.value
+        elif indent_token.unit != '%':
+            text_indent = box.style['text_indent'].value
+
+    # Yield widths for each line.
     current_line = 0
     if skip_stack is None:
         skip = 0
     else:
         (skip, skip_stack), = skip_stack.items()
     for child in box.children[skip:]:
+        # Skip absolutely positioned elements.
         if child.is_absolutely_positioned():
-            continue  # Skip
+            continue
 
+        # None is used in "lines" to track line breaks, transformed to 0 when yielded.
         if isinstance(child, boxes.InlineBox):
+            # Inline box, call function recursively.
             lines = inline_line_widths(
-                context, child, outer, is_line_start, minimum, skip_stack,
-                first_line)
+                context, child, outer, is_line_start, minimum, skip_stack, first_line)
             if first_line:
-                lines = [next(lines)]
+                lines = [next(lines) or None]
             else:
-                lines = list(lines)
+                lines = [line or None for line in lines]
             if len(lines) == 1:
-                lines[0] = adjust(child, outer, lines[0])
+                lines[0] = adjust(child, outer, lines[0] or 0)
             else:
-                lines[0] = adjust(child, outer, lines[0], right=False)
-                lines[-1] = adjust(child, outer, lines[-1], left=False)
+                lines[0] = adjust(child, outer, lines[0] or 0, right=False) or None
+                lines[-1] = adjust(child, outer, lines[-1] or 0, left=False) or None
         elif isinstance(child, boxes.TextBox):
-            space_collapse = child.style['white_space'] in (
-                'normal', 'nowrap', 'pre-line')
-            text_wrap = child.style['white_space'] in ('normal', 'pre-wrap', 'pre-line')
+            # Text box, split into lines.
+            white_space = child.style['white_space']
+            space_collapse = white_space in ('normal', 'nowrap', 'pre-line')
+            text_wrap = white_space in ('normal', 'pre-wrap', 'pre-line')
             if skip_stack is None:
                 skip = 0
             else:
@@ -318,18 +339,21 @@ def inline_line_widths(context, box, outer, is_line_start, minimum, skip_stack=N
                     child_text[resume_index:].decode(), child.style, context, max_width,
                     child.justification_spacing, is_line_start=is_line_start,
                     minimum=True)
-                lines.append(width)
+                lines.append(width or None)
                 if first_line:
                     break
             if first_line and new_resume_index:
-                current_line += lines[0]
+                # We only need the first line, break early.
+                current_line += lines[0] or 0
                 break
             # TODO: use the real next character instead of 'a' to detect line breaks.
-            can_break = can_break_text(
-                child_text.decode()[-1:] + 'a', child.style['lang'])
+            last_letter = child_text.decode()[-1:]
+            can_break = can_break_text(last_letter + 'a', child.style['lang'])
             if minimum and text_wrap and can_break:
-                lines.append(0)
+                # Add all possible line breaks for minimal width.
+                lines.append(None)
         else:
+            # Replaced elements, inline blocks…
             # https://www.w3.org/TR/css-text-3/#overflow-wrap
             # "The line breaking behavior of a replaced element
             #  or other atomic inline is equivalent to that
@@ -338,20 +362,20 @@ def inline_line_widths(context, box, outer, is_line_start, minimum, skip_stack=N
             # "By default, there is a break opportunity
             #  both before and after any inline object."
             if minimum:
-                lines = [0, min_content_width(context, child), 0]
+                lines = [None, min_content_width(context, child), None]
             else:
                 lines = [max_content_width(context, child)]
-        # The first text line goes on the current line
-        current_line += lines[0]
+        # The first text line goes on the current line.
+        current_line += lines[0] or 0
         if len(lines) > 1:
-            # Forced line break
+            # Forced line break(s).
             yield current_line + text_indent
             text_indent = 0
             if len(lines) > 2:
                 for line in lines[1:-1]:
-                    yield line
-            current_line = lines[-1]
-        is_line_start = lines[-1] == 0
+                    yield line or 0
+            current_line = lines[-1] or 0
+        is_line_start = lines[-1] is None
         skip_stack = None
     yield current_line + text_indent
 
@@ -362,15 +386,18 @@ def _percentage_contribution(box):
     https://dbaron.org/css/intrinsic/#pct-contrib
 
     """
+    min_width = box.style['min_width']
     min_width = (
-        box.style['min_width'].value if box.style['min_width'] != 'auto' and
-        box.style['min_width'].unit == '%' else 0)
+        min_width.value if min_width != 'auto' and
+        not check_math(min_width) and min_width.unit == '%' else 0)
+    max_width = box.style['max_width']
     max_width = (
-        box.style['max_width'].value if box.style['max_width'] != 'auto' and
-        box.style['max_width'].unit == '%' else inf)
+        max_width.value if max_width != 'auto' and
+        not check_math(max_width) and max_width.unit == '%' else inf)
+    width = box.style['width']
     width = (
-        box.style['width'].value if box.style['width'] != 'auto' and
-        box.style['width'].unit == '%' else 0)
+        width.value if width != 'auto' and
+        not check_math(width) and width.unit == '%' else 0)
     return max(min_width, min(width, max_width))
 
 
@@ -548,6 +575,7 @@ def table_and_columns_preferred_widths(context, box, outer=True):
         for cell in zipped_grid[i]:
             if (cell and cell.colspan == 1 and
                     cell.style['width'] != 'auto' and
+                    not check_math(cell.style['width']) and
                     cell.style['width'].unit != '%'):
                 constrainedness[i] = True
                 break
@@ -618,7 +646,7 @@ def table_and_columns_preferred_widths(context, box, outer=True):
             sum(max_content_widths), large_percentage_contribution,
             *small_percentage_contributions]))
 
-    if table.style['width'] != 'auto' and table.style['width'].unit == 'px':
+    if table.style['width'] != 'auto' and table.style['width'].unit.lower() == 'px':
         # "percentages on the following properties are treated instead as
         # though they were the following: width: auto"
         # https://dbaron.org/css/intrinsic/#outer-intrinsic
@@ -656,10 +684,9 @@ def replaced_min_content_width(box, outer=True):
         if height == 'auto' or height.unit == '%':
             height = 'auto'
         else:
-            assert height.unit == 'px'
+            assert height.unit.lower() == 'px'
             height = height.value
-        if (box.style['max_width'] != 'auto' and
-                box.style['max_width'].unit == '%'):
+        if box.style['max_width'] != 'auto' and box.style['max_width'].unit == '%':
             # See https://drafts.csswg.org/css-sizing/#intrinsic-contribution
             width = 0
         else:
@@ -667,17 +694,14 @@ def replaced_min_content_width(box, outer=True):
             intrinsic_width, intrinsic_height, intrinsic_ratio = (
                 image.get_intrinsic_size(
                     box.style['image_resolution'], box.style['font_size']))
-            if intrinsic_ratio and not intrinsic_width and not intrinsic_height:
-                width = 0
-            else:
-                width, _ = default_image_sizing(
-                    intrinsic_width, intrinsic_height, intrinsic_ratio, 'auto',
-                    height, default_width=300, default_height=150)
+            width, _ = default_image_sizing(
+                intrinsic_width, intrinsic_height, intrinsic_ratio, 'auto',
+                height, default_width=0, default_height=0)
     elif box.style['width'].unit == '%':
         # See https://drafts.csswg.org/css-sizing/#intrinsic-contribution
         width = 0
     else:
-        assert width.unit == 'px'
+        assert width.unit.lower() == 'px'
         width = width.value
     return adjust(box, outer, width)
 
@@ -690,7 +714,7 @@ def replaced_max_content_width(box, outer=True):
         if height == 'auto' or height.unit == '%':
             height = 'auto'
         else:
-            assert height.unit == 'px'
+            assert height.unit.lower() == 'px'
             height = height.value
         image = box.replacement
         intrinsic_width, intrinsic_height, intrinsic_ratio = (
@@ -703,7 +727,7 @@ def replaced_max_content_width(box, outer=True):
         # See https://drafts.csswg.org/css-sizing/#intrinsic-contribution
         width = 0
     else:
-        assert width.unit == 'px'
+        assert width.unit.lower() == 'px'
         width = width.value
     return adjust(box, outer, width)
 
@@ -743,17 +767,30 @@ def trailing_whitespace_size(context, box):
     """Return the size of the trailing whitespace of ``box``."""
     from .inline import split_first_line, split_text_box
 
+    # Find last box child, keep last parent to remove nested trailing spaces.
+    last_parent = None
     while isinstance(box, (boxes.InlineBox, boxes.LineBox)):
         if not box.children:
             return 0
-        box = box.children[-1]
-    if not (isinstance(box, boxes.TextBox) and box.text and
-            box.style['white_space'] in ('normal', 'nowrap', 'pre-line')):
+        last_parent, box = box, box.children[-1]
+
+    # Return early if possible.
+    if not isinstance(box, boxes.TextBox) or not box.text:
+        # There’s no text in last child.
         return 0
-    stripped_text = box.text.rstrip(' ')
-    if box.style['font_size'] == 0 or len(stripped_text) == len(box.text):
+    elif box.style['white_space'] not in ('normal', 'nowrap', 'pre-line'):
+        # Spaces don’t collapse.
         return 0
-    if stripped_text:
+    elif box.style['font_size'] == 0:
+        # Trailing spaces take no space.
+        return 0
+    elif not box.text.endswith(' '):
+        # No trailing space.
+        return 0
+
+    # Strip text.
+    if stripped_text := box.text.rstrip(' '):
+        # Stripped text is not empty, calculate width difference.
         resume = 0
         while resume is not None:
             old_resume = resume
@@ -763,12 +800,17 @@ def trailing_whitespace_size(context, box):
         stripped_box, resume, _ = split_text_box(
             context, stripped_box, None, old_resume)
         if stripped_box is None:
-            # old_box split just before the trailing spaces
+            # Old box is split just before the trailing spaces.
             return old_box.width
         else:
+            # Return difference between old width and stripped width.
             assert resume is None
             return old_box.width - stripped_box.width
     else:
+        # Stripped text is empty, render spaces to get width.
         _, _, _, width, _, _ = split_first_line(
             box.text, box.style, context, None, box.justification_spacing)
+        # Remove possible trailing spaces from previous child.
+        if last_parent and len(last_parent.children) >= 2:
+            width += trailing_whitespace_size(context, last_parent.children[-2])
         return width

weasyprint/layout/replaced.py

@@ -117,8 +117,8 @@ def replacedbox_layout(box):
     ref_x = box.width - draw_width
     ref_y = box.height - draw_height
 
-    position_x = percentage(position_x, ref_x)
-    position_y = percentage(position_y, ref_y)
+    position_x = percentage(position_x, box.style, ref_x)
+    position_y = percentage(position_y, box.style, ref_y)
     if origin_x == 'right':
         position_x = ref_x - position_x
     if origin_y == 'bottom':
@@ -281,10 +281,13 @@ def block_replaced_box_layout(context, box, containing_block):
         block_replaced_width(box, containing_block)
         replaced_box_height(box)
 
-    # Don't collide with floats
-    # https://www.w3.org/TR/CSS21/visuren.html#floats
-    box.position_x, box.position_y, _ = avoid_collisions(
-        context, box, containing_block, outer=False)
+    # TODO: flex items shouldn't be block boxes, this condition
+    # would then be useless when this is fixed.
+    if not box.is_flex_item:
+        # Don't collide with floats
+        # https://www.w3.org/TR/CSS21/visuren.html#floats
+        box.position_x, box.position_y, _ = avoid_collisions(
+            context, box, containing_block, outer=False)
     resume_at = None
     next_page = {'break': 'any', 'page': None}
     adjoining_margins = []

weasyprint/layout/table.py

@@ -2,7 +2,7 @@
 
 from math import inf
 
-import tinycss2.color4
+import tinycss2.color5
 
 from ..formatting_structure import boxes
 from ..logger import LOGGER
@@ -184,14 +184,16 @@ def table_layout(context, table, bottom_space, skip_stack, containing_block,
                     context, cell, bottom_space, cell_skip_stack,
                     page_is_empty=page_is_empty, absolute_boxes=absolute_boxes,
                     fixed_boxes=fixed_boxes, adjoining_margins=None,
-                    discard=False, max_lines=None)
+                    first_letter_style=None, first_line_style=None, discard=False,
+                    max_lines=None)
                 cell.style = original_style
                 if new_cell is None:
                     cell = cell.copy_with_children([])
                     cell, _, _, _, _, _ = block_container_layout(
                         context, cell, bottom_space, cell_skip_stack,
                         page_is_empty=True, absolute_boxes=[], fixed_boxes=[],
-                        adjoining_margins=None, discard=False, max_lines=None)
+                        adjoining_margins=None, first_letter_style=None,
+                        first_line_style=None, discard=False, max_lines=None)
                     cell_resume_at = {0: None}
                 else:
                     cell = new_cell
@@ -414,9 +416,13 @@ def table_layout(context, table, bottom_space, skip_stack, containing_block,
                     if avoid_page_break(page_break, context):
                         earlier_page_break = find_earlier_page_break(
                             context, new_table_children, absolute_boxes, fixed_boxes)
-                        if earlier_page_break is not None:
-                            new_table_children, resume_at = earlier_page_break
-                            break
+                        if earlier_page_break is None:
+                            remove_placeholders(
+                                context, new_table_children, absolute_boxes,
+                                fixed_boxes)
+                            return None, None, next_page, position_y
+                        new_table_children, resume_at = earlier_page_break
+                        break
                     resume_at = {index_group: None}
                 else:
                     return None, None, next_page, position_y
@@ -538,7 +544,8 @@ def table_layout(context, table, bottom_space, skip_stack, containing_block,
                 # We could not fit any content, drop the footer.
                 footer = None
 
-        assert not (header or footer)
+        assert not header
+        assert not footer
         new_table_children, resume_at, next_page, end_position_y = (
             body_groups_layout(skip_stack, position_y, bottom_space, page_is_empty))
         return header, new_table_children, footer, end_position_y, resume_at, next_page
@@ -782,7 +789,7 @@ def auto_table_layout(context, box, containing_block):
 
     if assignable_width < sum(max_content_guess):
         # Default values shouldn't be used, but we never know.
-        # See https://github.com/Kozea/WeasyPrint/issues/770
+        # See issue #770.
         lower_guess = guesses[0]
         upper_guess = guesses[-1]
 
@@ -933,7 +940,7 @@ def distribute_excess_width(context, grid, excess_width, column_widths, constrai
         column_widths[i] += excess_width / len(columns)
 
 
-TRANSPARENT = tinycss2.color4.parse_color('transparent')
+TRANSPARENT = tinycss2.color5.parse_color('transparent')
 
 
 def collapse_table_borders(table, grid_width, grid_height):

weasyprint/pdf/__init__.py

@@ -3,22 +3,24 @@
 from importlib.resources import files
 
 import pydyf
-from tinycss2.color4 import D50, D65
+from tinycss2.color5 import D50, D65
 
 from .. import VERSION, Attachment
 from ..html import W3C_DATE_RE
 from ..logger import LOGGER, PROGRESS_LOGGER
 from ..matrix import Matrix
-from . import debug, pdfa, pdfua
+from . import debug, pdfa, pdfua, pdfx
 from .fonts import build_fonts_dictionary
 from .stream import Stream
+from .tags import add_tags
 
 from .anchors import (  # isort:skip
     add_annotations, add_forms, add_links, add_outlines, resolve_links,
     write_pdf_attachment)
 
 VARIANTS = {
-    name: data for variants in (pdfa.VARIANTS, pdfua.VARIANTS, debug.VARIANTS)
+    name: data
+    for variants in (pdfa.VARIANTS, pdfua.VARIANTS, pdfx.VARIANTS, debug.VARIANTS)
     for (name, data) in variants.items()}
 
 
@@ -52,16 +54,16 @@ def _w3c_date_to_pdf(string, attr_name):
     return f'D:{pdf_date}'
 
 
-def _reference_resources(pdf, resources, images, fonts):
+def _reference_resources(pdf, resources, images, fonts, color_profiles):
     if 'Font' in resources:
         assert resources['Font'] is None
         resources['Font'] = fonts
-    _use_references(pdf, resources, images)
+    _use_references(pdf, resources, images, color_profiles)
     pdf.add_object(resources)
     return resources.reference
 
 
-def _use_references(pdf, resources, images):
+def _use_references(pdf, resources, images, color_profiles):
     # XObjects
     for key, x_object in resources.get('XObject', {}).items():
         # Images
@@ -90,7 +92,8 @@ def _use_references(pdf, resources, images):
         # Resources
         if 'Resources' in x_object.extra:
             x_object.extra['Resources'] = _reference_resources(
-                pdf, x_object.extra['Resources'], images, resources['Font'])
+                pdf, x_object.extra['Resources'], images, resources['Font'],
+                color_profiles)
 
     # Patterns
     for key, pattern in resources.get('Pattern', {}).items():
@@ -98,7 +101,8 @@ def _use_references(pdf, resources, images):
         resources['Pattern'][key] = pattern.reference
         if 'Resources' in pattern.extra:
             pattern.extra['Resources'] = _reference_resources(
-                pdf, pattern.extra['Resources'], images, resources['Font'])
+                pdf, pattern.extra['Resources'], images, resources['Font'],
+                color_profiles)
 
     # Shadings
     for key, shading in resources.get('Shading', {}).items():
@@ -117,16 +121,18 @@ def generate_pdf(document, target, zoom, **options):
 
     PROGRESS_LOGGER.info('Step 6 - Creating PDF')
 
+    compress = not options['uncompressed_pdf']
+
     # Set properties according to PDF variants
-    mark = False
     srgb = options['srgb']
+    pdf_tags = options['pdf_tags']
     variant = options['pdf_variant']
     if variant:
         variant_function, properties = VARIANTS[variant]
-        if 'mark' in properties:
-            mark = properties['mark']
         if 'srgb' in properties:
             srgb = properties['srgb']
+        if 'pdf_tags' in properties:
+            pdf_tags = properties['pdf_tags']
 
     pdf = pydyf.PDF()
     images = {}
@@ -140,6 +146,17 @@ def generate_pdf(document, target, zoom, **options):
             'Range': pydyf.Array((-125, 125, -125, 125)),
         }))),
     })
+    # Custom color profiles
+    for key, color_profile in document.color_profiles.items():
+        if key == 'device-cmyk':
+            # Device CMYK profile is stored as OutputIntent.
+            continue
+        profile = pydyf.Stream(
+            [color_profile.content],
+            pydyf.Dictionary({'N': len(color_profile.components)}),
+            compress=compress)
+        pdf.add_object(profile)
+        color_space[key] = pydyf.Array(('/ICCBased', profile.reference))
     pdf.add_object(color_space)
     resources = pydyf.Dictionary({
         'ExtGState': pydyf.Dictionary(),
@@ -156,9 +173,10 @@ def generate_pdf(document, target, zoom, **options):
 
     annot_files = {}
     pdf_pages, page_streams = [], []
-    compress = not options['uncompressed_pdf']
     for page_number, (page, links_and_anchors) in enumerate(
             zip(document.pages, page_links_and_anchors)):
+        tags = {} if pdf_tags else None
+
         # Draw from the top-left corner
         matrix = Matrix(scale, 0, 0, -scale, 0, page.height * scale)
 
@@ -175,7 +193,8 @@ def generate_pdf(document, target, zoom, **options):
             left / scale, top / scale,
             (right - left) / scale, (bottom - top) / scale)
         stream = Stream(
-            document.fonts, page_rectangle, resources, images, mark, compress=compress)
+            document.fonts, page_rectangle, resources, images, tags,
+            document.color_profiles, compress=compress)
         stream.transform(d=-1, f=(page.height * scale))
         pdf.add_object(stream)
         page_streams.append(stream)
@@ -187,13 +206,13 @@ def generate_pdf(document, target, zoom, **options):
             'Contents': stream.reference,
             'Resources': resources.reference,
         })
-        if mark:
+        if pdf_tags:
             pdf_page['Tabs'] = '/S'
             pdf_page['StructParents'] = page_number
         pdf.add_page(pdf_page)
         pdf_pages.append(pdf_page)
 
-        add_links(links_and_anchors, matrix, pdf, pdf_page, pdf_names, mark)
+        add_links(links_and_anchors, matrix, pdf, pdf_page, pdf_names, tags)
         add_annotations(
             links_and_anchors[0], matrix, document, pdf, pdf_page, annot_files,
             compress)
@@ -293,7 +312,7 @@ def generate_pdf(document, target, zoom, **options):
         pdf.add_object(dingbats)
         pdf_fonts['ZaDb'] = dingbats.reference
     resources['Font'] = pdf_fonts.reference
-    _use_references(pdf, resources, images)
+    _use_references(pdf, resources, images, document.color_profiles)
 
     # Anchors
     if pdf_names:
@@ -307,8 +326,25 @@ def generate_pdf(document, target, zoom, **options):
             pdf.catalog['Names'] = pydyf.Dictionary()
         pdf.catalog['Names']['Dests'] = dests
 
-    if srgb:
-        # Add ICC profile.
+    # Add output ICC profile.
+    # TODO: we should allow the user or the PDF variant code to set custom values in
+    # OutputIntents and remove the "srgb" option. See PDF 2.0 chapter 14.11.5, and
+    # https://www.color.org/chardata/drsection1.xalter for a list of "standard
+    # production conditions".
+    if 'device-cmyk' in document.color_profiles:
+        color_profile = document.color_profiles['device-cmyk']
+        profile = pydyf.Stream(
+            [color_profile.content], pydyf.Dictionary({'N': 4}), compress=compress)
+        pdf.add_object(profile)
+        pdf.catalog['OutputIntents'] = pydyf.Array([
+            pydyf.Dictionary({
+                'Type': '/OutputIntent',
+                'S': '/GTS_PDFX',
+                'OutputConditionIdentifier': pydyf.String(color_profile.name),
+                'DestOutputProfile': profile.reference,
+            }),
+        ])
+    elif srgb:
         profile = pydyf.Stream(
             [(files(__package__) / 'sRGB2014.icc').read_bytes()],
             pydyf.Dictionary({'N': 3, 'Alternate': '/DeviceRGB'}),
@@ -323,6 +359,10 @@ def generate_pdf(document, target, zoom, **options):
             }),
         ])
 
+    # Add tags
+    if pdf_tags:
+        add_tags(pdf, document, page_streams)
+
     # Apply PDF variants functions
     if variant:
         variant_function(