diff --git a/Creator/App.config b/Creator/App.config index a28c49f..ba6b45f 100644 --- a/Creator/App.config +++ b/Creator/App.config @@ -1,7 +1,7 @@ - + diff --git a/Creator/ApplicationArguments.cs b/Creator/ApplicationArguments.cs index fac204d..eec0663 100644 --- a/Creator/ApplicationArguments.cs +++ b/Creator/ApplicationArguments.cs @@ -10,6 +10,7 @@ namespace KattekerCreator private string _outputDir; private string _programFile; private string _publishDir; + private string _version; [DisplayName("Program")] [Description("Path to the program file")] @@ -20,11 +21,11 @@ namespace KattekerCreator } [DisplayName("Changelog")] - [Description("Filename of the changelog file")] + [Description("Path of the changelog file")] public string ChangeLog { get => _changeLog; - set => SetPropertyIfNotDefault(ref _changeLog, value); + set => SetPropertyIfNotDefault(ref _changeLog, Path.GetFullPath(value)); } [DisplayName("Channel")] @@ -51,6 +52,14 @@ namespace KattekerCreator set => SetPropertyIfNotDefault(ref _publishDir, value); } + [DisplayName("Version")] + [Description("Override version number of the application.")] + public string Version + { + get => _version; + set => SetPropertyIfNotDefault(ref _version, value); + } + private static bool SetPropertyIfNotDefault(ref T field, T value) { if (Equals(value, field)) return false; diff --git a/Creator/AssemblyFileInfo.cs b/Creator/AssemblyFileInfo.cs index 011f104..9c826e7 100644 --- a/Creator/AssemblyFileInfo.cs +++ b/Creator/AssemblyFileInfo.cs @@ -2,7 +2,6 @@ using System.Drawing; using System.IO; using System.Linq; -using Katteker; using Semver; using TsudaKageyu; using Vestris.ResourceLib; @@ -16,17 +15,17 @@ namespace KattekerCreator private readonly string _description; private readonly string _productName; - public AssemblyFileInfo(string fileName, string tempDir) + public AssemblyFileInfo(ApplicationArguments appArguments, string tempDir) { - FileInfo = new FileInfo(fileName); + FileInfo = new FileInfo(appArguments.ProgramFile); using (var resourceInfo = new ResourceInfo()) { - resourceInfo.Load(fileName); + resourceInfo.Load(appArguments.ProgramFile); if (resourceInfo.ResourceTypes.All(x => x.ResourceType != Kernel32.ResourceTypes.RT_VERSION)) return; var versionResource = (VersionResource) resourceInfo[Kernel32.ResourceTypes.RT_VERSION].First(); var stringFileInfo = ((StringFileInfo) versionResource[nameof(StringFileInfo)]).Strings .FirstOrDefault().Value; - AssemblyIconPath = GetAssemblyIcon(fileName, tempDir); + AssemblyIconPath = GetAssemblyIcon(appArguments.ProgramFile, tempDir); if (stringFileInfo.Strings.ContainsKey("CompanyName")) _company = stringFileInfo.Strings["CompanyName"].StringValue.TrimEnd('\0'); if (stringFileInfo.Strings.ContainsKey("FileDescription")) @@ -36,14 +35,13 @@ namespace KattekerCreator if (stringFileInfo.Strings.ContainsKey("ProductName")) _productName = stringFileInfo.Strings["ProductName"].StringValue.TrimEnd('\0'); if (!stringFileInfo.Strings.ContainsKey("ProductVersion")) return; - AssemblyVersion = - GetSemanticVersion(stringFileInfo.Strings["ProductVersion"].StringValue.TrimEnd('\0')); + AssemblyVersion = appArguments.Version != null ? GetSemanticVersion(appArguments.Version) : GetSemanticVersion(stringFileInfo.Strings["ProductVersion"].StringValue.TrimEnd('\0')); } } public string AssemblyIconPath { get; } - public SemVersion AssemblyVersion { get; private set; } + public SemVersion AssemblyVersion { get; } public string Company => _company ?? string.Empty; diff --git a/Creator/Helper/Log.cs b/Creator/Helper/Log.cs index 07647e4..1c253ac 100644 --- a/Creator/Helper/Log.cs +++ b/Creator/Helper/Log.cs @@ -1,4 +1,5 @@ using System; +using System.Threading; namespace KattekerCreator.Helper { @@ -9,17 +10,17 @@ namespace KattekerCreator.Helper public static void WriteInfoLine(string text) { - using (var c = new ConsoleWithOtherColor()) + using (new ConsoleWithOtherColor()) { - c.WriteLine($"{Info} [{DateTime.Now:G}] {text}"); + ConsoleWithOtherColor.WriteLine($"{Info} [{DateTime.Now:G}] {text}"); } } public static void WriteErrorLine(string text) { - using (var c = new ConsoleWithOtherColor(ConsoleColor.DarkRed)) + using (new ConsoleWithOtherColor(ConsoleColor.DarkRed)) { - c.WriteLine($"{Error} [{DateTime.Now:G}] {text}"); + ConsoleWithOtherColor.WriteLine($"{Error} [{DateTime.Now:G}] {text}"); } } } @@ -38,13 +39,20 @@ namespace KattekerCreator.Helper Console.ForegroundColor = color; } - public void WriteLine(string text) + public static void WriteLine(string text) { Console.WriteLine(text); } public void Dispose() { + Dispose(true); + GC.SuppressFinalize(this); + } + + private void Dispose(bool disposing) + { + if (!disposing) return; if (_defaultColor != null) Console.ForegroundColor = _defaultColor.Value; } } diff --git a/Creator/KattekerCreator.csproj b/Creator/KattekerCreator.csproj index d9e03e2..e300511 100644 --- a/Creator/KattekerCreator.csproj +++ b/Creator/KattekerCreator.csproj @@ -9,7 +9,7 @@ Properties KattekerCreator KattekerCreator - v4.7 + v4.6.2 512 ..\ true diff --git a/Creator/Program.cs b/Creator/Program.cs index ab192ea..3b54e4b 100644 --- a/Creator/Program.cs +++ b/Creator/Program.cs @@ -56,7 +56,7 @@ namespace KattekerCreator //Modify AppStub var appStubFile = ModifyAppStub(); //Acquire infos from Executable. - _assemblyFileInfo = new AssemblyFileInfo(_appArguments.ProgramFile, _tempDir); + _assemblyFileInfo = new AssemblyFileInfo(_appArguments, _tempDir); var configFile = CreateConfigFile(); //Generate NSIS-Script @@ -109,9 +109,10 @@ namespace KattekerCreator if (!Directory.Exists(_appArguments.OutputDir)) Directory.CreateDirectory(_appArguments.OutputDir); if (!string.IsNullOrEmpty(_appArguments.ChangeLog)) { - var changeLogPath = Path.Combine(Path.GetDirectoryName(_appArguments.ProgramFile), _appArguments.ChangeLog); - if (!File.Exists(changeLogPath)) throw new FileNotFoundException(changeLogPath); - File.Copy(changeLogPath, Path.Combine(_appArguments.OutputDir, _appArguments.ChangeLog), true); + var changeLogFilename = Path.GetFileName(_appArguments.ChangeLog); + + if (!File.Exists(_appArguments.ChangeLog)) throw new FileNotFoundException(_appArguments.ChangeLog); + File.Copy(_appArguments.ChangeLog, Path.Combine(_appArguments.OutputDir, changeLogFilename), true); } File.Copy(setupFilePath, Path.Combine(_appArguments.OutputDir, setupFile), true); } @@ -145,7 +146,7 @@ namespace KattekerCreator var kattekerConfig = new KattekerConfig { Publish = _appArguments.PublishDir ?? _appArguments.OutputDir, - Changelog = _appArguments.ChangeLog + Changelog = Path.GetFileName(_appArguments.ChangeLog) }; kattekerConfig.WriteToFile(pathToFile); return pathToFile; diff --git a/Katteker.Gui/Katteker.Gui.csproj b/Katteker.Gui/Katteker.Gui.csproj index a4c1fe1..6e9b001 100644 --- a/Katteker.Gui/Katteker.Gui.csproj +++ b/Katteker.Gui/Katteker.Gui.csproj @@ -42,6 +42,7 @@ + diff --git a/Katteker.Gui/NativeMethods.cs b/Katteker.Gui/NativeMethods.cs new file mode 100644 index 0000000..3a57b26 --- /dev/null +++ b/Katteker.Gui/NativeMethods.cs @@ -0,0 +1,41 @@ +using System; +using System.Runtime.InteropServices; + +// ReSharper disable InconsistentNaming + +namespace Katteker.Gui +{ + /// + /// Native methods. + /// + public static class NativeMethods + { + /// + /// Hit Test Caption + /// + public const int HTCAPTION = 0x2; + + /// + /// Posted when the user presses the left mouse button while the cursor is within the nonclient area of a window. + /// + public const int WM_NCLBUTTONDOWN = 0xA1; + + /// + /// Release the capture + /// + [DllImport("User32.dll")] + public static extern bool ReleaseCapture(); + + /// + /// Send message + /// + [DllImport("User32.dll")] + public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam); + + /// + /// Set Process API aware + /// + [DllImport("user32.dll")] + public static extern bool SetProcessDPIAware(); + } +} \ No newline at end of file diff --git a/Katteker.Gui/UpdateWindow.cs b/Katteker.Gui/UpdateWindow.cs index d7087fc..1185cda 100644 --- a/Katteker.Gui/UpdateWindow.cs +++ b/Katteker.Gui/UpdateWindow.cs @@ -1,7 +1,6 @@ using System; using System.Drawing; using System.IO; -using System.Runtime.InteropServices; using System.Windows.Forms; using Katteker.Gui.Properties; @@ -9,13 +8,11 @@ namespace Katteker.Gui { public sealed partial class UpdateWindow : Form { - private readonly UpdateManager _updateManager; private readonly ReleaseEntry _entry; - private const int HTCAPTION = 0x2; - private const int WM_NCLBUTTONDOWN = 0xA1; + private readonly UpdateManager _updateManager; /// - /// The Update Window + /// The Update Window /// public UpdateWindow(UpdateManager updateManager, ReleaseEntry entry) { @@ -24,36 +21,25 @@ namespace Katteker.Gui Font = SystemFonts.MessageBoxFont; Application.EnableVisualStyles(); if (Environment.OSVersion.Version.Major >= 6) - SetProcessDPIAware(); + NativeMethods.SetProcessDPIAware(); InitializeComponent(); } private string Changelog => _updateManager.ChangelogFilename; private string PublishPath => _updateManager.UrlOrPath; - + /// /// - /// Clean up any resources being used. + /// Clean up any resources being used. /// /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { - if (disposing) - { - components?.Dispose(); - } + if (disposing) components?.Dispose(); base.Dispose(disposing); } - [DllImport("User32.dll")] - private static extern bool ReleaseCapture(); - - [DllImport("User32.dll")] - private static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam); - - [DllImport("user32.dll")] - private static extern bool SetProcessDPIAware(); private void CloseBtn_Click(object sender, EventArgs e) { Close(); @@ -76,9 +62,10 @@ namespace Katteker.Gui MaximizeBtn_Click(sender, e); return; } + if (e.Button != MouseButtons.Left) return; - ReleaseCapture(); - SendMessage(Handle, WM_NCLBUTTONDOWN, HTCAPTION, 0); + NativeMethods.ReleaseCapture(); + NativeMethods.SendMessage(Handle, NativeMethods.WM_NCLBUTTONDOWN, NativeMethods.HTCAPTION, 0); } @@ -137,9 +124,9 @@ namespace Katteker.Gui } catch (Exception ex) { - MessageBox.Show(Resources.CouldNotUpdateYourApplication + Environment.NewLine + ex.Message, Gui.Properties.Resources.Updater, MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(Resources.CouldNotUpdateYourApplication + Environment.NewLine + ex.Message, + Resources.Updater, MessageBoxButtons.OK, MessageBoxIcon.Error); WriteTitle(Resources.Updater); - } finally { diff --git a/Katteker.Test/Katteker.Test.csproj b/Katteker.Test/Katteker.Test.csproj index 8dea54e..09478c9 100644 --- a/Katteker.Test/Katteker.Test.csproj +++ b/Katteker.Test/Katteker.Test.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -39,10 +39,10 @@ - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll @@ -51,9 +51,6 @@ - - - PreserveNewest @@ -65,14 +62,17 @@ Katteker + + + - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/Katteker.Test/KattekerLibTest.cs b/Katteker.Test/KattekerLibTest.cs index 18775a7..fe6caa9 100644 --- a/Katteker.Test/KattekerLibTest.cs +++ b/Katteker.Test/KattekerLibTest.cs @@ -15,7 +15,7 @@ namespace Katteker.Test public void Sha1ChecksumOfFile() { var actual = Utility.ComputeFileHash(ExampleFile); - const string expected = "0zgDmFuotnldZIyADoWrpiSDUx4="; + const string expected = "maFpV7FK3EtnU2G5+q2nZ1E3YKY="; Assert.AreEqual(expected, actual); } diff --git a/Katteker.Test/packages.config b/Katteker.Test/packages.config index cf2d094..6b79fc9 100644 --- a/Katteker.Test/packages.config +++ b/Katteker.Test/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Katteker/KattekerConfig.cs b/Katteker/KattekerConfig.cs index f9b026c..9f86454 100644 --- a/Katteker/KattekerConfig.cs +++ b/Katteker/KattekerConfig.cs @@ -22,7 +22,6 @@ namespace Katteker [DataMember] public string Changelog { get; set; } - /// /// Read file and deserialize content. /// @@ -36,7 +35,7 @@ namespace Katteker using (var fileStream = File.OpenRead(path)) { var obj = dataContractJsonSerializer.ReadObject(fileStream); - return (KattekerConfig) obj; + return (KattekerConfig)obj; } } diff --git a/Katteker/MarkdownSharp.cs b/Katteker/MarkdownSharp.cs deleted file mode 100644 index 345d2c1..0000000 --- a/Katteker/MarkdownSharp.cs +++ /dev/null @@ -1,1779 +0,0 @@ -/* - * MarkdownSharp - * ------------- - * a C# Markdown processor - * - * Markdown is a text-to-HTML conversion tool for web writers - * Copyright (c) 2004 John Gruber - * http://daringfireball.net/projects/markdown/ - * - * Markdown.NET - * Copyright (c) 2004-2009 Milan Negovan - * http://www.aspnetresources.com - * http://aspnetresources.com/blog/markdown_announced.aspx - * - * MarkdownSharp - * Copyright (c) 2009-2011 Jeff Atwood - * http://stackoverflow.com - * http://www.codinghorror.com/blog/ - * http://code.google.com/p/markdownsharp/ - * - * History: Milan ported the Markdown processor to C#. He granted license to me so I can open source it - * and let the community contribute to and improve MarkdownSharp. - * - */ - -#region Copyright and license - -/* - -Copyright (c) 2009 - 2010 Jeff Atwood - -http://www.opensource.org/licenses/mit-license.php - -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. - -Copyright (c) 2003-2004 John Gruber - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -* Neither the name "Markdown" nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. - -This software is provided by the copyright holders and contributors "as -is" and any express or implied warranties, including, but not limited -to, the implied warranties of merchantability and fitness for a -particular purpose are disclaimed. In no event shall the copyright owner -or contributors be liable for any direct, indirect, incidental, special, -exemplary, or consequential damages (including, but not limited to, -procurement of substitute goods or services; loss of use, data, or -profits; or business interruption) however caused and on any theory of -liability, whether in contract, strict liability, or tort (including -negligence or otherwise) arising in any way out of the use of this -software, even if advised of the possibility of such damage. -*/ - -#endregion - -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Text; -using System.Text.RegularExpressions; - -namespace MarkdownSharp -{ - - public class MarkdownOptions - { - /// - /// when true, (most) bare plain URLs are auto-hyperlinked - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool AutoHyperlink { get; set; } - /// - /// when true, RETURN becomes a literal newline - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool AutoNewlines { get; set; } - /// - /// use ">" for HTML output, or " />" for XHTML output - /// - public string EmptyElementSuffix { get; set; } - /// - /// when true, problematic URL characters like [, ], (, and so forth will be encoded - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool EncodeProblemUrlCharacters { get; set; } - /// - /// when false, email addresses will never be auto-linked - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool LinkEmails { get; set; } - /// - /// when true, bold and italic require non-word characters on either side - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool StrictBoldItalic { get; set; } - } - - - /// - /// Markdown is a text-to-HTML conversion tool for web writers. - /// Markdown allows you to write using an easy-to-read, easy-to-write plain text format, - /// then convert it to structurally valid XHTML (or HTML). - /// - public class Markdown - { - private const string _version = "1.13"; - - #region Constructors and Options - - /// - /// Create a new Markdown instance using default options - /// - public Markdown() - { - } - - /// - /// Create a new Markdown instance and set the options from the MarkdownOptions object. - /// - public Markdown(MarkdownOptions options) - { - _autoHyperlink = options.AutoHyperlink; - _autoNewlines = options.AutoNewlines; - _emptyElementSuffix = options.EmptyElementSuffix; - _encodeProblemUrlCharacters = options.EncodeProblemUrlCharacters; - _linkEmails = options.LinkEmails; - _strictBoldItalic = options.StrictBoldItalic; - } - - - /// - /// use ">" for HTML output, or " />" for XHTML output - /// - public string EmptyElementSuffix - { - get { return _emptyElementSuffix; } - set { _emptyElementSuffix = value; } - } - private string _emptyElementSuffix = " />"; - - /// - /// when false, email addresses will never be auto-linked - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool LinkEmails - { - get { return _linkEmails; } - set { _linkEmails = value; } - } - private bool _linkEmails = true; - - /// - /// when true, bold and italic require non-word characters on either side - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool StrictBoldItalic - { - get { return _strictBoldItalic; } - set { _strictBoldItalic = value; } - } - private bool _strictBoldItalic = false; - - /// - /// when true, RETURN becomes a literal newline - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool AutoNewLines - { - get { return _autoNewlines; } - set { _autoNewlines = value; } - } - private bool _autoNewlines = false; - - /// - /// when true, (most) bare plain URLs are auto-hyperlinked - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool AutoHyperlink - { - get { return _autoHyperlink; } - set { _autoHyperlink = value; } - } - private bool _autoHyperlink = false; - - /// - /// when true, problematic URL characters like [, ], (, and so forth will be encoded - /// WARNING: this is a significant deviation from the markdown spec - /// - public bool EncodeProblemUrlCharacters - { - get { return _encodeProblemUrlCharacters; } - set { _encodeProblemUrlCharacters = value; } - } - private bool _encodeProblemUrlCharacters = false; - - #endregion - - private enum TokenType { Text, Tag } - - private struct Token - { - public Token(TokenType type, string value) - { - this.Type = type; - this.Value = value; - } - public TokenType Type; - public string Value; - } - - /// - /// maximum nested depth of [] and () supported by the transform; implementation detail - /// - private const int _nestDepth = 6; - - /// - /// Tabs are automatically converted to spaces as part of the transform - /// this constant determines how "wide" those tabs become in spaces - /// - private const int _tabWidth = 4; - - private const string _markerUL = @"[*+-]"; - private const string _markerOL = @"\d+[.]"; - - private static readonly Dictionary _escapeTable; - private static readonly Dictionary _invertedEscapeTable; - private static readonly Dictionary _backslashEscapeTable; - - private readonly Dictionary _urls = new Dictionary(); - private readonly Dictionary _titles = new Dictionary(); - private readonly Dictionary _htmlBlocks = new Dictionary(); - - private int _listLevel; - private static string AutoLinkPreventionMarker = "\x1AP"; // temporarily replaces "://" where auto-linking shouldn't happen; - - /// - /// In the static constuctor we'll initialize what stays the same across all transforms. - /// - static Markdown() - { - // Table of hash values for escaped characters: - _escapeTable = new Dictionary(); - _invertedEscapeTable = new Dictionary(); - // Table of hash value for backslash escaped characters: - _backslashEscapeTable = new Dictionary(); - - string backslashPattern = ""; - - foreach (char c in @"\`*_{}[]()>#+-.!/") - { - string key = c.ToString(); - string hash = GetHashKey(key, isHtmlBlock: false); - _escapeTable.Add(key, hash); - _invertedEscapeTable.Add(hash, key); - _backslashEscapeTable.Add(@"\" + key, hash); - backslashPattern += Regex.Escape(@"\" + key) + "|"; - } - - _backslashEscapes = new Regex(backslashPattern.Substring(0, backslashPattern.Length - 1), RegexOptions.Compiled); - } - - /// - /// current version of MarkdownSharp; - /// see http://code.google.com/p/markdownsharp/ for the latest code or to contribute - /// - public string Version - { - get { return _version; } - } - - /// - /// Transforms the provided Markdown-formatted text to HTML; - /// see http://en.wikipedia.org/wiki/Markdown - /// - /// - /// The order in which other subs are called here is - /// essential. Link and image substitutions need to happen before - /// EscapeSpecialChars(), so that any *'s or _'s in the a - /// and img tags get encoded. - /// - public string Transform(string text) - { - if (String.IsNullOrEmpty(text)) return ""; - - Setup(); - - text = Normalize(text); - - text = HashHTMLBlocks(text); - text = StripLinkDefinitions(text); - text = RunBlockGamut(text); - text = Unescape(text); - - Cleanup(); - - return text + "\n"; - } - - - /// - /// Perform transformations that form block-level tags like paragraphs, headers, and list items. - /// - private string RunBlockGamut(string text, bool unhash = true) - { - text = DoHeaders(text); - text = DoHorizontalRules(text); - text = DoLists(text); - text = DoCodeBlocks(text); - text = DoBlockQuotes(text); - - // We already ran HashHTMLBlocks() before, in Markdown(), but that - // was to escape raw HTML in the original Markdown source. This time, - // we're escaping the markup we've just created, so that we don't wrap - //

