Support for render the markdown source code instead of the formatted …

…output.

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 =======
 
+
+### 1.0.7 (32)
+New features:
+- Support for render the markdown source code instead of the formatted output.
+
+
 ### 1.0.6 (31)
 New features:
 - Application menu item to install/reveal the CLI tool on `/usr/local/bin` folder.

QLExtension/PreviewViewController.swift

@@ -235,9 +235,10 @@ class PreviewViewController: NSViewController, QLPreviewingController {
             markdown_url = url
         }
 
-        let text = try settings.render(file: markdown_url, forAppearance: type == "Light" ? .light : .dark, baseDir: markdown_url.deletingLastPathComponent().path, log: self.log)
+        let appearance: Appearance = type == "Light" ? .light : .dark
+        let text = try settings.render(file: markdown_url, forAppearance: appearance, baseDir: markdown_url.deletingLastPathComponent().path, log: self.log)
 
-        let html = settings.getCompleteHTML(title: url.lastPathComponent, body: text, footer: "", basedir: url.deletingLastPathComponent())
+        let html = settings.getCompleteHTML(title: url.lastPathComponent, body: text, footer: "", basedir: url.deletingLastPathComponent(), forAppearance: appearance)
 
         return html
     }

QLMarkdown.xcodeproj/project.pbxproj

@@ -1426,7 +1426,7 @@
 				CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1447,7 +1447,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1464,7 +1464,7 @@
 				CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1485,7 +1485,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1671,7 +1671,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1697,7 +1697,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1718,7 +1718,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1744,7 +1744,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.6;
+				MARKETING_VERSION = 1.0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

QLMarkdown/Settings+ext.swift

