quints 0.6.0__tar.gz → 0.7.0__tar.gz

{quints-0.6.0 → quints-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quints
-Version: 0.6.0
+Version: 0.7.0
 Summary: Swiss VAT & accounting toolkit for plain-text (beancount) books: MWST reports and quarterly settlement, Bezugsteuer helpers, BAZG daily FX rates, QR-bill invoicing, KMU statutory statements, and statement importers (UBS MT940, Yapeal, Wise, Stripe) that draft into a staging area
 License: GPL-2.0-only
 License-File: LICENSE

{quints-0.6.0 → quints-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "quints"
-version = "0.6.0"
+version = "0.7.0"
 description = "Swiss VAT & accounting toolkit for plain-text (beancount) books: MWST reports and quarterly settlement, Bezugsteuer helpers, BAZG daily FX rates, QR-bill invoicing, KMU statutory statements, and statement importers (UBS MT940, Yapeal, Wise, Stripe) that draft into a staging area"
 readme = "README.md"
 requires-python = ">=3.10"

quints-0.7.0/src/quints/invoice/fonts/LICENSE

@@ -0,0 +1,102 @@
+Digitized data copyright (c) 2010 Google Corporation
+	with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+	with Reserved Font Name Liberation.
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+
+PREAMBLE The goals of the Open Font License (OFL) are to stimulate
+worldwide development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to provide
+a free and open framework in which fonts may be shared and improved in
+partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves.
+The fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works.  The fonts and derivatives,
+however, cannot be released under any other type of license.  The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+ 
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such.
+This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components
+as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting ? in part or in whole ?
+any of the components of the Original Version, by changing formats or
+by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer
+or other person who contributed to the Font Software.
+
+
+PERMISSION & CONDITIONS
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,in
+   Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+   redistributed and/or sold with any software, provided that each copy
+   contains the above copyright notice and this license. These can be
+   included either as stand-alone text files, human-readable headers or
+   in the appropriate machine-readable metadata fields within text or
+   binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+   Name(s) unless explicit written permission is granted by the
+   corresponding Copyright Holder. This restriction only applies to the
+   primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+   Software shall not be used to promote, endorse or advertise any
+   Modified Version, except to acknowledge the contribution(s) of the
+   Copyright Holder(s) and the Author(s) or with their explicit written
+   permission.
+
+5) The Font Software, modified or unmodified, in part or in whole, must
+   be distributed entirely under this license, and must not be distributed
+   under any other license. The requirement for fonts to remain under
+   this license does not apply to any document created using the Font
+   Software.
+
+
+ 
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+ 
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
+DEALINGS IN THE FONT SOFTWARE.
+

quints-0.7.0/src/quints/invoice/fonts/README.md

@@ -0,0 +1,15 @@
+# Bundled fallback fonts
+
+Liberation Sans, always added to the Typst font search path.
+
+It carries two guarantees the invoice template would otherwise only get by
+luck, from whatever the rendering machine happens to have installed:
+
+- `Brand.font` defaults to Liberation Sans, and the template names it as the
+  fallback behind every issuer-configured family.
+- The Swiss QR-bill Implementation Guidelines permit only Arial, Frutiger,
+  Helvetica and Liberation Sans in the payment part. Liberation Sans is the
+  one of the four that can be licensed and shipped, and it is metric-
+  compatible with Arial, which the `qrbill` library sizes its text boxes for.
+
+Liberation Fonts 2.1.5, SIL Open Font License 1.1 — see `LICENSE`.

{quints-0.6.0 → quints-0.7.0}/src/quints/invoice/model.py

@@ -14,10 +14,17 @@ import sys
 from datetime import date
 from decimal import ROUND_HALF_UP, Decimal
 from pathlib import Path
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 import yaml
-from pydantic import BaseModel, Field, RootModel, field_validator, model_validator
+from pydantic import (
+    BaseModel,
+    Field,
+    RootModel,
+    StringConstraints,
+    field_validator,
+    model_validator,
+)
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -249,13 +256,40 @@ class BankAccount(BaseModel):
         return v.replace(" ", "")
 
 
+# Every hex form Typst's `rgb()` takes: RGB, RGBA, RRGGBB, RRGGBBAA. `accent`
+# used to be a bare `str` handed straight to `rgb()`, so anything shorthand that
+# rendered before still loads; only strings Typst would have rejected anyway are
+# caught here, and now at config-load time instead of mid-render.
+HexColor = Annotated[
+    str, StringConstraints(pattern=r"^#([0-9A-Fa-f]{3,4}|[0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$")
+]
+
+
 class Brand(BaseModel):
-    accent: str = "#123c3a"
+    """Typography and colour tokens the template renders with.
+
+    The colour defaults reproduce the neutral greyscale the template used
+    before tokens existed, so an issuer config that sets none of them keeps
+    its previous look. An issuer with a palette overrides them all.
+    """
+
+    accent: HexColor = "#123c3a"
     font: str = "Liberation Sans"
     font_display: str | None = None  # title/wordmark family; defaults to `font`
     font_display_stretch: int = 100  # CSS-style font-stretch % (125 → Expanded cut)
+    # Title weight. Not every display family ships every cut — Mona Sans
+    # Expanded starts at Medium, so asking for "regular" silently drops back to
+    # the normal-width face; a serif title usually wants "regular".
+    font_display_weight: Literal["regular", "medium", "semibold", "bold"] = "semibold"
+    font_mono: str | None = None  # figures, IBAN, reference; defaults to `font`
     font_dir: str | None = None  # bundled fonts dir passed to typst (repo-relative)
     logo: str | None = None
+    logo_height: float = 12.0  # mm, as placed in the header
+
+    ink: HexColor = "#141414"  # body copy
+    subtle: HexColor = "#696969"  # labels and secondary text
+    rule: HexColor = "#d2d2d2"  # hairlines
+    panel: HexColor = "#f6f6f6"  # fill behind bounded blocks
 
 
 class Issuer(BaseModel):

{quints-0.6.0 → quints-0.7.0}/src/quints/invoice/qr.py

@@ -52,7 +52,7 @@ def build_bill(inv: Invoice, issuer: Issuer, account: BankAccount, grand: Decima
         raise ValueError(f"Swiss QR-bill supports only CHF or EUR, not {currency!r}")
     with warnings.catch_warnings():
         warnings.simplefilter("ignore")
-        return QRBill(
+        bill = QRBill(
             account=account.qr_iban or account.iban,
             creditor=_structured(issuer.name, issuer.address, issuer.country),
             debtor=_structured(customer.name, customer.address, customer.country),
@@ -61,6 +61,12 @@ def build_bill(inv: Invoice, issuer: Issuer, account: BankAccount, grand: Decima
             reference_number=reference_for(inv, account),
             additional_information=f"{inv.number}",
         )
+    # The Implementation Guidelines allow Arial, Frutiger, Helvetica and
+    # Liberation Sans in the payment part, and nothing else. qrbill asks for
+    # Arial/Helvetica only, which are system faces — an issuer that bundles
+    # fonts has system faces switched off, so name the OFL one it can ship.
+    bill.font_family = "Arial,Helvetica,Liberation Sans"
+    return bill
 
 
 def write_svg(bill: QRBill, path: Path) -> None:

{quints-0.6.0 → quints-0.7.0}/src/quints/invoice/render.py

@@ -18,6 +18,10 @@ from .labels import labels as get_labels
 from .model import Invoice, Issuer, Totals, compute, make_scor, money, number
 
 TEMPLATE = Path(__file__).parent / "template.typ"
+# Liberation Sans, always on the search path: the default `Brand.font`, the
+# template's last-resort fallback, and the only face the QR-bill payment part
+# is allowed to use that we can ship. See fonts/README.md.
+BUNDLED_FONTS = Path(__file__).parent / "fonts"
 
 
 class InvoiceContext(TypedDict):
@@ -36,7 +40,7 @@ class InvoiceContext(TypedDict):
     totals: dict[str, str | bool]
     payment: Mapping[str, str | None]
     notes: list[str]
-    brand: dict[str, str | int | None]
+    brand: dict[str, str | float | None]
 
 
 def _fmt_iban(iban: str) -> str:
@@ -113,20 +117,45 @@ def build_context(
             "font": issuer.brand.font,
             "font_display": issuer.brand.font_display or issuer.brand.font,
             "display_stretch": issuer.brand.font_display_stretch,
+            "display_weight": issuer.brand.font_display_weight,
+            "font_mono": issuer.brand.font_mono or issuer.brand.font,
+            "ink": issuer.brand.ink,
+            "subtle": issuer.brand.subtle,
+            "rule": issuer.brand.rule,
+            "panel": issuer.brand.panel,
             "logo": logo,
+            "logo_height": issuer.brand.logo_height,
         },
     }
 
 
-def _compile(main: Path, output: Path, root: Path, font_paths: list[Path]) -> None:
-    """Compile to PDF/A-2b (archival) when supported, else a plain PDF."""
+def _compile(
+    main: Path, output: Path, root: Path, font_paths: list[Path], only_bundled: bool
+) -> None:
+    """Compile to PDF/A-2b (archival) when supported, else a plain PDF.
+
+    `only_bundled` switches machine-installed families off, and is set when the
+    issuer ships their own font directory. Without it, a variable font installed
+    on the designer's machine shadows the bundled static cuts of the same family
+    and every weight silently collapses to the variable font's default instance,
+    so the same invoice renders differently on a colleague's machine. Issuers on
+    the default font keep system fonts, since their families may live there.
+    """
     fonts = [str(p) for p in font_paths]
-    try:
-        typst.compile(
-            str(main), output=str(output), root=str(root), font_paths=fonts, pdf_standards="a-2b"
-        )
-    except (TypeError, ValueError):  # older typst-py, or standard unsupported
-        typst.compile(str(main), output=str(output), root=str(root), font_paths=fonts)
+    base: dict[str, object] = {"output": str(output), "root": str(root), "font_paths": fonts}
+    # Most capable call first; drop the options an older typst-py may not know.
+    attempts = [
+        {**base, "ignore_system_fonts": only_bundled, "pdf_standards": "a-2b"},
+        {**base, "pdf_standards": "a-2b"},
+        base,
+    ]
+    for i, opts in enumerate(attempts):
+        try:
+            typst.compile(str(main), **opts)  # type: ignore[arg-type]
+            return
+        except (TypeError, ValueError):
+            if i == len(attempts) - 1:
+                raise
 
 
 def render(inv: Invoice, issuer: Issuer, out_path: Path) -> tuple[Path, Totals, str | None]:
@@ -184,11 +213,14 @@ def render(inv: Invoice, issuer: Issuer, out_path: Path) -> tuple[Path, Totals,
         shutil.copy(TEMPLATE, work / "template.typ")
 
         font_dir = issuer.brand.font_dir
-        font_paths = [Path(font_dir)] if font_dir and Path(font_dir).is_dir() else []
+        issuer_fonts = [Path(font_dir)] if font_dir and Path(font_dir).is_dir() else []
+        # Ours first so the guaranteed fallback is always resolvable; the
+        # issuer's own families win on name, not on search order.
+        font_paths = [BUNDLED_FONTS, *issuer_fonts]
 
         out_path = Path(out_path)
         out_path.parent.mkdir(parents=True, exist_ok=True)
-        _compile(work / "template.typ", out_path, work, font_paths)
+        _compile(work / "template.typ", out_path, work, font_paths, bool(issuer_fonts))
         return out_path, totals, qr_payload
     finally:
         shutil.rmtree(work, ignore_errors=True)

quints-0.7.0/src/quints/invoice/template.typ

@@ -0,0 +1,184 @@
+// quints invoice template — data-driven (reads data.json), two modes.
+//
+// Everything issuer-specific arrives through `data.json`: no family name, hex
+// colour or asset path is hard-coded here. The brand tokens are:
+//   accent  — the one saturated colour: title, rules that lead, the amount due
+//   ink     — body copy            subtle — labels and secondary text
+//   rule    — hairlines            panel  — fill behind bounded blocks
+// and three families: `font` (body), `font_display` (title), `font_mono` —
+// every figure, IBAN and reference. Set `font_mono` to a real monospace and the
+// amount columns align on the digit; left unset it follows the body face.
+#let d = json("data.json")
+#let L = d.labels
+#let accent = rgb(d.brand.accent)
+#let ink = rgb(d.brand.ink)
+#let subtle = rgb(d.brand.subtle)
+#let rule = rgb(d.brand.rule)
+#let panel = rgb(d.brand.panel)
+#let body = (d.brand.font, "Liberation Sans", "Arial")
+#let display = (d.brand.font_display, d.brand.font, "Liberation Sans", "Arial")
+#let mono = (d.brand.font_mono, d.brand.font, "Liberation Mono", "Courier New")
+#let lines(a) = a.join(linebreak())
+#let qrbill = d.payment.type == "qrbill"
+
+// Display face. `stretch` is only passed when the issuer actually asks for a
+// width other than normal: a font with no wdth axis fails to match against an
+// explicit stretch and silently falls back to the body face.
+#let disp(it, size: 10pt, fill: ink) = text(
+  font: display, size: size, weight: d.brand.display_weight, fill: fill,
+  ..(if d.brand.display_stretch != 100 { (stretch: d.brand.display_stretch * 1%) } else { (:) }),
+)[#it]
+
+// Small tracked capitals: every label in the document, at one size.
+#let label(it) = text(size: 7pt, weight: "medium", tracking: 0.1em, fill: subtle)[#upper(it)]
+// Figures. Tabular by construction — the mono family keeps columns on the digit.
+#let fig(it, weight: "regular", fill: ink, size: 9.5pt) = text(
+  font: mono, size: size, weight: weight, fill: fill,
+)[#it]
+
+#set document(title: L.invoice + " " + d.invoice.number, author: d.issuer.name)
+#set page(
+  paper: "a4",
+  margin: (x: 20mm, top: 16mm, bottom: if qrbill { 108mm } else { 24mm }),
+)
+#set text(font: body, size: 9.5pt, fill: ink)
+#set par(justify: false, leading: 0.65em)
+
+// ── Header: wordmark left, issuer identity right (Art. 26 Abs. 2 lit. a MWSTG) ─
+#grid(columns: (1fr, auto), column-gutter: 10mm,
+  align(left + top,
+    if d.brand.logo != none {
+      image(d.brand.logo, height: d.brand.logo_height * 1mm)
+    } else {
+      disp(d.issuer.name, size: 17pt)
+    }
+  ),
+  align(right + top)[
+    #set text(size: 7.5pt, fill: subtle)
+    #set par(leading: 0.55em)
+    #text(fill: ink, weight: "medium")[#d.issuer.name] \
+    #lines(d.issuer.address) \
+    #d.issuer.vat_id
+    #if d.issuer.email != none [ \ #link("mailto:" + d.issuer.email)[#d.issuer.email] ]
+    #if d.issuer.phone != none [ \ #d.issuer.phone ]
+  ],
+)
+#v(4mm)
+#line(length: 100%, stroke: 0.5pt + rule)
+
+// ── Recipient (right, window-envelope position) ───────────────────────
+#place(top + left, dx: 112mm, dy: 30mm, block(width: 78mm)[
+  #set par(leading: 0.6em)
+  #text(weight: "medium")[#d.customer.name] \
+  #lines(d.customer.address)
+  #if d.customer.country != d.issuer.country [ \ #d.customer.country ]
+  #if d.customer.vat_id != none [ \ #d.customer.vat_id ]
+])
+
+// Clears the recipient block placed above; the QR-bill leaves only ~173mm of
+// body height, so the rhythm below stays deliberately tight.
+#v(17mm)
+
+// ── Title + meta ──────────────────────────────────────────────────────
+#disp(L.invoice, size: 25pt, fill: accent)
+#v(4mm)
+#grid(columns: (auto, auto), column-gutter: 7mm, row-gutter: 4pt,
+  align(horizon, label(L.invoice_no)), fig(d.invoice.number, weight: "medium"),
+  align(horizon, label(L.date)), fig(d.invoice.issue_date),
+  ..(if d.invoice.supply != "" {
+    (align(horizon, label(L.supply)), text(size: 9.5pt)[#d.invoice.supply])
+  } else { () }),
+)
+#v(8mm)
+
+// ── Line items ────────────────────────────────────────────────────────
+#table(
+  columns: (auto, 1fr, auto, auto, auto),
+  inset: (x: 0pt, y: 7pt),
+  column-gutter: 6mm,
+  align: (x, y) => if x >= 2 { right } else { left },
+  stroke: none,
+  table.hline(stroke: 1pt + accent),
+  table.header(
+    label(L.pos), label(L.description), label(L.qty), label(L.unit_price), label(L.line_total),
+  ),
+  table.hline(stroke: 0.5pt + rule),
+  ..d.items.map(it => (
+    fig(it.pos, fill: subtle, size: 9pt),
+    [#it.description],
+    fig[#it.quantity#if it.unit != "" [ #it.unit]],
+    fig(it.unit_price),
+    fig(it.total),
+  )).flatten(),
+  table.hline(stroke: 0.5pt + rule),
+)
+
+// ── Totals ────────────────────────────────────────────────────────────
+#v(4mm)
+#align(right, block(width: 76mm)[
+  #let row(l, v) = grid(
+    columns: (1fr, auto), column-gutter: 6mm,
+    align(horizon, label(l)), v,
+  )
+  #row(L.subtotal, fig(d.currency + " " + d.totals.subtotal))
+  #if not d.totals.export {
+    v(3pt)
+    row(L.vat + " " + d.totals.vat_rate + "%", fig(d.currency + " " + d.totals.vat_amount))
+  }
+  #if d.totals.show_rounding {
+    v(3pt)
+    row(L.rounding, fig(d.currency + " " + d.totals.rounding))
+  }
+  #v(5pt)
+  // The amount due is the one thing a reader looks for: accent on a tinted band.
+  #block(fill: panel, inset: (x: 8pt, y: 7pt), width: 100%,
+    grid(columns: (1fr, auto), column-gutter: 6mm,
+      align(horizon, text(size: 8pt, weight: "medium", tracking: 0.1em, fill: accent)[
+        #upper(L.grand_total)
+      ]),
+      fig(d.currency + " " + d.totals.grand_total, weight: "medium", fill: accent, size: 12pt),
+    ),
+  )
+])
+
+// ── Export legal notes ────────────────────────────────────────────────
+#if d.totals.export {
+  v(6mm)
+  block(
+    fill: panel, width: 100%,
+    inset: (left: 9pt, right: 9pt, y: 8pt), stroke: (left: 1.5pt + accent),
+  )[
+    #set text(size: 8.5pt)
+    #L.export_note
+    #if d.reverse_charge [ \ #text(fill: subtle)[#L.reverse_charge] ]
+  ]
+}
+
+// ── Payment terms + notes ─────────────────────────────────────────────
+#if d.terms != none or d.notes.len() > 0 {
+  v(5mm)
+  set text(size: 8.5pt, fill: subtle)
+  if d.terms != none [ #d.terms \ ]
+  for n in d.notes [ #n \ ]
+}
+
+// ── Payment ───────────────────────────────────────────────────────────
+#if qrbill {
+  // Full-width Swiss QR-bill payment part, flush at the page bottom. Its
+  // layout and typography are prescribed by the Implementation Guidelines —
+  // it is rendered by qr.py and deliberately left unstyled here.
+  place(bottom + left, dx: -20mm, dy: 108mm, image("qrbill.svg", width: 210mm))
+} else {
+  v(8mm)
+  block(fill: panel, inset: (x: 10pt, y: 9pt), width: 100%)[
+    #text(size: 8pt, weight: "medium", tracking: 0.1em, fill: accent)[#upper(L.payment_to)]
+    #v(4pt)
+    #grid(columns: (auto, 1fr), column-gutter: 7mm, row-gutter: 4pt,
+      align(horizon, label("IBAN")), fig(d.payment.iban),
+      ..(if d.payment.bic != none {
+        (align(horizon, label("BIC")), fig(d.payment.bic))
+      } else { () }),
+      align(horizon, label(L.reference)), fig(d.payment.reference),
+    )
+  ]
+}

