Skip to content

Commit f5c00fa

Browse files
17o2kvid
andcommitted
Rename "sheetsize_default" to <!-- %template_sheetsize% --> (#380)
Fixes #377 (makes HTML output template placeholders more consistent) Co-authored-by: kvid <kvid@users.noreply.github.com>
1 parent 8608445 commit f5c00fa

File tree

3 files changed

+41
-25
lines changed

3 files changed

+41
-25
lines changed

src/wireviz/templates/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Note that there must be one single space between `--` and `%` at both ends.
4343
| `<!-- %{item}% -->` | String or numeric value of `metadata.{item}` |
4444
| `<!-- %{item}_{i}% -->` | Category number `{i}` within dict value of `metadata.{item}` |
4545
| `<!-- %{item}_{i}_{key}% -->` | Value of `metadata.{item}.{category}.{key}` |
46+
| `<!-- %template_sheetsize% -->` | Value of `metadata.template.sheetsize` |
4647

4748
Note that `{item}`, `{category}` and `{key}` in the description above can be
4849
any valid YAML key, and `{i}` is an integer representing the 1-based index of

src/wireviz/templates/din-6771.html

Lines changed: 35 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/wireviz/wv_output.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ def svgdata() -> str:
145145
"<!-- %bom_reversed% -->": bom_html_reversed,
146146
"<!-- %sheet_current% -->": "1", # TODO: handle multi-page documents
147147
"<!-- %sheet_total% -->": "1", # TODO: handle multi-page documents
148+
"<!-- %template_sheetsize% -->": metadata.get("template", {}).get(
149+
"sheetsize", ""
150+
),
148151
}
149152

150153
def replacement_if_used(key: str, func: Callable[[], str]) -> None:
@@ -170,11 +173,8 @@ def replacement_if_used(key: str, func: Callable[[], str]) -> None:
170173
replacements[f"<!-- %{item}_{index+1}_{entry_key}% -->"] = (
171174
html_line_breaks(str(entry_value))
172175
)
173-
174-
replacements['"sheetsize_default"'] = '"{}"'.format(
175-
metadata.get("template", {}).get("sheetsize", "")
176-
)
177-
# include quotes so no replacement happens within <style> definition
176+
elif isinstance(entry, (str, int, float)):
177+
pass # TODO?: replacements[f"<!-- %{item}_{category}% -->"] = html_line_breaks(str(entry))
178178

179179
# perform replacements
180180
# regex replacement adapted from:

0 commit comments

Comments
 (0)