@@ -56,6 +56,7 @@ extension Settings {
 
         defaultsDomain["debug"] = self.debug
         defaultsDomain["inline-link"] = openInlineLink
+        defaultsDomain["render-as-code"] = self.renderAsCode
 
         let file: String
         if let url = customCSS {

QLMarkdown/Settings.swift

@@ -78,6 +78,7 @@ class Settings {
     @objc var customCSSOverride: Bool = false
     @objc var openInlineLink: Bool = false
 
+    @objc var renderAsCode: Bool = false
     @objc var debug: Bool = false
 
 
@@ -250,6 +251,9 @@ class Settings {
         if let opt = defaultsDomain["inline-link"] as? Bool {
             openInlineLink = opt
         }
+        if let opt = defaultsDomain["render-as-code"] as? Bool {
+            renderAsCode = opt
+        }
 
         sanitizeEmojiOption()
     }
@@ -307,6 +311,7 @@ class Settings {
             self.openInlineLink = s.openInlineLink
 
             self.debug = s.debug
+            self.renderAsCode = s.renderAsCode
 
             DistributedNotificationCenter.default().post(name: .QLMarkdownSettingsUpdated, object: nil)
         }
@@ -445,7 +450,60 @@ class Settings {
         return "```yaml\n"+text+"```\n"
     }
 
+    func renderCode(text: String, forAppearance appearance: Appearance, baseDir: String, log: OSLog? = nil) -> String? {
+
+        if let path = getHighlightSupportPath() {
+            cmark_syntax_highlight_init("\(path)/".cString(using: .utf8))
+        } else {
+            if let l = log {
+                os_log("Unable to found the `highlight` support dir!", log: l, type: .error)
+            }
+        }
+
+        let theme: String
+        switch appearance {
+        case .light:
+            theme = self.syntaxThemeLight
+        case .dark:
+            theme = self.syntaxThemeDark
+        case .undefined:
+            let mode = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") ?? "Light"
+            if mode == "Light" {
+                theme = self.syntaxThemeLight
+            } else {
+                theme = self.syntaxThemeDark
+            }
+        }
+
+        // Initialize a new generator and clear previous settings.
+        highlight_init_generator()
+
+        highlight_set_print_line_numbers(self.syntaxLineNumbersOption ? 1 : 0)
+        highlight_set_formatting_mode(Int32(self.syntaxWordWrapOption), Int32(self.syntaxTabsOption))
+
+        if !self.syntaxFontFamily.isEmpty {
+            highlight_set_current_font(self.syntaxFontFamily, self.syntaxFontSize > 0 ? String(format: "%.02f", self.syntaxFontSize) : "1rem") // 1rem is rendered as 1rempt, so it is ignored.
+        } else {
+            highlight_set_current_font("ui-monospace, -apple-system, BlinkMacSystemFont, sans-serif", "10");
+        }
+
+        if let s = colorizeCode(text, "md", theme, true, self.syntaxLineNumbersOption) {
+            defer {
+                s.deallocate()
+            }
+            let code = String(cString: s)
+            return code
+        } else {
+            return nil
+        }
+    }
+
     func render(text: String, filename: String, forAppearance appearance: Appearance, baseDir: String, log: OSLog? = nil) throws -> String {
+
+        if self.renderAsCode, let code = self.renderCode(text: text, forAppearance: appearance, baseDir: baseDir, log: log) {
+            return code
+        }
+
         cmark_gfm_core_extensions_ensure_registered()
 
         var options = CMARK_OPT_DEFAULT
@@ -912,7 +970,8 @@ table.debug td {
         }
     }
 
-    func getCompleteHTML(title: String, body: String, header: String = "", footer: String = "", basedir: URL) -> String {
+    func getCompleteHTML(title: String, body: String, header: String = "", footer: String = "", basedir: URL, forAppearance appearance: Appearance) -> String {
+
         let css_doc: String
         let css_doc_extended: String
 
@@ -923,40 +982,81 @@ table.debug td {
             return "<style type='text/css'>\(css)\n</style>\n"
         }
 
-        if let css = self.getCustomCSSCode() {
-            css_doc_extended = formatCSS(css)
-            if !self.customCSSOverride {
-                css_doc = formatCSS(getBundleContents(forResource: "default", ofType: "css"))
+        if !self.renderAsCode {
+            if let css = self.getCustomCSSCode() {
+                css_doc_extended = formatCSS(css)
+                if !self.customCSSOverride {
+                    css_doc = formatCSS(getBundleContents(forResource: "default", ofType: "css"))
+                } else {
+                    css_doc = ""
+                }
             } else {
-                css_doc = ""
+                css_doc_extended = ""
+                css_doc = formatCSS(getBundleContents(forResource: "default", ofType: "css"))
             }
+            // css_doc = "<style type=\"text/css\">\n\(css_doc)\n</style>\n"
         } else {
             css_doc_extended = ""
-            css_doc = formatCSS(getBundleContents(forResource: "default", ofType: "css"))
+            css_doc = ""
         }
-        // css_doc = "<style type=\"text/css\">\n\(css_doc)\n</style>\n"
 
         var css_highlight: String = ""
-        if self.syntaxHighlightExtension, let ext = cmark_find_syntax_extension("syntaxhighlight"), cmark_syntax_extension_highlight_get_rendered_count(ext) > 0 {
+        if self.renderAsCode {
+            let theme: String
+            var background: String = ""
+            switch appearance {
+            case .light:
+                theme = self.syntaxThemeLight
+            case .dark:
+                theme = self.syntaxThemeDark
+            case .undefined:
+                let mode = UserDefaults.standard.string(forKey: "AppleInterfaceStyle") ?? "Light"
+                if mode == "Light" {
+                    theme = self.syntaxThemeLight
+                } else {
+                    theme = self.syntaxThemeDark
+                }
+            }
+            var release: ReleaseTheme?
+            var exit_code: Int32 = 0
+            if let theme = highlight_get_theme2(theme, &exit_code, &release) {
+                defer {
+                    release?(theme)
+                }
+                if let s = theme.pointee.canvas?.pointee.color {
+                    background = String(cString: s)
+                }
+            }
+            exit_code = 0
+            if let p = highlight_format_style2(&exit_code, background) {
+                css_highlight = String(cString: p) + "\npre.hl { white-space: pre; }\n"
+                p.deallocate()
+            }
+        } else if self.syntaxHighlightExtension, let ext = cmark_find_syntax_extension("syntaxhighlight"), cmark_syntax_extension_highlight_get_rendered_count(ext) > 0 {
             let theme = String(cString: cmark_syntax_extension_highlight_get_theme_name(ext))
             if !theme.isEmpty, let p = cmark_syntax_extension_get_style(ext) {
                 // Embed the theme style.
-                let font = self.syntaxFontFamily
                 css_highlight = String(cString: p)
-                if font != "" {
-                    css_highlight += """
-    :root {
-    --code-font: "\(font)", -apple-system, Menlo, monospace;
-    }
-    """;
-                }
-                css_highlight = formatCSS(css_highlight);
-                p.deallocate();
+                p.deallocate()
             }
         }
+        if !css_highlight.isEmpty {
+            let font = self.syntaxFontFamily
+            if font != "" {
+                let code = """
+:root {
+--code-font: "\(font)", ui-monospace, -apple-system, Menlo, monospace;
+}
+"""
+                css_highlight += code
+            }
+            css_highlight = formatCSS(css_highlight)
+        }
 
         let style = css_doc + css_highlight + css_doc_extended
-
+        let wrapper_open = self.renderAsCode ? "<pre class='hl'>" : "<article class='markdown-body'>"
+        let wrapper_close = self.renderAsCode ? "</pre>" : "</article>"
+        let body_style = self.renderAsCode ? " class='hl'" : ""
         var html =
 """
 <!doctype html>
@@ -968,15 +1068,15 @@ table.debug td {
 \(style)
 \(header)
 </head>
-<body>
-<article class="markdown-body">
+<body\(body_style)>
+\(wrapper_open)
 \(body)
-</article>
+\(wrapper_close)
 \(footer)
 </body>
 </html>
 """
-        if self.unsafeHTMLOption && self.inlineImageExtension, let ext = cmark_find_syntax_extension("inlineimage"), cmark_syntax_extension_inlineimage_get_raw_images_count(ext) > 0 {
+        if !self.renderAsCode && self.unsafeHTMLOption && self.inlineImageExtension, let ext = cmark_find_syntax_extension("inlineimage"), cmark_syntax_extension_inlineimage_get_raw_images_count(ext) > 0 {
             var changed = false
             do {
                 let doc = try SwiftSoup.parse(html, basedir.path)

QLMarkdown/Themes/Theme.swift

@@ -377,7 +377,7 @@ import Cocoa
         <title>\(self.name)</title>
 <style type="text/css">
 body {
-    font-family: -apple-system, BlinkMacSystemFont, sans-serif;
+    font-family: ui-monospace, -apple-system, BlinkMacSystemFont, sans-serif;
     user-select: none;
 }
 \(css)

QLMarkdown/Themes/ThemesViewController.swift

@@ -10,7 +10,7 @@ import Foundation
 import Cocoa
 import WebKit
 
-protocol ThemesViewDelegate: class {
+protocol ThemesViewDelegate: AnyObject {
     var theme: ThemePreview? { get set }
 }