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

{oapi_profile_builder-3.2.1/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.1
+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.1 → 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.1 → 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.1"
+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.1 → 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.1 → 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()

{oapi_profile_builder-3.2.1 → oapi_profile_builder-3.3.0}/src/oapi_profile_builder/generate.py

@@ -1374,18 +1374,249 @@ def _individual_test_adoc(profile: ServiceProfile, test_id: str) -> str:
 # Metanorma root document
 # ---------------------------------------------------------------------------
 
-_LOGO_OVERRIDE_XSL = """<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-  <!-- Rebranding override: suppress the OGC flavor logo on the preface/legal
-       page (and the cover, which is replaced separately). Coupled to the OGC
-       Metanorma flavor's XSL template names. -->
+_PDF_OVERRIDE_FILENAME = "pdf_override.xsl"
+
+# Individual template overrides for the OGC Metanorma flavor's PDF XSL. Each is
+# keyed to a real template name in metanorma-ogc's ogc.standard.xsl and merged
+# in via :pdf-stylesheet-override:. These are coupled to the OGC flavor.
+_OVERRIDE_SUPPRESS_LOGO = """
+  <!-- Suppress the OGC flavor logo on cover/preface (rebranding). -->
   <xsl:template name="insertLogoPreface"/>
   <xsl:template name="insertLogo"/>
-</xsl:stylesheet>
 """
 
+_OVERRIDE_SUPPRESS_CROSSING_LINES = """
+  <!-- Remove the 'crossing lines' design element by making it invisible. -->
+  <xsl:template name="insertCrossingLines">
+    <fo:block-container absolute-position="fixed" width="0mm" height="0mm" font-size="0">
+      <fo:block/>
+    </fo:block-container>
+  </xsl:template>
+"""
+
+_OVERRIDE_SUPPRESS_TITLE_UNDERLINES = """
+  <!-- Remove the horizontal rule drawn beneath section titles. -->
+  <xsl:template name="insertShortHorizontalLine">
+    <fo:block/>
+  </xsl:template>
+  <xsl:template name="insertBigHorizontalLine">
+    <fo:block/>
+  </xsl:template>
+"""
+
+# Render the section-divider number as plain text instead of a coloured circle.
+# Mirrors the flavor's own number computation so annexes still number correctly.
+# The colour is injected so the number stays readable against whatever divider
+# background is in effect (white text on the flavor's navy, or a dark DGIWG
+# colour on a rebranded light page).
+def _plain_section_numbers_override(color: str) -> str:
+    return f"""
+  <!-- Section-divider number as plain text (no OGC circle), coloured {color}. -->
+  <xsl:template name="insertSectionNumInCircle">
+    <xsl:variable name="sectionNum_"><xsl:call-template name="getSection"/></xsl:variable>
+    <xsl:variable name="sectionNum">
+      <xsl:choose>
+        <xsl:when test="normalize-space($sectionNum_) = '' and self::mn:annex">
+          <xsl:number format="A" count="mn:annex[not(@continue = 'true')]" level="any" lang="en"/>
+        </xsl:when>
+        <xsl:otherwise><xsl:value-of select="$sectionNum_"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <fo:block font-size="24pt" font-weight="bold" color="{color}"><xsl:value-of select="$sectionNum"/></fo:block>
+  </xsl:template>
+"""
+
+
+# Force the big section-divider title colour. The flavor's divider page-sequence
+# sets the text colour to white (readable on its navy background); when the
+# divider page is rebranded to a light background that white title becomes
+# invisible, so we set an explicit (dark) colour here.
+def _section_title_color_override(color: str) -> str:
+    return f"""
+  <!-- Section-divider title colour (readable on a rebranded light page). -->
+  <xsl:template name="insertSectionTitleBig">
+    <xsl:param name="title"/>
+    <fo:block font-size="33pt" margin-bottom="6pt" color="{color}">
+      <xsl:apply-templates select="xalan:nodeset($title)" mode="titlebig"/>
+    </fo:block>
+    <xsl:call-template name="insertBigHorizontalLine"/>
+  </xsl:template>
+"""
+
+
+# Every-page watermark (e.g. "DRAFT"). The OGC flavor's region-body flow is
+# painted on top of the header region, so a watermark placed in the header sits
+# behind opaque tables. The footer region is painted after the body, so we
+# reproduce the flavor's footer and prepend a page-fixed, rotated, semi-
+# transparent SVG text mark inside the footer static-content — this overlays
+# every page, including over tables.
+def _page_watermark_override(text: str, color: str = "rgb(200,200,200)") -> str:
+    esc = _xml_escape(text)
+    watermark = f"""
+      <fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0">
+        <fo:block>
+          <fo:instream-foreign-object content-height="{{$pageHeight}}mm" content-width="{{$pageWidth}}mm" fox:alt-text="Watermark">
+            <svg xmlns="http://www.w3.org/2000/svg" width="{{$pageWidth}}mm" height="{{$pageHeight}}mm" viewBox="0 0 210 297">
+              <text x="105" y="150" text-anchor="middle" transform="rotate(-45 105 150)" font-size="38" font-family="Lato" fill="{color}" fill-opacity="0.55">{esc}</text>
+            </svg>
+          </fo:instream-foreign-object>
+        </fo:block>
+      </fo:block-container>"""
+    return f"""
+  <!-- Every-page diagonal watermark, prepended to the footer region (painted
+       over the body, so it also overlays tables). Reproduces the OGC footer. -->
+  <xsl:template name="insertFooter">
+    <xsl:param name="num"/>
+    <xsl:param name="color"/>
+    <fo:static-content flow-name="footer" role="artifact">
+{watermark}
+      <fo:block-container font-size="8pt" color="{{$color}}" padding-top="6mm">
+        <xsl:if test="normalize-space($color) = ''">
+          <xsl:variable name="color_text_title">
+            <xsl:call-template name="getVariable"><xsl:with-param name="variable">color_text_title</xsl:with-param></xsl:call-template>
+          </xsl:variable>
+          <xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
+        </xsl:if>
+        <fo:table table-layout="fixed" width="100%">
+          <fo:table-column column-width="90%"/>
+          <fo:table-column column-width="10%"/>
+          <fo:table-body>
+            <fo:table-row>
+              <fo:table-cell>
+                <fo:block>
+                  <fo:inline font-weight="bold">
+                    <xsl:call-template name="addLetterSpacing">
+                      <xsl:with-param name="text" select="concat($variables/mnx:doc[@num = $num]/copyright-owner, ' ')"/>
+                      <xsl:with-param name="letter-spacing" select="0.2"/>
+                    </xsl:call-template>
+                  </fo:inline>
+                  <xsl:call-template name="addLetterSpacing">
+                    <xsl:with-param name="text" select="$variables/mnx:doc[@num = $num]/docnumber"/>
+                    <xsl:with-param name="letter-spacing" select="0.2"/>
+                  </xsl:call-template>
+                </fo:block>
+              </fo:table-cell>
+              <fo:table-cell text-align="right">
+                <fo:block font-weight="bold">
+                  <fo:page-number/>
+                </fo:block>
+              </fo:table-cell>
+            </fo:table-row>
+          </fo:table-body>
+        </fo:table>
+      </fo:block-container>
+    </fo:static-content>
+  </xsl:template>
+"""
+
+
+def _effective_pdf_config(m) -> dict:
+    """Resolve effective PDF-styling flags and divider colours from metadata.
+
+    ``suppress_design_elements`` is the consolidated "debrand" switch: it turns
+    on crossing-line suppression, plain section numbers and title-underline
+    suppression together, and rebrands the section-divider pages to a light
+    (default white) background with dark, readable numbers/titles so they no
+    longer carry the OGC navy house style.
+    """
+    debrand = bool(getattr(m, "suppress_design_elements", False))
+    crossing = debrand or bool(getattr(m, "suppress_crossing_lines", False))
+    underlines = debrand or bool(getattr(m, "suppress_title_underlines", False))
+    plain_nums = debrand or bool(getattr(m, "plain_section_numbers", False))
+
+    colors = getattr(m, "colors", None)
+    page_bg = getattr(colors, "page_background", None) if colors else None
+    title_c = getattr(colors, "title", None) if colors else None
+    cover_c = getattr(colors, "cover_text", None) if colors else None
+
+    # Divider background + foreground colours.
+    if debrand:
+        # Rebrand: light divider pages (white unless overridden) + dark text.
+        divider_bg = page_bg or "#FFFFFF"
+        divider_fg = title_c or cover_c or "#1F3864"
+    elif page_bg:
+        # Explicit custom background: assume it is light, use a dark foreground.
+        divider_bg = page_bg
+        divider_fg = title_c or cover_c or "#1F3864"
+    else:
+        # Flavor default: navy divider pages, white number/title.
+        divider_bg = None
+        divider_fg = "white"
+
+    return {
+        "logo": bool(getattr(m, "suppress_flavor_logo", False)),
+        "crossing": crossing,
+        "underlines": underlines,
+        "plain_nums": plain_nums,
+        "body_font": getattr(m, "body_font", None),
+        "watermark": getattr(m, "page_watermark", None),
+        "divider_bg": divider_bg,
+        "divider_fg": divider_fg,
+    }
+
+
+def _pdf_override_flags(m) -> list[str]:
+    """Return the override snippets enabled by document_metadata, in order."""
+    if not m:
+        return []
+    cfg = _effective_pdf_config(m)
+    parts: list[str] = []
+    if cfg["logo"]:
+        parts.append(_OVERRIDE_SUPPRESS_LOGO)
+    if cfg["crossing"]:
+        parts.append(_OVERRIDE_SUPPRESS_CROSSING_LINES)
+    if cfg["underlines"]:
+        parts.append(_OVERRIDE_SUPPRESS_TITLE_UNDERLINES)
+    if cfg["plain_nums"]:
+        parts.append(_plain_section_numbers_override(cfg["divider_fg"]))
+    # When the divider background is rebranded (light), force the big title
+    # colour too — the flavor inherits white text, invisible on a light page.
+    if cfg["divider_bg"] is not None:
+        parts.append(_section_title_color_override(cfg["divider_fg"]))
+    if cfg["watermark"]:
+        parts.append(_page_watermark_override(cfg["watermark"]))
+    # Body font override — the OGC flavor hardcodes Lato in the root-style
+    # attribute-set, so :body-font: alone doesn't work; we need an XSL override.
+    body = cfg["body_font"]
+    if body:
+        noto = '<xsl:value-of select="$font_noto_sans"/>'
+        parts.append(
+            f'\n  <!-- Override body font family (OGC default is Lato). -->\n'
+            f'  <xsl:attribute-set name="root-style">\n'
+            f'    <xsl:attribute name="font-family">{body}, STIX Two Math, {noto}</xsl:attribute>\n'
+            f'    <xsl:attribute name="font-family-generic">Sans</xsl:attribute>\n'
+            f'    <xsl:attribute name="font-size">11pt</xsl:attribute>\n'
+            f'  </xsl:attribute-set>\n'
+        )
+    return parts
+
+
+def _build_pdf_override_xsl(m) -> str | None:
+    """Assemble the consolidated PDF stylesheet override, or None when unused.
+
+    :pdf-stylesheet-override: accepts a single file, so all requested template
+    overrides (logo suppression, crossing lines, section-number circles, title
+    underlines, divider rebranding and the every-page watermark) are merged into
+    one stylesheet. mn2pdf splices these named-template bodies over the flavor's
+    at equal import precedence, so they take effect.
+    """
+    parts = _pdf_override_flags(m)
+    if not parts:
+        return None
+    return (
+        '<?xml version="1.0" encoding="UTF-8"?>\n'
+        '<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\n'
+        '                xmlns:fo="http://www.w3.org/1999/XSL/Format"\n'
+        '                xmlns:mn="https://www.metanorma.org/ns/standoc"\n'
+        '                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"\n'
+        '                xmlns:xalan="http://xml.apache.org/xalan"\n'
+        '                xmlns:java="http://xml.apache.org/xalan/java"\n'
+        '                xmlns:mnx="https://www.metanorma.org/ns/xslt"\n'
+        '                version="1.0">\n'
+        + "".join(parts)
+        + "</xsl:stylesheet>\n"
+    )
+
 
 def _xml_escape(text: str) -> str:
     return (
@@ -1489,6 +1720,28 @@ def _build_document_adoc(profile: ServiceProfile) -> str:
     if m and m.colors:
         for attr, value in m.colors.to_metanorma_attributes().items():
             lines.append(f":{attr}: {value}")
+    # When debranding (suppress_design_elements) rebrands the section-divider
+    # pages to a light background, emit the background-page colour unless the
+    # profile already set one explicitly via colors.page_background.
+    if m:
+        cfg = _effective_pdf_config(m)
+        explicit_bg = bool(m.colors and m.colors.page_background)
+        if cfg["divider_bg"] is not None and not explicit_bg:
+            lines.append(
+                f":presentation-metadata-color-background-page: {cfg['divider_bg']}"
+            )
+        # The preface/contents pages draw the OGC 'crossing lines with dot'
+        # motif inline (using the secondary-shade-2 / color_design_light colour),
+        # not via a named template, so an XSL override can't remove them. When
+        # crossing lines are being suppressed we white them out via the colour
+        # instead, unless the profile already set colors.cover_lines explicitly.
+        explicit_lines = bool(m.colors and m.colors.cover_lines)
+        if cfg["crossing"] and not explicit_lines:
+            lines.append(":presentation-metadata-color-secondary-shade-2: #FFFFFF")
+    # PDF font overrides (body/header/monospace).
+    if m and m.fonts:
+        for attr, value in m.fonts.to_metanorma_attributes().items():
+            lines.append(f":{attr}: {value}")
     # Custom cover page: replace the built-in OGC cover with our generated image.
     # The image file (cover.png) is written by generate(); this just references it.
     if m and m.cover and m.cover.logo:
@@ -1497,12 +1750,20 @@ def _build_document_adoc(profile: ServiceProfile) -> str:
     # Copyright holder → also sets the PDF footer org name (replaces OGC default).
     if m and m.copyright_holder:
         lines.append(f":copyright-holder: {m.copyright_holder}")
+    # PDF font family overrides (e.g. DGIWG house font 'Source Sans Pro').
+    if m and m.body_font:
+        lines.append(f":body-font: {m.body_font}")
+    if m and m.header_font:
+        lines.append(f":header-font: {m.header_font}")
+    if m and m.monospace_font:
+        lines.append(f":monospace-font: {m.monospace_font}")
     # Custom legal boilerplate (page ii). The XML file is written by generate().
     if m and m.boilerplate:
         lines.append(":boilerplate-authority: boilerplate.xml")
-    # Suppress the flavor's built-in (OGC) logo on the preface page when rebranding.
-    if m and m.suppress_flavor_logo:
-        lines.append(":pdf-stylesheet-override: logo_override.xsl")
+    # Consolidated PDF stylesheet override: logo suppression, crossing lines,
+    # section-number circles, title underlines. The file is written by generate().
+    if _pdf_override_flags(m):
+        lines.append(f":pdf-stylesheet-override: {_PDF_OVERRIDE_FILENAME}")
     lines += [
         ":mn-document-class: ogc",
         ":mn-output-extensions: xml,html,pdf",
@@ -1527,6 +1788,21 @@ def _build_document_adoc(profile: ServiceProfile) -> str:
     return "\n".join(lines) + "\n"
 
 
+def _terms_adoc(profile: ServiceProfile) -> str:
+    """Render profile-supplied terms as Metanorma term clauses, or empty string."""
+    m = profile.document_metadata
+    terms = getattr(m, "terms", None) if m else None
+    if not terms:
+        return ""
+    out = ["\n"]
+    for t in terms:
+        out.append(f"=== {t.term}\n\n{t.definition}\n")
+        if t.source:
+            out.append(f"\n_{t.source}_\n")
+        out.append("\n")
+    return "".join(out)
+
+
 def _build_sections(profile: ServiceProfile) -> dict[str, str]:
     """Return the minimal boilerplate sections required by Metanorma OGC."""
     m = profile.document_metadata
@@ -1655,6 +1931,7 @@ def _build_sections(profile: ServiceProfile) -> dict[str, str]:
             "which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. "
             "In particular, the word \"shall\" (not \"must\") is the verb form used to indicate a requirement to be strictly followed to conform to this standard.\n\n"
             "This document also uses terms defined in OGC API - EDR Part 1: Core.\n"
+            + _terms_adoc(profile)
         ),
         "sections/06-requirements.adoc": (
             "== Requirements\n\n"
@@ -1738,8 +2015,10 @@ def generate(profile: ServiceProfile, output_dir: Path) -> None:
     if boilerplate_xml:
         safe_write("boilerplate.xml", boilerplate_xml)
 
-    # PDF stylesheet override to suppress the flavor's preface-page logo.
-    if m and m.suppress_flavor_logo:
-        safe_write("logo_override.xsl", _LOGO_OVERRIDE_XSL)
+    # Consolidated PDF stylesheet override (logo, crossing lines, section-number
+    # circles, title underlines) — written when any override flag is set.
+    pdf_override_xsl = _build_pdf_override_xsl(m)
+    if pdf_override_xsl:
+        safe_write(_PDF_OVERRIDE_FILENAME, pdf_override_xsl)
 
     print(f"Profile '{profile.name}' written to {output_dir}")

{oapi_profile_builder-3.2.1 → oapi_profile_builder-3.3.0}/src/oapi_profile_builder/models.py

@@ -353,6 +353,20 @@ class NormativeReference(BaseModel):
     title: str = Field(description="Full reference title")
 
 
+class Term(BaseModel):
+    """A profile-supplied entry for the Terms and Definitions section.
+
+    Appended after the base terms so a profile can extend the vocabulary (e.g.
+    with EDR Part 3 or Pub/Sub terms). Rendered as a Metanorma term clause.
+    """
+    term: str = Field(description="The term being defined, e.g. 'publish/subscribe'")
+    definition: str = Field(description="The definition text")
+    source: str | None = Field(
+        default=None,
+        description="Optional source/authority for the definition, e.g. 'SOURCE: OGC 19-086r6'",
+    )
+
+
 # Metanorma OGC document stages (`:status:` / `:docstage:`). See
 # https://www.metanorma.org/author/ogc/ref/document-attributes/
 DocStatus = Literal[
@@ -435,6 +449,29 @@ class CoverPage(BaseModel):
     tagline: str | None = Field(default=None, description="Optional line rendered under the logo, e.g. an organisation motto")
     background: str | None = Field(default=None, description="Cover background hex colour (default white)")
     text_color: str | None = Field(default=None, description="Cover text hex colour (default black)")
+    font_regular: str | None = Field(
+        default=None,
+        description=(
+            "Cover font for normal text: a font-file path (.ttf/.otf) or an installed "
+            "family name (e.g. 'Source Sans Pro'). Family names are resolved via fontconfig. "
+            "Defaults to DejaVu Sans."
+        ),
+    )
+    font_bold: str | None = Field(
+        default=None,
+        description="Cover font for bold text (doc number/title). Path or family name; derived from font_regular when unset.",
+    )
+    font_italic: str | None = Field(
+        default=None,
+        description="Cover font for the italic tagline. Path or family name; derived from font_regular when unset.",
+    )
+    watermark: str | None = Field(
+        default=None,
+        description=(
+            "Optional watermark text stamped diagonally across the cover (e.g. 'DRAFT'). "
+            "Note: this marks the cover only; an every-page watermark requires the Metanorma layer."
+        ),
+    )
 
     @field_validator("background", "text_color")
     @classmethod
@@ -444,6 +481,25 @@ class CoverPage(BaseModel):
         return v
 
 
+class PdfFonts(BaseModel):
+    """PDF body/heading/monospace font overrides.
+
+    Maps to Metanorma's ``:body-font:``, ``:header-font:`` and
+    ``:monospace-font:`` document attributes, so a profile can set the PDF
+    typeface (e.g. DGIWG's Source Sans Pro) without a custom flavor. The named
+    fonts must be resolvable by the Metanorma container (i.e. present in the
+    mounted ``~/.fontist/fonts``). See
+    https://www.metanorma.org/author/ref/document-attributes/
+    """
+    body: str | None = Field(default=None, description="Body text font family (:body-font:), e.g. 'Source Sans Pro'")
+    header: str | None = Field(default=None, description="Heading font family (:header-font:)")
+    monospace: str | None = Field(default=None, description="Monospace/code font family (:monospace-font:)")
+
+    def to_metanorma_attributes(self) -> dict[str, str]:
+        mapping = {"body": "body-font", "header": "header-font", "monospace": "monospace-font"}
+        return {attr: getattr(self, f) for f, attr in mapping.items() if getattr(self, f, None)}
+
+
 class Boilerplate(BaseModel):
     """Front-matter legal boilerplate (page ii) — copyright, license, legal notice.
 
@@ -508,11 +564,22 @@ class DocumentMetadata(BaseModel):
         default_factory=list,
         description="Additional normative references appended to the References section.",
     )
+    terms: list[Term] = Field(
+        default_factory=list,
+        description=(
+            "Profile-supplied terms appended to the Terms and Definitions section "
+            "(e.g. EDR Part 3 / Pub/Sub terms), each with a definition and optional source."
+        ),
+    )
     external_id: str | None = None
     colors: PdfColors | None = Field(
         default=None,
         description="PDF colour-scheme overrides (mapped to Metanorma :presentation-metadata-color-*: attributes).",
     )
+    fonts: PdfFonts | None = Field(
+        default=None,
+        description="PDF font overrides (body/header/monospace) mapped to Metanorma :body-font:/:header-font:/:monospace-font:.",
+    )
     cover: CoverPage | None = Field(
         default=None,
         description="Custom cover-page branding (logo + generated cover) replacing the built-in OGC cover.",
@@ -542,6 +609,62 @@ class DocumentMetadata(BaseModel):
             "Metanorma flavor."
         ),
     )
