added RO flag

Added RO flag
This commit is contained in:
John Jenko 2010-06-23 18:07:17 +00:00
parent 9140d46c1d
commit 49a6d85f39
2 changed files with 7 additions and 1 deletions

View File

@ -147,7 +147,7 @@ public struct XtraFlgs
public string LJBorderlessTable; public string LJBorderlessTable;
public string SuppressAndInTran; public string SuppressAndInTran;
public string CapHighSetpnt; public string CapHighSetpnt;
// public string CAPFIRSTLETTERINHIGHSP // not migrated: used in fpl public string CapFirstLetterInHighSP; // used in fpl
public string CapsPIFLastLower; public string CapsPIFLastLower;
#endregion #endregion
#region xtraflags5 #region xtraflags5
@ -1032,6 +1032,7 @@ public struct RO
public string CapRoIfLastLower; //CapsPIFLastLower; public string CapRoIfLastLower; //CapsPIFLastLower;
public string UpRoIfPrevUpper; //UpSpIfPrevUpper public string UpRoIfPrevUpper; //UpSpIfPrevUpper
public string UnderlineRo; //UnderlineSetpoints public string UnderlineRo; //UnderlineSetpoints
public string CapFirstLetterInHighRO; //CAPFIRSTLETTERINHIGHSP
/* End of Format flags */ /* End of Format flags */
} }
[Flags] [Flags]
@ -1136,6 +1137,7 @@ namespace fmtxml
public static int LJBORDERLESSTABLE = 0x0800; public static int LJBORDERLESSTABLE = 0x0800;
public static int SUPPRESSANDINTRAN = 0x1000; public static int SUPPRESSANDINTRAN = 0x1000;
public static int CAPHIGHSETPNT = 0x2000; public static int CAPHIGHSETPNT = 0x2000;
public static int CAPFIRSTLETTERINHIGHSP = 0x4000;
public static int CAPSPIFLASTLOWER = 0x8000; public static int CAPSPIFLASTLOWER = 0x8000;
// XtraFlag[5] from 16-bit... // XtraFlag[5] from 16-bit...
@ -1849,6 +1851,7 @@ namespace fmtxml
if ((flg & SUPPRESSANDINTRAN) > 0) XtraFlags.SuppressAndInTran = true.ToString(); if ((flg & SUPPRESSANDINTRAN) > 0) XtraFlags.SuppressAndInTran = true.ToString();
if ((flg & CAPHIGHSETPNT) > 0) XtraFlags.CapHighSetpnt = true.ToString(); if ((flg & CAPHIGHSETPNT) > 0) XtraFlags.CapHighSetpnt = true.ToString();
if ((flg & CAPSPIFLASTLOWER) > 0) XtraFlags.CapsPIFLastLower = true.ToString(); if ((flg & CAPSPIFLASTLOWER) > 0) XtraFlags.CapsPIFLastLower = true.ToString();
if ((flg & CAPFIRSTLETTERINHIGHSP) > 0) XtraFlags.CapFirstLetterInHighSP = true.ToString();
} }
else if (i == 5) else if (i == 5)
{ {
@ -3909,6 +3912,8 @@ namespace fmtxml
else fmtdata.ROData.UpRoIfPrevUpper = "False"; else fmtdata.ROData.UpRoIfPrevUpper = "False";
if (XtraFlags.UnderlineSetpoints == "True") fmtdata.ROData.UnderlineRo = "True"; if (XtraFlags.UnderlineSetpoints == "True") fmtdata.ROData.UnderlineRo = "True";
else fmtdata.ROData.UnderlineRo = "False"; else fmtdata.ROData.UnderlineRo = "False";
if (XtraFlags.CapFirstLetterInHighSP == "True") fmtdata.ROData.CapFirstLetterInHighRO = "True";
else fmtdata.ROData.CapFirstLetterInHighRO = "False";
#endregion #endregion
return true; return true;
} }
@ -4933,6 +4938,7 @@ namespace fmtxml
if (mainFmt.ROData.CapRoIfLastLower != null && mainFmt.ROData.CapRoIfLastLower == subFmt.ROData.CapRoIfLastLower) subFmt.ROData.CapRoIfLastLower = "null"; if (mainFmt.ROData.CapRoIfLastLower != null && mainFmt.ROData.CapRoIfLastLower == subFmt.ROData.CapRoIfLastLower) subFmt.ROData.CapRoIfLastLower = "null";
if (mainFmt.ROData.UpRoIfPrevUpper != null && mainFmt.ROData.UpRoIfPrevUpper == subFmt.ROData.UpRoIfPrevUpper) subFmt.ROData.UpRoIfPrevUpper = "null"; if (mainFmt.ROData.UpRoIfPrevUpper != null && mainFmt.ROData.UpRoIfPrevUpper == subFmt.ROData.UpRoIfPrevUpper) subFmt.ROData.UpRoIfPrevUpper = "null";
if (mainFmt.ROData.UnderlineRo != null && mainFmt.ROData.UnderlineRo == subFmt.ROData.UnderlineRo) subFmt.ROData.UnderlineRo = "null"; if (mainFmt.ROData.UnderlineRo != null && mainFmt.ROData.UnderlineRo == subFmt.ROData.UnderlineRo) subFmt.ROData.UnderlineRo = "null";
if (mainFmt.ROData.CapFirstLetterInHighRO !=null && mainFmt.ROData.CapFirstLetterInHighRO == subFmt.ROData.CapFirstLetterInHighRO) subFmt.ROData.CapFirstLetterInHighRO = "null";
if (mainFmt.ProcData.ProcedureSuffixFlags == subFmt.ProcData.ProcedureSuffixFlags) subFmt.ProcData.ProcedureSuffixFlags = null; if (mainFmt.ProcData.ProcedureSuffixFlags == subFmt.ProcData.ProcedureSuffixFlags) subFmt.ProcData.ProcedureSuffixFlags = null;
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)

Binary file not shown.