zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tentatively fixed #383 and #386: semicolons and ">>>" sequences are correctly escaped inside @@...@@ tags.

Browse source
This commit is contained in:
Dario Solera 2009-10-22 15:32:56 +00:00
parent bc3a5fa51f
commit 0edaac7132
2 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.1.416")] [assembly: AssemblyVersion("3.0.1.417")]
[assembly: AssemblyFileVersion("3.0.1.416")] [assembly: AssemblyFileVersion("3.0.1.417")]

67
Core/Formatter.cs
View file

@ -157,6 +157,23 @@ namespace ScrewTurn.Wiki {
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd); ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);
// Before Producing HTML
match = FullCodeRegex.Match(sb.ToString());
while(match.Success) {
if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) {
sb.Remove(match.Index, match.Length);
string content = match.Value.Substring(2, match.Length - 4);
dummy = new StringBuilder();
dummy.Append("<nobr><pre>");
// IE needs \r\n for line breaks
dummy.Append(EscapeWikiMarkup(content).Replace("\n", "\r\n"));
dummy.Append("</pre></nobr>");
sb.Insert(match.Index, dummy.ToString());
}
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);
match = FullCodeRegex.Match(sb.ToString(), end);
}
if(current != null) { if(current != null) {
// Check redirection // Check redirection
match = RedirectionRegex.Match(sb.ToString()); match = RedirectionRegex.Match(sb.ToString());
@ -177,23 +194,6 @@ namespace ScrewTurn.Wiki {
} }
} }
// Before Producing HTML
match = FullCodeRegex.Match(sb.ToString());
while(match.Success) {
if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) {
sb.Remove(match.Index, match.Length);
string content = match.Value.Substring(2, match.Length - 4);
dummy = new StringBuilder();
dummy.Append("<nobr><pre>");
// IE needs \r\n for line breaks
dummy.Append(EscapeWikiMarkup(content).Replace("\n", "\r\n"));
dummy.Append("</pre></nobr>");
sb.Insert(match.Index, dummy.ToString());
}
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);
match = FullCodeRegex.Match(sb.ToString(), end);
}
// No more needed (Striked Regex modified) // No more needed (Striked Regex modified)
// Temporarily "escape" comments // Temporarily "escape" comments
//sb.Replace("<!--", "($_^)"); //sb.Replace("<!--", "($_^)");
@ -1497,24 +1497,25 @@ namespace ScrewTurn.Wiki {
private static string EscapeWikiMarkup(string content) { private static string EscapeWikiMarkup(string content) {
StringBuilder sb = new StringBuilder(content); StringBuilder sb = new StringBuilder(content);
sb.Replace("&", "&amp;"); // Before all other escapes! sb.Replace("&", "&amp;"); // Before all other escapes!
sb.Replace("#", "&#0035;"); sb.Replace("#", "&#35;");
sb.Replace("*", "&#0042;"); sb.Replace("*", "&#42;");
sb.Replace("<", "&lt;"); sb.Replace("<", "&lt;");
sb.Replace(">", "&gt;"); sb.Replace(">", "&gt;");
sb.Replace("[", "&#0091;"); sb.Replace("[", "&#91;");
sb.Replace("]", "&#0093;"); sb.Replace("]", "&#93;");
sb.Replace("{", "&#0123;"); sb.Replace("{", "&#123;");
sb.Replace("}", "&#0125;"); sb.Replace("}", "&#125;");
sb.Replace("'''", "&#0039;&#0039;&#0039;"); sb.Replace("'''", "&#39;&#39;&#39;");
sb.Replace("''", "&#0039;&#0039;"); sb.Replace("''", "&#39;&#39;");
sb.Replace("=====", "&#0061;&#0061;&#0061;&#0061;&#0061;"); sb.Replace("=====", "&#61;&#61;&#61;&#61;&#61;");
sb.Replace("====", "&#0061;&#0061;&#0061;&#0061;"); sb.Replace("====", "&#61;&#61;&#61;&#61;");
sb.Replace("===", "&#0061;&#0061;&#0061;"); sb.Replace("===", "&#61;&#61;&#61;");
sb.Replace("==", "&#0061;&#0061;"); sb.Replace("==", "&#61;&#61;");
sb.Replace("§§", "&#0167;&#0167;"); sb.Replace("§§", "&#167;&#167;");
sb.Replace("__", "&#0095;&#0095;"); sb.Replace("__", "&#95;&#95;");
sb.Replace("--", "&#0045;&#0045;"); sb.Replace("--", "&#45;&#45;");
sb.Replace("@@", "&#0064;&#0064;"); sb.Replace("@@", "&#64;&#64;");
sb.Replace(":", "&#58;");
return sb.ToString(); return sb.ToString();
} }