{quints-0.6.0 → quints-0.7.0}/tests/test_invoice.py

@@ -304,6 +304,61 @@ def test_reverse_charge_flag_in_context():
     assert ctx["reverse_charge"] is True
 
 
+# ── brand tokens ──────────────────────────────────────────────────────────────
+
+
+def test_brand_tokens_reach_the_template_context():
+    from quints.invoice.model import Brand
+    from quints.invoice.render import build_context
+
+    brand_in = Brand(accent="#6b1f4a", ink="#1c1618", font="Geist", font_mono="Geist Mono")
+    inv = _export()
+    brand = build_context(inv, ISSUER.model_copy(update={"brand": brand_in}), compute(inv), {})[
+        "brand"
+    ]
+    assert brand["accent"] == "#6b1f4a"
+    assert brand["ink"] == "#1c1618"
+    assert brand["font_mono"] == "Geist Mono"
+    # Every token the template dereferences must be present: Typst fails on a
+    # missing dictionary key, and only when that branch of the layout renders.
+    assert {
+        "subtle",
+        "rule",
+        "panel",
+        "font_display",
+        "display_stretch",
+        "logo_height",
+    } <= set(brand)
+
+
+def test_brand_font_families_fall_back_to_the_body_face():
+    from quints.invoice.model import Brand
+    from quints.invoice.render import build_context
+
+    issuer = ISSUER.model_copy(update={"brand": Brand(font="Mona Sans")})
+    inv = _export()
+    brand = build_context(inv, issuer, compute(inv), {})["brand"]
+    assert brand["font_display"] == "Mona Sans"
+    assert brand["font_mono"] == "Mona Sans"
+
+
+def test_brand_rejects_a_non_hex_colour():
+    from quints.invoice.model import Brand
+
+    for bad in ("tyrian", "#6b1f4", "6b1f4a", "rgb(107,31,74)"):
+        with pytest.raises(ValueError):
+            Brand(accent=bad)
+
+
+def test_brand_accepts_every_hex_form_typst_takes():
+    """`accent` was an unconstrained `str` handed straight to Typst's `rgb()`.
+    Validating it must not reject a shorthand palette that rendered before."""
+    from quints.invoice.model import Brand
+
+    for good in ("#fff", "#fff8", "#6b1f4a", "#6b1f4aff"):
+        assert Brand(accent=good).accent == good
+
+
 # ── schema ────────────────────────────────────────────────────────────────────
 
 
