oapi-profile-builder 3.2.0__tar.gz → 3.3.0__tar.gz

{oapi_profile_builder-3.2.0/src/oapi_profile_builder.egg-info → oapi_profile_builder-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.2.0
+Version: 3.3.0
 Summary: Authoritative tooling for creating OGC API Service Profiles (EDR, Features)
 Author-email: Shane Mill <shane.mill@noaa.gov>
 License: Apache License
@@ -234,18 +234,20 @@ Everything about the document — cover, title-page metadata, legal page, footer
 
 | What you want to change | Field | Mechanism |
 |---|---|---|
-| Cover logo + tagline (replaces the OGC cover) | `document_metadata.cover` | Generated cover image via `:coverpage-image:` full replacement |
+| Cover logo, tagline, fonts, watermark (replaces the OGC cover) | `document_metadata.cover` | Generated cover image via `:coverpage-image:` full replacement |
 | Title, doc number, edition, dates, sub-title/status | `title`, `version`, `document_metadata.{doc_number, doc_type, doc_subtype, status, *_date}` | Metanorma document attributes |
 | PDF colours (titles, tables, cover, backgrounds) | `document_metadata.colors` | `:presentation-metadata-color-*:` |
 | Page-ii legal text (copyright / license / notice) | `document_metadata.boilerplate` | `:boilerplate-authority:` |
 | Footer organisation name | `document_metadata.copyright_holder` | `:copyright-holder:` |
 | Remove the OGC logo from the legal page | `document_metadata.suppress_flavor_logo` | targeted `:pdf-stylesheet-override:` |
+| Remove OGC design (crossing lines, circled numbers, rules, navy divider pages) | `document_metadata.suppress_design_elements` (or the individual `suppress_crossing_lines` / `plain_section_numbers` / `suppress_title_underlines`) | `:pdf-stylesheet-override:` + colour attributes |
+| Every-page DRAFT-style watermark (over content) | `document_metadata.page_watermark` | `:pdf-stylesheet-override:` (footer overlay) |
 | Requirement / conformance identifier namespace | `spec_uri_base` | derives `req_uri` / `conf_uri` |
-| Submitter table, notice paragraph, normative refs | `document_metadata.{submitters, notice, normative_references}` | Metanorma attributes / sections |
+| Submitter table, notice paragraph, normative refs, extra terms | `document_metadata.{submitters, notice, normative_references, terms}` | Metanorma attributes / sections |
 
-Custom branding requires Pillow for the cover image: `pip install 'oapi-profile-builder[pdf]'`. Field-by-field detail is in the [`document_metadata`](#document_metadata) reference below; [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml) is a complete DGIWG-branded example.
+Custom branding requires Pillow for the cover image: `pip install 'oapi-profile-builder[pdf]'`. Field-by-field detail is in the [`document_metadata`](#document_metadata) reference below; [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml) is a complete DGIWG-branded example. Omit all of these fields and the output keeps the standard OGC house style.
 
-> The `suppress_flavor_logo` override reaches into the OGC Metanorma flavor's XSL (template `insertLogoPreface`) and is coupled to that flavor. Everything else uses documented Metanorma attributes. For long-term SDO adoption, a dedicated Metanorma "taste"/flavor is the most durable path.
+> The `suppress_flavor_logo`, `suppress_design_elements`/`suppress_*`, and `page_watermark` overrides reach into the OGC Metanorma flavor's XSL templates (e.g. `insertLogoPreface`, `insertCrossingLines`, `insertSectionNumInCircle`, `insertFooter`) and are coupled to that flavor. Everything else uses documented Metanorma attributes. mn2pdf merges our same-named templates over the flavor's at equal precedence (via `merge_override.xsl`), which is what makes these work; a future metanorma-ogc release could require refreshing the template names. For long-term SDO adoption, a dedicated Metanorma "taste"/flavor is the most durable path.
 
 ---
 
@@ -701,6 +703,10 @@ document_metadata:
     tagline: Delivering Military Advantage through multi-national geospatial interoperability
     background: "#FFFFFF"          # optional cover background (default white)
     text_color: "#1F3864"          # optional cover text colour (default black)
+    font_regular: "Source Sans Pro" # optional: .ttf/.otf path OR installed family name (fontconfig)
+    font_bold: "Source Sans Pro"    # optional bold face; derived from font_regular when unset
+    font_italic: "Source Sans Pro"  # optional italic face for the tagline
+    watermark: "DRAFT"             # optional diagonal watermark stamped on the cover
   colors:
     text: "#000000"                # body text
     cover_text: "#1F3864"          # cover text / section numbers / ToC
@@ -733,7 +739,41 @@ document_metadata:
     feedback: "Comments on this document should be directed to DGIWG."
 ```
 
-With `cover` + `colors` + `copyright_holder` + `boilerplate` + `suppress_flavor_logo` (and `spec_uri_base` for the requirement/conformance identifiers), the generated PDF carries no OGC branding — only legitimate citations to the OGC standards the profile conforms to. See [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml).
+#### Removing the OGC page design (crossing lines, circled numbers, divider pages)
+
+The OGC flavor also draws decorative design elements: the blue "crossing lines with a dot" motif, circled section-divider numbers, a short rule under section titles, and full-navy section-divider pages. One switch removes them all:
+
+- **`suppress_design_elements: true`** — a consolidated switch that:
+  - removes the blue crossing-lines + dot motif (on divider/cover pages via a template override; on the Contents/preface pages, which draw the lines inline in the flavor's own colour, by whiting that colour out);
+  - renders section numbers as plain text (e.g. `1 Scope`, `i Abstract`) instead of coloured circles;
+  - removes the short rule beneath section titles;
+  - rebrands the full-navy section-divider pages to a clean white page with a DGIWG-navy (from `colors.title`) plain number and title.
+
+  The individual toggles `suppress_crossing_lines`, `plain_section_numbers`, and `suppress_title_underlines` are still available if you want finer control; `suppress_design_elements` simply turns all three on plus the divider rebrand.
+
+- **`page_watermark`** — stamps a light diagonal watermark (e.g. `DRAFT`) on **every page**, rendered *over* the content including tables. This is distinct from `cover.watermark`, which marks only the generated cover image. The cover page is left unmarked.
+
+```yaml
+document_metadata:
+  suppress_design_elements: true   # plain numbers, no crossing lines/rules, white divider pages
+  page_watermark: DRAFT            # every-page diagonal watermark (over content)
+```
+
+With `cover` + `colors` + `copyright_holder` + `boilerplate` + `suppress_flavor_logo` + `suppress_design_elements` (and `spec_uri_base` for the requirement/conformance identifiers), the generated PDF carries no OGC branding — only legitimate citations to the OGC standards the profile conforms to. Omit these fields and you get the standard OGC house style. See [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml).
+
+> These design-element overrides (and the `page_watermark` footer overlay) reach into the OGC Metanorma flavor's XSL template names and are coupled to that flavor; a future metanorma-ogc release could require refreshing them.
+
+#### Extending Terms and Definitions
+
+Add profile-specific terms (e.g. EDR Part 3 or Pub/Sub terms) appended after the base terms in the Terms and Definitions section:
+
+```yaml
+document_metadata:
+  terms:
+    - term: service profile
+      definition: A named, referenceable set of constraints and additional requirements applied to an OGC API - EDR implementation.
+      source: "SOURCE: OGC API - EDR Part 3: Service Profiles (draft)"
+```
 
 ---
 

{oapi_profile_builder-3.2.0 → oapi_profile_builder-3.3.0}/README.md

@@ -187,18 +187,20 @@ Everything about the document — cover, title-page metadata, legal page, footer
 
 | What you want to change | Field | Mechanism |
 |---|---|---|
-| Cover logo + tagline (replaces the OGC cover) | `document_metadata.cover` | Generated cover image via `:coverpage-image:` full replacement |
+| Cover logo, tagline, fonts, watermark (replaces the OGC cover) | `document_metadata.cover` | Generated cover image via `:coverpage-image:` full replacement |
 | Title, doc number, edition, dates, sub-title/status | `title`, `version`, `document_metadata.{doc_number, doc_type, doc_subtype, status, *_date}` | Metanorma document attributes |
 | PDF colours (titles, tables, cover, backgrounds) | `document_metadata.colors` | `:presentation-metadata-color-*:` |
 | Page-ii legal text (copyright / license / notice) | `document_metadata.boilerplate` | `:boilerplate-authority:` |
 | Footer organisation name | `document_metadata.copyright_holder` | `:copyright-holder:` |
 | Remove the OGC logo from the legal page | `document_metadata.suppress_flavor_logo` | targeted `:pdf-stylesheet-override:` |
+| Remove OGC design (crossing lines, circled numbers, rules, navy divider pages) | `document_metadata.suppress_design_elements` (or the individual `suppress_crossing_lines` / `plain_section_numbers` / `suppress_title_underlines`) | `:pdf-stylesheet-override:` + colour attributes |
+| Every-page DRAFT-style watermark (over content) | `document_metadata.page_watermark` | `:pdf-stylesheet-override:` (footer overlay) |
 | Requirement / conformance identifier namespace | `spec_uri_base` | derives `req_uri` / `conf_uri` |
-| Submitter table, notice paragraph, normative refs | `document_metadata.{submitters, notice, normative_references}` | Metanorma attributes / sections |
+| Submitter table, notice paragraph, normative refs, extra terms | `document_metadata.{submitters, notice, normative_references, terms}` | Metanorma attributes / sections |
 
-Custom branding requires Pillow for the cover image: `pip install 'oapi-profile-builder[pdf]'`. Field-by-field detail is in the [`document_metadata`](#document_metadata) reference below; [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml) is a complete DGIWG-branded example.
+Custom branding requires Pillow for the cover image: `pip install 'oapi-profile-builder[pdf]'`. Field-by-field detail is in the [`document_metadata`](#document_metadata) reference below; [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml) is a complete DGIWG-branded example. Omit all of these fields and the output keeps the standard OGC house style.
 
-> The `suppress_flavor_logo` override reaches into the OGC Metanorma flavor's XSL (template `insertLogoPreface`) and is coupled to that flavor. Everything else uses documented Metanorma attributes. For long-term SDO adoption, a dedicated Metanorma "taste"/flavor is the most durable path.
+> The `suppress_flavor_logo`, `suppress_design_elements`/`suppress_*`, and `page_watermark` overrides reach into the OGC Metanorma flavor's XSL templates (e.g. `insertLogoPreface`, `insertCrossingLines`, `insertSectionNumInCircle`, `insertFooter`) and are coupled to that flavor. Everything else uses documented Metanorma attributes. mn2pdf merges our same-named templates over the flavor's at equal precedence (via `merge_override.xsl`), which is what makes these work; a future metanorma-ogc release could require refreshing the template names. For long-term SDO adoption, a dedicated Metanorma "taste"/flavor is the most durable path.
 
 ---
 
@@ -654,6 +656,10 @@ document_metadata:
     tagline: Delivering Military Advantage through multi-national geospatial interoperability
     background: "#FFFFFF"          # optional cover background (default white)
     text_color: "#1F3864"          # optional cover text colour (default black)
+    font_regular: "Source Sans Pro" # optional: .ttf/.otf path OR installed family name (fontconfig)
+    font_bold: "Source Sans Pro"    # optional bold face; derived from font_regular when unset
+    font_italic: "Source Sans Pro"  # optional italic face for the tagline
+    watermark: "DRAFT"             # optional diagonal watermark stamped on the cover
   colors:
     text: "#000000"                # body text
     cover_text: "#1F3864"          # cover text / section numbers / ToC
@@ -686,7 +692,41 @@ document_metadata:
     feedback: "Comments on this document should be directed to DGIWG."
 ```
 
-With `cover` + `colors` + `copyright_holder` + `boilerplate` + `suppress_flavor_logo` (and `spec_uri_base` for the requirement/conformance identifiers), the generated PDF carries no OGC branding — only legitimate citations to the OGC standards the profile conforms to. See [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml).
+#### Removing the OGC page design (crossing lines, circled numbers, divider pages)
+
+The OGC flavor also draws decorative design elements: the blue "crossing lines with a dot" motif, circled section-divider numbers, a short rule under section titles, and full-navy section-divider pages. One switch removes them all:
+
+- **`suppress_design_elements: true`** — a consolidated switch that:
+  - removes the blue crossing-lines + dot motif (on divider/cover pages via a template override; on the Contents/preface pages, which draw the lines inline in the flavor's own colour, by whiting that colour out);
+  - renders section numbers as plain text (e.g. `1 Scope`, `i Abstract`) instead of coloured circles;
+  - removes the short rule beneath section titles;
+  - rebrands the full-navy section-divider pages to a clean white page with a DGIWG-navy (from `colors.title`) plain number and title.
+
+  The individual toggles `suppress_crossing_lines`, `plain_section_numbers`, and `suppress_title_underlines` are still available if you want finer control; `suppress_design_elements` simply turns all three on plus the divider rebrand.
+
+- **`page_watermark`** — stamps a light diagonal watermark (e.g. `DRAFT`) on **every page**, rendered *over* the content including tables. This is distinct from `cover.watermark`, which marks only the generated cover image. The cover page is left unmarked.
+
+```yaml
+document_metadata:
+  suppress_design_elements: true   # plain numbers, no crossing lines/rules, white divider pages
+  page_watermark: DRAFT            # every-page diagonal watermark (over content)
+```
+
+With `cover` + `colors` + `copyright_holder` + `boilerplate` + `suppress_flavor_logo` + `suppress_design_elements` (and `spec_uri_base` for the requirement/conformance identifiers), the generated PDF carries no OGC branding — only legitimate citations to the OGC standards the profile conforms to. Omit these fields and you get the standard OGC house style. See [`examples/nwp_radar.yaml`](examples/nwp_radar.yaml).
+
+> These design-element overrides (and the `page_watermark` footer overlay) reach into the OGC Metanorma flavor's XSL template names and are coupled to that flavor; a future metanorma-ogc release could require refreshing them.
+
+#### Extending Terms and Definitions
+
+Add profile-specific terms (e.g. EDR Part 3 or Pub/Sub terms) appended after the base terms in the Terms and Definitions section:
+
+```yaml
+document_metadata:
+  terms:
+    - term: service profile
+      definition: A named, referenceable set of constraints and additional requirements applied to an OGC API - EDR implementation.
+      source: "SOURCE: OGC API - EDR Part 3: Service Profiles (draft)"
+```
 
 ---
 

{oapi_profile_builder-3.2.0 → oapi_profile_builder-3.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "oapi-profile-builder"
-version = "3.2.0"
+version = "3.3.0"
 description = "Authoritative tooling for creating OGC API Service Profiles (EDR, Features)"
 readme = "README.md"
 license = { file = "LICENSE" }

{oapi_profile_builder-3.2.0 → oapi_profile_builder-3.3.0}/src/oapi_profile_builder/cli.py

@@ -164,7 +164,7 @@ def main() -> None:
     generate(profile, args.output)
 
     if args.pdf:
-        compile_pdf(args.output.resolve())
+        compile_pdf(args.output.resolve(), profile=profile)
 
 
 def _run_validate_server(args) -> None:

oapi_profile_builder-3.3.0/src/oapi_profile_builder/compile.py

@@ -0,0 +1,126 @@
+# =================================================================
+#
+# Authors: Shane Mill <shane.mill@noaa.gov>
+#
+# Copyright (c) 2026 Shane Mill
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# =================================================================
+"""
+PDF compilation: shell out to the Metanorma Docker image.
+"""
+
+from __future__ import annotations
+
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+
+def compile_pdf(output_dir: Path, profile=None) -> bool:
+    """
+    Run `docker run metanorma/metanorma compile` against document.adoc
+    in output_dir. Returns True on success.
+
+    If *profile* is provided, custom fonts declared in document_metadata will be
+    pre-installed into the fontist cache so Metanorma can embed them.
+    """
+    if shutil.which("docker") is None:
+        print("docker not found. Install Docker to use --pdf.", file=sys.stderr)
+        sys.exit(1)
+
+    doc = output_dir / "document.adoc"
+    if not doc.exists():
+        print(f"document.adoc not found in {output_dir}", file=sys.stderr)
+        sys.exit(1)
+
+    fonts_dir = Path.home() / ".fontist" / "fonts"
+    fonts_dir.mkdir(parents=True, exist_ok=True)
+
+    # Pre-install any custom fonts requested by the profile so fontist inside
+    # the container recognizes them during PDF generation.
+    extra_fonts: list[str] = []
+    if profile is not None:
+        m = getattr(profile, "document_metadata", None)
+        if m:
+            for attr in ("body_font", "header_font", "monospace_font"):
+                val = getattr(m, attr, None)
+                if val:
+                    extra_fonts.append(val)
+
+    # De-duplicate while preserving order.
+    if extra_fonts:
+        seen: set[str] = set()
+        extra_fonts = [f for f in extra_fonts if not (f in seen or seen.add(f))]  # type: ignore[func-returns-value]
+
+    # Build the Docker command. When custom fonts are needed, we run fontist
+    # install + metanorma compile in the *same* container so the fontist
+    # database is available at compile time. We also monkey-patch the OGC
+    # processor's fonts_manifest so mn2pdf receives the correct font paths.
+    if extra_fonts:
+        install_cmds = " && ".join(f"fontist install '{f}'" for f in extra_fonts)
+        # Ruby snippet to inject extra fonts into the OGC processor's manifest
+        # so mn2pdf's font-manifest YAML includes them.
+        font_hash_entries = ", ".join(f'\\"{f}\\" => nil' for f in extra_fonts)
+        # Write the Ruby patch via heredoc to avoid shell quoting issues.
+        patch_rb_escaped = (
+            'require \\"metanorma-ogc\\"; '
+            "module Metanorma; module Ogc; class Processor; "
+            "alias_method :_orig_fonts_manifest, :fonts_manifest; "
+            f"def fonts_manifest; _orig_fonts_manifest.merge({{{font_hash_entries}}}); end; "
+            "end; end; end"
+        )
+        shell_script = (
+            f"{install_cmds} && "
+            f'printf "%s" "{patch_rb_escaped}" > /tmp/_font_patch.rb && '
+            "RUBYOPT='-r/tmp/_font_patch.rb' "
+            "metanorma compile --agree-to-terms -t ogc -x pdf document.adoc"
+        )
+        cmd = [
+            "docker", "run", "--rm",
+            "-v", f"{output_dir.resolve()}:/metanorma",
+            "-v", f"{fonts_dir}:/config/fonts",
+            "-w", "/metanorma",
+            "metanorma/metanorma",
+            "bash", "-c", shell_script,
+        ]
+        print(f"Installing custom fonts ({', '.join(extra_fonts)}) and compiling PDF...")
+    else:
+        cmd = [
+            "docker", "run", "--rm",
+            "-v", f"{output_dir.resolve()}:/metanorma",
+            "-v", f"{fonts_dir}:/config/fonts",
+            "metanorma/metanorma",
+            "metanorma", "compile",
+            "--agree-to-terms",
+            "-t", "ogc",
+            "-x", "pdf",
+            "document.adoc",
+        ]
+        print("Compiling PDF via Metanorma Docker...")
+    result = subprocess.run(cmd, check=False)
+    if result.returncode == 0:
+        pdf = output_dir / "document.pdf"
+        print(f"PDF written to {pdf}")
+    return result.returncode == 0

{oapi_profile_builder-3.2.0 → oapi_profile_builder-3.3.0}/src/oapi_profile_builder/cover.py

@@ -31,6 +31,8 @@ so no system font paths are required.
 
 from __future__ import annotations
 
+import shutil
+import subprocess
 from datetime import datetime
 from pathlib import Path
 
@@ -40,25 +42,83 @@ _PAGE_H = 1754
 
 _COVER_FILENAME = "cover.png"
 
+# Default font family (bundled with Pillow, resolved by name).
+_DEFAULT_REGULAR = "DejaVuSans.ttf"
+_DEFAULT_BOLD = "DejaVuSans-Bold.ttf"
+_DEFAULT_ITALIC = "DejaVuSans-Oblique.ttf"
 
-def _load_font(bold: bool, size: int):
-    from PIL import ImageFont
 
-    name = "DejaVuSans-Bold.ttf" if bold else "DejaVuSans.ttf"
-    try:
-        return ImageFont.truetype(name, size)
-    except Exception:
-        # Last-resort fallback; not scalable but keeps rendering from failing.
-        return ImageFont.load_default()
+def _resolve_font_file(spec: str | None, *, bold: bool = False, italic: bool = False) -> str | None:
+    """Resolve a user font spec to a usable font file path.
 
+    ``spec`` may be either a path to a ``.ttf``/``.otf`` file or a font family
+    name (e.g. ``"Source Sans Pro"``). Family names are resolved via
+    ``fc-match`` (fontconfig) when available. Returns ``None`` when the spec is
+    empty or cannot be resolved, so the caller can fall back to a default.
+    """
+    if not spec:
+        return None
+    p = Path(spec).expanduser()
+    if p.is_file():
+        return str(p)
+    if shutil.which("fc-match"):
+        styles = []
+        if bold:
+            styles.append("Bold")
+        if italic:
+            styles.append("Italic")
+        query = spec if not styles else f"{spec}:style={' '.join(styles)}"
+        try:
+            out = subprocess.run(
+                ["fc-match", "-f", "%{file}", query],
+                capture_output=True, text=True, timeout=5, check=False,
+            )
+            path = out.stdout.strip()
+            if path and Path(path).is_file():
+                return path
+        except Exception:
+            pass
+    return None
+
+
+class _FontSet:
+    """Resolves cover fonts from optional profile config, with sane defaults.
+
+    Each of ``regular``/``bold``/``italic`` may be a font-file path or a family
+    name; unset styles are derived from ``regular`` (with the matching style) and
+    ultimately fall back to the bundled DejaVu family.
+    """
 
-def _italic_font(size: int):
-    from PIL import ImageFont
+    def __init__(self, cover=None):
+        self.regular = getattr(cover, "font_regular", None) if cover else None
+        self.bold = getattr(cover, "font_bold", None) if cover else None
+        self.italic = getattr(cover, "font_italic", None) if cover else None
+
+    def _font(self, size: int, *, bold: bool = False, italic: bool = False):
+        from PIL import ImageFont
+
+        # Prefer an explicit per-style spec, else derive from the regular family.
+        explicit = self.bold if bold else (self.italic if italic else self.regular)
+        candidates = [
+            _resolve_font_file(explicit, bold=bold, italic=italic),
+            _resolve_font_file(self.regular, bold=bold, italic=italic),
+        ]
+        default = _DEFAULT_BOLD if bold else (_DEFAULT_ITALIC if italic else _DEFAULT_REGULAR)
+        candidates.append(default)
+        for cand in candidates:
+            if not cand:
+                continue
+            try:
+                return ImageFont.truetype(cand, size)
+            except Exception:
+                continue
+        return ImageFont.load_default()
 
-    try:
-        return ImageFont.truetype("DejaVuSans-Oblique.ttf", size)
-    except Exception:
-        return _load_font(False, size)
+    def regular_font(self, size: int, bold: bool = False):
+        return self._font(size, bold=bold)
+
+    def italic_font(self, size: int):
+        return self._font(size, italic=True)
 
 
 def _format_date(iso_date: str | None) -> str | None:
@@ -100,6 +160,7 @@ def build_cover_image(profile, output_dir: Path) -> str | None:
 
     bg = cover.background or "#FFFFFF"
     fg = cover.text_color or "#000000"
+    fonts = _FontSet(cover)
 
     page = Image.new("RGB", (_PAGE_W, _PAGE_H), bg)
     draw = ImageDraw.Draw(page)
@@ -129,28 +190,32 @@ def build_cover_image(profile, output_dir: Path) -> str | None:
 
     # --- Tagline (italic) ---
     if cover.tagline:
-        y = centered(cover.tagline, _italic_font(30), y, fg) + 60
+        y = centered(cover.tagline, fonts.italic_font(30), y, fg) + 60
 
     # --- Document number ---
     if m and m.doc_number:
-        y = centered(m.doc_number, _load_font(True, 46), y, fg) + 40
+        y = centered(m.doc_number, fonts.regular_font(46, bold=True), y, fg) + 40
 
     # --- Edition ---
     edition = getattr(profile, "version", None)
     if edition:
-        y = centered(f"Edition {edition}", _load_font(False, 28), y, fg) + 24
+        y = centered(f"Edition {edition}", fonts.regular_font(28), y, fg) + 24
 
     # --- Date ---
     date_str = _format_date(m.publication_date if m else None)
     if date_str:
-        y = centered(f"Dated {date_str}", _load_font(False, 28), y, fg) + 80
+        y = centered(f"Dated {date_str}", fonts.regular_font(28), y, fg) + 80
 
     # --- Title (large, bold, wrapped) ---
     title = getattr(profile, "title", "") or ""
-    title_font = _load_font(True, 54)
+    title_font = fonts.regular_font(54, bold=True)
     for line in _wrap(draw, title, title_font, _PAGE_W - 240):
         y = centered(line, title_font, y, fg) + 16
 
+    # --- Draft watermark (diagonal, semi-transparent) ---
+    if getattr(cover, "watermark", None):
+        _stamp_watermark(page, cover.watermark, fonts)
+
     target = (output_dir / _COVER_FILENAME).resolve()
     if not str(target).startswith(str(output_dir.resolve())):
         raise RuntimeError(f"Refusing to write cover outside output directory: {target}")
@@ -158,6 +223,28 @@ def build_cover_image(profile, output_dir: Path) -> str | None:
     return _COVER_FILENAME
 
 
+def _stamp_watermark(page, text: str, fonts: "_FontSet") -> None:
+    """Overlay a large, diagonal, semi-transparent watermark on the cover.
+
+    Rendered on its own RGBA layer and rotated 45°, then alpha-composited onto
+    the (RGB) cover page. Gives a clear 'DRAFT' style indication on the cover;
+    an every-page watermark additionally requires the Metanorma layer.
+    """
+    from PIL import Image, ImageDraw
+
+    layer = Image.new("RGBA", page.size, (0, 0, 0, 0))
+    ldraw = ImageDraw.Draw(layer)
+    font = fonts.regular_font(150, bold=True)
+    bbox = ldraw.textbbox((0, 0), text, font=font)
+    tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
+    ldraw.text(
+        ((page.width - tw) / 2, (page.height - th) / 2),
+        text, font=font, fill=(200, 0, 0, 70),
+    )
+    layer = layer.rotate(45, resample=Image.BICUBIC, center=(page.width / 2, page.height / 2))
+    page.paste(Image.alpha_composite(page.convert("RGBA"), layer).convert("RGB"), (0, 0))
+
+
 def _wrap(draw, text: str, font, max_width: int) -> list[str]:
     """Greedy word-wrap to fit max_width pixels."""
     words = text.split()