diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs
index 69f17ebb..ab31c3bb 100644
--- a/PROMS/fmtxml/AppendPlantSpecific.cs
+++ b/PROMS/fmtxml/AppendPlantSpecific.cs
@@ -141,6 +141,9 @@ namespace fmtxml
{
fmtdata.StepData[9].TabData.Ident = " {!C0}{Section Prefix}{numeric}. ";
fmtdata.StepData[9].TabData.RNOIdent = " {!C0}{Section Prefix}. ";
+ fmtdata.StepData[9].TabData.MacroList[0].LocWithXOff = "True";
+ fmtdata.TransData.TransTypeData[5].TransFormat = "{Sect Num}, {Sect Title}, Step {First Step}";
+ fmtdata.TransData.TransTypeData[5].TransMenu = "{Sect Num}, {Sect Title}, Step {First Step}";
}
private void AddIP3fmt(ref FormatData fmtdata)
@@ -1510,6 +1513,9 @@ namespace fmtxml
pgstyles.PgStyles[6].Items[2].Col = 240;
pgstyles.PgStyles[6].Items[3].Col = 240;
pgstyles.PgStyles[6].Items[4].Col = 240;
+ pgstyles.PgStyles[6].Items[3].Row = 295;
+ pgstyles.PgStyles[6].Items[4].Row = 317;
+ pgstyles.PgStyles[6].Items[3].Justify = pgstyles.PgStyles[6].Items[4].Justify;
pgstyles.PgStyles[6].Items[3].Style.FontSize = "14";
pgstyles.PgStyles[6].Items[4].Style.FontSize = "14";
pgstyles.PgStyles[6].Items[5].Col = 240;
@@ -2916,9 +2922,18 @@ namespace fmtxml
case "FNP.DOC":
AddFNPDOC(ref dcstyles);
break;
+ case "CAL2.DOC":
+ case "CALOTO.DOC":
+ case "CAL2.Y00":
+ AddCAL2DOC(ref dcstyles);
+ break;
}
}
+ private void AddCAL2DOC(ref DocStyles dcstyles)
+ {
+ dcstyles.DcStyles[1].PageLength = 672;
+ }
private void AddFNPDOC(ref DocStyles dcstyles)
{
dcstyles.DcStyles[2].AlignHLSTabWithSect = true;
@@ -3391,9 +3406,9 @@ namespace fmtxml
{
XmlDocument xdNew = new XmlDocument();
xdNew.LoadXml("");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]);
@@ -3403,8 +3418,8 @@ namespace fmtxml
{
XmlDocument xdNew = new XmlDocument();
xdNew.LoadXml("");
diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs
index c0069a2e..b538cc85 100644
--- a/PROMS/fmtxml/FmtFileToXml.cs
+++ b/PROMS/fmtxml/FmtFileToXml.cs
@@ -1039,6 +1039,7 @@ public struct COMacro
public string Macro;
public string Grouping;
public string NotInRNO;
+ public string LocWithXOff;
}
[Serializable]
public struct Box
@@ -5367,6 +5368,11 @@ namespace fmtxml
if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Macro == null) return null;
return stp.TabData.MacroList[0].Macro;
}
+ private string StepPartTabMacroListLocWithXOff(Step stp)
+ {
+ if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].LocWithXOff == null) return null;
+ return stp.TabData.MacroList[0].LocWithXOff;
+ }
private string StepPartTabMacroListGrouping(Step stp)
{
if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Grouping == null) return null;
@@ -5504,11 +5510,13 @@ namespace fmtxml
if (CheckInheritedStr(new StepPartStr(StepPartTabMacroListName), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListMacro), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListGrouping), step, dicParents) &&
+ CheckInheritedStr(new StepPartStr(StepPartTabMacroListLocWithXOff), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListNotInRNO), step, dicParents))
{
step.TabData.MacroList[0].Macro = null;
step.TabData.MacroList[0].Grouping = NullString;
step.TabData.MacroList[0].NotInRNO = null;
+ step.TabData.MacroList[0].LocWithXOff = null;
}
}
diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL
index 0a4425b1..98308993 100644
Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