@@ -433,3 +488,64 @@ def test_render_embeds_bundled_font(tmp_path: Path):
     # body font and the wide title cut must be embedded, not system fallbacks
     assert b"MonaSans-Regular" in pdf
     assert b"MonaSansExpanded-SemiBold" in pdf
+
+
+def test_bundled_fallback_font_is_always_on_the_search_path(tmp_path: Path):
+    """Liberation Sans ships with the package: it is the default `Brand.font`,
+    the template's last-resort fallback, and the only face the QR-bill payment
+    part may use that we can distribute (its guidelines allow four)."""
+    from quints.invoice import render
+
+    out = tmp_path / "inv.pdf"
+    render.render(_domestic(), ISSUER, out)  # ISSUER sets no font_dir
+    assert b"LiberationSans" in out.read_bytes()
+
+
+def test_qr_bill_keeps_a_permitted_face_without_system_fonts(tmp_path: Path):
+    """With system fonts off, Arial and Helvetica are unreachable, and the QR-bill
+    payment part may use only those two, Frutiger, or Liberation Sans. It must
+    land on the bundled Liberation Sans and not fall through to a Typst default.
+
+    The bold cut doubles as the regression test for weight shadowing: the
+    payment part sets headings bold, so a real `-Bold` face has to be embedded.
+    """
+    from quints.invoice import render
+    from quints.invoice.model import Brand
+
+    # Pointing font_dir at our own bundle is the smallest issuer that ships
+    # fonts, which is what switches machine-installed families off.
+    issuer = ISSUER.model_copy(update={"brand": Brand(font_dir=str(render.BUNDLED_FONTS))})
+    out = tmp_path / "inv.pdf"
+    render.render(_domestic(), issuer, out)
+    pdf = out.read_bytes()
+    assert b"LiberationSans-Bold" in pdf
+    assert b"DejaVu" not in pdf and b"Libertinus" not in pdf
+
+
+def test_issuer_bundled_fonts_switch_off_machine_fonts(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+):
+    """Regression: a variable font installed on the rendering machine shadows
+    the bundled static cuts of the same family, collapsing every weight to the
+    variable default. Only an issuer that ships fonts opts out of system ones —
+    issuers on the default font may legitimately keep a family installed."""
+    import typst
+
+    from quints.invoice import render
+    from quints.invoice.model import Brand
+
+    seen: list[object] = []
+
+    def spy(_main: str, **kwargs: object) -> None:
+        seen.append(kwargs.get("ignore_system_fonts"))
+        raise ValueError("stop after capturing the first attempt")
+
+    monkeypatch.setattr(typst, "compile", spy)
+
+    fonts = render.BUNDLED_FONTS  # any real directory will do
+    for brand, expected in [(Brand(font_dir=str(fonts)), True), (Brand(), False)]:
+        seen.clear()
+        issuer = ISSUER.model_copy(update={"brand": brand})
+        with pytest.raises(ValueError):
+            render.render(_domestic(), issuer, tmp_path / "inv.pdf")
+        assert seen[0] is expected

