Modified the options and processing of ReLaXedJS.

Author: orzih

README.md

@@ -245,14 +245,15 @@ plugins:
 >    <ANY_SITE_URL(eg. 'https://google.com')>
 > ```
 
-* `use_relaxed_js_renderer`
+* `relaxedjs_path`
 
-    Set the value to `true` if you're using e.g. '[Mermaid](https://mermaid-js.github.io) diagrams and Headless Chrome is not working for you.
+    Set the value to execute command of relaxed if you're using e.g. '[Mermaid](https://mermaid-js.github.io) diagrams and Headless Chrome is not working for you.
     Require "ReLaXed" Javascript PDF renderer to be installed on your system. See: '[ReLaXed](https://github.com/RelaxedJS/ReLaXed)'.
 
     Please use 'theme_handler_path' option to specify custom JS sources and CSS Stylesheets which covers your needs. E.g. for Material
     theme it would be **material.py**. See: **mkdocs-with-pdf/mkdocs_with_pdf/themes/material.py** for implementation details.
-    **default**: `false`
+    **default**: `None`
+    _**since**: `v0.7.0`_
 
 > Install on your system:
 > ```

mkdocs_with_pdf/drivers/relaxedjs.py

@@ -0,0 +1,44 @@
+import os
+from logging import Logger
+from shutil import which
+from subprocess import PIPE, Popen
+from tempfile import TemporaryDirectory
+
+
+class RelaxedJSRenderer(object):
+
+    @classmethod
+    def setup(self, program_path: str, logger: Logger):
+        if not program_path:
+            return None
+
+        if not which(program_path):
+            raise RuntimeError(
+                'No such `ReLaXed` program or not executable'
+                + f': "{program_path}".')
+
+        return self(program_path, logger)
+
+    def __init__(self, program_path: str, logger: Logger):
+        self._program_path = program_path
+        self._logger = logger
+
+    def write_pdf(self, html_string: str, output: str):
+        self._logger.info(' Rendering with `ReLaXed JS`.')
+
+        with TemporaryDirectory() as work_dir:
+            entry_point = os.path.join(work_dir, 'pdf_print.html')
+            with open(entry_point, 'w+') as f:
+                f.write(html_string)
+                f.close()
+
+            self._logger.info(f"  entry_point: {entry_point}")
+            with Popen([self._program_path, entry_point, output,
+                        "--build-once"],
+                       stdout=PIPE) as proc:
+                while True:
+                    log = proc.stdout.readline().decode().strip()
+                    if log:
+                        self._logger.info(f"  {log}")
+                    if proc.poll() is not None:
+                        break

mkdocs_with_pdf/generator.py

@@ -2,7 +2,6 @@
 import os
 import re
 from typing import Pattern
-import subprocess
 from importlib import import_module
 from importlib.util import module_from_spec, spec_from_file_location
 
@@ -140,31 +139,31 @@ def add_stylesheet(stylesheet: str):
                                 self._options.two_columns_level,
                                 self._options.logger)
         self._normalize_link_anchors(soup)
-        html_string = self._render_js(soup)
+
+        if self._options.relaxed_js:
+            html_string = str(soup)
+        else:
+            html_string = self._render_js(soup)
 
         html_string = self._options.hook.pre_pdf_render(html_string)
 
         if self._options.debug_html:
             print(f'{html_string}')
 
+        self.logger.info("Rendering for PDF.")
+
         abs_pdf_path = os.path.join(config['site_dir'], output_path)
-        output_pdf_name = self._options.output_pdf_name
         os.makedirs(os.path.dirname(abs_pdf_path), exist_ok=True)
 
-        self.logger.info("Rendering for PDF.")
         self.logger.info(f'Output a PDF to "{abs_pdf_path}".')
 
-        if self._options.use_relaxed_js_renderer:
-            self.logger.info("Use 'Relaxed' JS renderer.")
-            output_html_name = os.path.join(abs_pdf_path, output_pdf_name + '.html')
-            with open(output_html_name, 'w+') as f:
-                f.write(html_string)
-                f.close()
-            subprocess.call(["relaxed", output_html_name, "--build-once"])
+        if self._options.relaxed_js:
+            self._options.relaxed_js.write_pdf(
+                html_string, abs_pdf_path)
         else:
             html = HTML(string=html_string)
             render = html.render()
-            render.write_pdf(abs_pdf_path + output_pdf_name + ".pdf")
+            render.write_pdf(abs_pdf_path)
 
     # ------------------------
     def _remove_empty_tags(self, soup: PageElement):
@@ -393,10 +392,7 @@ def _render_js(self, soup):
                 for src in scripts:
                     body.append(soup.new_tag('script', src=f'file://{src}'))
 
-        if self._options.use_relaxed_js_renderer:
-            return str(soup)
-        else:
-            return self._options.js_renderer.render(str(soup))
+        return self._options.js_renderer.render(str(soup))
 
     def _scrap_scripts(self, soup):
         if not self._options.js_renderer:

mkdocs_with_pdf/options.py

@@ -4,6 +4,7 @@
 
 from .drivers.event_hook import EventHookHandler
 from .drivers.headless_chrome import HeadlessChromeDriver
+from .drivers.relaxedjs import RelaxedJSRenderer
 from .templates.template import Template
 
 
@@ -16,8 +17,7 @@ class Options(object):
         ('debug_html', config_options.Type(bool, default=False)),
         ('show_anchors', config_options.Type(bool, default=False)),
 
-        ('output_pdf_name', config_options.Type(str, default="document")),
-        ('output_path', config_options.Type(str, default="pdf/")),
+        ('output_path', config_options.Type(str, default="pdf/document.pdf")),
         ('theme_handler_path', config_options.Type(str, default=None)),
 
         ('author', config_options.Type(str, default=None)),
@@ -44,8 +44,8 @@ class Options(object):
         ('render_js', config_options.Type(bool, default=False)),
         ('headless_chrome_path',
             config_options.Type(str, default='chromium-browser')),
-        ('use_relaxed_js_renderer',
-            config_options.Type(bool, default=False)),
+        ('relaxedjs_path',
+            config_options.Type(str, default=None)),
     )
 
     def __init__(self, local_config, config, logger: logging):
@@ -56,7 +56,6 @@ def __init__(self, local_config, config, logger: logging):
         self.show_anchors = local_config['show_anchors']
 
         self.output_path = local_config.get('output_path', None)
-        self.output_pdf_name = local_config.get('output_pdf_name', None)
         self.theme_handler_path = local_config.get('theme_handler_path', None)
 
         # Author and Copyright
@@ -93,17 +92,15 @@ def __init__(self, local_config, config, logger: logging):
 
         self.two_columns_level = local_config['two_columns_level']
 
-        if local_config['use_relaxed_js_renderer']:
-            self.use_relaxed_js_renderer = True
-        else:
-            self.use_relaxed_js_renderer = False
-
         # ...etc.
         self.js_renderer = None
         if local_config['render_js']:
             self.js_renderer = HeadlessChromeDriver.setup(
                 local_config['headless_chrome_path'], logger)
 
+        self.relaxed_js = RelaxedJSRenderer.setup(
+            local_config['relaxedjs_path'], logger)
+
         # Theming
         self.theme_name = config['theme'].name
         self.theme_handler_path = local_config.get('theme_handler_path', None)