tags around block-level tags. - text = HashHTMLBlocks(text); - - text = FormParagraphs(text, unhash: unhash); - - return text; - } - - - ///

- /// Perform transformations that occur *within* block-level tags like paragraphs, headers, and list items. - /// - private string RunSpanGamut(string text) - { - text = DoCodeSpans(text); - text = EscapeSpecialCharsWithinTagAttributes(text); - text = EscapeBackslashes(text); - - // Images must come first, because ![foo][f] looks like an anchor. - text = DoImages(text); - text = DoAnchors(text); - - // Must come after DoAnchors(), because you can use < and > - // delimiters in inline links like [this](). - text = DoAutoLinks(text); - - text = text.Replace(AutoLinkPreventionMarker, "://"); - - text = EncodeAmpsAndAngles(text); - text = DoItalicsAndBold(text); - text = DoHardBreaks(text); - - return text; - } - - private static Regex _newlinesLeadingTrailing = new Regex(@"^\n+|\n+\z", RegexOptions.Compiled); - private static Regex _newlinesMultiple = new Regex(@"\n{2,}", RegexOptions.Compiled); - private static Regex _leadingWhitespace = new Regex(@"^[ ]*", RegexOptions.Compiled); - - private static Regex _htmlBlockHash = new Regex("\x1AH\\d+H", RegexOptions.Compiled); - - /// - /// splits on two or more newlines, to form "paragraphs"; - /// each paragraph is then unhashed (if it is a hash and unhashing isn't turned off) or wrapped in HTML p tag - /// - private string FormParagraphs(string text, bool unhash = true) - { - // split on two or more newlines - string[] grafs = _newlinesMultiple.Split(_newlinesLeadingTrailing.Replace(text, "")); - - for (int i = 0; i < grafs.Length; i++) - { - if (grafs[i].StartsWith("\x1AH")) - { - // unhashify HTML blocks - if (unhash) - { - int sanityCheck = 50; // just for safety, guard against an infinite loop - bool keepGoing = true; // as long as replacements where made, keep going - while (keepGoing && sanityCheck > 0) - { - keepGoing = false; - grafs[i] = _htmlBlockHash.Replace(grafs[i], match => - { - keepGoing = true; - return _htmlBlocks[match.Value]; - }); - sanityCheck--; - } - /* if (keepGoing) - { - // Logging of an infinite loop goes here. - // If such a thing should happen, please open a new issue on http://code.google.com/p/markdownsharp/ - // with the input that caused it. - }*/ - } - } - else - { - // do span level processing inside the block, then wrap result in

