diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 99e700e9..1bd9bb57 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -755,7 +755,7 @@ public struct StepSectionLayout public Int16 HLSWidthOVRD; public Int16 SubPaginationWght; public Int16 TextTitleAdjustment; - public float TabPtsPerChar; // added for BGE + public float? TabPtsPerChar; // added for BGE public string TableCenterPos; // string array with floats. public string LowerLimitDivisor; // pagination - should it be in print? - 16bit: quoted float public string NonLinkedStepNumber; @@ -4466,7 +4466,7 @@ namespace fmtxml if (success) { PushStepLists(subdata.StepData); - DoStepInheritance(ref subdata.StepData,fname); + DoStepInheritance(ref subdata.StepData, fname); AddPlantSpecificOverrideInheritance(fmtName, ref subdata); PopStepLists(); } diff --git a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs index 2391a3ab..c6734510 100644 --- a/PROMS/fmtxml/PlantSpecific_WolfCreak.cs +++ b/PROMS/fmtxml/PlantSpecific_WolfCreak.cs @@ -17,10 +17,10 @@ namespace fmtxml // replace words fmtdata.SectData.ReplaceStrData[0].ReplaceWith = @"\b \ul IF\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"\par}\b \ul THEN\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[2].ReplaceWith = @"{\par}\b \ul THEN\ulnone \b0 "; fmtdata.SectData.ReplaceStrData[3].ReplaceWith = @"\b \ul WHEN\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"\par}\b \ul AND\ulnone \b0 "; - fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"\par}\b \ul OR\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[4].ReplaceWith = @"{\par}\b \ul AND\ulnone \b0 "; + fmtdata.SectData.ReplaceStrData[5].ReplaceWith = @"{\par}\b \ul OR\ulnone \b0 "; } private void AddWCN2Fmt(ref FormatData fmtdata) { diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index e771d3b0..538d303c 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