v1.30.1 (#182)

* cleanup code * fix index out of range when only front matter present * fix clipboard to DataUri * allow per monitor dpi * move commands * move commands * move commands * refactor to use static * refactor commands * fix init problem * refactor more commands * refactor more commands * refactor more commands * refactor more commands * fix openfile command * move more commands * main window refactored * begin refactoring editor commands * move more editor commands: * move more commands * refactor to commands * update packages, reduce template * make stylesheet less github like * add list indent on tab * add multi-jit startup * fix redraw issues * navigate to named anchors in same document #171 * only add to list items if it's increasing line count #172 * check if previous/previous line in list #173 * to enable newer common control styles * move app manifest into solution items * v1.30 * Create local.txt * Add files via upload * Add files via upload * Update SpellingLanguages.cs * Update SpellingLanguages.cs * Update SpellingLanguages.cs * sv translation * add translations * Add swedish translation to project * fix crash * CustomMarkdownConverter to use long file names * fix CustomConverter by adding separate CustomConverterArgs setting, disable UI when set * special case handling of blockquote in list #176 * 1.30.1
mike-ward · Sep 1, 2016 · eb8d4d9 · eb8d4d9
1 parent a4cf980
commit eb8d4d9
Show file tree

Hide file tree

Showing 18 changed files with 306,138 additions and 76 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,17 +1,29 @@
-# Contributor Guidelines
+Contributor Guidelines
+======================
 
 There are a number of ways to contribute:
 
-  - Bug Reports: Yep, they happen and it's important catalog them for further investigation. Please use the Issues feature here in Github to report problems.
-  - Feature Requests: Got an idea for a feature. Open an issue. That way we can all see and comment on it.
-  - Pull Requests: Please check with me before you write something. I may already be working on that feature. Don't be surprised if I extensively edit your pull request. I'm anal that way. (I'm also a ReSharper freak).
-  - Fix My Prose: Dammit Jim, I'm a programmer, not an English major.
-  - Snippets, Templates, and Themes: Got a cool theme or some killer snippets? Send them to me. Better yet, open an issue and put them there so we can all see and comment on them.
-  - Logo - Something that incorporates the current icon with the name. [insert *Dammit Jim* text here]
-  - Write a review (a nice one I hope)
+-   Bug Reports: Yep, they happen and it's important catalog them for
+    further investigation. Please use the Issues feature here in Github
+    to report problems.
+-   Language Translations: Check out the languages folder. It's only
+    two files. You don't have to integrate it into the program unless
+    you want to. You did the hard part of translating. I'm more than
+    happy to incorporate the changes into the program.
+-   Feature Requests: Got an idea for a feature. Open an issue. That way
+    we can all see and comment on it.
+-   Pull Requests: Use the `dev` branch.
+-   Fix My Prose: Dammit Jim, I'm a programmer, not an English major.
+-   Snippets, Templates, and Themes: Got a cool theme or some killer
+    snippets? Send them to me. Better yet, open an issue and put them
+    there so we can all see and comment on them.
+-   Write a review (a nice one I hope)
 
-## Tools Required to Build
+Tools Required to Build
+-----------------------
+
+-   [Visual Studio
+    2015](http://msdn.microsoft.com/en-us/vstudio/aa718325.aspx) (uses
+    C\# 6.0 features)
+-   [WiX](http://wixtoolset.org/)
 
-  - [Visual Studio 2015](http://msdn.microsoft.com/en-us/vstudio/aa718325.aspx) (uses C# 6.0 features)
-  - [WiX](http://wixtoolset.org/)
-  - [Chocolatey](https://chocolatey.org/)
diff --git a/src/MarkdownEdit/Controls/DisplaySettings.xaml b/src/MarkdownEdit/Controls/DisplaySettings.xaml
@@ -126,6 +126,7 @@
           OffLabel="{i18N:Localize settings-sync-scroll-pos}"
           OnLabel="{i18N:Localize settings-sync-scroll-pos}" />
         <controls:ToggleSwitch
+          x:Name="MarkdownEngine"
           Style="{StaticResource ToggleSwitchStyle}"
           IsChecked="{Binding GitHubMarkdown}"
           OffLabel="{i18N:Localize settings-github-markdown}"

diff --git a/src/MarkdownEdit/Controls/DisplaySettings.xaml.cs b/src/MarkdownEdit/Controls/DisplaySettings.xaml.cs
@@ -38,6 +38,7 @@ private void OnIsVisibleChanged(object sender,
             FontCombo.SetBinding(FontComboBox.SelectedFontSizeProperty, fontSizeBinding);
             var encodingBinding = new Binding("EditorEncoding") {Source = DataContext, Mode = BindingMode.TwoWay};
             EncodingComboBox.SetBinding(EncodingComboBox.SelectedEncodingProperty, encodingBinding);
+            MarkdownEngine.IsEnabled = string.IsNullOrWhiteSpace(App.UserSettings.CustomMarkdownConverter);
         }
 
         public void SaveState() { _clonedSettings = ((UserSettings)DataContext).Clone() as UserSettings; }

diff --git a/src/MarkdownEdit/Controls/Preview.xaml.cs b/src/MarkdownEdit/Controls/Preview.xaml.cs
@@ -221,7 +221,7 @@ private static string ScrubHtml(string html)
 
             // Inject anchors at all block level elements for scroll synchronization
             var nc = doc.DocumentNode.SelectNodes("//p|//h1|//h2|//h3|//h4|//h5|//h6|//ul|//ol|//li|//hr|//pre|//blockquote");
-            each(nc, node => node.Attributes.Add("id", getName()));
+            each(nc, node => { if (node.Name != "blockquote" || node.ParentNode.Name != "li") node.Attributes.Add("id", getName()); });
 
             // Remove potentially harmful elements
             nc = doc.DocumentNode.SelectNodes("//script|//link|//iframe|//frameset|//frame|//applet|//object|//embed");

diff --git a/src/MarkdownEdit/Languages/sv/help.md b/src/MarkdownEdit/Languages/sv/help.md
@@ -0,0 +1,176 @@
+Keyboard Shortcuts
+------------------
+
+    F1             Visa/Dölj denna hjälp
+
+    Ctrl+N         Ny fil
+    Ctrl+Shift+N   Öppna ny instans
+    Ctrl+O         Öppna fil
+    Ctrl+Shift+O   Infoga fil
+    Ctrl+S         Spara fil
+    Ctrl+Shift+S   Spara fil som
+    Ctrl+R         Tidigare filer
+    Ctrl+E         Exportera HTML till Urklipp
+    Ctrl+Shift+E   Exportera HTML med mall till Urklipp
+    Alt+E          Spara som HTML
+    F5             Läs in fil igen
+    Alt+F4         Avsluta
+
+    Ctrl+W         Radbrytning av/på
+    Ctrl+F7        Stavningskontroll av/på
+    F11            Helskärm av/på
+    F12            Växla mellan förhandsgranskning/redigering/bägge
+    Alt+S          Spara atomatiskt av/på
+    Ctrl+,         Inställningar visa/stäng
+    Ctrl+.         Innehållstabell av/på
+
+    Tab            Dra in aktuell rad/markerat med 2 mellanslag
+    Shift+Tab      Dra tillbaka aktuell rad/markerat med 2 mellanslag
+
+    Ctrl+C         Kopiera
+    Ctrl+V         Klistra in
+    Ctrl+X         Klipp ut
+    Ctrl+Shift+V   Klistra in special - smarta citationstecken och bindestreck som vanlig text
+    Alt+V          Klistra in från HTML till Markdown
+
+    Ctrl+F         Sök
+    F3             Sök nästa
+    Shift+F3       Sök föregående
+    Ctrl+H         Sök och ersätt
+
+    Ctrl+G         Gå till rad
+    Alt+Up         Flytta upp aktuell rad
+    Alt+Down       Flytta ner aktuell rad
+    Ctrl+U         Välj föregående header
+    Ctrl+J         Välj nästa header
+
+    Ctrl+Plus      Öka teckenstorlek
+    Ctrl+Minus     Minska teckenstorlek
+    Ctrl+0         Återställ teckenstorlek
+    Alt+Plus       Öka redigerings-/förhandsgranskningsbredd (singelpanel endast)
+    Alt+Minus      Minska redigerings-/förhandsgranskningsbredd (singelpanel endast)
+
+    Ctrl+T         Välj programtema
+    F6             Öppna användarutdrag i Anteckningar
+    F7             Öppna användarordbok i Anteckningar
+    F8             Öppna HTML-mall i Anteckningar
+    F9             Öppna inställningar i Anteckningar
+
+    Ctrl+B         Konvertera markerat/omarkerat till fet stil (infoga **)
+    Ctrl+I         Konvertera markerat/omarkerat till kursiv stil (infoga *)
+    Ctrl+K         Kod (omslut med omvända citationstecken ``) (ingen markering - infoga `)
+    Alt+L          Konvertera markerat till lista. Växla osorterat/sorterat
+    Ctrl+Q         Konvertera markerat/raden till citat
+    Alt+F          Radbryt & formatera text
+    Ctrl+Shift+F   Radbryt, formatera, använd referenslänkar
+    Alt+Shift+F    Ta bort radbrytning & formatera text
+    Ctrl+L         Infoga hyperlänk
+
+    Ctrl+1         Infoga # i början på raden
+    Ctrl+2         Infoga ## i början på raden
+    Ctrl+3         Infoga ### i början på raden
+    Ctrl+4         Infoga #### i början på raden
+    Ctrl+5         Infoga ##### i början på raden
+    Ctrl+6         Infoga ###### i början på raden
+
+-   [Syntax Cheat Sheet (Tabeller, genomstrykning stöds ej)]
+    (https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet)
+
+-   [Markdown Tutorial](http://markdowntutorial.com/)
+
+-   [CommonMark](http://commonmark.org)
+
+Donera
+------
+
+Gillar du det jag gör? Visa din uppskattning genom att donera. Vad händer med 
+pengarna? En del av dem doneras till skapare av mjukvara och verktyg jag 
+använder. Resten går till utrustning och mjukvarulicensiering.
+
+[Donera med PayPal](http://mike-ward.net/donate)
+
+Användardokumentation
+------------------
+
+[Wiki User Documentation](https://github.com/mike-ward/Markdown-Edit/wiki)
+
+
+Om
+-----
+
+Hemsida: <http://markdownedit.com>  
+Twitter: `@mikeward_aa` 
+Källkod: <https://github.com/mike-ward/Markdown-Edit>
+
+Markdown Edit Licens
+---------------------
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Mike Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Infogade paket
+---------------------
+
+### Pandoc
+
+-   [Licens](https://github.com/jgm/pandoc/blob/master/COPYING)
+-   [Källkod](https://github.com/jgm/pandoc)
+
+### Hunspell
+
+-   [Licens](http://sourceforge.net/directory/license:lgpl/)
+-   [Källkod](http://sourceforge.net/projects/hunspell/)
+
+### Fluent Assertions
+
+-   [Licens](https://github.com/dennisdoomen/fluentassertions/blob/develop/LICENSE)
+-   [Källkod](https://github.com/dennisdoomen/fluentassertions)
+
+### Avalon Edit
+
+-   [Licens](http://opensource.org/licenses/MIT)
+-   [Källkod](https://github.com/icsharpcode/AvalonEdit)
+
+### Commonmark.NET
+
+-   [Licens](https://github.com/Knagis/CommonMark.NET/blob/master/LICENSE.md)
+-   [Källkod](https://github.com/Knagis/CommonMark.NET)
+
+### HtmlAgilityPack
+
+-   [Licens](https://htmlagilitypack.codeplex.com/license)
+-   [Källkod](https://htmlagilitypack.codeplex.com/)
+
+### MahApps Metro
+
+-   [Licens](http://opensource.org/licenses/MS-PL)
+-   [Källkod](https://github.com/MahApps/MahApps.Metro)
+
+### Newtonsoft.Json
+
+-   [Licens](https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md)
+-   [Källkod](https://github.com/JamesNK/Newtonsoft.Json)
+
+### TinyIoC
+
+-   [Licens](https://github.com/grumpydev/TinyIoC/blob/master/licence.txt)
+-   [Källkod](https://github.com/grumpydev/TinyIoC)
+
diff --git a/src/MarkdownEdit/Languages/sv/local.txt b/src/MarkdownEdit/Languages/sv/local.txt
@@ -0,0 +1,138 @@
+=======================================================
+= Swedish
+=======================================================
+
+=== Main Window
+
+tooltip-new-command:              Nytt - Ctrl+N
+tooltip-open-command:             Öppna - Ctrl+O
+tooltip-save-command:             Spara - Ctrl+S
+tooltip-save-as-command:          Spara som - Ctrl+Shift+S
+tooltip-toggle-settings:          Inställningar - Ctrl+,
+tooltip-document-statistics:      (t)ecken/(o)rd/Standard(s)idor (1500t=1s)
+tooltip-spell-check:              Stavningskontroll - Ctrl+F7
+tooltip-word-wrap:                Radbrytning - Ctrl+W
+tooltip-auto-save:                Autospara - Alt+S
+tooltip-new-version:              Ny version tillgänglig
+settings-flyout-header:           Inställningar
+
+=== Editor
+
+editor-f1-for-help:               - F1 för hjälp
+editor-new-document:              Nytt dokument
+editor-menu-undo:                 Ångra
+editor-menu-redo:                 Upprepa
+editor-menu-cut:                  Klipp ut
+editor-menu-copy:                 Kopiera
+editor-menu-paste:                Klistra in
+editor-menu-paste-special:        Klistra in special
+editor-menu-paste-from-html:      Klistra in från HTML
+editor-menu-select-all:           Markera alla
+editor-menu-delete:               Ta bort
+editor-menu-wrap-format:          Radbryt & formatera
+editor-menu-unwrap-format:        Ta bort radbrytning & formatera
+editor-menu-add-to-dictionary:    Lägg till i ordboken
+
+=== Settings Dialog
+
+settings-editor-section:          Redigerare
+settings-word-wrap:               Radbrytning
+settings-auto-save:               Autospara
+settings-line-numbers:            Radnummer
+settings-open-last-file:          Öppna senaste filen
+settings-remember-cursor-pos:     Kom ihåg markörposition
+settings-highlight-current:       Belys aktuell rad
+settings-show-scroll-bar:         Visa vertikal rullningslist
+settings-show-tabs:               Visa flikar
+settings-show-spaces:             Visa mellanslag
+settings-show-end-of-line:        Visa radslut
+settings-sync-scroll-pos:         Synkronisera rullningspositioner
+settings-format-on-save:          Formatera text vid spara
+settings-github-markdown:         GitHub Markdown
+settings-line-endings:            Radslut
+
+settings-spell-check-section:     Stavningskontroll
+settings-spell-checking:          Stavningskontroll
+settings-ignore-all-caps:         Ignorera versaler
+settings-ignore-code-blocks:      Ignorera kodblock
+settings-ignore-markup:           Ignorera markup-taggar
+settings-ignore-words-digits:     Ignorera ord med siffror
+
+settings-advanced:                Avancerat
+settings-open-settings:           Inställningar
+settings-open-html-template:      HTML-mall
+settings-open-dictionary:         Användarordbok
+settings-open-snippets:           Utdrag
+settings-open-key-bindings:       Tangentbindningar
+
+settings-about:                   Om
+settings-version:				          Version
+settings-web:					            Webb
+settings-source:				          Källa
+settings-donate:				          Donera
+settings-yes-i-donated:           Ja, jag har donerat!
+settings-encoding:                Teckentabell
+settings-encode-automatic:        Automatiskt
+
+=== Find Replace Dialog
+
+find-replace-title:               Sök och ersätt
+find-replace-tab-find:            Sök
+find-replace-tab-replace:         Ersätt
+find-replace-watermark-find:      Sök
+find-replace-watermark-replace:   Ersätt
+find-replace-find-next:           Sök nästa
+find-replace-replace:             Ersätt
+find-replace-replace-all:         Ersätt alla
+find-replace-match-case:          Skiftlägeskänslig
+find-replace-match-whole-word:    Sök hela ord
+find-replace-regular-expression:  Regular expression
+find-replace-wildcards:           Jokertecken
+
+=== Goto Line Dialog
+
+goto-line-title:                  Gå till rad
+
+=== Image Drop Progress Dialog
+
+image-drop-insert-path:           Infoga sökväg
+image-drop-upload-imgur:          Ladda upp till Imgur
+image-drop-as-data-uri:           Som data-URI
+image-drop-as-local-file:         Som lokal fil
+image-drop-overwrite-file:        Filen finns redan. Vill di skriva över den?
+image-drop-save-as:               Spara som
+
+=== Recent Files Dialog
+
+recent-files-title:               Tidigare filer
+recent-file-not-found:            Filen finns inte längre
+
+=== Themes Dialog
+
+themes-title:                     Teman
+
+=== Tooltips
+
+tooltip-f6:                       F6
+tooltip-f7:                       F7
+tooltip-f8:                       F8
+tooltip-f9:                       F9
+tooltip-f10:                      F10
+tooltip-alt-s:                    Alt+S
+tooltip-ctrl-f7:                  Ctrl+F7
+tooltip-ctrl-w:                   Ctrl+W
+
+=== Insert Hyperlink Dialog
+
+insert-hyperlink-title:           Infoga hyperlänk
+insert-hyperlink-optional-title:  frivilligt namn
+
+=== Generic
+
+ok:                               OK
+open:                             Öppna
+save:                             Spara
+cancel:                           Avbryt
+message-html-clipboard:		        HTML kopierat till Urklipp
+aslocalfile-save-file-as:         Spara fil som (.png läggs till namnet)?
+table-of-contents:                Innehållstabell