From e55a2a48ae326132fffbdc4a7d12071ffa12e6ca Mon Sep 17 00:00:00 2001 From: KV Date: Sun, 9 Jun 2024 22:34:37 +0200 Subject: [PATCH] Rename "sheetsize_default" to (#380) Fixes #377 (makes HTML output template placeholders more consistent) --- src/wireviz/templates/README.md | 1 + src/wireviz/templates/din-6771.html | 2 +- src/wireviz/wv_html.py | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/wireviz/templates/README.md b/src/wireviz/templates/README.md index a172aa4a..31d3ef88 100644 --- a/src/wireviz/templates/README.md +++ b/src/wireviz/templates/README.md @@ -43,6 +43,7 @@ Note that there must be one single space between `--` and `%` at both ends. | `` | String or numeric value of `metadata.{item}` | | `` | Category number `{i}` within dict value of `metadata.{item}` | | `` | Value of `metadata.{item}.{category}.{key}` | +| `` | Value of `metadata.template.sheetsize` | Note that `{item}`, `{category}` and `{key}` in the description above can be any valid YAML key, and `{i}` is an integer representing the 1-based index of diff --git a/src/wireviz/templates/din-6771.html b/src/wireviz/templates/din-6771.html index 547a340c..1aab000d 100644 --- a/src/wireviz/templates/din-6771.html +++ b/src/wireviz/templates/din-6771.html @@ -179,7 +179,7 @@
-
+
diff --git a/src/wireviz/wv_html.py b/src/wireviz/wv_html.py index 4941e94a..4052fdcf 100644 --- a/src/wireviz/wv_html.py +++ b/src/wireviz/wv_html.py @@ -87,6 +87,9 @@ def svgdata() -> str: "": bom_html_reversed, "": "1", # TODO: handle multi-page documents "": "1", # TODO: handle multi-page documents + "": metadata.get("template", {}).get( + "sheetsize", "" + ), } def replacement_if_used(key: str, func: Callable[[], str]) -> None: @@ -112,11 +115,8 @@ def replacement_if_used(key: str, func: Callable[[], str]) -> None: replacements[f""] = ( html_line_breaks(str(entry_value)) ) - - replacements['"sheetsize_default"'] = '"{}"'.format( - metadata.get("template", {}).get("sheetsize", "") - ) - # include quotes so no replacement happens within