diff --git a/PROMS/DataLoader/TextConvert.cs b/PROMS/DataLoader/TextConvert.cs index 379bfcf8..fa1e5563 100644 --- a/PROMS/DataLoader/TextConvert.cs +++ b/PROMS/DataLoader/TextConvert.cs @@ -211,8 +211,10 @@ namespace DataLoader public static string ConvertDOSSuperAndSubScripts(string instr) { - string retval = Regex.Replace(instr, "[#](.*?)[#]", "\\super $1\\nosupersub ");// DOS Superscript - retval = Regex.Replace(retval, "[~](.*?)[~]", "\\sub $1\\nosupersub ");// DOS Subscript + //string retval = Regex.Replace(instr, "[#](.*?)[#]", "\\super $1\\nosupersub ");// DOS Superscript + //retval = Regex.Replace(retval, "[~](.*?)[~]", "\\sub $1\\nosupersub ");// DOS Subscript + string retval = Regex.Replace(instr, "[#](.*?)[#]", "\\up3 $1\\up0 ");// DOS Superscript + retval = Regex.Replace(retval, "[~](.*?)[~]", "\\dn3 $1\\dn0 ");// DOS Subscript return retval; } private static string FixFortranNumber(Match match) @@ -226,7 +228,8 @@ namespace DataLoader else // A number with a decimal point sb.Append(match.Groups[2].Value + "." + match.Groups[3].Value + "x10"); // Add the exponent as superscript - return sb.ToString() + "\\super " + match.Groups[4].Value + "\\nosupersub "; + //return sb.ToString() + "\\super " + match.Groups[4].Value + "\\nosupersub "; + return sb.ToString() + "\\up3 " + match.Groups[4].Value + "\\up0 "; } //private static string ConvertFortranFormatToScienctificNotation(string str) //{ @@ -389,13 +392,17 @@ namespace DataLoader // italics on/off (B2, DD) s2 = s2.Replace("\xAB", "\\ul "); s2 = s2.Replace("\xBB", "\\ulnone "); - s2 = s2.Replace("\x255E", "\\super "); - s2 = s2.Replace("\x255F", "\\nosupersub "); - s2 = s2.Replace("\x2552", "\\b "); + //s2 = s2.Replace("\x255E", "\\super "); + //s2 = s2.Replace("\x255F", "\\nosupersub "); + s2 = s2.Replace("\x255E", "\\up3 "); + s2 = s2.Replace("\x255F", "\\up0 "); + s2 = s2.Replace("\x2552", "\\b "); s2 = s2.Replace("\x2553", "\\b0 "); - s2 = s2.Replace("\x2564", "\\sub "); - s2 = s2.Replace("\xAA", "\\nosupersub "); - s2 = s2.Replace("\x2593", "\\i "); + //s2 = s2.Replace("\x2564", "\\sub "); + //s2 = s2.Replace("\xAA", "\\nosupersub "); + s2 = s2.Replace("\x2564", "\\dn3 "); + s2 = s2.Replace("\xAA", "\\dn0 "); + s2 = s2.Replace("\x2593", "\\i "); s2 = s2.Replace("\x258C", "\\i0 "); s2 = s2.Replace("\x2559", "\\ul\\b "); s2 = s2.Replace("\x2558", "\\b0\\ulnone "); @@ -405,9 +412,11 @@ namespace DataLoader // subscript next is 0x19 // bold next is 0x13 s2 = Regex.Replace(s2, @"\x17([^\x17 ]*?)(?:[\x17]|(?= )|\Z)(.*?)", @"\ul $1\ulnone $2"); - s2 = Regex.Replace(s2, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z)(.*?)", @"\super $1\nosupersub $2"); - s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z)(.*?)", @"\sub $1\nosupersub $2"); - s2 = Regex.Replace(s2, @"\x13([^\x13 ]*?)(?:[\x13]|(?= )|\Z)(.*?)", @"\b $1\b0 $2"); + //s2 = Regex.Replace(s2, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z)(.*?)", @"\super $1\nosupersub $2"); + //s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z)(.*?)", @"\sub $1\nosupersub $2"); + s2 = Regex.Replace(s2, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z)(.*?)", @"\up3 $1\up0 $2"); + s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z)(.*?)", @"\dn3 $1\dn0 $2"); + s2 = Regex.Replace(s2, @"\x13([^\x13 ]*?)(?:[\x13]|(?= )|\Z)(.*?)", @"\b $1\b0 $2"); s2 = Reg2.Replace(s2, new MatchEvaluator(ReplaceChars)); @@ -416,8 +425,10 @@ namespace DataLoader s2 = s2.Replace(@"{", @"\{"); s2 = s2.Replace(@"}", @"\}"); s2 = s2.Replace("\n", @"\par "); // line break in tables - s2 = s2.Replace(@"\nosupersub \super ", @"\super "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically - s2 = s2.Replace(@"\nosupersub \sub ", @"\sub "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically + //s2 = s2.Replace(@"\nosupersub \super ", @"\super "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically + //s2 = s2.Replace(@"\nosupersub \sub ", @"\sub "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically + s2 = s2.Replace(@"\up0 \up3 ", @"\up3 "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically + s2 = s2.Replace(@"\dn0 \dn3 ", @"\dn3 "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically return s2; } diff --git a/PROMS/DataLoader/TransitionFixer.cs b/PROMS/DataLoader/TransitionFixer.cs index c6614f36..a56c3d8a 100644 --- a/PROMS/DataLoader/TransitionFixer.cs +++ b/PROMS/DataLoader/TransitionFixer.cs @@ -121,8 +121,12 @@ namespace DataLoader } public string FixTransitionText(string Text, TransitionInfo tran) { - string transText = tran.ResolvePathTo(); string lookFor = string.Format(@"", tran.TranType, tran.TransitionID, "{1,2}"); + Console.WriteLine(">>>>> FixTransitionText"); + Console.WriteLine("Text = {0}", Text); + Console.WriteLine("lookFor = {0}", lookFor); + string transText = tran.ResolvePathTo(); + Console.WriteLine("TransText = {0}", transText); Match m = Regex.Match(Text, lookFor); if (m != null && m.Groups.Count > 1) {