diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index e9e3524..18db7df 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.1.431")] -[assembly: AssemblyFileVersion("3.0.1.431")] +[assembly: AssemblyVersion("3.0.1.432")] +[assembly: AssemblyFileVersion("3.0.1.432")] diff --git a/Core/ReverseFormatter.cs b/Core/ReverseFormatter.cs index 3de90ac..426061c 100644 --- a/Core/ReverseFormatter.cs +++ b/Core/ReverseFormatter.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; using System.Web; namespace ScrewTurn.Wiki { - + /// /// Implements reverse formatting methods (HTML->WikiMarkup). /// @@ -581,6 +581,16 @@ namespace ScrewTurn.Wiki { //sb.Replace("\r\n
", "\r\n\r\n"); //sb.Replace("
", "{BR}\r\n"); buffer.Replace("
", "\r\n"); + + // Fix line breaks in IE + buffer.Replace("\r\n\r\n\r\n=====", "\r\n\r\n====="); + buffer.Replace("\r\n\r\n\r\n====", "\r\n\r\n===="); + buffer.Replace("\r\n\r\n\r\n===", "\r\n\r\n==="); + buffer.Replace("\r\n\r\n\r\n==", "\r\n\r\n=="); + buffer.Replace("\r\n\r\n\r\n----", "\r\n\r\n----"); + buffer.Replace("\r\n\r\n\r\n* ", "\r\n\r\n* "); + buffer.Replace("\r\n\r\n\r\n# ", "\r\n\r\n# "); + match = SingleNewLine.Match(buffer.ToString()); while(match.Success) { buffer.Remove(match.Index, match.Length); @@ -588,13 +598,6 @@ namespace ScrewTurn.Wiki { match = SingleNewLine.Match(buffer.ToString(), match.Index); } - // Fix line breaks in IE - //sb.Replace("\r\n\r\n\r\n=====", "\r\n\r\n====="); - //sb.Replace("\r\n\r\n\r\n====", "\r\n\r\n===="); - //sb.Replace("\r\n\r\n\r\n===", "\r\n\r\n==="); - //sb.Replace("\r\n\r\n\r\n==", "\r\n\r\n=="); - //sb.Replace("\r\n\r\n\r\n----", "\r\n\r\n----"); - buffer.Replace("<", "<"); buffer.Replace(">", ">"); @@ -995,7 +998,7 @@ namespace ScrewTurn.Wiki { string provider, page, file; GetProviderAndFileAndPage(rawUrl, out provider, out page, out file); - if (provider == null) return "{UP" + (page != null ? "(" + page + ")" : "") + "}" + file; + if(provider == null) return "{UP" + (page != null ? "(" + page + ")" : "") + "}" + file; else return "{UP:" + provider + (page != null ? "(" + page + ")" : "") + "}" + file; } else return rawUrl;