quints-0.6.0/src/quints/invoice/template.typ

@@ -1,140 +0,0 @@
-// quints invoice template — data-driven (reads data.json), two modes.
-#let d = json("data.json")
-#let L = d.labels
-#let accent = rgb(d.brand.accent)
-#let display = (d.brand.font_display, d.brand.font, "Liberation Sans", "Arial")
-#let dstretch = d.brand.display_stretch * 1%
-#let muted = luma(105)
-#let lines(a) = a.join(linebreak())
-#let qrbill = d.payment.type == "qrbill"
-
-#set document(title: L.invoice + " " + d.invoice.number, author: d.issuer.name)
-#set page(
-  paper: "a4",
-  margin: (x: 20mm, top: 18mm, bottom: if qrbill { 108mm } else { 24mm }),
-)
-#set text(font: (d.brand.font, "Liberation Sans", "Arial"), size: 10pt, fill: luma(20))
-#set par(justify: false, leading: 0.62em)
-
-// ── Header: wordmark left, issuer identity right (Art. 26 Abs. 2 lit. a MWSTG) ─
-#grid(columns: (1fr, auto),
-  align(left + top,
-    if d.brand.logo != none {
-      image(d.brand.logo, height: 12mm)
-    } else {
-      text(font: display, stretch: dstretch, size: 15pt, weight: "bold", fill: accent)[#d.issuer.name]
-    }
-  ),
-  align(right + top)[
-    #set text(size: 8pt, fill: muted)
-    #set par(leading: 0.5em)
-    #text(weight: "semibold", fill: luma(60))[#d.issuer.name] \
-    #lines(d.issuer.address) \
-    #d.issuer.vat_id
-    #if d.issuer.email != none [ \ #link("mailto:" + d.issuer.email)[#d.issuer.email] ]
-    #if d.issuer.phone != none [ \ #d.issuer.phone ]
-  ],
-)
-
-// ── Recipient (right, window-envelope position) ───────────────────────
-#place(top + left, dx: 112mm, dy: 34mm, block(width: 78mm)[
-  #set text(size: 10pt)
-  #strong(d.customer.name) \
-  #lines(d.customer.address)
-  #if d.customer.country != d.issuer.country [ \ #d.customer.country ]
-  #if d.customer.vat_id != none [ \ #d.customer.vat_id ]
-])
-
-#v(38mm)
-
-// ── Title + meta ──────────────────────────────────────────────────────
-#text(font: display, stretch: dstretch, size: 20pt, weight: "semibold", fill: accent)[#L.invoice]
-#v(3mm)
-#grid(columns: (auto, auto), column-gutter: 8mm, row-gutter: 3pt,
-  text(fill: muted)[#L.invoice_no], text(weight: "bold")[#d.invoice.number],
-  text(fill: muted)[#L.date], [#d.invoice.issue_date],
-  ..(if d.invoice.supply != "" { (text(fill: muted)[#L.supply], [#d.invoice.supply]) } else { () }),
-)
-#v(7mm)
-
-// ── Line items ────────────────────────────────────────────────────────
-#table(
-  columns: (auto, 1fr, auto, auto, auto),
-  inset: (x: 4pt, y: 6.5pt),
-  align: (x, y) => if x >= 2 { right } else { left },
-  stroke: none,
-  table.hline(stroke: 0.7pt + accent),
-  table.header(
-    text(size: 9pt, fill: accent, weight: "bold")[#L.pos],
-    text(size: 9pt, fill: accent, weight: "bold")[#L.description],
-    text(size: 9pt, fill: accent, weight: "bold")[#L.qty],
-    text(size: 9pt, fill: accent, weight: "bold")[#L.unit_price],
-    text(size: 9pt, fill: accent, weight: "bold")[#L.line_total],
-  ),
-  table.hline(stroke: 0.7pt + accent),
-  ..d.items.map(it => (
-    [#it.pos],
-    [#it.description],
-    [#it.quantity#if it.unit != "" [ #it.unit]],
-    [#it.unit_price],
-    [#it.total],
-  )).flatten(),
-  table.hline(stroke: 0.4pt + luma(210)),
-)
-
-// ── Totals ────────────────────────────────────────────────────────────
-#v(3mm)
-#align(right, block(width: 72mm)[
-  #let row(l, v, strong: false) = grid(
-    columns: (1fr, auto), column-gutter: 6mm,
-    if strong { text(weight: "bold")[#l] } else { text(fill: muted)[#l] },
-    if strong { text(weight: "bold")[#v] } else [#v],
-  )
-  #row(L.subtotal, [#d.currency #d.totals.subtotal])
-  #if not d.totals.export {
-    v(2.2pt)
-    row(L.vat + " " + d.totals.vat_rate + "%", [#d.currency #d.totals.vat_amount])
-  }
-  #if d.totals.show_rounding {
-    v(2.2pt)
-    row(L.rounding, [#d.currency #d.totals.rounding])
-  }
-  #v(4pt)
-  #line(length: 100%, stroke: 0.5pt + luma(180))
-  #v(4pt)
-  #row(L.grand_total, text(fill: accent)[#d.currency #d.totals.grand_total], strong: true)
-])
-
-// ── Export legal notes ────────────────────────────────────────────────
-#if d.totals.export {
-  v(6mm)
-  block(fill: luma(246), inset: 8pt, radius: 3pt, width: 100%)[
-    #text(size: 9pt)[#L.export_note]
-    #if d.reverse_charge [ \ #text(size: 9pt, fill: muted)[#L.reverse_charge] ]
-  ]
-}
-
-// ── Payment terms + notes ─────────────────────────────────────────────
-#if d.terms != none or d.notes.len() > 0 {
-  v(6mm)
-  set text(size: 9pt, fill: muted)
-  if d.terms != none [ #d.terms \ ]
-  for n in d.notes [ #n \ ]
-}
-
-// ── Payment ───────────────────────────────────────────────────────────
-#if qrbill {
-  // Full-width Swiss QR-bill payment part, flush at the page bottom.
-  place(bottom + left, dx: -20mm, dy: 108mm, image("qrbill.svg", width: 210mm))
-} else {
-  v(8mm)
-  block(stroke: 0.6pt + accent, inset: 10pt, radius: 3pt, width: 100%)[
-    #text(fill: accent, weight: "bold")[#L.payment_to] \
-    #v(2pt)
-    #grid(columns: (auto, 1fr), column-gutter: 6mm, row-gutter: 3pt,
-      text(fill: muted)[IBAN], [#d.payment.iban],
-      ..(if d.payment.bic != none { (text(fill: muted)[BIC], [#d.payment.bic]) } else { () }),
-      text(fill: muted)[#L.reference], [#d.payment.reference],
-    )
-  ]
-}