+    body_font: str | None = Field(
+        default=None,
+        description=(
+            "PDF body-text font family (Metanorma :body-font:), e.g. 'Source Sans Pro'. "
+            "The font must be resolvable by fontist/the Metanorma container."
+        ),
+    )
+    header_font: str | None = Field(
+        default=None,
+        description="PDF heading font family (Metanorma :header-font:).",
+    )
+    monospace_font: str | None = Field(
+        default=None,
+        description="PDF monospace font family (Metanorma :monospace-font:).",
+    )
+    suppress_crossing_lines: bool = Field(
+        default=False,
+        description=(
+            "When true, remove the OGC flavor's 'crossing lines' design element (the "
+            "blue crossed lines with dots on the cover and section-divider pages) via "
+            "the PDF stylesheet override. Coupled to the OGC Metanorma flavor."
+        ),
+    )
+    plain_section_numbers: bool = Field(
+        default=False,
+        description=(
+            "When true, render section-divider numbers as plain text instead of the OGC "
+            "flavor's coloured circles (e.g. '1 Scope' rather than a circled '1'). "
+            "Coupled to the OGC Metanorma flavor."
+        ),
+    )
+    suppress_title_underlines: bool = Field(
+        default=False,
+        description=(
+            "When true, remove the short/long horizontal rule the OGC flavor draws "
+            "beneath section titles. Coupled to the OGC Metanorma flavor."
+        ),
+    )
+    suppress_design_elements: bool = Field(
+        default=False,
+        description=(
+            "When true, strip the OGC flavor's decorative PDF design elements — the "
+            "blue 'crossing lines' motif, the circular badges around clause numbers, and "
+            "the short rule under clause titles — via a targeted PDF stylesheet override. "
+            "Produces a plainer 'i. Abstract' / '1 Scope' heading style for SDOs (e.g. "
+            "DGIWG) that don't use the OGC house style. Coupled to the OGC Metanorma flavor."
+        ),
+    )
+    page_watermark: str | None = Field(
+        default=None,
+        description=(
+            "Optional text (e.g. 'DRAFT') rendered as a light diagonal watermark on every "
+            "PDF page via a PDF stylesheet override. Distinct from cover.watermark, which "
+            "only marks the generated cover image. Coupled to the OGC Metanorma flavor."
+        ),
+    )
 
     @field_validator("submission_date", "approval_date", "publication_date")
     @classmethod

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oapi-profile-builder
-Version: 3.2.1
+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.1/src/oapi_profile_builder/compile.py

@@ -1,75 +0,0 @@
-# =================================================================
-#
-# 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) -> bool:
-    """
-    Run `docker run metanorma/metanorma compile` against document.adoc
-    in output_dir. Returns True on success.
-    """
-    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)
-
-    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(f"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