Skip to content

Commit e15fd01

Browse files
committed
Bugfix.
1 parent 5109670 commit e15fd01

File tree

5 files changed

+31
-9
lines changed

5 files changed

+31
-9
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22

33

4+
### 1.0.12 (37)
5+
Bugfix:
6+
- Better procedure for install the command line tool.
7+
- Fixed the bug that prevented the processing of html raw images when they are not inserted in a html block element.
8+
49
### 1.0.11 (36)
510
New features:
611
- Support for opening markdown files (by dragging the file onto the app icon)

QLMarkdown.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@
14331433
CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
14341434
CODE_SIGN_IDENTITY = "-";
14351435
CODE_SIGN_STYLE = Manual;
1436-
CURRENT_PROJECT_VERSION = 36;
1436+
CURRENT_PROJECT_VERSION = 37;
14371437
DEVELOPMENT_TEAM = "";
14381438
ENABLE_HARDENED_RUNTIME = NO;
14391439
HEADER_SEARCH_PATHS = (
@@ -1453,7 +1453,7 @@
14531453
"$(BUILT_PRODUCTS_DIR)/libpcre2/lib",
14541454
);
14551455
MACOSX_DEPLOYMENT_TARGET = 10.15;
1456-
MARKETING_VERSION = 1.0.11;
1456+
MARKETING_VERSION = 1.0.12;
14571457
PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
14581458
PRODUCT_NAME = "$(TARGET_NAME)";
14591459
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1470,7 +1470,7 @@
14701470
CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
14711471
CODE_SIGN_IDENTITY = "-";
14721472
CODE_SIGN_STYLE = Manual;
1473-
CURRENT_PROJECT_VERSION = 36;
1473+
CURRENT_PROJECT_VERSION = 37;
14741474
DEVELOPMENT_TEAM = "";
14751475
ENABLE_HARDENED_RUNTIME = NO;
14761476
HEADER_SEARCH_PATHS = (
@@ -1490,7 +1490,7 @@
14901490
"$(BUILT_PRODUCTS_DIR)/libpcre2/lib",
14911491
);
14921492
MACOSX_DEPLOYMENT_TARGET = 10.15;
1493-
MARKETING_VERSION = 1.0.11;
1493+
MARKETING_VERSION = 1.0.12;
14941494
PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
14951495
PRODUCT_NAME = "$(TARGET_NAME)";
14961496
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1684,7 +1684,7 @@
16841684
CODE_SIGN_IDENTITY = "-";
16851685
CODE_SIGN_STYLE = Manual;
16861686
COMBINE_HIDPI_IMAGES = YES;
1687-
CURRENT_PROJECT_VERSION = 36;
1687+
CURRENT_PROJECT_VERSION = 37;
16881688
DEVELOPMENT_TEAM = "";
16891689
ENABLE_HARDENED_RUNTIME = NO;
16901690
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -1706,7 +1706,7 @@
17061706
"$(BUILT_PRODUCTS_DIR)/libpcre2/lib",
17071707
);
17081708
MACOSX_DEPLOYMENT_TARGET = 10.15;
1709-
MARKETING_VERSION = 1.0.11;
1709+
MARKETING_VERSION = 1.0.12;
17101710
PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
17111711
PRODUCT_NAME = "$(TARGET_NAME)";
17121712
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1727,7 +1727,7 @@
17271727
CODE_SIGN_IDENTITY = "-";
17281728
CODE_SIGN_STYLE = Manual;
17291729
COMBINE_HIDPI_IMAGES = YES;
1730-
CURRENT_PROJECT_VERSION = 36;
1730+
CURRENT_PROJECT_VERSION = 37;
17311731
DEVELOPMENT_TEAM = "";
17321732
ENABLE_HARDENED_RUNTIME = NO;
17331733
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -1749,7 +1749,7 @@
17491749
"$(BUILT_PRODUCTS_DIR)/libpcre2/lib",
17501750
);
17511751
MACOSX_DEPLOYMENT_TARGET = 10.15;
1752-
MARKETING_VERSION = 1.0.11;
1752+
MARKETING_VERSION = 1.0.12;
17531753
PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
17541754
PRODUCT_NAME = "$(TARGET_NAME)";
17551755
PROVISIONING_PROFILE_SPECIFIER = "";

QLMarkdown/Base.lproj/Main.storyboard

+5
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@
9595
<action selector="exportPreview:" target="Ady-hI-5gd" id="ThC-Ot-hlN"/>
9696
</connections>
9797
</menuItem>
98+
<menuItem title="Reload Markdown source" keyEquivalent="R" id="oCc-uW-APD">
99+
<connections>
100+
<action selector="reloadMarkdown:" target="Ady-hI-5gd" id="iOr-Z4-dVU"/>
101+
</connections>
102+
</menuItem>
98103
<menuItem isSeparatorItem="YES" id="U4l-0Q-Iha"/>
99104
<menuItem title="Save settings" keyEquivalent="s" id="pxx-59-PXV">
100105
<connections>

QLMarkdown/ViewController.swift

+12
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,18 @@ class ViewController: NSViewController {
667667
}
668668
}
669669

670+
@IBAction func reloadMarkdown(_ sender: Any) {
671+
guard let file = self.markdown_file else {
672+
return
673+
}
674+
let prev_scroll = self.prev_scroll
675+
self.openMarkdown(file: file)
676+
self.prev_scroll = prev_scroll
677+
if prev_scroll > 0 {
678+
webView.evaluateJavaScript("document.documentElement.scrollTop = \(prev_scroll);")
679+
}
680+
}
681+
670682
@IBAction func exportPreview(_ sender: Any) {
671683
let savePanel = NSSavePanel()
672684
savePanel.canCreateDirectories = true

cmark-gfm/extensions/inlineimage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static cmark_node *postprocess(cmark_syntax_extension *ext, cmark_parser *parser
185185
cmark_chunk_set_cstr(mem, &node->as.link.url, encoded);
186186
free(encoded);
187187
}
188-
} else if (node->type == CMARK_NODE_HTML_BLOCK && html_callback != NULL) {
188+
} else if ((node->type == CMARK_NODE_HTML_BLOCK || node->type == CMARK_NODE_HTML_INLINE) && html_callback != NULL) {
189189
// Search inside the raw html fragment and process the images.
190190
cmark_chunk_to_cstr(parser->mem, &node->as.literal);
191191
unsigned char *s = NULL;

0 commit comments

Comments
 (0)