diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 4b05a61a..99c48fdb 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -323,6 +323,9 @@ namespace fmtxml case "NSP.PAG": AddNSPPage(ref pgstyles); break; + case "SHE.PAG": + AddSHEPage(ref pgstyles); + break; /* Under Development case "TP.PAG": AddTPPage(ref pgstyles); @@ -333,6 +336,12 @@ namespace fmtxml * */ } } + + private void AddSHEPage(ref PageStyles pgstyles) + { + // Procedure Steps + pgstyles.PgStyles[0].Items[1].Col = 78; // Column for BOX5 needed adjusted to match 16bit + } // NSP_ALL private void AddNSPPage(ref PageStyles pgstyles) { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index b64473da..da95e947 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -4726,12 +4726,12 @@ namespace fmtxml //Macros // - draws a diamond around the stepnumber // - A macro - // + // for SHE (Shearon Harris) format. Convert to just a tab with asterisk. // <> - ignored // \241 - circle macro around step, same as // Also note, the format files had "<>", these get converted during input in this // format converter code. - wkstr = wkstr.Replace("{!asterisk}", "\\fs10 \\b*\\b0"); // was font size 20 in 16-bit + if (wkstr.Contains("!asterisk")) wkstr = "{asterisk} {numeric}. "; wkstr = Regex.Replace(wkstr, @"{![.*?]}", @"{!$1}"); wkstr = wkstr.Replace("{}", ""); wkstr = wkstr.Replace("ñ", "{!C0}"); diff --git a/PROMS/fmtxml/FmtToXml.cs b/PROMS/fmtxml/FmtToXml.cs index 1896f646..0428ed43 100644 --- a/PROMS/fmtxml/FmtToXml.cs +++ b/PROMS/fmtxml/FmtToXml.cs @@ -695,7 +695,7 @@ namespace fmtxml // replace the '<' with '{' & '>' with '}' pi.Token = pi.Token.Replace('<', '{'); pi.Token = pi.Token.Replace('>', '}'); - + pi.Token = pi.Token.Replace("REVDATE", "REV2"); cnt++; if (!isfirst) {