From 90ede21aeb041cb26b9407147eae67527d507276 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:27 -0500 Subject: [PATCH 01/24] spelling: accessory --- MacDown/Code/Document/MPDocument.m | 2 +- MacDown/Code/Document/MPRenderer.h | 2 +- MacDown/Code/Document/MPRenderer.m | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MacDown/Code/Document/MPDocument.m b/MacDown/Code/Document/MPDocument.m index acbc77ff..2be2302e 100644 --- a/MacDown/Code/Document/MPDocument.m +++ b/MacDown/Code/Document/MPDocument.m @@ -1026,7 +1026,7 @@ - (BOOL)rendererHasGraphviz:(MPRenderer *)renderer return self.preferences.htmlGraphviz; } -- (MPCodeBlockAccessoryType)rendererCodeBlockAccesory:(MPRenderer *)renderer +- (MPCodeBlockAccessoryType)rendererCodeBlockAccessory:(MPRenderer *)renderer { return self.preferences.htmlCodeBlockAccessory; } diff --git a/MacDown/Code/Document/MPRenderer.h b/MacDown/Code/Document/MPRenderer.h index 2415864f..026f937b 100644 --- a/MacDown/Code/Document/MPRenderer.h +++ b/MacDown/Code/Document/MPRenderer.h @@ -56,7 +56,7 @@ typedef NS_ENUM(NSUInteger, MPCodeBlockAccessoryType) - (BOOL)rendererHasSyntaxHighlighting:(MPRenderer *)renderer; - (BOOL)rendererHasMermaid:(MPRenderer *)renderer; - (BOOL)rendererHasGraphviz:(MPRenderer *)renderer; -- (MPCodeBlockAccessoryType)rendererCodeBlockAccesory:(MPRenderer *)renderer; +- (MPCodeBlockAccessoryType)rendererCodeBlockAccessory:(MPRenderer *)renderer; - (BOOL)rendererHasMathJax:(MPRenderer *)renderer; - (NSString *)rendererHighlightingThemeName:(MPRenderer *)renderer; - (void)renderer:(MPRenderer *)renderer didProduceHTMLOutput:(NSString *)html; diff --git a/MacDown/Code/Document/MPRenderer.m b/MacDown/Code/Document/MPRenderer.m index f797444f..6d32ba2b 100644 --- a/MacDown/Code/Document/MPRenderer.m +++ b/MacDown/Code/Document/MPRenderer.m @@ -222,7 +222,7 @@ @interface MPRenderer () @property BOOL syntaxHighlighting; @property BOOL mermaid; @property BOOL graphviz; -@property MPCodeBlockAccessoryType codeBlockAccesory; +@property MPCodeBlockAccessoryType codeBlockAccessory; @property BOOL lineNumbers; @property BOOL manualRender; @property (copy) NSString *highlightingThemeName; @@ -382,7 +382,7 @@ - (NSArray *)prismStylesheets NSURL *url = MPPrismPluginURL(@"line-numbers", @"css"); [stylesheets addObject:[MPStyleSheet CSSWithURL:url]]; } - if ([self.delegate rendererCodeBlockAccesory:self] + if ([self.delegate rendererCodeBlockAccessory:self] == MPCodeBlockAccessoryLanguageName) { NSURL *url = MPPrismPluginURL(@"show-language", @"css"); @@ -410,7 +410,7 @@ - (NSArray *)prismScripts NSURL *url = MPPrismPluginURL(@"line-numbers", @"js"); [scripts addObject:[MPScript javaScriptWithURL:url]]; } - if ([self.delegate rendererCodeBlockAccesory:self] + if ([self.delegate rendererCodeBlockAccessory:self] == MPCodeBlockAccessoryLanguageName) { NSURL *url = MPPrismPluginURL(@"show-language", @"js"); @@ -494,7 +494,7 @@ - (NSArray *)stylesheets } - if ([delegate rendererCodeBlockAccesory:self] == MPCodeBlockAccessoryCustom) + if ([delegate rendererCodeBlockAccessory:self] == MPCodeBlockAccessoryCustom) { NSURL *url = MPExtensionURL(@"show-information", @"css"); [stylesheets addObject:[MPStyleSheet CSSWithURL:url]]; @@ -632,7 +632,7 @@ - (void)renderIfPreferencesChanged else if (!MPAreNilableStringsEqual( [d rendererStyleName:self], self.styleName)) changed = YES; - else if ([d rendererCodeBlockAccesory:self] != self.codeBlockAccesory) + else if ([d rendererCodeBlockAccessory:self] != self.codeBlockAccessory) changed = YES; if (changed) @@ -654,7 +654,7 @@ - (void)render self.mermaid = [delegate rendererHasMermaid:self]; self.graphviz = [delegate rendererHasGraphviz:self]; self.highlightingThemeName = [delegate rendererHighlightingThemeName:self]; - self.codeBlockAccesory = [delegate rendererCodeBlockAccesory:self]; + self.codeBlockAccessory = [delegate rendererCodeBlockAccessory:self]; } - (NSString *)HTMLForExportWithStyles:(BOOL)withStyles From 3d707a6f8e47b3454b905176c0eb3c8add3cdf5b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:28 -0500 Subject: [PATCH 02/24] spelling: ambiguous --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1ed67965..d2bcbad7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,7 +56,7 @@ Exception: If a URL in a comment is too long, it can go over the limit. This hap } ``` -* If code alignment is ambiguious, add extra indentation. +* If code alignment is ambiguous, add extra indentation. Yes: ```c From 556f04a447f58c0157b3804252349c588b9a8947 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:29 -0500 Subject: [PATCH 03/24] spelling: appreciate --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2bcbad7..11849304 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,7 +88,7 @@ Exception: If a URL in a comment is too long, it can go over the limit. This hap Always use *four spaces* instead of tabs for indentation. Trailing whitespaces should be removed. You can turn on the **Automatically trim trailing whitespace** option in Xcode to let it do the job for you. -Try to ensure that there’s a trailing newline in the end of a file. This is not strictly enforced since there are no easy ways to do that (except checking manually), but I’d appriciate the effort. +Try to ensure that there’s a trailing newline in the end of a file. This is not strictly enforced since there are no easy ways to do that (except checking manually), but I’d appreciate the effort. ## Version Control From 1af072393b4121ced8a9fffe904779a499e258a5 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:30 -0500 Subject: [PATCH 04/24] spelling: background --- MacDown/Code/Document/MPRenderer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Document/MPRenderer.m b/MacDown/Code/Document/MPRenderer.m index 6d32ba2b..18723b6f 100644 --- a/MacDown/Code/Document/MPRenderer.m +++ b/MacDown/Code/Document/MPRenderer.m @@ -541,7 +541,7 @@ - (void)parseAndRenderWithMaxDelay:(NSTimeInterval)maxDelay { markdown = [[self.dataSource rendererMarkdown:self] copy]; }); - // Parse in backgound + // Parse in background [self parseMarkdown:markdown]; // Wait untils is renderer has finished loading OR until the maxDelay has passed From 056a26f6c205d94d6929ae547603a5f9fed660d5 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:31 -0500 Subject: [PATCH 05/24] spelling: characters --- MacDown/Code/Extension/NSTextView+Autocomplete.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Extension/NSTextView+Autocomplete.m b/MacDown/Code/Extension/NSTextView+Autocomplete.m index b27df5ad..92ac3a3e 100644 --- a/MacDown/Code/Extension/NSTextView+Autocomplete.m +++ b/MacDown/Code/Extension/NSTextView+Autocomplete.m @@ -147,7 +147,7 @@ - (BOOL)completeMatchingCharacterForText:(NSString *)string for (const unichar *cs = kMPMatchingCharactersMap[0]; *cs != 0; cs += 2) { - // Ignore IM input of ASCII charaters. + // Ignore IM input of ASCII characters. if (hasMarkedText && cs[0] < L'\u0100') continue; From 974a4810ef48919d97b4fae34b83b8236f1f17c8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:32 -0500 Subject: [PATCH 06/24] spelling: convenience --- MacDown/Code/Preferences/MPPreferences.h | 2 +- MacDownTests/MPAssetTests.m | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MacDown/Code/Preferences/MPPreferences.h b/MacDown/Code/Preferences/MPPreferences.h index e14d2621..d4f3c006 100644 --- a/MacDown/Code/Preferences/MPPreferences.h +++ b/MacDown/Code/Preferences/MPPreferences.h @@ -81,7 +81,7 @@ extern NSString * const MPDidDetectFreshInstallationNotification; - (instancetype)init; -// Convinience methods. +// Convenience methods. @property (nonatomic, assign) NSArray *filesToOpen; @property (nonatomic, assign) NSString *pipedContentFileToOpen; diff --git a/MacDownTests/MPAssetTests.m b/MacDownTests/MPAssetTests.m index 4782541b..d561b5fb 100644 --- a/MacDownTests/MPAssetTests.m +++ b/MacDownTests/MPAssetTests.m @@ -46,7 +46,7 @@ - (void)testAssetNone @"Init and NULL rendering"); } -- (void)testAssetConvinienceAndEmbedded +- (void)testAssetConvenienceAndEmbedded { NSURL *url = [self.bundle URLForResource:@"test" withExtension:@"txt"]; MPScript *script = [MPScript assetWithURL:url andType:@"text/plain"]; @@ -54,7 +54,7 @@ - (void)testAssetConvinienceAndEmbedded NSString *expected = @""; XCTAssertEqualObjects([script htmlForOption:MPAssetEmbedded], expected, - @"Convinience and embedded"); + @"Convenience and embedded"); } - (void)testAssetInitAndFullLink @@ -65,7 +65,7 @@ - (void)testAssetInitAndFullLink NSString *expected = @""; expected = [NSString stringWithFormat:expected, url.absoluteString]; XCTAssertEqualObjects([script htmlForOption:MPAssetFullLink], expected, - @"Convinience and full link"); + @"Convenience and full link"); } From 114edd04f486d10c687c6dc09b85161ff7314147 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:33 -0500 Subject: [PATCH 07/24] spelling: default --- MacDown/Code/Preferences/MPPreferences.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Preferences/MPPreferences.m b/MacDown/Code/Preferences/MPPreferences.m index 4f54f8e9..b0916e34 100644 --- a/MacDown/Code/Preferences/MPPreferences.m +++ b/MacDown/Code/Preferences/MPPreferences.m @@ -235,7 +235,7 @@ - (void)cleanupObsoleteAutosaveValues * Note that since this is called only when the user launches the app the first * time, new preferences that breaks backward compatibility should NOT be put * here. An example would be adding a boolean config to turn OFF an existing - * functionality. If you add the defualt-loading code here, existing users + * functionality. If you add the default-loading code here, existing users * upgrading from an old version will not have this method invoked, thus * effecting app behavior. * From 78056f55834c24677fcbc9b36017a7db3b892676 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:34 -0500 Subject: [PATCH 08/24] spelling: dimension --- MacDown/Code/Document/MPDocument.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Document/MPDocument.m b/MacDown/Code/Document/MPDocument.m index 2be2302e..92e61e74 100644 --- a/MacDown/Code/Document/MPDocument.m +++ b/MacDown/Code/Document/MPDocument.m @@ -450,7 +450,7 @@ - (void)windowControllerDidLoadNib:(NSWindowController *)controller wordCountWidget.enabled = NO; // These needs to be queued until after the window is shown, so that editor - // can have the correct dimention for size-limiting and stuff. See + // can have the correct dimension for size-limiting and stuff. See // https://github.com/uranusjr/macdown/issues/236 [[NSOperationQueue mainQueue] addOperationWithBlock:^{ [self setupEditor:nil]; From 8060bfcf38d2f54f151c20baa81b88b3fae7ba0b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:35 -0500 Subject: [PATCH 09/24] spelling: document --- MacDown/Code/Document/MPDocument.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MacDown/Code/Document/MPDocument.m b/MacDown/Code/Document/MPDocument.m index 92e61e74..926c71bd 100644 --- a/MacDown/Code/Document/MPDocument.m +++ b/MacDown/Code/Document/MPDocument.m @@ -1064,7 +1064,7 @@ - (void)renderer:(MPRenderer *)renderer didProduceHTMLOutput:(NSString *)html } NSURL *baseUrl = self.fileURL; - if (!baseUrl) // Unsaved doument; just use the default URL. + if (!baseUrl) // Unsaved document; just use the default URL. baseUrl = self.preferences.htmlDefaultDirectoryUrl; self.manualRender = self.preferences.markdownManualRender; @@ -1082,7 +1082,7 @@ - (void)renderer:(MPRenderer *)renderer didProduceHTMLOutput:(NSString *)html if (self.isPreviewReady && [self.currentBaseUrl isEqualTo:baseUrl]) { // HACK: Ideally we should only inject the parts that changed, and only - // get the parts we need. For now we only get a complete HTML codument, + // get the parts we need. For now we only get a complete HTML document, // and rely on regex to get the parts we want in the DOM. // Use the existing tree if available, and replace the content. From c6a62c699f7b14d5c037f46f2e55d8e462ba7faa Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:37 -0500 Subject: [PATCH 10/24] spelling: grammar --- assets/demo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/demo.md b/assets/demo.md index 4bbe7f8d..e71d4b48 100644 --- a/assets/demo.md +++ b/assets/demo.md @@ -1,7 +1,7 @@ # Graph Visualization -Two graph visualization grammer are supported, mermaid and graphviz. +Two graph visualization grammar are supported, mermaid and graphviz. To enable these features, options `Mermaid` and/or `Graphviz` in `MacDown` -> `Perferences...` -> `Rendering` should be checked. # Mermaid From 0a4fa85b0b4e013ffa210f457b512691246b83f8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:38 -0500 Subject: [PATCH 11/24] spelling: language --- MacDown/Code/Document/MPRenderer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Document/MPRenderer.m b/MacDown/Code/Document/MPRenderer.m index 18723b6f..e5d088ff 100644 --- a/MacDown/Code/Document/MPRenderer.m +++ b/MacDown/Code/Document/MPRenderer.m @@ -252,7 +252,7 @@ NS_INLINE void add_to_languages( } else if (require) { - NSLog(@"Unknown Prism langauge requirement " + NSLog(@"Unknown Prism language requirement " @"%@ dropped for unknown format", require); } } From 3661ea07a35ad7424f9cab14c8be1c22ba6e2f8e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:39 -0500 Subject: [PATCH 12/24] spelling: macdown --- .../Code/Preferences/MPTerminalPreferencesViewController.m | 4 ++-- MacDown/MacDown-Info.plist | 2 +- MacDown/Resources/help.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m b/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m index fc1b1a59..2daebcb7 100644 --- a/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m +++ b/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m @@ -90,7 +90,7 @@ - (void)setShellUtilityURL:(NSURL *)url - (void)viewDidLoad { [super viewDidLoad]; - [self highlightMacdownInInfo]; + [self highlightMacDownInInfo]; self.installUninstallButton.target = self; self.shellUtilityURL = nil; @@ -174,7 +174,7 @@ - (void)uninstallShellUtility /** * Highlights all occurences of "macdown" in the info-text */ -- (void)highlightMacdownInInfo +- (void)highlightMacDownInInfo { NSString *infoString = self.infoTextField.stringValue; NSMutableAttributedString *attributedInfoString = diff --git a/MacDown/MacDown-Info.plist b/MacDown/MacDown-Info.plist index 90ff8b8f..3cc324b3 100644 --- a/MacDown/MacDown-Info.plist +++ b/MacDown/MacDown-Info.plist @@ -8,7 +8,7 @@ CFBundleURLName - Macdown custom control + MacDown custom control CFBundleURLSchemes x-macdown diff --git a/MacDown/Resources/help.md b/MacDown/Resources/help.md index 95b40181..5216ee49 100644 --- a/MacDown/Resources/help.md +++ b/MacDown/Resources/help.md @@ -78,8 +78,8 @@ Just put angle brackets around an email and it becomes clickable: ` ` -Perhaps you want to link some text like this: [Macdown Website](https://macdown.uranusjr.com "Title") -`[Macdown Website](https://macdown.uranusjr.com "Title")` (The title is optional) +Perhaps you want to link some text like this: [MacDown Website](https://macdown.uranusjr.com "Title") +`[MacDown Website](https://macdown.uranusjr.com "Title")` (The title is optional) #### Reference style @@ -297,7 +297,7 @@ If you like, I can display Jekyll front-matter in a nice table. Just make sure y ``` --- -title: "Macdown is my friend" +title: "MacDown is my friend" date: 2014-06-06 20:00:00 --- ``` From eabfd8a604afc19e19e5ad0d213706b238174ad6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 12:07:12 -0500 Subject: [PATCH 13/24] spelling: macos --- MacDown/Code/Extension/NSTextView+Autocomplete.m | 2 +- MacDown/Resources/help.md | 4 ++-- README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MacDown/Code/Extension/NSTextView+Autocomplete.m b/MacDown/Code/Extension/NSTextView+Autocomplete.m index 92ac3a3e..f6618b0b 100644 --- a/MacDown/Code/Extension/NSTextView+Autocomplete.m +++ b/MacDown/Code/Extension/NSTextView+Autocomplete.m @@ -157,7 +157,7 @@ - (BOOL)completeMatchingCharacterForText:(NSString *)string { NSRange range = NSMakeRange(location, 0); NSString *completion = [NSString stringWithCharacters:cs length:2]; - // Mimic OS X's quote substitution if it's on. + // Mimic macOS's quote substitution if it's on. if (self.isAutomaticQuoteSubstitutionEnabled) { unichar c = L'\0'; diff --git a/MacDown/Resources/help.md b/MacDown/Resources/help.md index 5216ee49..7d11e423 100644 --- a/MacDown/Resources/help.md +++ b/MacDown/Resources/help.md @@ -2,7 +2,7 @@ ![MacDown logo](https://macdown.uranusjr.com/static/images/logo-160.png) -Hello there! I’m **MacDown**, the open source Markdown editor for OS X. +Hello there! I’m **MacDown**, the open source Markdown editor for macOS. Let me introduce myself. @@ -329,7 +329,7 @@ I offer auto-completion and other functions to ease your editing experience. If ## Hidden preference -You can see the HTML behind a preview by enabling the OS X built-in WebKit developer tools for MacDown in a terminal window: +You can see the HTML behind a preview by enabling the macOS built-in WebKit developer tools for MacDown in a terminal window: ``` defaults write com.uranusjr.macdown WebKitDeveloperExtras -bool true diff --git a/README.md b/README.md index a656c7f7..4a76d46c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Build Status](https://travis-ci.org/MacDownApp/macdown.svg?branch=master)](https://travis-ci.org/MacDownApp/macdown) -MacDown is an open source Markdown editor for OS X, released under the MIT License. The author stole the idea from [Chen Luo](https://twitter.com/chenluois)’s [Mou](http://mouapp.com) so that people can make crappy clones. +MacDown is an open source Markdown editor for macOS, released under the MIT License. The author stole the idea from [Chen Luo](https://twitter.com/chenluois)’s [Mou](http://mouapp.com) so that people can make crappy clones. Visit the [project site](http://macdown.uranusjr.com/) for more information, or download [MacDown.app.zip](http://macdown.uranusjr.com/download/latest/) directly from the [latest releases](https://github.com/MacDownApp/macdown/releases/latest) page. @@ -49,7 +49,7 @@ The following editor themes and CSS files are extracted from [Mou](http://mouapp If you wish to build MacDown yourself, you will need the following components/tools: -* OS X SDK (10.14 or later) +* macOS SDK (10.14 or later) * Git * [Bundler](http://bundler.io) From f7c8e38e607393e93efdda39d91e1976e8bdbf0e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:40 -0500 Subject: [PATCH 14/24] spelling: multiplier --- MacDown/Code/Extension/WebView+WebViewPrivateHeaders.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Extension/WebView+WebViewPrivateHeaders.h b/MacDown/Code/Extension/WebView+WebViewPrivateHeaders.h index a6d511d0..5222767e 100644 --- a/MacDown/Code/Extension/WebView+WebViewPrivateHeaders.h +++ b/MacDown/Code/Extension/WebView+WebViewPrivateHeaders.h @@ -19,7 +19,7 @@ /*! @method pageSizeMultiplier - @result The page size multipler. + @result The page size multiplier. */ - (float)pageSizeMultiplier; From e6c79b57b1b58ddecf3302817747c544e5851674 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:41 -0500 Subject: [PATCH 15/24] spelling: occurrences --- .../Code/Preferences/MPTerminalPreferencesViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m b/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m index 2daebcb7..a4792b23 100644 --- a/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m +++ b/MacDown/Code/Preferences/MPTerminalPreferencesViewController.m @@ -172,7 +172,7 @@ - (void)uninstallShellUtility } /** - * Highlights all occurences of "macdown" in the info-text + * Highlights all occurrences of "macdown" in the info-text */ - (void)highlightMacDownInInfo { @@ -197,7 +197,7 @@ - (void)highlightMacDownInInfo searchRange.location = foundRange.location + foundRange.length; } - else // Found all occurences + else // Found all occurrences { break; } From 44734020244dca644d202bab6ddd8dd608a88c18 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:42 -0500 Subject: [PATCH 16/24] spelling: omitted --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11849304..49d3f5cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ All code should obey the 80-column rule. Exception: If a URL in a comment is too long, it can go over the limit. This happens a lot for Apple’s official documentation. Remember, however, that many websites offer alternative, shorter URL forms that are permanent. For example: -* The title slug in StackOverflow (and other StackExchange sites) URLs can be ommitted. The following two are equivalent: +* The title slug in StackOverflow (and other StackExchange sites) URLs can be omitted. The following two are equivalent: `http://stackoverflow.com/questions/13155612/how-does-one-eliminate-objective-c-try-catch-blocks-like-this` `http://stackoverflow.com/questions/13155612` From 3837e173dab215f0396db0e693f6c2165534cc36 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:43 -0500 Subject: [PATCH 17/24] spelling: overridden --- MacDown/Code/View/MPEditorView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MacDown/Code/View/MPEditorView.m b/MacDown/Code/View/MPEditorView.m index 6c7804ac..88033376 100644 --- a/MacDown/Code/View/MPEditorView.m +++ b/MacDown/Code/View/MPEditorView.m @@ -141,7 +141,7 @@ - (void)setFrameSize:(NSSize)newSize [super setFrameSize:newSize]; } -/** Overriden to perform extra operation on initial text setup. +/** Overridden to perform extra operation on initial text setup. * * When we first launch the editor, -didChangeText will *not* be called, so we * override this to perform required resizing. The -updateContentRect is wrapped @@ -165,7 +165,7 @@ - (void)setString:(NSString *)string #pragma mark - Overrides -/** Overriden to perform extra operation on text change. +/** Overridden to perform extra operation on text change. * * Updates content height, and invoke the resizing method to apply it. * From e8a784ab708da83c4515716c15403175bbb7004e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:44 -0500 Subject: [PATCH 18/24] spelling: possible --- MacDown/Code/Document/MPDocument.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Document/MPDocument.m b/MacDown/Code/Document/MPDocument.m index 926c71bd..b48b3eb3 100644 --- a/MacDown/Code/Document/MPDocument.m +++ b/MacDown/Code/Document/MPDocument.m @@ -1682,7 +1682,7 @@ - (void)redrawDivider else { // If both sides are visible, draw a default "transparent" divider. - // This works around the possibile problem of divider's color being too + // This works around the possible problem of divider's color being too // similar to both the editor and preview and being obscured. self.splitView.dividerColor = nil; } From 098ab44f473b9a4c0d2ea3b605ed2a39b22b5afa Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:45 -0500 Subject: [PATCH 19/24] spelling: preferences --- assets/demo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/demo.md b/assets/demo.md index e71d4b48..c72f9d0d 100644 --- a/assets/demo.md +++ b/assets/demo.md @@ -2,7 +2,7 @@ # Graph Visualization Two graph visualization grammar are supported, mermaid and graphviz. -To enable these features, options `Mermaid` and/or `Graphviz` in `MacDown` -> `Perferences...` -> `Rendering` should be checked. +To enable these features, options `Mermaid` and/or `Graphviz` in `MacDown` -> `Preferences...` -> `Rendering` should be checked. # Mermaid From 0f74e58548d1ac790ee4d0c939b7d5e6900378c1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:46 -0500 Subject: [PATCH 20/24] spelling: safety --- MacDown/Code/Utility/MPUtilities.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MacDown/Code/Utility/MPUtilities.m b/MacDown/Code/Utility/MPUtilities.m index c6a546fa..72dcc8a3 100644 --- a/MacDown/Code/Utility/MPUtilities.m +++ b/MacDown/Code/Utility/MPUtilities.m @@ -135,7 +135,7 @@ BOOL MPStringIsNewline(NSString *str) NSURL *url = [bundle URLForResource:name withExtension:@"css" subdirectory:@"Prism/themes"]; - // Safty net: file not found, use default. + // Safety net: file not found, use default. if (!url) { url = [bundle URLForResource:@"prism" withExtension:@"css" From 236cc1deeb014a580b710fd7373371ccbed8fd0d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 11:44:47 -0500 Subject: [PATCH 21/24] spelling: statements --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 49d3f5cb..d16134ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ Exception: If a URL in a comment is too long, it can go over the limit. This hap * If only one statement is contained inside the block, omit braces unless... * This is part of an if-(else if-)else structure. All brace styles in the same structure should match (i.e. either non or all of them omit braces). -#### Stetements Inside `if`, `while`, etc. +#### Statements Inside `if`, `while`, etc. * Prefer implicit boolean conversion when it makes sense. * `if (str.length)` is better than `if (str.length != 0)` if you want to know whether a string is empty. From cdb63446f7f91ec3d58fb1e8f90c42c1e906bf95 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 30 Dec 2020 12:34:58 -0500 Subject: [PATCH 22/24] spelling: strikethrough --- MacDown/Code/Document/MPDocument.m | 4 ++-- MacDown/Code/Preferences/MPPreferences.h | 2 +- MacDown/Code/Preferences/MPPreferences.m | 2 +- .../Base.lproj/MPMarkdownPreferencesViewController.xib | 2 +- MacDown/Localization/Base.lproj/MainMenu.xib | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MacDown/Code/Document/MPDocument.m b/MacDown/Code/Document/MPDocument.m index b48b3eb3..d02cab6b 100644 --- a/MacDown/Code/Document/MPDocument.m +++ b/MacDown/Code/Document/MPDocument.m @@ -139,7 +139,7 @@ - (int)extensionFlags flags |= HOEDOWN_EXT_NO_INTRA_EMPHASIS; if (self.extensionQuote) flags |= HOEDOWN_EXT_QUOTE; - if (self.extensionStrikethough) + if (self.extensionStrikethrough) flags |= HOEDOWN_EXT_STRIKETHROUGH; if (self.extensionSuperscript) flags |= HOEDOWN_EXT_SUPERSCRIPT; @@ -723,7 +723,7 @@ - (BOOL)textView:(NSTextView *)textView shouldChangeTextInRange:(NSRange)range if (self.preferences.editorCompleteMatchingCharacters) { - BOOL strikethrough = self.preferences.extensionStrikethough; + BOOL strikethrough = self.preferences.extensionStrikethrough; if ([textView completeMatchingCharactersForTextInRange:range withString:str strikethroughEnabled:strikethrough]) diff --git a/MacDown/Code/Preferences/MPPreferences.h b/MacDown/Code/Preferences/MPPreferences.h index d4f3c006..9190c3a0 100644 --- a/MacDown/Code/Preferences/MPPreferences.h +++ b/MacDown/Code/Preferences/MPPreferences.h @@ -25,7 +25,7 @@ extern NSString * const MPDidDetectFreshInstallationNotification; @property (assign) BOOL extensionTables; @property (assign) BOOL extensionFencedCode; @property (assign) BOOL extensionAutolink; -@property (assign) BOOL extensionStrikethough; +@property (assign) BOOL extensionStrikethrough; @property (assign) BOOL extensionUnderline; @property (assign) BOOL extensionSuperscript; @property (assign) BOOL extensionHighlight; diff --git a/MacDown/Code/Preferences/MPPreferences.m b/MacDown/Code/Preferences/MPPreferences.m index b0916e34..b533bc5a 100644 --- a/MacDown/Code/Preferences/MPPreferences.m +++ b/MacDown/Code/Preferences/MPPreferences.m @@ -80,7 +80,7 @@ - (instancetype)init @dynamic extensionTables; @dynamic extensionFencedCode; @dynamic extensionAutolink; -@dynamic extensionStrikethough; +@dynamic extensionStrikethrough; @dynamic extensionUnderline; @dynamic extensionSuperscript; @dynamic extensionHighlight; diff --git a/MacDown/Localization/Base.lproj/MPMarkdownPreferencesViewController.xib b/MacDown/Localization/Base.lproj/MPMarkdownPreferencesViewController.xib index 87256644..8b8c0dd5 100644 --- a/MacDown/Localization/Base.lproj/MPMarkdownPreferencesViewController.xib +++ b/MacDown/Localization/Base.lproj/MPMarkdownPreferencesViewController.xib @@ -71,7 +71,7 @@ - +