Include images in the automated PDF

diff --git a/README.md b/README.md
index 00fdfa3549f09b3560c30ff79787242b5bdb0c2e..e9ab27cb088b93d483c191783569819aa111ee95 100644 (file)
--- a/README.md
+++ b/README.md
@@ -126,3 +126,4 @@ The `build.py` script that builds the manual accepts the following options:
 - '-q', or '--quiet', to suppress all output (overrides -v)
 - '-d', or '--devmode', to add content to pages to help developers debug them
 (link, file name, URL)
+- '-n', or '--nopdf', to prevent the build script from generate a PDF from the content

diff --git a/build.py b/build.py
index e656fd198efaa0980bb7601c9b001862c780dffa..75a13f18122c462dcf9ec97e00f242fadca6fa1a 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -454,11 +454,12 @@ temp.close()
 onepage = onepage.replace('{{page.bootstrap_path}}', global_bootstrap_path)
 onepage = onepage.replace('{{page.page_title}}', global_page_title)
 
-# Same as above, but for the PDF version
-temp = open(global_pdf_template)
-pdfpage = temp.read()
-temp.close()
-pdfpage = pdfpage.replace('{{page.page_title}}', global_page_title)
+if not nopdf:
+       # Same as above, but for the PDF version
+       temp = open(global_pdf_template)
+       pdfpage = temp.read()
+       temp.close()
+       pdfpage = pdfpage.replace('{{page.page_title}}', global_page_title)
 
 # Parse out the master document's structure into a dictionary list
 fileStruct = GetFileStructure()
@@ -614,7 +615,8 @@ for header in fileStruct:
 
        # Set up the actual page from the template
        onepage = onepage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
-       pdfpage = pdfpage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
+       if not nopdf:
+               pdfpage = pdfpage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
 
        # ----- Normal version -----
 
@@ -681,6 +683,8 @@ if not nopdf:
        pdfpageFile = open(global_site_dir + 'pdf.html', 'w')
        pdfpage = pdfpage.replace('{% tree %}', opsidebar) # create the TOC
        pdfpage = pdfpage.replace('{{ content }}', '') # cleans up the last spaceholder
+       pdfpage = pdfpage.replace('src="/images/', 'src="images/') # makes images links relative
+       pdfpage = pdfpage.replace('url(\'/images/', 'url(\'images/') # CSS images links relative
        pdfpageFile.write(pdfpage)
        pdfpageFile.close()
 

diff --git a/page-template.html b/page-template.html
index bc4a10077f5549bd11263eae7a18d96d2297f261..026d0be92580811f25605492082e1e1cd12587f5 100644 (file)
--- a/page-template.html
+++ b/page-template.html
@@ -27,7 +27,7 @@
                                                <input type="text" class="form-control" placeholder="Search &hellip;" name="q">
                                                <span class="input-group-btn">
                                                        <button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
-                                                       <button class="btn btn-default" type="button" onclick="window.location.href='/ardourmanual.html'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
+                                                       <button class="btn btn-default" type="button" onclick="window.location.href='/manual.pdf'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
                                                </span>
                                        </div>
                                        <input type="hidden" name="sites" value="manual.ardour.org"><!-- domain -->