diff --git a/.gitignore b/.gitignore index 1d7dd18..523f96d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ __pycache__ # Built examples examples/* tutorial/* +outputs/* !examples/*.yml !tutorial/*.yml !tutorial/*.md diff --git a/requirements.txt b/requirements.txt index 8e752be..3227196 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +# need to install pango > 1.44.0 click graphviz pillow @@ -5,3 +6,4 @@ pyyaml setuptools tabulate jinja2 +weasyprint diff --git a/src/wireviz/templates/bom.html b/src/wireviz/templates/bom.html index 380762d..dbf7ef3 100644 --- a/src/wireviz/templates/bom.html +++ b/src/wireviz/templates/bom.html @@ -1,7 +1,7 @@ diff --git a/src/wireviz/templates/notes.html b/src/wireviz/templates/notes.html index e24e518..a9f2324 100644 --- a/src/wireviz/templates/notes.html +++ b/src/wireviz/templates/notes.html @@ -2,9 +2,9 @@ .A4 #notes { /* NOTES on top of BOM */ position: absolute; {% if show_bom %} - bottom: calc({{ titleblock_rows + bom_rows + 2 }} * 4.25mm); + bottom: {{ (titleblock_rows + bom_rows + 2) * 4.25 }}mm; {% else %} - bottom: calc({{ titleblock_rows + 1 }} * 4.25mm); + bottom: {{ (titleblock_rows + 1) * 4.25 }}mm; {% endif %} right: 0; } @@ -12,11 +12,11 @@ .A3 #notes, .A2 #notes { /* NOTES on top of title block */ position: absolute; {% if notes_on_right %} - bottom: calc({{ titleblock_rows + 1 }} * 4.25mm); + bottom: {{ (titleblock_rows + 1) * 4.25 }}mm; right: 0; {% else %} {% if show_bom %} - bottom: calc({{ bom_rows + 1 }} * 4.25mm); + bottom: {{ (bom_rows + 1) * 4.25 }}mm; {% else %} bottom: 0; {% endif %} diff --git a/src/wireviz/templates/titleblock.html b/src/wireviz/templates/titleblock.html index eab7424..c4edcee 100644 --- a/src/wireviz/templates/titleblock.html +++ b/src/wireviz/templates/titleblock.html @@ -1,13 +1,8 @@