This commit is contained in:
2010-09-21 18:29:58 +00:00
parent 3086c7ec5a
commit 7b685cf220
3 changed files with 75 additions and 67 deletions

View File

@@ -211,10 +211,8 @@ 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, "[#](.*?)[#]", "\\up3 $1\\up0 ");// DOS Superscript
retval = Regex.Replace(retval, "[~](.*?)[~]", "\\dn3 $1\\dn0 ");// DOS Subscript
string retval = Regex.Replace(instr, "[#](.*?)[#]", "\\up2 $1\\up0 ");// DOS Superscript
retval = Regex.Replace(retval, "[~](.*?)[~]", "\\dn2 $1\\dn0 ");// DOS Subscript
return retval;
}
private static string FixFortranNumber(Match match)
@@ -228,8 +226,7 @@ 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() + "\\up3 " + match.Groups[4].Value + "\\up0 ";
return sb.ToString() + "\\up2 " + match.Groups[4].Value + "\\up0 ";
}
//private static string ConvertFortranFormatToScienctificNotation(string str)
//{
@@ -394,13 +391,13 @@ namespace DataLoader
s2 = s2.Replace("\xBB", "\\ulnone ");
//s2 = s2.Replace("\x255E", "\\super ");
//s2 = s2.Replace("\x255F", "\\nosupersub ");
s2 = s2.Replace("\x255E", "\\up3 ");
s2 = s2.Replace("\x255E", "\\up2 ");
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("\x2564", "\\dn3 ");
s2 = s2.Replace("\x2564", "\\dn2 ");
s2 = s2.Replace("\xAA", "\\dn0 ");
s2 = s2.Replace("\x2593", "\\i ");
s2 = s2.Replace("\x258C", "\\i0 ");
@@ -414,8 +411,8 @@ namespace DataLoader
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, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z)(.*?)", @"\up3 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z)(.*?)", @"\dn3 $1\dn0 $2");
s2 = Regex.Replace(s2, @"\x18([^\x18 ]*?)(?:[\x18]|(?= )|\Z)(.*?)", @"\up2 $1\up0 $2");
s2 = Regex.Replace(s2, @"\x19([^\x19 ]*?)(?:[\x19]|(?= )|\Z)(.*?)", @"\dn2 $1\dn0 $2");
s2 = Regex.Replace(s2, @"\x13([^\x13 ]*?)(?:[\x13]|(?= )|\Z)(.*?)", @"\b $1\b0 $2");
s2 = Reg2.Replace(s2, new MatchEvaluator(ReplaceChars));
@@ -425,10 +422,8 @@ 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(@"\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
s2 = s2.Replace(@"\up0 \up2 ", @"\up2 "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically
s2 = s2.Replace(@"\dn0 \dn2 ", @"\dn2 "); //jsj - 18MAR2010 - rbt.Save() seems to do this automatically
return s2;
}