tags - grafs[i] = _leadingWhitespace.Replace(RunSpanGamut(grafs[i]), "

") + "

"; - } - } - - return string.Join("\n\n", grafs); - } - - - private void Setup() - { - // Clear the global hashes. If we don't clear these, you get conflicts - // from other articles when generating a page which contains more than - // one article (e.g. an index page that shows the N most recent - // articles): - _urls.Clear(); - _titles.Clear(); - _htmlBlocks.Clear(); - _listLevel = 0; - } - - private void Cleanup() - { - Setup(); - } - - private static string _nestedBracketsPattern; - - /// - /// Reusable pattern to match balanced [brackets]. See Friedl's - /// "Mastering Regular Expressions", 2nd Ed., pp. 328-331. - /// - private static string GetNestedBracketsPattern() - { - // in other words [this] and [this[also]] and [this[also[too]]] - // up to _nestDepth - if (_nestedBracketsPattern == null) - _nestedBracketsPattern = - RepeatString(@" - (?> # Atomic matching - [^\[\]]+ # Anything other than brackets - | - \[ - ", _nestDepth) + RepeatString( - @" \] - )*" - , _nestDepth); - return _nestedBracketsPattern; - } - - private static string _nestedParensPattern; - - /// - /// Reusable pattern to match balanced (parens). See Friedl's - /// "Mastering Regular Expressions", 2nd Ed., pp. 328-331. - /// - private static string GetNestedParensPattern() - { - // in other words (this) and (this(also)) and (this(also(too))) - // up to _nestDepth - if (_nestedParensPattern == null) - _nestedParensPattern = - RepeatString(@" - (?> # Atomic matching - [^()\s]+ # Anything other than parens or whitespace - | - \( - ", _nestDepth) + RepeatString( - @" \) - )*" - , _nestDepth); - return _nestedParensPattern; - } - - private static Regex _linkDef = new Regex(string.Format(@" - ^[ ]{{0,{0}}}\[([^\[\]]+)\]: # id = $1 - [ ]* - \n? # maybe *one* newline - [ ]* - ? # url = $2 - [ ]* - \n? # maybe one newline - [ ]* - (?: - (?<=\s) # lookbehind for whitespace - [""(] - (.+?) # title = $3 - ["")] - [ ]* - )? # title is optional - (?:\n+|\Z)", _tabWidth - 1), RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - /// - /// Strips link definitions from text, stores the URLs and titles in hash references. - /// - /// - /// ^[id]: url "optional title" - /// - private string StripLinkDefinitions(string text) - { - return _linkDef.Replace(text, new MatchEvaluator(LinkEvaluator)); - } - - private string LinkEvaluator(Match match) - { - string linkID = match.Groups[1].Value.ToLowerInvariant(); - _urls[linkID] = EncodeAmpsAndAngles(match.Groups[2].Value); - - if (match.Groups[3] != null && match.Groups[3].Length > 0) - _titles[linkID] = match.Groups[3].Value.Replace("\"", """); - - return ""; - } - - // compiling this monster regex results in worse performance. trust me. - private static Regex _blocksHtml = new Regex(GetBlockPattern(), RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace); - - - /// - /// derived pretty much verbatim from PHP Markdown - /// - private static string GetBlockPattern() - { - - // Hashify HTML blocks: - // We only want to do this for block-level HTML tags, such as headers, - // lists, and tables. That's because we still want to wrap

s around - // "paragraphs" that are wrapped in non-block-level tags, such as anchors, - // phrase emphasis, and spans. The list of tags we're looking for is - // hard-coded: - // - // * List "a" is made of tags which can be both inline or block-level. - // These will be treated block-level when the start tag is alone on - // its line, otherwise they're not matched here and will be taken as - // inline later. - // * List "b" is made of tags which are always block-level; - // - string blockTagsA = "ins|del"; - string blockTagsB = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|script|noscript|form|fieldset|iframe|math"; - - // Regular expression for the content of a block tag. - string attr = @" - (?>    # optional tag attributes - \s   # starts with whitespace - (?> - [^>""/]+ # text outside quotes - | - /+(?!>)  # slash not followed by > - | - ""[^""]*""  # text inside double quotes (tolerate >) - | - '[^']*' # text inside single quotes (tolerate >) - )* - )? - "; - - string content = RepeatString(@" - (?> - [^<]+   # content without tag - | - <\2   # nested opening tag - " + attr + @" # attributes - (?> - /> - | - >", _nestDepth) + // end of opening tag - ".*?" + // last level nested tag content - RepeatString(@" -  # closing nested tag - ) - |    - <(?!/\2\s*> # other tags with a different name - ) - )*", _nestDepth); - - string content2 = content.Replace(@"\2", @"\3"); - - // First, look for nested blocks, e.g.: - // 

- //  
- //   tags for inner block must be indented. - //  
- // 
- // - // The outermost tags must start at the left margin for this to match, and - // the inner nested divs must be indented. - // We need to do this before the next, more liberal match, because the next - // match will start at the first `
` and stop at the first `
`. - string pattern = @" - (?> - (?> - (?<=\n) # Starting at the beginning of a line - | # or - \A\n? # the beginning of the doc - ) - ( # save in $1 - - # Match from `\n` to `\n`, handling nested tags - # in between. - - <($block_tags_b_re) # start tag = $2 - $attr> # attributes followed by > and \n - $content # content, support nesting - # the matching end tag - [ ]* # trailing spaces - (?=\n+|\Z) # followed by a newline or end of document - - | # Special version for tags of group a. - - <($block_tags_a_re) # start tag = $3 - $attr>[ ]*\n # attributes followed by > - $content2 # content, support nesting - # the matching end tag - [ ]* # trailing spaces - (?=\n+|\Z) # followed by a newline or end of document - - | # Special case just for
. It was easier to make a special - # case than to make the other regex more complicated. - - [ ]{0,$less_than_tab} -
# the matching end tag - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # Special case for standalone HTML comments: - - (?<=\n\n|\A) # preceded by a blank line or start of document - [ ]{0,$less_than_tab} - (?s: - - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # PHP and ASP-style processor instructions ( - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - ) - )"; - - pattern = pattern.Replace("$less_than_tab", (_tabWidth - 1).ToString()); - pattern = pattern.Replace("$block_tags_b_re", blockTagsB); - pattern = pattern.Replace("$block_tags_a_re", blockTagsA); - pattern = pattern.Replace("$attr", attr); - pattern = pattern.Replace("$content2", content2); - pattern = pattern.Replace("$content", content); - - return pattern; - } - - /// - /// replaces any block-level HTML blocks with hash entries - /// - private string HashHTMLBlocks(string text) - { - return _blocksHtml.Replace(text, new MatchEvaluator(HtmlEvaluator)); - } - - private string HtmlEvaluator(Match match) - { - string text = match.Groups[1].Value; - string key = GetHashKey(text, isHtmlBlock: true); - _htmlBlocks[key] = text; - - return string.Concat("\n\n", key, "\n\n"); - } - - private static string GetHashKey(string s, bool isHtmlBlock) - { - var delim = isHtmlBlock ? 'H' : 'E'; - return "\x1A" + delim + Math.Abs(s.GetHashCode()).ToString() + delim; - } - - private static Regex _htmlTokens = new Regex(@" - ()| # match - (<\?.*?\?>)| # match " + - RepeatString(@" - (<[A-Za-z\/!$](?:[^<>]|", _nestDepth) + RepeatString(@")*>)", _nestDepth) + - " # match and ", - RegexOptions.Multiline | RegexOptions.Singleline | RegexOptions.ExplicitCapture | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - /// - /// returns an array of HTML tokens comprising the input string. Each token is - /// either a tag (possibly with nested, tags contained therein, such - /// as <a href="<MTFoo>">, or a run of text between tags. Each element of the - /// array is a two-element array; the first is either 'tag' or 'text'; the second is - /// the actual value. - /// - private List TokenizeHTML(string text) - { - int pos = 0; - int tagStart = 0; - var tokens = new List(); - - // this regex is derived from the _tokenize() subroutine in Brad Choate's MTRegex plugin. - // http://www.bradchoate.com/past/mtregex.php - foreach (Match m in _htmlTokens.Matches(text)) - { - tagStart = m.Index; - - if (pos < tagStart) - tokens.Add(new Token(TokenType.Text, text.Substring(pos, tagStart - pos))); - - tokens.Add(new Token(TokenType.Tag, m.Value)); - pos = tagStart + m.Length; - } - - if (pos < text.Length) - tokens.Add(new Token(TokenType.Text, text.Substring(pos, text.Length - pos))); - - return tokens; - } - - - private static Regex _anchorRef = new Regex(string.Format(@" - ( # wrap whole match in $1 - \[ - ({0}) # link text = $2 - \] - - [ ]? # one optional space - (?:\n[ ]*)? # one optional newline followed by spaces - - \[ - (.*?) # id = $3 - \] - )", GetNestedBracketsPattern()), RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - private static Regex _anchorInline = new Regex(string.Format(@" - ( # wrap whole match in $1 - \[ - ({0}) # link text = $2 - \] - \( # literal paren - [ ]* - ({1}) # href = $3 - [ ]* - ( # $4 - (['""]) # quote char = $5 - (.*?) # title = $6 - \5 # matching quote - [ ]* # ignore any spaces between closing quote and ) - )? # title is optional - \) - )", GetNestedBracketsPattern(), GetNestedParensPattern()), - RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - private static Regex _anchorRefShortcut = new Regex(@" - ( # wrap whole match in $1 - \[ - ([^\[\]]+) # link text = $2; can't contain [ or ] - \] - )", RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - /// - /// Turn Markdown link shortcuts into HTML anchor tags - /// - /// - /// [link text](url "title") - /// [link text][id] - /// [id] - /// - private string DoAnchors(string text) - { - // First, handle reference-style links: [link text] [id] - text = _anchorRef.Replace(text, new MatchEvaluator(AnchorRefEvaluator)); - - // Next, inline-style links: [link text](url "optional title") or [link text](url "optional title") - text = _anchorInline.Replace(text, new MatchEvaluator(AnchorInlineEvaluator)); - - // Last, handle reference-style shortcuts: [link text] - // These must come last in case you've also got [link test][1] - // or [link test](/foo) - text = _anchorRefShortcut.Replace(text, new MatchEvaluator(AnchorRefShortcutEvaluator)); - return text; - } - - private string SaveFromAutoLinking(string s) - { - return s.Replace("://", AutoLinkPreventionMarker); - } - - private string AnchorRefEvaluator(Match match) - { - string wholeMatch = match.Groups[1].Value; - string linkText = SaveFromAutoLinking(match.Groups[2].Value); - string linkID = match.Groups[3].Value.ToLowerInvariant(); - - string result; - - // for shortcut links like [this][]. - if (linkID == "") - linkID = linkText.ToLowerInvariant(); - - if (_urls.ContainsKey(linkID)) - { - string url = _urls[linkID]; - - url = EncodeProblemUrlChars(url); - url = EscapeBoldItalic(url); - result = ""; - } - else - result = wholeMatch; - - return result; - } - - private string AnchorRefShortcutEvaluator(Match match) - { - string wholeMatch = match.Groups[1].Value; - string linkText = SaveFromAutoLinking(match.Groups[2].Value); - string linkID = Regex.Replace(linkText.ToLowerInvariant(), @"[ ]*\n[ ]*", " "); // lower case and remove newlines / extra spaces - - string result; - - if (_urls.ContainsKey(linkID)) - { - string url = _urls[linkID]; - - url = EncodeProblemUrlChars(url); - url = EscapeBoldItalic(url); - result = ""; - } - else - result = wholeMatch; - - return result; - } - - - private string AnchorInlineEvaluator(Match match) - { - string linkText = SaveFromAutoLinking(match.Groups[2].Value); - string url = match.Groups[3].Value; - string title = match.Groups[6].Value; - string result; - - url = EncodeProblemUrlChars(url); - url = EscapeBoldItalic(url); - if (url.StartsWith("<") && url.EndsWith(">")) - url = url.Substring(1, url.Length - 2); // remove <>'s surrounding URL, if present - - result = string.Format("{0}", linkText); - return result; - } - - private static Regex _imagesRef = new Regex(@" - ( # wrap whole match in $1 - !\[ - (.*?) # alt text = $2 - \] - - [ ]? # one optional space - (?:\n[ ]*)? # one optional newline followed by spaces - - \[ - (.*?) # id = $3 - \] - - )", RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.Compiled); - - private static Regex _imagesInline = new Regex(String.Format(@" - ( # wrap whole match in $1 - !\[ - (.*?) # alt text = $2 - \] - \s? # one optional whitespace character - \( # literal paren - [ ]* - ({0}) # href = $3 - [ ]* - ( # $4 - (['""]) # quote char = $5 - (.*?) # title = $6 - \5 # matching quote - [ ]* - )? # title is optional - \) - )", GetNestedParensPattern()), - RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.Compiled); - - /// - /// Turn Markdown image shortcuts into HTML img tags. - /// - /// - /// ![alt text][id] - /// ![alt text](url "optional title") - /// - private string DoImages(string text) - { - // First, handle reference-style labeled images: ![alt text][id] - text = _imagesRef.Replace(text, new MatchEvaluator(ImageReferenceEvaluator)); - - // Next, handle inline images: ![alt text](url "optional title") - // Don't forget: encode * and _ - text = _imagesInline.Replace(text, new MatchEvaluator(ImageInlineEvaluator)); - - return text; - } - - // This prevents the creation of horribly broken HTML when some syntax ambiguities - // collide. It likely still doesn't do what the user meant, but at least we're not - // outputting garbage. - private string EscapeImageAltText(string s) - { - s = EscapeBoldItalic(s); - s = Regex.Replace(s, @"[\[\]()]", m => _escapeTable[m.ToString()]); - return s; - } - - private string ImageReferenceEvaluator(Match match) - { - string wholeMatch = match.Groups[1].Value; - string altText = match.Groups[2].Value; - string linkID = match.Groups[3].Value.ToLowerInvariant(); - - // for shortcut links like ![this][]. - if (linkID == "") - linkID = altText.ToLowerInvariant(); - - if (_urls.ContainsKey(linkID)) - { - string url = _urls[linkID]; - string title = null; - - if (_titles.ContainsKey(linkID)) - title = _titles[linkID]; - - return ImageTag(url, altText, title); - } - else - { - // If there's no such link ID, leave intact: - return wholeMatch; - } - } - - private string ImageInlineEvaluator(Match match) - { - string alt = match.Groups[2].Value; - string url = match.Groups[3].Value; - string title = match.Groups[6].Value; - - if (url.StartsWith("<") && url.EndsWith(">")) - url = url.Substring(1, url.Length - 2); // Remove <>'s surrounding URL, if present - - return ImageTag(url, alt, title); - } - - private string ImageTag(string url, string altText, string title) - { - altText = EscapeImageAltText(AttributeEncode(altText)); - url = EncodeProblemUrlChars(url); - url = EscapeBoldItalic(url); - var result = string.Format("\"{1}\"", - /// Turn Markdown headers into HTML header tags - /// - /// - /// Header 1 - /// ======== - /// - /// Header 2 - /// -------- - /// - /// # Header 1 - /// ## Header 2 - /// ## Header 2 with closing hashes ## - /// ... - /// ###### Header 6 - /// - private string DoHeaders(string text) - { - text = _headerSetext.Replace(text, new MatchEvaluator(SetextHeaderEvaluator)); - text = _headerAtx.Replace(text, new MatchEvaluator(AtxHeaderEvaluator)); - return text; - } - - private string SetextHeaderEvaluator(Match match) - { - string header = match.Groups[1].Value; - int level = match.Groups[2].Value.StartsWith("=") ? 1 : 2; - return string.Format("{0}\n\n", RunSpanGamut(header), level); - } - - private string AtxHeaderEvaluator(Match match) - { - string header = match.Groups[2].Value; - int level = match.Groups[1].Value.Length; - return string.Format("{0}\n\n", RunSpanGamut(header), level); - } - - - private static Regex _horizontalRules = new Regex(@" - ^[ ]{0,3} # Leading space - ([-*_]) # $1: First marker - (?> # Repeated marker group - [ ]{0,2} # Zero, one, or two spaces. - \1 # Marker character - ){2,} # Group repeated at least twice - [ ]* # Trailing spaces - $ # End of line. - ", RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - /// - /// Turn Markdown horizontal rules into HTML hr tags - /// - /// - /// *** - /// * * * - /// --- - /// - - - - /// - private string DoHorizontalRules(string text) - { - return _horizontalRules.Replace(text, " - /// Turn Markdown lists into HTML ul and ol and li tags - /// - private string DoLists(string text, bool isInsideParagraphlessListItem = false) - { - // We use a different prefix before nested lists than top-level lists. - // See extended comment in _ProcessListItems(). - if (_listLevel > 0) - text = _listNested.Replace(text, GetListEvaluator(isInsideParagraphlessListItem)); - else - text = _listTopLevel.Replace(text, GetListEvaluator(false)); - - return text; - } - - private MatchEvaluator GetListEvaluator(bool isInsideParagraphlessListItem = false) - { - return new MatchEvaluator(match => - { - string list = match.Groups[1].Value; - string listType = Regex.IsMatch(match.Groups[3].Value, _markerUL) ? "ul" : "ol"; - string result; - - result = ProcessListItems(list, listType == "ul" ? _markerUL : _markerOL, isInsideParagraphlessListItem); - - result = string.Format("<{0}>\n{1}\n", listType, result); - return result; - }); - } - - /// - /// Process the contents of a single ordered or unordered list, splitting it - /// into individual list items. - /// - private string ProcessListItems(string list, string marker, bool isInsideParagraphlessListItem = false) - { - // The listLevel global keeps track of when we're inside a list. - // Each time we enter a list, we increment it; when we leave a list, - // we decrement. If it's zero, we're not in a list anymore. - - // We do this because when we're not inside a list, we want to treat - // something like this: - - // I recommend upgrading to version - // 8. Oops, now this line is treated - // as a sub-list. - - // As a single paragraph, despite the fact that the second line starts - // with a digit-period-space sequence. - - // Whereas when we're inside a list (or sub-list), that line will be - // treated as the start of a sub-list. What a kludge, huh? This is - // an aspect of Markdown's syntax that's hard to parse perfectly - // without resorting to mind-reading. Perhaps the solution is to - // change the syntax rules such that sub-lists must start with a - // starting cardinal number; e.g. "1." or "a.". - - _listLevel++; - - // Trim trailing blank lines: - list = Regex.Replace(list, @"\n{2,}\z", "\n"); - - string pattern = string.Format( - @"(^[ ]*) # leading whitespace = $1 - ({0}) [ ]+ # list marker = $2 - ((?s:.+?) # list item text = $3 - (\n+)) - (?= (\z | \1 ({0}) [ ]+))", marker); - - bool lastItemHadADoubleNewline = false; - - // has to be a closure, so subsequent invocations can share the bool - MatchEvaluator ListItemEvaluator = (Match match) => - { - string item = match.Groups[3].Value; - - bool endsWithDoubleNewline = item.EndsWith("\n\n"); - bool containsDoubleNewline = endsWithDoubleNewline || item.Contains("\n\n"); - - if (containsDoubleNewline || lastItemHadADoubleNewline) - // we could correct any bad indentation here.. - item = RunBlockGamut(Outdent(item) + "\n", unhash: false); - else - { - // recursion for sub-lists - item = DoLists(Outdent(item), isInsideParagraphlessListItem: true); - item = item.TrimEnd('\n'); - if (!isInsideParagraphlessListItem) // only the outer-most item should run this, otherwise it's run multiple times for the inner ones - item = RunSpanGamut(item); - } - lastItemHadADoubleNewline = endsWithDoubleNewline; - return string.Format("
  • {0}
    • \n", item); - }; - - list = Regex.Replace(list, pattern, new MatchEvaluator(ListItemEvaluator), - RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline); - _listLevel--; - return list; - } - - private static Regex _codeBlock = new Regex(string.Format(@" - (?:\n\n|\A\n?) - ( # $1 = the code block -- one or more lines, starting with a space - (?: - (?:[ ]{{{0}}}) # Lines must start with a tab-width of spaces - .*\n+ - )+ - ) - ((?=^[ ]{{0,{0}}}[^ \t\n])|\Z) # Lookahead for non-space at line-start, or end of doc", - _tabWidth), RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled); - - /// - /// /// Turn Markdown 4-space indented code into HTML pre code blocks - /// - private string DoCodeBlocks(string text) - { - text = _codeBlock.Replace(text, new MatchEvaluator(CodeBlockEvaluator)); - return text; - } - - private string CodeBlockEvaluator(Match match) - { - string codeBlock = match.Groups[1].Value; - - codeBlock = EncodeCode(Outdent(codeBlock)); - codeBlock = _newlinesLeadingTrailing.Replace(codeBlock, ""); - - return string.Concat("\n\n
    ", codeBlock, "\n
    \n\n"); - } - - private static Regex _codeSpan = new Regex(@" - (? - /// Turn Markdown `code spans` into HTML code tags - /// - private string DoCodeSpans(string text) - { - // * You can use multiple backticks as the delimiters if you want to - // include literal backticks in the code span. So, this input: - // - // Just type ``foo `bar` baz`` at the prompt. - // - // Will translate to: - // - //

    Just type foo `bar` baz at the prompt.

    - // - // There's no arbitrary limit to the number of backticks you - // can use as delimters. If you need three consecutive backticks - // in your code, use four for delimiters, etc. - // - // * You can use spaces to get literal backticks at the edges: - // - // ... type `` `bar` `` ... - // - // Turns to: - // - // ... type `bar` ... - // - - return _codeSpan.Replace(text, new MatchEvaluator(CodeSpanEvaluator)); - } - - private string CodeSpanEvaluator(Match match) - { - string span = match.Groups[2].Value; - span = Regex.Replace(span, @"^[ ]*", ""); // leading whitespace - span = Regex.Replace(span, @"[ ]*$", ""); // trailing whitespace - span = EncodeCode(span); - span = SaveFromAutoLinking(span); // to prevent auto-linking. Not necessary in code *blocks*, but in code spans. - - return string.Concat("", span, ""); - } - - - private static Regex _bold = new Regex(@"(\*\*|__) (?=\S) (.+?[*_]*) (?<=\S) \1", - RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.Compiled); - private static Regex _strictBold = new Regex(@"(^|[\W_])(?:(?!\1)|(?=^))(\*|_)\2(?=\S)(.*?\S)\2\2(?!\2)(?=[\W_]|$)", - RegexOptions.Singleline | RegexOptions.Compiled); - - private static Regex _italic = new Regex(@"(\*|_) (?=\S) (.+?) (?<=\S) \1", - RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline | RegexOptions.Compiled); - private static Regex _strictItalic = new Regex(@"(^|[\W_])(?:(?!\1)|(?=^))(\*|_)(?=\S)((?:(?!\2).)*?\S)\2(?!\2)(?=[\W_]|$)", - RegexOptions.Singleline | RegexOptions.Compiled); - - /// - /// Turn Markdown *italics* and **bold** into HTML strong and em tags - /// - private string DoItalicsAndBold(string text) - { - - // must go first, then - if (_strictBoldItalic) - { - text = _strictBold.Replace(text, "$1$3"); - text = _strictItalic.Replace(text, "$1$3"); - } - else - { - text = _bold.Replace(text, "$2"); - text = _italic.Replace(text, "$2"); - } - return text; - } - - /// - /// Turn markdown line breaks (two space at end of line) into HTML break tags - /// - private string DoHardBreaks(string text) - { - if (_autoNewlines) - text = Regex.Replace(text, @"\n", string.Format("[ ]? # '>' at the start of a line - .+\n # rest of the first line - (.+\n)* # subsequent consecutive lines - \n* # blanks - )+ - )", RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline | RegexOptions.Compiled); - - /// - /// Turn Markdown > quoted blocks into HTML blockquote blocks - /// - private string DoBlockQuotes(string text) - { - return _blockquote.Replace(text, new MatchEvaluator(BlockQuoteEvaluator)); - } - - private string BlockQuoteEvaluator(Match match) - { - string bq = match.Groups[1].Value; - - bq = Regex.Replace(bq, @"^[ ]*>[ ]?", "", RegexOptions.Multiline); // trim one level of quoting - bq = Regex.Replace(bq, @"^[ ]+$", "", RegexOptions.Multiline); // trim whitespace-only lines - bq = RunBlockGamut(bq); // recurse - - bq = Regex.Replace(bq, @"^", " ", RegexOptions.Multiline); - - // These leading spaces screw with 
     content, so we need to fix that:
-            bq = Regex.Replace(bq, @"(\s*
    .+?
    )", new MatchEvaluator(BlockQuoteEvaluator2), RegexOptions.IgnorePatternWhitespace | RegexOptions.Singleline);
-
-            bq = string.Format("
    \n{0}\n
    ", bq);
-            string key = GetHashKey(bq, isHtmlBlock: true);
-            _htmlBlocks[key] = bq;
-
-            return "\n\n" + key + "\n\n";
-        }
-
-        private string BlockQuoteEvaluator2(Match match)
-        {
-            return Regex.Replace(match.Groups[1].Value, @"^  ", "", RegexOptions.Multiline);
-        }
-
-        private const string _charInsideUrl = @"[-A-Z0-9+&@#/%?=~_|\[\]\(\)!:,\.;" + "\x1a]";
-        private const string _charEndingUrl = "[-A-Z0-9+&@#/%=~_|\\[\\])]";
-
-        private static Regex _autolinkBare = new Regex(@"(<|="")?\b(https?|ftp)(://" + _charInsideUrl + "*" + _charEndingUrl + ")(?=$|\\W)",
-            RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-        private static Regex _endCharRegex = new Regex(_charEndingUrl, RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
-        private static string handleTrailingParens(Match match)
-        {
-            // The first group is essentially a negative lookbehind -- if there's a < or a =", we don't touch this.
-            // We're not using a *real* lookbehind, because of links with in links, like 
-            // With a real lookbehind, the full link would never be matched, and thus the http://www.google.com *would* be matched.
-            // With the simulated lookbehind, the full link *is* matched (just not handled, because of this early return), causing
-            // the google link to not be matched again.
-            if (match.Groups[1].Success)
-                return match.Value;
-
-            var protocol = match.Groups[2].Value;
-            var link = match.Groups[3].Value;
-            if (!link.EndsWith(")"))
-                return "<" + protocol + link + ">";
-            var level = 0;
-            foreach (Match c in Regex.Matches(link, "[()]"))
-            {
-                if (c.Value == "(")
-                {
-                    if (level <= 0)
-                        level = 1;
-                    else
-                        level++;
-                }
-                else
-                {
-                    level--;
-                }
-            }
-            var tail = "";
-            if (level < 0)
-            {
-                link = Regex.Replace(link, @"\){1," + (-level) + "}$", m => { tail = m.Value; return ""; });
-            }
-            if (tail.Length > 0)
-            {
-                var lastChar = link[link.Length - 1];
-                if (!_endCharRegex.IsMatch(lastChar.ToString()))
-                {
-                    tail = lastChar + tail;
-                    link = link.Substring(0, link.Length - 1);
-                }
-            }
-            return "<" + protocol + link + ">" + tail;
-        }
-
-        /// 
-        /// Turn angle-delimited URLs into HTML anchor tags
-        /// 
-        /// 
-        /// <http://www.example.com>
-        /// 
-        private string DoAutoLinks(string text)
-        {
-
-            if (_autoHyperlink)
-            {
-                // fixup arbitrary URLs by adding Markdown < > so they get linked as well
-                // note that at this point, all other URL in the text are already hyperlinked as 
-                // *except* for the  case
-                text = _autolinkBare.Replace(text, handleTrailingParens);
-            }
-
-            // Hyperlinks: 
-            text = Regex.Replace(text, "<((https?|ftp):[^'\">\\s]+)>", new MatchEvaluator(HyperlinkEvaluator));
-
-            if (_linkEmails)
-            {
-                // Email addresses: 
-                string pattern =
-                    @"<
-                      (?:mailto:)?
-                      (
-                        [-.\w]+
-                        \@
-                        [-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+
-                      )
-                      >";
-                text = Regex.Replace(text, pattern, new MatchEvaluator(EmailEvaluator), RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-            }
-
-            return text;
-        }
-
-        private string HyperlinkEvaluator(Match match)
-        {
-            string link = match.Groups[1].Value;
-            return string.Format("{1}", EscapeBoldItalic(EncodeProblemUrlChars(link)), link);
-        }
-
-        private string EmailEvaluator(Match match)
-        {
-            string email = Unescape(match.Groups[1].Value);
-
-            //
-            //    Input: an email address, e.g. "foo@example.com"
-            //
-            //    Output: the email address as a mailto link, with each character
-            //            of the address encoded as either a decimal or hex entity, in
-            //            the hopes of foiling most address harvesting spam bots. E.g.:
-            //
-            //      foo
-            //        @example.com
-            //
-            //    Based by a filter by Matthew Wickline, posted to the BBEdit-Talk
-            //    mailing list: 
-            //
-            email = "mailto:" + email;
-
-            // leave ':' alone (to spot mailto: later)
-            email = EncodeEmailAddress(email);
-
-            email = string.Format("{0}", email);
-
-            // strip the mailto: from the visible part
-            email = Regex.Replace(email, "\">.+?:", "\">");
-            return email;
-        }
-
-
-        private static Regex _outDent = new Regex(@"^[ ]{1," + _tabWidth + @"}", RegexOptions.Multiline | RegexOptions.Compiled);
-
-        /// 
-        /// Remove one level of line-leading spaces
-        /// 
-        private string Outdent(string block)
-        {
-            return _outDent.Replace(block, "");
-        }
-
-
-        #region Encoding and Normalization
-
-
-        /// 
-        /// encodes email address randomly
-        /// roughly 10% raw, 45% hex, 45% dec
-        /// note that @ is always encoded and : never is
-        /// 
-        private string EncodeEmailAddress(string addr)
-        {
-            var sb = new StringBuilder(addr.Length * 5);
-            var rand = new Random();
-            int r;
-            foreach (char c in addr)
-            {
-                r = rand.Next(1, 100);
-                if ((r > 90 || c == ':') && c != '@')
-                    sb.Append(c);                         // m
-                else if (r < 45)
-                    sb.AppendFormat("&#x{0:x};", (int)c); // m
-                else
-                    sb.AppendFormat("&#{0};", (int)c);    // m
-            }
-            return sb.ToString();
-        }
-
-        private static Regex _codeEncoder = new Regex(@"&|<|>|\\|\*|_|\{|\}|\[|\]", RegexOptions.Compiled);
-
-        /// 
-        /// Encode/escape certain Markdown characters inside code blocks and spans where they are literals
-        /// 
-        private string EncodeCode(string code)
-        {
-            return _codeEncoder.Replace(code, EncodeCodeEvaluator);
-        }
-        private string EncodeCodeEvaluator(Match match)
-        {
-            switch (match.Value)
-            {
-                // Encode all ampersands; HTML entities are not
-                // entities within a Markdown code span.
-                case "&":
-                    return "&";
-                // Do the angle bracket song and dance
-                case "<":
-                    return "<";
-                case ">":
-                    return ">";
-                // escape characters that are magic in Markdown
-                default:
-                    return _escapeTable[match.Value];
-            }
-        }
-
-
-        private static Regex _amps = new Regex(@"&(?!((#[0-9]+)|(#[xX][a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9]*));)", RegexOptions.ExplicitCapture | RegexOptions.Compiled);
-        private static Regex _angles = new Regex(@"<(?![A-Za-z/?\$!])", RegexOptions.ExplicitCapture | RegexOptions.Compiled);
-
-        /// 
-        /// Encode any ampersands (that aren't part of an HTML entity) and left or right angle brackets
-        /// 
-        private string EncodeAmpsAndAngles(string s)
-        {
-            s = _amps.Replace(s, "&");
-            s = _angles.Replace(s, "<");
-            return s;
-        }
-
-        private static Regex _backslashEscapes;
-
-        /// 
-        /// Encodes any escaped characters such as \`, \*, \[ etc
-        /// 
-        private string EscapeBackslashes(string s)
-        {
-            return _backslashEscapes.Replace(s, new MatchEvaluator(EscapeBackslashesEvaluator));
-        }
-        private string EscapeBackslashesEvaluator(Match match)
-        {
-            return _backslashEscapeTable[match.Value];
-        }
-
-        private static Regex _unescapes = new Regex("\x1A" + "E\\d+E", RegexOptions.Compiled);
-
-        /// 
-        /// swap back in all the special characters we've hidden
-        /// 
-        private string Unescape(string s)
-        {
-            return _unescapes.Replace(s, new MatchEvaluator(UnescapeEvaluator));
-        }
-        private string UnescapeEvaluator(Match match)
-        {
-            return _invertedEscapeTable[match.Value];
-        }
-
-
-        /// 
-        /// escapes Bold [ * ] and Italic [ _ ] characters
-        /// 
-        private string EscapeBoldItalic(string s)
-        {
-            s = s.Replace("*", _escapeTable["*"]);
-            s = s.Replace("_", _escapeTable["_"]);
-            return s;
-        }
-
-        private static string AttributeEncode(string s)
-        {
-            return s.Replace(">", ">").Replace("<", "<").Replace("\"", """);
-        }
-
-        private static readonly char[] _problemUrlChars = @"""'*()[]$:".ToCharArray();
-
-        /// 
-        /// hex-encodes some unusual "problem" chars in URLs to avoid URL detection problems
-        /// 
-        private string EncodeProblemUrlChars(string url)
-        {
-            if (!_encodeProblemUrlCharacters) return url;
-
-            var sb = new StringBuilder(url.Length);
-            bool encode;
-            char c;
-
-            for (int i = 0; i < url.Length; i++)
-            {
-                c = url[i];
-                encode = Array.IndexOf(_problemUrlChars, c) != -1;
-                if (encode && c == ':' && i < url.Length - 1)
-                    encode = !(url[i + 1] == '/') && !(url[i + 1] >= '0' && url[i + 1] <= '9');
-
-                if (encode)
-                    sb.Append("%" + String.Format("{0:x}", (byte)c));
-                else
-                    sb.Append(c);
-            }
-
-            return sb.ToString();
-        }
-
-
-        /// 
-        /// Within tags -- meaning between < and > -- encode [\ ` * _] so they
-        /// don't conflict with their use in Markdown for code, italics and strong.
-        /// We're replacing each such character with its corresponding hash
-        /// value; this is likely overkill, but it should prevent us from colliding
-        /// with the escape values by accident.
-        /// 
-        private string EscapeSpecialCharsWithinTagAttributes(string text)
-        {
-            var tokens = TokenizeHTML(text);
-
-            // now, rebuild text from the tokens
-            var sb = new StringBuilder(text.Length);
-
-            foreach (var token in tokens)
-            {
-                string value = token.Value;
-
-                if (token.Type == TokenType.Tag)
-                {
-                    value = value.Replace(@"\", _escapeTable[@"\"]);
-
-                    if (_autoHyperlink && value.StartsWith("(?=.)", _escapeTable[@"`"]);
-                    value = EscapeBoldItalic(value);
-                }
-
-                sb.Append(value);
-            }
-
-            return sb.ToString();
-        }
-
-        /// 
-        /// convert all tabs to _tabWidth spaces;
-        /// standardizes line endings from DOS (CR LF) or Mac (CR) to UNIX (LF);
-        /// makes sure text ends with a couple of newlines;
-        /// removes any blank lines (only spaces) in the text
-        /// 
-        private string Normalize(string text)
-        {
-            var output = new StringBuilder(text.Length);
-            var line = new StringBuilder();
-            bool valid = false;
-
-            for (int i = 0; i < text.Length; i++)
-            {
-                switch (text[i])
-                {
-                    case '\n':
-                        if (valid) output.Append(line);
-                        output.Append('\n');
-                        line.Length = 0; valid = false;
-                        break;
-                    case '\r':
-                        if ((i < text.Length - 1) && (text[i + 1] != '\n'))
-                        {
-                            if (valid) output.Append(line);
-                            output.Append('\n');
-                            line.Length = 0; valid = false;
-                        }
-                        break;
-                    case '\t':
-                        int width = (_tabWidth - line.Length % _tabWidth);
-                        for (int k = 0; k < width; k++)
-                            line.Append(' ');
-                        break;
-                    case '\x1A':
-                        break;
-                    default:
-                        if (!valid && text[i] != ' ') valid = true;
-                        line.Append(text[i]);
-                        break;
-                }
-            }
-
-            if (valid) output.Append(line);
-            output.Append('\n');
-
-            // add two newlines to the end before return
-            return output.Append("\n\n").ToString();
-        }
-
-        #endregion
-
-        /// 
-        /// this is to emulate what's evailable in PHP
-        /// 
-        private static string RepeatString(string text, int count)
-        {
-            var sb = new StringBuilder(text.Length * count);
-            for (int i = 0; i < count; i++)
-                sb.Append(text);
-            return sb.ToString();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Katteker/ReleaseEntry.cs b/Katteker/ReleaseEntry.cs
index 9c7f4a0..8ecdc2b 100644
--- a/Katteker/ReleaseEntry.cs
+++ b/Katteker/ReleaseEntry.cs
@@ -1,7 +1,7 @@
-using System;
+using Semver;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Semver;
 
 namespace Katteker
 {
@@ -59,26 +59,32 @@ namespace Katteker
         /// Version
         /// 
         public SemVersion Version { get; }
+
         /// 
         /// Hashsum of the file.
         /// 
         public string SHA1 { get; }
+
         /// 
         /// filename
         /// 
         public string Filename { get; }
+
         /// 
         /// Size of the file.
         /// 
         public long Filesize { get; }
+
         /// 
         /// Is true if the update is delta file. False otherwise.
         /// 
         public bool IsDelta { get; }
+
         /// 
         /// Name of the application.
         /// 
         public string ApplicationName { get; }
+
         /// 
         /// Format the release entry as line for release file.
         /// 
diff --git a/Katteker/UpdateManager.cs b/Katteker/UpdateManager.cs
index a4961a9..18d2963 100644
--- a/Katteker/UpdateManager.cs
+++ b/Katteker/UpdateManager.cs
@@ -81,6 +81,10 @@ namespace Katteker
             }
         }
 
+        /// 
+        /// Check for updates
+        /// 
+        /// 
         public async Task> CheckForUpdateAsync()
         {
             _releases = Utility.IsWebUrl(_urlOrPath) ? await DownloadIndexAsync(_urlOrPath).ConfigureAwait(false) : GetFromFilesystem(_urlOrPath);
diff --git a/Katteker/Utility.cs b/Katteker/Utility.cs
index 29ffbaf..1b8f16a 100644
--- a/Katteker/Utility.cs
+++ b/Katteker/Utility.cs
@@ -30,21 +30,18 @@ namespace Katteker
 
         /// 
         /// Compute file hash with SHA1. 
-        /// If the file is greater than 5 MB, the hash will only computed with the first 5 MB.
         /// 
         /// 
-        /// 
+        /// Returns the hash as base64 string
         internal static string ComputeFileHash(string filename)
         {
             string sha1;
             var fileInfo = new FileInfo(filename);
 
+            using (var sha1Managed = new SHA1Managed())
             using (var fileStream = fileInfo.OpenRead())
             {
-                var buffer = new byte[5242880];
-                fileStream.Read(buffer, 0, buffer.Length);
-                var sha1Managed = new SHA1Managed();
-                sha1 = Convert.ToBase64String(sha1Managed.ComputeHash(buffer));
+                sha1 = Convert.ToBase64String(sha1Managed.ComputeHash(fileStream));
             }
             return sha1;
         }
diff --git a/README.md b/README.md
index d6ce844..e0c6286 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-SquirrelKiller (aka Wombat)
+Katteker
 =============
 
 Ziele: