pytex-preprocessor 0.4.4__tar.gz → 0.4.6__tar.gz

{pytex_preprocessor-0.4.4/src/pytex_preprocessor.egg-info → pytex_preprocessor-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytex-preprocessor
-Version: 0.4.4
+Version: 0.4.6
 Summary: Type-safe LaTeX document generation with Python
 Author-email: Frederik Beimgraben <frederik@beimgraben.net>
 License:                     GNU GENERAL PUBLIC LICENSE

{pytex_preprocessor-0.4.4 → pytex_preprocessor-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytex-preprocessor"
-version = "0.4.4"
+version = "0.4.6"
 authors = [
   { name="Frederik Beimgraben", email="frederik@beimgraben.net" },
 ]

{pytex_preprocessor-0.4.4 → pytex_preprocessor-0.4.6}/src/pytex/commands/biblatex.py

@@ -58,8 +58,12 @@ def Parencite(*keys: str) -> TeX:
 
 @Registry.add
 @with_package(BIBLATEX)
-def Autocite(*keys: str) -> TeX:
-    return ControlSequence("autocite", (Parameter(",".join(keys)),))
+def Autocite(*keys: str, postnote: str | None = None) -> TeX:
+    key_param = Parameter(",".join(keys))
+    if postnote is None:
+        return ControlSequence("autocite", (key_param,))
+    # A single optional argument to \autocite is the postnote (e.g. a page).
+    return ControlSequence("autocite", (Parameter(postnote, optional=True), key_param))
 
 
 @Registry.add

{pytex_preprocessor-0.4.4 → pytex_preprocessor-0.4.6}/src/pytex_builder/build.py

@@ -142,8 +142,8 @@ def _parse_args(argv: list[str]) -> Config:
         default=None,
         metavar="STYLE",
         help=(
-            "Markdown output style: plain, report, protocol-asta, protocol-stupa"
-            + " (default: auto-detect)"
+            "Markdown output style: plain, report, report-makers, "
+            + "protocol-asta, protocol-stupa (default: auto-detect)"
         ),
     )
     _ = parser.add_argument(

{pytex_preprocessor-0.4.4 → pytex_preprocessor-0.4.6}/src/pytex_builder/tectonic.py

@@ -15,6 +15,7 @@ import subprocess
 import tarfile
 import tempfile
 import xml.etree.ElementTree as ET
+import zipfile
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -52,20 +53,50 @@ BIBER_MIRROR_URL = (
     "/releases/download/biber-binaries/{asset}"
 )
 
-# SHA256 of each upstream biber tarball, keyed by the versioned mirror asset
-# name. Used to verify downloads from either source and to reject HTML error
-# pages a CDN might serve with a 200 status. Linux x86_64 only for now; other
-# platforms download from SourceForge without a pinned checksum.
+# SHA256 of each biber binary, keyed by the versioned mirror asset name. Used
+# to verify downloads from either source and to reject HTML error pages a CDN
+# might serve with a 200 status. Covers every mirrored platform (glibc/musl
+# Linux x86_64, Linux aarch64, macOS x86_64/universal, Windows x86_64).
 BIBER_SHA256: dict[str, str] = {
+    "biber-2.11-darwin_x86_64.tar.gz": "4e3343574f917d7825148e4c9ccb665154476ec0817abf67f1fea052fb8cc728",
+    "biber-2.11-linux_x86_64-musl.tar.gz": "a6b7e61446ee8b23cc0b6b1eaffd4a8e0d271f06874ad22b025cc41f74050617",
     "biber-2.11-linux_x86_64.tar.gz": "7fcb51491fb24151810a92b2e2d03b7a1291823c0f8d6fb53183af391fca42e7",
+    "biber-2.11-MSWIN64.zip": "f3a438ae8d94e7afbd069f0f941b3d93816fc06647d88460ba05a5485ed4372a",
+    "biber-2.12-darwin_x86_64.tar.gz": "5a5f20669bd3e4cf56fd246ef2ba37d601ca2059510590a5022da4487d5e7bb8",
     "biber-2.12-linux_x86_64.tar.gz": "fd0b5145cc908c400a701b583330635d533d750b73a272d1d5ea47e10b2fbf71",
+    "biber-2.12-MSWIN64.zip": "96d99e075dbb666ad4ec93bcca5fcc15ea07b6f70e9151e7d44baa4cc7c02932",
+    "biber-2.13-darwin_x86_64.tar.gz": "ad47307b6f27c7bb129a1a3235e01245be3e95541bba9adca6892196e599edfd",
+    "biber-2.13-linux_x86_64-musl.tar.gz": "d4a25d32fef6993b5ea0dece70af4b09a1f2758f8b8737924250f3e6b80a979a",
     "biber-2.13-linux_x86_64.tar.gz": "03101f418d46f4666272b68a4318d9e4b7a840d9dfa05d93ddc490d491157a75",
+    "biber-2.13-MSWIN64.zip": "bf3ab70629465d674d020a10f34e307c7f6fb031dc7ea73627a1fe53b1e8457b",
+    "biber-2.14-darwin_x86_64.tar.gz": "d834ba71c05f8dfe668d4c40d13c0e11e0fee24e567877479a0ac1c98ad89131",
+    "biber-2.14-linux_x86_64-musl.tar.gz": "0b6c2a8307111c6dc2897d338be1ad446ef2e1ca8d126f806ce5c9bf7ff486ca",
     "biber-2.14-linux_x86_64.tar.gz": "dab3177f03322b5529d07d47d21d9e573a90c23d86eaaf11591b2d155316ee1b",
+    "biber-2.14-MSWIN64.zip": "247451621ef60378045cf917a007ef3219d3cbf833f080c3333927dea854b4fe",
+    "biber-2.15-darwin_x86_64.tar.gz": "e2b4931db6b4a684b640f41e53faee1c68f931f03c41d8f2c40d8b11c85511c7",
+    "biber-2.15-linux_x86_64-musl.tar.gz": "277acd35d51a07c1b75782514f88f1ad380581b0077548eaa0db6b60263dafaa",
     "biber-2.15-linux_x86_64.tar.gz": "653c8add18d2e94a233a6b9aae6d8144f965c2ce13fb7b4e66502b55fcd06e06",
+    "biber-2.15-MSWIN64.zip": "61553ef3d5e8bdff86e1ac8204236fbf3980bc8ade94949f1ad874ba4031eb7f",
+    "biber-2.16-darwin_x86_64.tar.gz": "c396133cc924c23111353ea5cb0e9960a98f1fddca8f42fbdb89e89424fc136f",
+    "biber-2.16-linux_x86_64-musl.tar.gz": "e0935c8e67016889b3c8bb1f0fbd602b587f6935cd61ee23bc2eb898ae633f58",
     "biber-2.16-linux_x86_64.tar.gz": "3afb97a42d2cf272d3c0b51663725e55339c4e6f3d594cd52e16c39fa9fcfb13",
+    "biber-2.16-MSWIN64.zip": "8e7a4c98626511bcf1c89a1847242cdd0e0113927137577eedaa13c72ce84b4b",
+    "biber-2.17-darwin_universal.tar.gz": "182e1efa074d8a2a23a8893f2a22440d4e463cce55e4ed02076ac4c0ee0614b2",
+    "biber-2.17-darwin_x86_64.tar.gz": "aa72ccdd01d59367b919d517f7a116e5dc40848abc1909cd812b485f791df7f4",
+    "biber-2.17-linux_x86_64-musl.tar.gz": "8967c4d34bfd2ed3d71e54d8a20a0c766b90368348994c99fca56ee2d812619e",
     "biber-2.17-linux_x86_64.tar.gz": "129d2e0332a57e985ffa253e5e9fbd28ef99af5a068d1b141145211969aa8999",
+    "biber-2.17-MSWIN64.zip": "c103bffc5ae0a7f513e7c26b6d394e9be6cf41952959c5d604ee2e6581b5dea2",
+    "biber-2.18-darwin_universal.tar.gz": "a0848ca266334284f1145470e53c3882b2d5e8ad82828700df1f6e347f7b675b",
+    "biber-2.18-darwin_x86_64.tar.gz": "f05520a397162434e93ef28b6be2c866f555a1979f150601fecf6d22d4bb8f2e",
+    "biber-2.18-linux_x86_64-musl.tar.gz": "34da2cc489a1387bfda8c76add3d613ececd9b674d0361a2b1464cf592dee2ed",
     "biber-2.18-linux_x86_64.tar.gz": "2a6b4cd15a1139907799da0d23cd4ddcce8341af3960d2b3d1d3e4b4a9f1fb53",
+    "biber-2.18-MSWIN64.zip": "02ee3a8b6838b7ff1e9aea1a5342686981b9364067a7b8e7131c3b3201cf387c",
+    "biber-2.19-darwin_universal.tar.gz": "0ebda145064eb5b8901a4ed5c8c5e5e6a5208e0aba425f7febcb5fb5b1a9c11b",
+    "biber-2.19-darwin_x86_64.tar.gz": "3835aab3247d3bff79b0c2fcf061149b80e39bf11f55a3a30cf946043a85d45b",
+    "biber-2.19-linux_aarch64.tar.gz": "45571c262e714786ec841320ee1845f0e3e3cf29443bb58769b26c6fc6274766",
+    "biber-2.19-linux_x86_64-musl.tar.gz": "66e765df8b52446659a978f35d25974b835b7168ddd96f45d4a49cea6bd727eb",
     "biber-2.19-linux_x86_64.tar.gz": "e2eda3e6ea7ac7e78d60e99a0e2aeb1096829f95791c06b768ed31a12889e58e",
+    "biber-2.19-MSWIN64.zip": "f0bccdec320e89a04b067f1189957b4bbe6feb445005357601f6e295e83e97da",
 }
 
 
@@ -112,45 +143,140 @@ def ensure_tectonic(console: Console) -> Path:
     return cached
 
 
-def _biber_sf_path() -> tuple[str, str]:
-    """Return (sourceforge_subdir, filename) for biber on this platform."""
+# macOS binaries lived under OSX_Intel up to biber 2.16 and moved to MacOS
+# from 2.17 on; the SourceForge fallback URL needs the right subdir per version.
+_OLD_MAC_DIRS: frozenset[str] = frozenset(
+    {"2.11", "2.12", "2.13", "2.14", "2.15", "2.16"}
+)
+
+
+def _biber_candidates(version: str) -> list[tuple[str, str, str]]:
+    """``(sf_subdir, sf_filename, mirror_asset)`` for this platform, best first.
+
+    More than one candidate is returned where a fallback helps:
+
+    * Linux x86_64 prefers the statically-linked *musl* build, which has no
+      shared-library dependencies (the glibc build needs e.g. ``libnsl.so.1``,
+      absent on many minimal systems), then falls back to the glibc build.
+    * macOS prefers the *universal* build (the only arm64-native option, added
+      in 2.17), then the x86_64 build (runs under Rosetta on Apple silicon).
+
+    Candidates upstream never published for a given version simply 404, and the
+    download loop moves on to the next one.
+    """
     system = platform.system()
     machine = platform.machine()
+    mac_dir = "OSX_Intel" if version in _OLD_MAC_DIRS else "MacOS"
+    # biber 2.19 renamed the musl tarball; earlier releases use the old name.
+    musl_file = (
+        "biber-linux-musl_x86_64.tar.gz"
+        if version == "2.19"
+        else "biber-linux_x86_64-musl.tar.gz"
+    )
     if system == "Linux":
         if machine == "x86_64":
-            return "Linux", "biber-linux_x86_64.tar.gz"
-        return "Linux-musl", f"biber-linuxmusl_{machine}.tar.gz"
-    if system == "Darwin":
-        arch = "arm64" if machine == "arm64" else "x86_64"
-        return "MacOS", f"biber-darwin_{arch}.tar.gz"
-    if system == "Windows":
-        return "Windows", "biber-windows_x86_64.zip"
+            return [
+                ("Linux-musl", musl_file, f"biber-{version}-linux_x86_64-musl.tar.gz"),
+                (
+                    "Linux",
+                    "biber-linux_x86_64.tar.gz",
+                    f"biber-{version}-linux_x86_64.tar.gz",
+                ),
+            ]
+        if machine in ("aarch64", "arm64"):
+            return [
+                (
+                    "Linux",
+                    "biber-linux_aarch64.tar.gz",
+                    f"biber-{version}-linux_aarch64.tar.gz",
+                ),
+            ]
+    elif system == "Darwin":
+        return [
+            (
+                mac_dir,
+                "biber-darwin_universal.tar.gz",
+                f"biber-{version}-darwin_universal.tar.gz",
+            ),
+            (
+                mac_dir,
+                "biber-darwin_x86_64.tar.gz",
+                f"biber-{version}-darwin_x86_64.tar.gz",
+            ),
+        ]
+    elif system == "Windows":
+        return [("Windows", "biber-MSWIN64.zip", f"biber-{version}-MSWIN64.zip")]
     raise BuildError(
         f"unsupported platform for biber auto-download: {system} {machine}"
     )
 
 
 def _biber_cached(version: str) -> Path:
-    return CACHE_DIR / "biber" / version / "biber"
+    name = "biber.exe" if platform.system() == "Windows" else "biber"
+    return CACHE_DIR / "biber" / version / name
 
 
-def _mirror_asset(version: str, filename: str) -> str:
-    """Versioned mirror asset name, e.g. ``biber-2.17-linux_x86_64.tar.gz``."""
-    return filename.replace("biber-", f"biber-{version}-", 1)
+def _biber_sources(version: str) -> list[tuple[str, str | None]]:
+    """``(url, expected_sha256 or None)`` to try in order.
 
+    For each platform candidate the mirror is tried first, then SourceForge.
+    """
+    sources: list[tuple[str, str | None]] = []
+    for sf_dir, filename, asset in _biber_candidates(version):
+        sha = BIBER_SHA256.get(asset)
+        sources.append((BIBER_MIRROR_URL.format(asset=asset), sha))
+        sources.append(
+            (
+                BIBER_RELEASE_URL.format(
+                    version=version, sf_dir=sf_dir, filename=filename
+                ),
+                sha,
+            )
+        )
+    return sources
 
-def _biber_sources(version: str) -> list[tuple[str, str | None]]:
-    """(url, expected_sha256 or None) pairs to try in order: mirror, then SourceForge."""
-    sf_dir, filename = _biber_sf_path()
-    asset = _mirror_asset(version, filename)
-    sha = BIBER_SHA256.get(asset)
-    return [
-        (BIBER_MIRROR_URL.format(asset=asset), sha),
-        (
-            BIBER_RELEASE_URL.format(version=version, sf_dir=sf_dir, filename=filename),
-            sha,
-        ),
-    ]
+
+def _is_biber_member(name: str) -> bool:
+    """Whether an archive member is the biber executable.
+
+    Most archives hold a plain ``biber`` (``biber.exe`` on Windows), but a few
+    musl tarballs name the binary after the tarball (e.g.
+    ``biber-linux_x86_64-musl``). AppleDouble sidecars (``._biber``) are
+    excluded. The largest matching member is chosen by the callers.
+    """
+    base = Path(name).name
+    if base.startswith("._"):
+        return False
+    return base in {"biber", "biber.exe"} or base.startswith("biber")
+
+
+def _extract_biber_binary(archive: Path, version: str) -> bytes:
+    """Read the biber executable out of a ``.tar.gz`` or ``.zip`` archive."""
+    if zipfile.is_zipfile(archive):
+        with zipfile.ZipFile(archive) as zf:
+            members = [
+                i
+                for i in zf.infolist()
+                if not i.is_dir() and _is_biber_member(i.filename)
+            ]
+            if not members:
+                raise BuildError(
+                    f"biber binary not found inside the biber {version} archive"
+                )
+            return zf.read(max(members, key=lambda i: i.file_size))
+    with tarfile.open(archive) as tf:
+        tar_members = [
+            m for m in tf.getmembers() if m.isfile() and _is_biber_member(m.name)
+        ]
+        member = max(tar_members, key=lambda m: m.size, default=None)
+        if member is None:
+            raise BuildError(
+                f"biber binary not found inside the biber {version} archive"
+            )
+        src = tf.extractfile(member)
+        if src is None:
+            raise BuildError(f"could not read biber from the biber {version} archive")
+        return src.read()
 
 
 def _download_to(url: str, dest: Path, sha: str | None, console: Console) -> bool:
@@ -196,25 +322,7 @@ def _ensure_biber(version: str, console: Console) -> Path:
             raise BuildError(
                 f"failed to download biber {version} from the mirror or SourceForge"
             )
-        with tarfile.open(tmp) as tf:
-            member = next(
-                (
-                    m
-                    for m in tf.getmembers()
-                    if Path(m.name).name == "biber" and m.isfile()
-                ),
-                None,
-            )
-            if member is None:
-                raise BuildError(
-                    f"biber binary not found inside the biber {version} archive"
-                )
-            src = tf.extractfile(member)
-            if src is None:
-                raise BuildError(
-                    f"could not read biber from the biber {version} archive"
-                )
-            cached.write_bytes(src.read())
+        cached.write_bytes(_extract_biber_binary(tmp, version))
     except Exception:
         if cached.exists():
             cached.unlink()

{pytex_preprocessor-0.4.4 → pytex_preprocessor-0.4.6}/src/pytex_builder/variants.py

@@ -4,6 +4,8 @@ A *variant* maps a Markdown source to a concrete document:
 
 * ``plain``          - a bare ``Document`` wrapping the converted Markdown.
 * ``report``         - an HSRT report with title page and table of contents.
+* ``report-makers``  - an HSRT report branded with the MAKERS logo (title page
+  and footer on every page).
 * ``protocol-asta``  - an AStA meeting protocol (HSRT report, AStA logos).
 * ``protocol-stupa`` - a StuPa meeting protocol (HSRT report, StuPa logos).
 
@@ -19,29 +21,37 @@ of the document when it is not given via frontmatter/config.
 from __future__ import annotations
 
 import re
+from pathlib import Path
 from typing import TYPE_CHECKING
 
+from pytex.commands.biblatex import Addbibresource
 from pytex.commands.builtin import ChapterStar
 from pytex.model.concat import Concat
 from pytex.model.document import Document
+from pytex.model.empty import Empty
 from pytex.model.raw import Raw
 from pytex_hsrtreport.document import HSRTReport
 from pytex_hsrtreport.titlepage import TitlePageDataLine
 from pytex_hsrtreport.variants import Variant
-from pytex_markdown import Markdown, escape_latex
-from pytex_protocol.document import build_protocol
-from pytex_protocol.frontmatter import split_frontmatter
+from pytex_markdown import Markdown, escape_latex, split_frontmatter
+from pytex_markdown.protocol import build_protocol
 
 if TYPE_CHECKING:
     from collections.abc import Mapping
 
     from pytex.interface.package import PackageOption
     from pytex.interface.tex import TeX
-    from pytex_protocol.frontmatter import FrontmatterValue
+    from pytex_markdown.frontmatter import FrontmatterValue
 
 __all__ = ["VARIANT_NAMES", "build_document"]
 
-VARIANT_NAMES: tuple[str, ...] = ("plain", "report", "protocol-asta", "protocol-stupa")
+VARIANT_NAMES: tuple[str, ...] = (
+    "plain",
+    "report",
+    "report-makers",
+    "protocol-asta",
+    "protocol-stupa",
+)
 
 type Options = Mapping[str, object]
 
@@ -65,6 +75,8 @@ def build_document(
         return _plain(body, options)
     if variant == "report":
         return _report(body, options)
+    if variant == "report-makers":
+        return _report(body, options, logo_variant=Variant.MAKERS, footer_logos=True)
     if variant == "protocol-asta":
         return _protocol(meta, body, options, force=Variant.ASTA)
     if variant == "protocol-stupa":
@@ -92,7 +104,13 @@ def _plain(body: str, options: dict[str, object]) -> TeX:
     )
 
 
-def _report(body: str, options: dict[str, object]) -> TeX:
+def _report(
+    body: str,
+    options: dict[str, object],
+    *,
+    logo_variant: Variant = Variant.INF,
+    footer_logos: bool = False,
+) -> TeX:
     title = _str(options, "title", "titel")
     derived = False
     if title is None:
@@ -103,10 +121,14 @@ def _report(body: str, options: dict[str, object]) -> TeX:
         # The `#` heading was pulled out for the title page; re-emit it at the
         # top of the body as a big, unnumbered heading so it is not lost.
         body_tex = Concat(ChapterStar(escape_latex(title)), Raw("\n\n"), body_tex)
+    bibliography = _bibliography(options)
     return HSRTReport(
-        variant=Variant.INF,
+        variant=logo_variant,
         show_titlepage=title is not None,
+        show_footer_logos=footer_logos,
         show_toc=True,
+        show_bibliography=bibliography is not None,
+        user_preamble=_bib_preamble(bibliography) if bibliography else Empty,
         title=escape_latex(title) if title is not None else None,
         author=_escaped(_str(options, "author", "autor")),
         abstract=_escaped(_str(options, "abstract", "zusammenfassung")),
@@ -144,6 +166,41 @@ def _protocol(
 
 # -- helpers ---------------------------------------------------------------
 
+# Self-contained .bib name written next to the .tex via filecontents so biber
+# finds it in the build dir without an external file path.
+_BIB_FILENAME = "pytex-md-refs.bib"
+
+
+def _bibliography(options: Mapping[str, object]) -> str | None:
+    """BibTeX content from the ``bibliography`` frontmatter, or ``None``.
+
+    The value is either inline BibTeX (a block scalar, recognised by an ``@``
+    entry) or a path to a ``.bib`` file, which is read in. A path that does not
+    resolve to a file is ignored.
+    """
+    value = _str(options, "bibliography", "literatur", "bibliografie", "bib")
+    if value is None:
+        return None
+    if "@" in value:
+        return value
+    path = Path(value)
+    return path.read_text(encoding="utf-8") if path.is_file() else None
+
+
+def _bib_preamble(content: str) -> TeX:
+    """Emit the bibliography as an inline ``filecontents`` .bib + ``\\addbibresource``.
+
+    Writing the .bib via ``filecontents`` keeps the document self-contained: the
+    file lands in the build dir at compile time, so biber resolves it without a
+    separate path (and the numeric biblatex default style applies).
+    """
+    block = (
+        f"\\begin{{filecontents*}}[overwrite,noheader]{{{_BIB_FILENAME}}}\n"
+        + content.rstrip("\n")
+        + "\n\\end{filecontents*}\n"
+    )
+    return Concat(Raw(block, allow_replacements=False), Addbibresource(_BIB_FILENAME))
+
 
 def _str(options: Mapping[str, object], *keys: str) -> str | None:
     for key in keys:

pytex_preprocessor-0.4.6/src/pytex_hsrtreport/assets/logos/MAKERS-Icon.svg

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="461.55865mm"
+   height="447.56244mm"
+   viewBox="0 0 461.55865 447.56244"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer2"
+     transform="translate(-1560.2505,-33.956207)"><g
+       id="layer1-4"
+       transform="translate(1536)"><g
+         id="g11-7-0-0-9-0-20-7"
+         transform="matrix(0,0.59667125,0.59667125,0,393.2673,161.87008)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-2-8"
+           style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-3-4"
+           style="fill:#f18700;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-7-5"
+           style="fill:#ce1625;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45415,-495.99122)" /></g><g
+         id="g11-7-0-0-9-0-0-5-0"
+         transform="matrix(0.51673246,-0.29833562,0.29833562,0.51673246,241.95468,423.93573)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-1-9-3"
+           style="fill:#008b92;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-9-2-6"
+           style="fill:#0075bf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-6-2-1"
+           style="fill:#29235c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45415,-495.99122)" /></g><g
+         id="g11-7-0-0-9-0-2-89-0"
+         transform="matrix(0,0.59667125,0.59667125,0,630.13284,25.684221)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-16-7-6"
+           style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-2-36-3"
+           style="fill:#f18700;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-1-1-2"
+           style="fill:#ce1625;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45415,-495.99122)" /></g><g
+         id="g11-7-0-0-9-0-2-8-2-0"
+         transform="matrix(0,0.59667125,0.59667125,0,630.43565,300.31284)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-16-6-9-6"
+           style="fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-2-3-3-1"
+           style="fill:#f18700;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-1-8-1-5"
+           style="fill:#ce1625;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45414,-495.99122)" /></g><g
+         id="g11-7-0-0-9-0-0-0-94-5"
+         transform="matrix(0.51673246,-0.29833562,0.29833562,0.51673246,478.82011,560.2897)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-1-1-78-4"
+           style="fill:#008b92;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-9-9-4-7"
+           style="fill:#0075bf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-6-7-5-6"
+           style="fill:#29235c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45415,-495.99122)" /></g><g
+         id="g11-7-0-0-9-0-0-0-9-0-5"
+         transform="matrix(0.51673246,-0.29833562,0.29833562,0.51673246,241.95467,698.73251)"
+         style="stroke-width:0.443432"><path
+           id="path3-9-3-3-8-7-0-1-0-3-1-1-5-3-6"
+           style="fill:#008b92;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z" /><path
+           id="path3-9-3-3-8-7-3-1-7-3-6-9-9-1-6-9"
+           style="fill:#0075bf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(120,158.4647,-495.98275)" /><path
+           id="path3-9-3-3-8-7-3-5-2-9-3-2-6-7-2-10-3"
+           style="fill:#29235c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.87637;stroke-dasharray:none;stroke-opacity:1"
+           d="m 72.187145,-608.63455 c -8.389369,38.44406 -27.282093,70.83442 -54.178521,94.61352 -4.137019,3.65754 -5.449842,10.26951 -2.688548,15.05251 14.675938,25.42107 29.351877,50.84214 44.027816,76.26321 2.761293,4.783 8.673559,6.0982 13.068673,2.75435 28.548345,-21.71988 52.510725,-48.95763 72.013875,-81.76553 2.82204,-4.74718 3.00458,-12.6906 0.7284,-17.72185 -7.11103,-15.71813 -21.09098,-50.13052 -25.68624,-89.06116 -0.64735,-5.48427 -5.43095,-9.95351 -10.9538,-9.95353 l -24.440675,-6e-5 c -5.522847,-2e-5 -10.713598,4.42321 -11.89098,9.81854 z"
+           transform="rotate(-120,158.45415,-495.99122)" /></g></g></g></svg>