From 72176677f747700aa54e77e4b323858735c1daed Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 28 Mar 2023 16:07:33 -0400
Subject: [PATCH 1/9] .gitignore: ignore outputs

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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

From 1ecbe6d23cfe4662f154fc7de3361e79bad302ed Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 28 Mar 2023 17:26:11 -0400
Subject: [PATCH 2/9] pdf: underlying commands - no converter included

---
 src/wireviz/tools/build_examples.py |  4 ++--
 src/wireviz/wv_cli.py               |  6 ++++++
 src/wireviz/wv_harness.py           |  5 ++---
 src/wireviz/wv_output.py            | 24 +++++++++++++++++++++++-
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/wireviz/tools/build_examples.py b/src/wireviz/tools/build_examples.py
index a95a0c3..0bc001c 100755
--- a/src/wireviz/tools/build_examples.py
+++ b/src/wireviz/tools/build_examples.py
@@ -37,7 +37,7 @@ groups = {
 
 input_extensions = [".yml"]
 extensions_not_containing_graphviz_output = [".gv", ".bom.tsv"]
-extensions_containing_graphviz_output = [".png", ".svg", ".html"]
+extensions_containing_graphviz_output = [".png", ".svg", ".html", ".pdf"]
 generated_extensions = (
     extensions_not_containing_graphviz_output + extensions_containing_graphviz_output
 )
@@ -68,7 +68,7 @@ def build_generated(groupkeys):
             try:
                 res = cli([
                     "--formats",
-                    "ghpst",
+                    "ghpstPb",
                     str(yaml_file),
                     "--prepend",
                     yaml_file.parent / "metadata.yml"
diff --git a/src/wireviz/wv_cli.py b/src/wireviz/wv_cli.py
index 7f10e5b..9be3738 100644
--- a/src/wireviz/wv_cli.py
+++ b/src/wireviz/wv_cli.py
@@ -14,6 +14,7 @@ from wireviz import APP_NAME, __version__
 from wireviz.wv_bom import bom_list
 from wireviz.wv_utils import bom2tsv
 from wireviz.wv_harness_quantity import HarnessQuantity
+from wireviz.wv_output import generate_pdf_output
 
 format_codes = {
     "c": "csv",
@@ -126,9 +127,11 @@ def cli(files, formats, prepend, output_dir, output_name, version, use_qty_multi
     harness = None
     shared_bom = {}
     sheet_current = 1
+    output_names = []
     # run WireVIz on each input file
     for _file in files:
         _output_name = _file.stem if not output_name else output_name
+        output_names.append(_output_dir / _output_name)
 
         print("Input file:  ", _file)
         print(
@@ -155,6 +158,9 @@ def cli(files, formats, prepend, output_dir, output_name, version, use_qty_multi
         )
         shared_bom = ret["shared_bom"]
 
+    if 'pdf' in output_formats and 'html' in output_formats:
+        generate_pdf_output(output_names)
+
     # TODO: move shared bom generation to a method?
     if "shared_bom" in output_formats:
         shared_bom_file = (_output_dir / "shared_bom").with_suffix(".tsv")
diff --git a/src/wireviz/wv_harness.py b/src/wireviz/wv_harness.py
index 90d538f..61071fa 100644
--- a/src/wireviz/wv_harness.py
+++ b/src/wireviz/wv_harness.py
@@ -30,7 +30,7 @@ from wireviz.wv_graphviz import (
     parse_arrow_str,
     set_dot_basics,
 )
-from wireviz.wv_output import embed_svg_images_file, generate_html_output
+from wireviz.wv_output import embed_svg_images_file, generate_html_output, generate_pdf_output
 from wireviz.wv_utils import bom2tsv
 
 
@@ -394,8 +394,7 @@ class Harness:
             generate_html_output(filename, bomlist, self.metadata, self.options)
         # PDF output
         if "pdf" in fmt:
-            # TODO: implement PDF output
-            print("PDF output is not yet supported")
+            generate_pdf_output(filename)
         # delete SVG if not needed
         if "html" in fmt and not "svg" in fmt:
             # SVG file was just needed to generate HTML
diff --git a/src/wireviz/wv_output.py b/src/wireviz/wv_output.py
index f966241..93ec230 100644
--- a/src/wireviz/wv_output.py
+++ b/src/wireviz/wv_output.py
@@ -3,7 +3,7 @@
 import base64
 import re
 from pathlib import Path
-from typing import List, Union
+from typing import Dict, List, Union
 
 import wireviz  # for doing wireviz.__file__
 from wireviz.wv_dataclasses import Metadata, Options
@@ -56,6 +56,28 @@ def embed_svg_images_file(
         filename_out.replace(filename_in)
 
 
+def generate_pdf_output(
+    filename_list: List[Path],
+    options: Dict=None,
+):
+    #options = options if options is not None else {}
+    # TODO: pass intelligent options
+    options = {
+        'options': {
+            'page-size': 'A3',
+            'orientation': 'landscape',
+        }
+    }
+    if isinstance(filename_list, Path):
+        filename_list = [filename_list]
+        output_path = filename_list[0].with_suffix('.pdf')
+    else:
+        output_dir = filename_list[0].parent
+        output_path = (output_dir / output_dir.name).with_suffix('.pdf')
+
+    filepath_list = [f.with_suffix('.html') for f in filename_list]
+
+    print(f'Generating pdf output: {output_path}')
 
 def generate_html_output(
     filename: Path,

From 275d4b596e34944fceff199d2888fb7dd942665f Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 28 Mar 2023 18:12:15 -0400
Subject: [PATCH 3/9] wv_cli: output combined html only if more than 1 file

---
 src/wireviz/wv_cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wireviz/wv_cli.py b/src/wireviz/wv_cli.py
index 9be3738..335ed9d 100644
--- a/src/wireviz/wv_cli.py
+++ b/src/wireviz/wv_cli.py
@@ -158,7 +158,7 @@ def cli(files, formats, prepend, output_dir, output_name, version, use_qty_multi
         )
         shared_bom = ret["shared_bom"]
 
-    if 'pdf' in output_formats and 'html' in output_formats:
+    if 'pdf' in output_formats and 'html' in output_formats and len(output_names) > 1:
         generate_pdf_output(output_names)
 
     # TODO: move shared bom generation to a method?

From 77770027ac5699061b83d9574d28c7fdb4f0c1bd Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 28 Mar 2023 18:13:00 -0400
Subject: [PATCH 4/9] pdf: add support using weasyprint

---
 requirements.txt         | 2 ++
 src/wireviz/wv_output.py | 9 +++++++++
 2 files changed, 11 insertions(+)

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/wv_output.py b/src/wireviz/wv_output.py
index 93ec230..78fccbf 100644
--- a/src/wireviz/wv_output.py
+++ b/src/wireviz/wv_output.py
@@ -4,6 +4,9 @@ import base64
 import re
 from pathlib import Path
 from typing import Dict, List, Union
+import logging
+
+from weasyprint import HTML, CSS
 
 import wireviz  # for doing wireviz.__file__
 from wireviz.wv_dataclasses import Metadata, Options
@@ -72,12 +75,18 @@ def generate_pdf_output(
         filename_list = [filename_list]
         output_path = filename_list[0].with_suffix('.pdf')
     else:
+        logging.warn('Multiple file pdf conversion is not supported!')
+        return
         output_dir = filename_list[0].parent
         output_path = (output_dir / output_dir.name).with_suffix('.pdf')
 
     filepath_list = [f.with_suffix('.html') for f in filename_list]
 
     print(f'Generating pdf output: {output_path}')
+    html = HTML(filename=filepath_list[0])
+    #html.write_pdf(output_path)
+    css = CSS(string='@page { size: A3 landscape; margin: 1cm; }')
+    html.write_pdf(output_path, stylesheets=[css])
 
 def generate_html_output(
     filename: Path,

From 19a6c04496105a9d2f27c64df4f2c9dac648f6e4 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 17:02:04 -0400
Subject: [PATCH 5/9] templates: remove calc, do all through jinja

---
 src/wireviz/templates/bom.html        |  2 +-
 src/wireviz/templates/din-6771.html   | 11 +++++++++--
 src/wireviz/templates/notes.html      |  8 ++++----
 src/wireviz/templates/titleblock.html |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

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 @@
 <style>
   .A4 #bom { /* BOM on top of title block */
     position: absolute;
-    bottom: calc({{ titleblock_rows + 1 }} * 4.25mm);
+    bottom: {{ (titleblock_rows + 1)  * 4.25 }}mm;
     right: 0;
   }
 
diff --git a/src/wireviz/templates/din-6771.html b/src/wireviz/templates/din-6771.html
index a48a0ff..a5b70dd 100644
--- a/src/wireviz/templates/din-6771.html
+++ b/src/wireviz/templates/din-6771.html
@@ -67,11 +67,18 @@
       top: 0;
       left: 0;
       max-width: 100%;
-      height: calc(100% - {{ bottom_rows }}  * 4.25mm);
       text-align: center;
       vertical-align: middle;
     }
 
+    #diagram {
+      {% if sheetsize == A2 %}
+        height: {{ 400 - bottom_rows * 4.25 }}mm;
+      {% else %}
+        height: {{ 277 - bottom_rows * 4.25 }}mm;
+      {% endif %}
+    }
+
     #diagram svg, #diagram img {
       max-width: 95%;
       max-height: 100%;
@@ -104,7 +111,7 @@
         {{ description }}
       </div>
 
-      <div id="diagram">
+      <div id="diagram" class={{ sheetsize }}>
         {{ diagram }}
       </div>
 
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..b18c6d1 100644
--- a/src/wireviz/templates/titleblock.html
+++ b/src/wireviz/templates/titleblock.html
@@ -7,7 +7,7 @@
 
   #titleblock {
     width: 180mm;
-    height: calc({{ titleblock_rows }} * 4.25mm));
+    height: {{ titleblock_rows * 4.25 }}mm;
   }
 
   #titleblock table, th, td {
@@ -108,7 +108,7 @@
 
 <!-- START OF TEMPLATE --!>
 <div id="titleblock">
-  <table id="titleblock">
+  <table>
     <tr> <!-- ROW 1 --!>
       <!-- REVISIONS            Column 1 to 4 --!>
       {{ revision(1) }}

From e1cf97c8fd69e6856de60869df335845a6907762 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 17:31:10 -0400
Subject: [PATCH 6/9] din-6771 orientation set in page

---
 src/wireviz/templates/din-6771.html |  2 +-
 src/wireviz/wv_output.py            | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/wireviz/templates/din-6771.html b/src/wireviz/templates/din-6771.html
index a5b70dd..e22f702 100644
--- a/src/wireviz/templates/din-6771.html
+++ b/src/wireviz/templates/din-6771.html
@@ -92,7 +92,7 @@
   <style type="text/css" media="print">
 
     @page {
-      size: auto;
+      size: {{ sheetsize }} {{ orientation }};
       margin: 0;
     }
 
diff --git a/src/wireviz/wv_output.py b/src/wireviz/wv_output.py
index 78fccbf..93d4661 100644
--- a/src/wireviz/wv_output.py
+++ b/src/wireviz/wv_output.py
@@ -63,14 +63,9 @@ def generate_pdf_output(
     filename_list: List[Path],
     options: Dict=None,
 ):
-    #options = options if options is not None else {}
-    # TODO: pass intelligent options
-    options = {
-        'options': {
-            'page-size': 'A3',
-            'orientation': 'landscape',
-        }
-    }
+    '''Generate a pdf output, options are ignored for now, expect the formatting
+       to be done within the html files
+    '''
     if isinstance(filename_list, Path):
         filename_list = [filename_list]
         output_path = filename_list[0].with_suffix('.pdf')
@@ -84,9 +79,8 @@ def generate_pdf_output(
 
     print(f'Generating pdf output: {output_path}')
     html = HTML(filename=filepath_list[0])
-    #html.write_pdf(output_path)
-    css = CSS(string='@page { size: A3 landscape; margin: 1cm; }')
-    html.write_pdf(output_path, stylesheets=[css])
+    html.write_pdf(output_path)
+
 
 def generate_html_output(
     filename: Path,
@@ -148,7 +142,8 @@ def generate_html_output(
     added_metadata = {
         "revisions": [],
         "authors": [],
-        "sheetsize": "sheetsize_default",
+        "sheetsize": "A4",
+        "orientation": "portrait",
     }
     if metadata:
         for item, contents in metadata.items():
@@ -163,9 +158,9 @@ def generate_html_output(
             elif item == "pn":
                 added_metadata[item] = f'{contents}-{metadata.get("sheet_name")}'
             elif item == "template":
-                added_metadata["sheetsize"] = contents.get(
-                    "sheetsize", "sheetsize_default"
-                )
+                added_metadata["sheetsize"] = contents.get("sheetsize", "A4")
+                if added_metadata["sheetsize"] in ["A2", "A3"]:
+                    added_metadata["orientation"] = "landscape"
             else:
                 added_metadata[item] = contents
 

From 241225a0f3bfe53334ef197d3eec649f7c148e41 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 18:17:32 -0400
Subject: [PATCH 7/9] templates: titleblock: don't force total width or height

---
 src/wireviz/templates/titleblock.html | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/wireviz/templates/titleblock.html b/src/wireviz/templates/titleblock.html
index b18c6d1..c4edcee 100644
--- a/src/wireviz/templates/titleblock.html
+++ b/src/wireviz/templates/titleblock.html
@@ -1,13 +1,8 @@
 <style>
   #titleblock {
     position: absolute;
-    bottom: 0mm;
-    right: -0mm;
-  }
-
-  #titleblock {
-    width: 180mm;
-    height: {{ titleblock_rows * 4.25 }}mm;
+    bottom: 0;
+    right: 0;
   }
 
   #titleblock table, th, td {

From 2ea9c447d89afa9e8cc5e077cae0e2b0a839e7b4 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 18:18:28 -0400
Subject: [PATCH 8/9] templates: din-6771: fix dimensions

---
 src/wireviz/templates/din-6771.html | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/wireviz/templates/din-6771.html b/src/wireviz/templates/din-6771.html
index e22f702..e576a47 100644
--- a/src/wireviz/templates/din-6771.html
+++ b/src/wireviz/templates/din-6771.html
@@ -38,7 +38,7 @@
       position: relative;
     }
 
-    .A4, .sheetsize_default { /* portrait */
+    .A4 { /* portrait */
       width: 180mm;
       height: 277mm;
     }
@@ -62,6 +62,14 @@
       {% set bottom_rows = [bom_rows, titleblock_rows]|max + 1 %}
     {% endif %}
 
+    .A4 #diagram, .A3 #diagram {
+        height: {{ 277 - bottom_rows * 4.25 }}mm;
+    }
+
+    .A2 #diagram {
+        height: {{ 400 - bottom_rows * 4.25 }}mm;
+    }
+
     #diagram {
       position: relative;
       top: 0;
@@ -71,14 +79,6 @@
       vertical-align: middle;
     }
 
-    #diagram {
-      {% if sheetsize == A2 %}
-        height: {{ 400 - bottom_rows * 4.25 }}mm;
-      {% else %}
-        height: {{ 277 - bottom_rows * 4.25 }}mm;
-      {% endif %}
-    }
-
     #diagram svg, #diagram img {
       max-width: 95%;
       max-height: 100%;
@@ -96,10 +96,9 @@
       margin: 0;
     }
 
-    /* TODO: auto-adjust based on portrait (larger margin on left) or landscape (larger margin on top) */
     #page {
-      margin: 10mm;
-      margin-left: 20mm;
+      margin-top: 10mm;
+      margin-left: 15mm; /* TODO: maybe scale this value depending on sheetsize */
     }
 
   </style>
@@ -111,7 +110,7 @@
         {{ description }}
       </div>
 
-      <div id="diagram" class={{ sheetsize }}>
+      <div id="diagram">
         {{ diagram }}
       </div>
 

From b013369e3c14388fad850bd8172021adf1760e56 Mon Sep 17 00:00:00 2001
From: Laurier Loiselle <lal@xiphos.com>
Date: Tue, 11 Apr 2023 18:53:12 -0400
Subject: [PATCH 9/9] wv_output: support multiple-pages pdf

---
 src/wireviz/wv_output.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/wireviz/wv_output.py b/src/wireviz/wv_output.py
index 93d4661..20c80e3 100644
--- a/src/wireviz/wv_output.py
+++ b/src/wireviz/wv_output.py
@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Dict, List, Union
 import logging
 
-from weasyprint import HTML, CSS
+from weasyprint import HTML
 
 import wireviz  # for doing wireviz.__file__
 from wireviz.wv_dataclasses import Metadata, Options
@@ -70,16 +70,16 @@ def generate_pdf_output(
         filename_list = [filename_list]
         output_path = filename_list[0].with_suffix('.pdf')
     else:
-        logging.warn('Multiple file pdf conversion is not supported!')
-        return
         output_dir = filename_list[0].parent
         output_path = (output_dir / output_dir.name).with_suffix('.pdf')
 
     filepath_list = [f.with_suffix('.html') for f in filename_list]
 
     print(f'Generating pdf output: {output_path}')
-    html = HTML(filename=filepath_list[0])
-    html.write_pdf(output_path)
+    files_html = [HTML(path) for path in filepath_list]
+    documents = [f.render() for f in files_html]
+    all_pages = [p for doc in documents for p in doc.pages]
+    documents[0].copy(all_pages).write_pdf(output_path)
 
 
 def generate_html_output(