Bugfix and improved performance.

Author: sbarex

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 =======
 
+### 1.0.5 (30)
+Bugfix:
+- Tag Filter extension fixed.
+- Improved performance for inline image handling in raw HTML fragment.
+- Better recognition of javascript fenced block.
+- Missing library credits on about dialog.
+
 ### 1.0.4 (29)
 New features:
 - On macOS 12 Monterey, the new lightweight data based preview will be used.

QLMarkdown.xcodeproj/project.pbxproj

@@ -1426,7 +1426,7 @@
 				CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				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.4;
+				MARKETING_VERSION = 1.0.5;
 				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 = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				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.4;
+				MARKETING_VERSION = 1.0.5;
 				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 = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				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.4;
+				MARKETING_VERSION = 1.0.5;
 				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 = 29;
+				CURRENT_PROJECT_VERSION = 30;
 				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.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

QLMarkdown/AboutViewController.swift

@@ -56,6 +56,8 @@ class AboutViewController: NSViewController {
         s += "\(String(cString: get_lua_info()))<br />\n"
         s += "Enry (<a href=\"https://www.github.com/go-enry/go-enry/\">https://www.github.com/go-enry/go-enry</a>)<br />\n"
         s += "Google re2 (<a href=\"https://github.com/google/re2\">https://github.com/google/re2</a>)<br />\n"
+        s += "Yams (<a href=\"https://github.com/jpsim/Yams.git\">https://github.com/jpsim/Yams.git</a>)<br />\n"
+        s += "SwiftSoup (<a href=\"https://github.com/scinfu/SwiftSoup\">https://github.com/scinfu/SwiftSoup</a>)<br />\n"
         s += "<br />\n———<br />\n<br />\n"
         s += "Thanks to hazarek (<a href=\"https://github.com/hazarek\">https://github.com/hazarek</a>) for the app icon and CSS style.<br />\n"
 

QLMarkdown/Settings.swift

@@ -497,6 +497,13 @@ class Settings {
             cmark_parser_free(parser)
         }
 
+        /*
+        var extensions: UnsafeMutablePointer<cmark_llist>? = nil
+        defer {
+            cmark_llist_free(cmark_get_default_mem_allocator(), extensions)
+        }
+        */
+        
         if self.tableExtension, let ext = cmark_find_syntax_extension("table") {
             cmark_parser_attach_syntax_extension(parser, ext)
             if let l = log {
@@ -506,6 +513,7 @@ class Settings {
                     type: .debug
                 )
             }
+            // extensions = cmark_llist_append(cmark_get_default_mem_allocator(), nil, &ext)
         }
 
         if self.autoLinkExtension, let ext = cmark_find_syntax_extension("autolink") {
@@ -696,7 +704,7 @@ class Settings {
 
         let html_debug = self.renderDebugInfo(forAppearance: appearance, baseDir: baseDir)
         // Render
-        if let html2 = cmark_render_html(doc, options, nil) {
+        if let html2 = cmark_render_html(doc, options, cmark_parser_get_syntax_extensions(parser)) {
             defer {
                 free(html2)
             }
@@ -968,7 +976,7 @@ table.debug td {
 </body>
 </html>
 """
-        if self.unsafeHTMLOption && self.inlineImageExtension {
+        if 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)

TODO.md

@@ -1,12 +1,13 @@
 #  TODO
 
+- [ ] Bugfix: on dark style, there is a flashing white rectangle before show the preview on Monterey.
 - [ ] Investigate if export syntax highlighting colors scheme style as CSS var overriding the default style
 - [ ] Syntax highlighting color scheme editor
 - [ ] Check code signature and app group access
 - [ ] Check inline images on network / mounted disk
 - [ ] Investigate font family override for fanced blocks
 - [ ] Localization support
-- [x] embed inline image for `<img>` raw tag without using javascript/callbacks.
+- [x] Embed inline image for `<img>` raw tag without using javascript/callbacks.
 - [x] Emoji extension: better code that parse the single placeholder and generate nodes inside the AST (this would avoid the CMARK_OPT_UNSAFE option for emojis as images)
 - [x] Investigate CMARK_OPT_UNSAFE for inline images
 - [x] Application screenshot in the docs

cmark-gfm/extensions/inlineimage.c

@@ -26,6 +26,7 @@ typedef struct {
     char *path;
     MimeCheck *magic_callback;
     void *magic_context;
+    int raw_images;
 } inlineimage_settings;
 
 static inlineimage_settings *init_settings() {
@@ -34,6 +35,7 @@ static inlineimage_settings *init_settings() {
     settings->path = NULL;
     settings->magic_callback = NULL;
     settings->magic_context = NULL;
+    settings->raw_images = 0;
     return settings;
 }
 
@@ -48,6 +50,7 @@ static void release_settings(cmark_mem *mem, void *user_data)
         }
         settings->magic_callback = NULL;
         settings->magic_context = NULL;
+        settings->raw_images = 0;
         mem->free(user_data);
     }
 }
@@ -197,6 +200,33 @@ char *cmark_syntax_extension_inlineimage_get_wd(cmark_syntax_extension *extensio
     return settings ? settings->path : NULL;
 }
 
+int cmark_syntax_extension_inlineimage_get_raw_images_count(cmark_syntax_extension *ext) {
+    inlineimage_settings *settings = (inlineimage_settings *)cmark_syntax_extension_get_private(ext);
+    if (!settings) {
+        settings = init_settings();
+        cmark_syntax_extension_set_private(ext, settings, release_settings);
+    }
+    return settings->raw_images;
+}
+
+void cmark_syntax_extension_inlineimage_set_raw_images_count(cmark_syntax_extension *ext, int value) {
+    inlineimage_settings *settings = (inlineimage_settings *)cmark_syntax_extension_get_private(ext);
+    if (!settings) {
+        settings = init_settings();
+        cmark_syntax_extension_set_private(ext, settings, release_settings);
+    }
+    settings->raw_images = value;
+}
+
+void cmark_syntax_extension_inlineimage_increment_raw_images_count(cmark_syntax_extension *ext, int delta) {
+    inlineimage_settings *settings = (inlineimage_settings *)cmark_syntax_extension_get_private(ext);
+    if (!settings) {
+        settings = init_settings();
+        cmark_syntax_extension_set_private(ext, settings, release_settings);
+    }
+    settings->raw_images += delta;
+}
+
 MimeCheck *cmark_syntax_extension_inlineimage_get_mime_callback(cmark_syntax_extension *extension)
 {
     inlineimage_settings *settings = (inlineimage_settings *)cmark_syntax_extension_get_private(extension);
@@ -227,13 +257,28 @@ void cmark_syntax_extension_inlineimage_set_mime_callback(cmark_syntax_extension
     settings->magic_context = context;
 }
 
+static bool prefix(const char *pre, const char *str)
+{
+    return strncmp(pre, str, strlen(pre)) == 0;
+}
+
+static int filter(cmark_syntax_extension *ext, const unsigned char *tag,
+                  size_t tag_len) {
+  if (prefix("<img ", (const char *)tag)) {
+    cmark_syntax_extension_inlineimage_increment_raw_images_count(ext, 1);
+  }
+
+  return 1;
+}
+
 cmark_syntax_extension *create_inlineimage_extension(void) {
     cmark_syntax_extension *ext = cmark_syntax_extension_new("inlineimage");
 
     inlineimage_settings *settings = init_settings();
     cmark_syntax_extension_set_private(ext, settings, release_settings);
 
     cmark_syntax_extension_set_postprocess_func(ext, postprocess);
-
+    cmark_syntax_extension_set_html_filter_func(ext, filter);
+    
     return ext;
 }

cmark-gfm/extensions/inlineimage.h

@@ -16,6 +16,9 @@ cmark_syntax_extension *create_inlineimage_extension(void);
 
 char *cmark_syntax_extension_inlineimage_get_wd(cmark_syntax_extension *extension);
 void cmark_syntax_extension_inlineimage_set_wd(cmark_syntax_extension *ext, const char *path);
+int cmark_syntax_extension_inlineimage_get_raw_images_count(cmark_syntax_extension *ext);
+void cmark_syntax_extension_inlineimage_set_raw_images_count(cmark_syntax_extension *ext, int value);
+void cmark_syntax_extension_inlineimage_increment_raw_images_count(cmark_syntax_extension *ext, int delta);
 
 typedef char *(MimeCheck)( const char *filename, void *context );
 

highlight-wrapper/wrapper_highlight.cpp

@@ -304,15 +304,12 @@ char *highlight_format_string2(const char *code, const char *language, int *exit
     outFilePath = "";
 
     string suffix = language;
-    if (suffix == "c++") {
-        suffix = "cpp";
-    } else if (suffix == "ascr" || suffix == "scpt") {
-        suffix = "applescript";
-    } else if (suffix == "plist" ) {
-        suffix = "xml";
-    } else if (suffix == "m" ) {
-        suffix = "objc";
-    } else if (suffix.front() == '{' && suffix.back() == '}') {
+    // convert string to lower case
+    std::for_each(suffix.begin(), suffix.end(), [](char & c){
+        c = ::tolower(c);
+    });
+    
+    if (suffix.front() == '{' && suffix.back() == '}') {
         // remove r-markdown curly braces
         std::size_t found1 = suffix.find_first_of(','); // arguments separator
         std::size_t found2 = suffix.find_first_of(' ');
@@ -324,6 +321,18 @@ char *highlight_format_string2(const char *code, const char *language, int *exit
             suffix.erase(0, 1);
         }
     }
+    
+    if (suffix == "c++") {
+        suffix = "cpp";
+    } else if (suffix == "ascr" || suffix == "scpt") {
+        suffix = "applescript";
+    } else if (suffix == "plist" ) {
+        suffix = "xml";
+    } else if (suffix == "m" ) {
+        suffix = "objc";
+    } else if (suffix == "javascript" ) {
+        suffix = "js";
+    }
     generator->setFilesCnt(1);
 
     string getFallbackSyntax = "txt";

re2.xcodeproj/xcuserdata/sbaldiss.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>re2.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>