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

Fixed {br} and <br /> in wikimarkup and visual, now work correctly

Browse source
This commit is contained in:
Cristian Trapattoni 2011-02-28 14:48:31 +01:00
parent d68793daba
commit 4056860d9b
4 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Core/Formatter.cs
View file

@ -262,6 +262,22 @@ namespace ScrewTurn.Wiki {
match = ExtendedUpRegex.Match(sb.ToString(), end);
}
match = SpecialTagRegex.Match(sb.ToString());
while(match.Success) {
if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) {
sb.Remove(match.Index, match.Length);
if(!forIndexing) {
switch(match.Value.Substring(1, match.Value.Length - 2).ToUpperInvariant()) {
case "BR":
sb.Insert(match.Index, "<br />");
break;
}
}
}
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);
match = SpecialTagRegex.Match(sb.ToString(), end);
}
if(!bareBones) {
NamespaceInfo ns = DetectNamespaceInfo(current);
match = SpecialTagRegex.Match(sb.ToString());
@ -293,9 +309,6 @@ namespace ScrewTurn.Wiki {
case "CLEAR":
sb.Insert(match.Index, @"<div style=""clear: both;""></div>");
break;
case "BR":
sb.Insert(match.Index, "<br />");
break;
case "TOP":
sb.Insert(match.Index, @"<a href=""#PageTop"">" + Exchanger.ResourceExchanger.GetResource("Top") + "</a>");
break;
@ -1196,17 +1209,19 @@ namespace ScrewTurn.Wiki {
private static void ProcessLineBreaks(StringBuilder sb, bool bareBones) {
if(bareBones || AreSingleLineBreaksToBeProcessed()) {
// Replace new-lines only when not enclosed in <nobr> tags
Match match = NoSingleBr.Match(sb.ToString());
while(match.Success) {
sb.Remove(match.Index, match.Length);
sb.Insert(match.Index, match.Value.Replace("\n", SingleBrPlaceHolder));
//sb.Insert(match.Index, match.Value.Replace("\n", "<br />"));
match = NoSingleBr.Match(sb.ToString(), match.Index + 1);
}
sb.Replace("\n", "<br />");
sb.Replace(SingleBrPlaceHolder, "\n");
//sb.Replace(SingleBrPlaceHolder, "<br />");
}
else {
// Replace new-lines only when not enclosed in <nobr> tags
@ -1215,12 +1230,14 @@ namespace ScrewTurn.Wiki {
while(match.Success) {
sb.Remove(match.Index, match.Length);
sb.Insert(match.Index, match.Value.Replace("\n", SingleBrPlaceHolder));
//sb.Insert(match.Index, match.Value.Replace("\n", "<br />"));
match = NoSingleBr.Match(sb.ToString(), match.Index + 1);
}
sb.Replace("\n\n", "<br /><br />");
sb.Replace("\n", "<br />");
sb.Replace(SingleBrPlaceHolder, "\n");
}
sb.Replace("<br>", "<br />");