From 49a6d85f39a76f95a1ef33310e78ea4767ac4e4b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 23 Jun 2010 18:07:17 +0000 Subject: [PATCH] added RO flag Added RO flag --- PROMS/fmtxml/FmtFileToXml.cs | 8 +++++++- PROMS/fmtxml/TranslateFMT.XSL | Bin 183756 -> 184238 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 28484cec..c10ab959 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -147,7 +147,7 @@ public struct XtraFlgs public string LJBorderlessTable; public string SuppressAndInTran; public string CapHighSetpnt; - // public string CAPFIRSTLETTERINHIGHSP // not migrated: used in fpl + public string CapFirstLetterInHighSP; // used in fpl public string CapsPIFLastLower; #endregion #region xtraflags5 @@ -1032,6 +1032,7 @@ public struct RO public string CapRoIfLastLower; //CapsPIFLastLower; public string UpRoIfPrevUpper; //UpSpIfPrevUpper public string UnderlineRo; //UnderlineSetpoints + public string CapFirstLetterInHighRO; //CAPFIRSTLETTERINHIGHSP /* End of Format flags */ } [Flags] @@ -1136,6 +1137,7 @@ namespace fmtxml public static int LJBORDERLESSTABLE = 0x0800; public static int SUPPRESSANDINTRAN = 0x1000; public static int CAPHIGHSETPNT = 0x2000; + public static int CAPFIRSTLETTERINHIGHSP = 0x4000; public static int CAPSPIFLASTLOWER = 0x8000; // XtraFlag[5] from 16-bit... @@ -1849,6 +1851,7 @@ namespace fmtxml if ((flg & SUPPRESSANDINTRAN) > 0) XtraFlags.SuppressAndInTran = true.ToString(); if ((flg & CAPHIGHSETPNT) > 0) XtraFlags.CapHighSetpnt = true.ToString(); if ((flg & CAPSPIFLASTLOWER) > 0) XtraFlags.CapsPIFLastLower = true.ToString(); + if ((flg & CAPFIRSTLETTERINHIGHSP) > 0) XtraFlags.CapFirstLetterInHighSP = true.ToString(); } else if (i == 5) { @@ -3909,6 +3912,8 @@ namespace fmtxml else fmtdata.ROData.UpRoIfPrevUpper = "False"; if (XtraFlags.UnderlineSetpoints == "True") fmtdata.ROData.UnderlineRo = "True"; else fmtdata.ROData.UnderlineRo = "False"; + if (XtraFlags.CapFirstLetterInHighSP == "True") fmtdata.ROData.CapFirstLetterInHighRO = "True"; + else fmtdata.ROData.CapFirstLetterInHighRO = "False"; #endregion 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.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.CapFirstLetterInHighRO !=null && mainFmt.ROData.CapFirstLetterInHighRO == subFmt.ROData.CapFirstLetterInHighRO) subFmt.ROData.CapFirstLetterInHighRO = "null"; if (mainFmt.ProcData.ProcedureSuffixFlags == subFmt.ProcData.ProcedureSuffixFlags) subFmt.ProcData.ProcedureSuffixFlags = null; for (int i = 0; i < 10; i++) diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 9f623e75fb34110f44896932a42c35b5f75909a8..72176f076efa8656ee9e233d60ed415ab3f7a90b 100644 GIT binary patch delta 211 zcmX>zn|s}S?uHh|ElfW9bZZ!#84?)^7~B{#8HyN+8A=#@7*c^`36Lye@MOqi@BqrB zGh{FXG5AkzWD(zDHRgmBl15d4WRQcC}MX%a{SK6g77M delta 29 lcmZ2CpZm;g?uHh|ElfW9CO5H&ZJ)4@=?M3Bjx$Wlm;t&b3(Eii