diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 0534d149..af5381b7 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -69,8 +69,27 @@ namespace fmtxml case "IP3.X15": AddIP3_15fmt(ref fmtdata); break; + case "IP3.FMT": + AddIP3fmt(ref fmtdata); + break; + case "IP2.FMT": + AddIP2fmt(ref fmtdata); + break; } } + + private void AddIP3fmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.StpSectPrtData.RNOSepLineLength = 186; + fmtdata.SectData.StepSectionData.StpSectPrtData.RNOSepString = null; + } + + private void AddIP2fmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.IndentToken = 0; + fmtdata.StepData[9].TabData.Ident = "{!C0}{numeric}. "; + fmtdata.StepData[9].TabData.RNOIdent = "{!C0}. "; + } private void AddWCNCKLFmt(ref FormatData fmtdata) { @@ -1657,8 +1676,16 @@ namespace fmtxml case "NSPBCK.DOC": AddNSPBckDOC(ref dcstyles); break; + case "IP2.DOC": + AddIp2DOC(ref dcstyles); + break; } } + + private void AddIp2DOC(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].ContTop = ""; + } private void AddCPLSSDDDoc(ref DocStyles dcstyles) { dcstyles.DcStyles[2].PageWidth = 576; @@ -1806,14 +1833,28 @@ namespace fmtxml case "NSP": AddNSP(myDoc); break; + case "IP2": + AddIP2(myDoc); + break; } } + private void AddIP2(XmlDocument myDoc) + { + XmlDocument xdNew = new XmlDocument(); + xdNew.LoadXml(" " + + "\r\n" + + "*\r\n" + + ""); + + myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[4]); + } + private void AddWCN2(XmlDocument myDoc) { XmlDocument xd = new XmlDocument(); // include the svg level so that the xmlns can be set to be the same as the generated document. - xd.LoadXml("\r\n" + + xd.LoadXml("" + "\r\n" + "\r\n" + "\r\n" + diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 63b67463..eb8110ea 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -798,6 +798,7 @@ public struct StepSectionPrint public float ImmStepHdrCol; public Int16 SecColHdrforActPMode; public string RNOSepString; + public float RNOSepLineLength; public string HLStpSeparatorString; public string HLRNOStpSeparatorString; /* Format flags moved to here.... */ @@ -5058,6 +5059,7 @@ namespace fmtxml //} if (msctpr.RNOSepString == ssctpr.RNOSepString) subFmt.SectData.StepSectionData.StpSectPrtData.RNOSepString = null; + if (msctpr.RNOSepLineLength == ssctpr.RNOSepLineLength) subFmt.SectData.StepSectionData.StpSectPrtData.RNOSepLineLength = 0; for (int i = 0; i < 10; i++) if (msctstp.UnderlineTerminate[i] == ssctstp.UnderlineTerminate[i]) subFmt.SectData.StepSectionData.UnderlineTerminate[i] = null; diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 8c84df0e..3f768bdc 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