This commit is contained in:
Kathy Ruffing 2013-07-10 14:35:42 +00:00
parent 8ccdecf244
commit a0a226e26e

View File

@ -204,7 +204,7 @@ namespace DataLoader
}
//#endif
s2 = Regex.Replace(s2, @"(\\[^ \\?]*) \-", @"$1\u8209?");
s2 = s2.Replace("-", @"\u8209?");
//KBR s2 = s2.Replace("-", @"\u8209?");
//Remove spaces between comment end nad Next token
s2 = s2.Replace(@"\v0 \", @"\v0\");
//Change Token Order to match RTB output
@ -445,17 +445,15 @@ namespace DataLoader
// subscript next is 0x19
// bold next is 0x13
// \x18([A-Za-z0-9]+)(?:[\x18]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)
s2 = Regex.Replace(s2, @"\x18([A-Za-z0-9\-]+)(?:[\x18]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\up2 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x19([A-Za-z0-9\-]+)(?:[\x19]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\dn2 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x13([A-Za-z0-9\-]+)(?:[\x13]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\b $1\b0 $2");
s2 = s2.Replace("\x11", ""); // this was an 'end' string for the above, 16bit just removed this char
s2 = s2.Replace("-", @"\u8209?"); // do this here so that super/sub & bold next work.
// if the underline is at beginning of text, don't replace the underline token with a space:
s2 = Regex.Replace(s2, @"^\x17(([A-Za-z0-9]|\\u[0-9]+\?)+)", @"\ul $1\ulnone ");
s2 = Regex.Replace(s2, @"\x17(([A-Za-z0-9]|\\u[0-9]+\?)+)", @" \ul $1\ulnone ");
// \x18([A-Za-z0-9]+)(?:[\x18]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)
s2 = Regex.Replace(s2, @"\x18([A-Za-z0-9]+)(?:[\x18]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\up2 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x19([A-Za-z0-9]+)(?:[\x19]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\dn2 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x13([A-Za-z0-9]+)(?:[\x13]|(?= )|\Z|(?=[^A-Za-z0-9]))(.*?)", @"\b $1\b0 $2");
//s2 = Regex.Replace(s2, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z|/)(.*?)", @"\up2 $1\up0 $2");
//s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z|/)(.*?)", @"\dn2 $1\up0 $2");
//s2 = Regex.Replace(s2, @"\x13([^\x13 ]*?)(?:[\x13]|(?= )|\Z|/)(.*?)", @"\b $1\b0 $2");
s2 = Reg2.Replace(s2, new MatchEvaluator(ReplaceChars));