hdoc-tools 0.17.10 → 0.17.12

package/hdoc-build-pdf.js

@@ -38,7 +38,7 @@
 
         // Use cheerio to parse html
         const $ = cheerio.load(html_source);
-        
+
         // Get iFrames from HTML, to replace with a tags
         let iframes = [];
         const iframe_html = $('iframe').map(function () {
@@ -55,7 +55,7 @@
             const regex = new RegExp(`<iframe.*src="${iframes[i].src.replace('/', '\\/')}".*</iframe>`);
             html_source = html_source.replace(regex, link);
         }
-        
+
         // Get image links from HTML, to embed into the pdf
         let imgs = [];
         const srcs = $('img').map(function (i) {
@@ -64,18 +64,18 @@
         imgs.push(...srcs);
         for (let i = 0; i < imgs.length; i++) {
             if (!hdoc.valid_url(imgs[i])) {
-                 // Internal link
-                 const image_path = path.join(book_work_root, imgs[i].replace('_books/', ''));
-                 try {
-                     const image_buffer = fs.readFileSync(image_path);
-                     const mime_type = mime.lookup(image_path);
-                     let image_b64 = image_buffer.toString("base64");
-                     image_b64 = `data:${mime_type};base64,${image_b64}`;
-                     html_source = html_source.replace(imgs[i], image_b64);
-                 } catch (err) {
-                     console.log('Error reading image from HTML source [', image_path, '] -', err);
-                     return null;
-                 }
+                // Internal link
+                const image_path = path.join(book_work_root, imgs[i].replace('_books/', ''));
+                try {
+                    const image_buffer = fs.readFileSync(image_path);
+                    const mime_type = mime.lookup(image_path);
+                    let image_b64 = image_buffer.toString("base64");
+                    image_b64 = `data:${mime_type};base64,${image_b64}`;
+                    html_source = html_source.replace(imgs[i], image_b64);
+                } catch (err) {
+                    console.log('Error reading image from HTML source [', image_path, '] -', err);
+                    return null;
+                }
             } else {
                 // External Link
                 try {
@@ -100,7 +100,7 @@
 
     exports.generate_pdf = async function (browser, pdf_template_path, pdf_template_content, book_config, html_source, target_file, css_templates, verbose = false) {
         let pdf_size = 0;
-    
+
         // Cache footer
         if (footer === '') footer = get_footer(pdf_template_path);
 

package/hdoc-module.js

@@ -6,6 +6,7 @@
         cheerio = require('cheerio'),
         html2text = require('html-to-text'),
         https = require('https'),
+        htmlentities = require('html-entities'),
         wordsCount = require('words-count').default;
 
     let includesCache = {},
@@ -204,6 +205,9 @@
                                 if (/^".*"$/.test(prop_val)) {
                                     prop_val = prop_val.substring(1, prop_val.length - 1);
                                 }
+                                if (property_details[0].trim().toLowerCase() === 'title') {
+                                    prop_val = htmlentities.decode(prop_val);
+                                }
                                 response.fm_properties[property_details[0].trim().toLowerCase()] = prop_val;
                             }
                         }
@@ -214,6 +218,7 @@
                 }
             });
         }
+
         return response;
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hdoc-tools",
-  "version": "0.17.10",
+  "version": "0.17.12",
   "description": "Hornbill HDocBook Development Support Tool",
   "main": "hdoc.js",
   "bin": {
@@ -45,6 +45,7 @@
     "dree": "^3.4.2",
     "express": "^4.18.2",
     "fs-extra": "^11.1.0",
+    "html-entities": "^2.4.0",
     "html-to-text": "^8.2.1",
     "js-yaml": "^4.1.0",
     "markdown-it": "^13.0.1",
@@ -53,7 +54,7 @@
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "prompt": "^1.3.0",
-    "puppeteer": "^21.6.0",
+    "puppeteer": "^21.11.0",
     "retry": "^0.13.1",
     "stream": "0.0.2",
     "true-case-path": "^2.2.1",
@@ -61,4 +62,4 @@
     "xml-formatter": "^3.6.0",
     "zip-a-folder": "^1.1.5"
   }
-}
+}

package/templates/pdf/css/hdocs-pdf.css

@@ -451,4 +451,37 @@ video {
 
 code {
   font-size: 0.9em;
+}
+
+/* From Bootstrap 5, text color decorations */
+.text-primary {
+  color: #0d6efd !important;
+}
+
+.text-secondary {
+  color: #6c757d !important;
+}
+
+.text-success {
+  color: #198754 !important;
+}
+
+.text-info {
+  color: #0dcaf0 !important;
+}
+
+.text-warning {
+  color: #ffc107 !important;
+}
+
+.text-danger {
+  color: #dc3545 !important;
+}
+
+.text-light {
+  color: #f8f9fa !important;
+}
+
+.text-dark {
+  color: #212529 !important;
 }