Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2012-08-10 10:41:31 +00:00
parent 74b17eb481
commit cc4b8a2020
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PROMS/Volian.Controls.Library/DisplayText.cs
View File

@ -382,7 +382,7 @@ namespace Volian.Controls.Library
string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* (.*?)(\\[^v \\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):[0-9]* ([0-9]*).*?\[END>"); string lookFor = string.Format(@"<START\](\\[^v \\]+)*\\v0(\\[^v \\]+)* (.*?)(\\[^v \\]+)*\\v(\\[^v \\]+)* #Link:(ReferencedObject|Transition[^:]*?):[0-9]* ([0-9]*).*?\[END>");
MatchCollection matches = Regex.Matches(text, lookFor); MatchCollection matches = Regex.Matches(text, lookFor);
if (matches.Count == 0) return text; if (matches.Count == 0) return text;
string retstr = null; string retstr = text;
for (int i = matches.Count - 1; i >= 0; i--) for (int i = matches.Count - 1; i >= 0; i--)
{ {
Match m = matches[i]; Match m = matches[i];
@ -395,8 +395,8 @@ namespace Volian.Controls.Library
if (m.Groups[7].Value != "" && StepTransition(int.Parse(m.Groups[7].Value))) if (m.Groups[7].Value != "" && StepTransition(int.Parse(m.Groups[7].Value)))
{ {
System.Text.RegularExpressions.Group g = m.Groups[3]; System.Text.RegularExpressions.Group g = m.Groups[3];
string beforeTran = text.Substring(0, g.Index); string beforeTran = retstr.Substring(0, g.Index);
string afterTran = text.Substring(g.Index + g.Length); string afterTran = retstr.Substring(g.Index + g.Length);
string newvalue = g.ToString(); string newvalue = g.ToString();
int indexLastSpace = newvalue.LastIndexOf(' '); int indexLastSpace = newvalue.LastIndexOf(' ');
if (indexLastSpace >= 0) if (indexLastSpace >= 0)
@ -409,7 +409,6 @@ namespace Volian.Controls.Library
} }
} }
} }
if (retstr == null) return text; // no transition processing occurred, just return original string.
return retstr; return retstr;
} }
private string ReplaceLastSpaceWithHardSpace(string str) private string ReplaceLastSpaceWithHardSpace(string str)