diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml index 51a4848d..727240ee 100644 Binary files a/PROMS/Formats/fmtall/BGEOIall.xml and b/PROMS/Formats/fmtall/BGEOIall.xml differ diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 0bcc4a7b..7c63c1ba 100644 Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 89c3bcc8..2894f4ac 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4104,6 +4104,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AlignNullTabWSectHead, "@AlignNullTabWSectHead"); } } + private LazyLoad _ForceAlignNullTabWSectHead; + public bool ForceAlignNullTabWSectHead + { + get + { + return LazyLoad(ref _ForceAlignNullTabWSectHead, "@ForceAlignNullTabWSectHead"); + } + } private LazyLoad _AlignHLSTabWithSectOvride; public bool AlignHLSTabWithSectOvride { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index c0d8fb41..36ed1112 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4039,8 +4039,11 @@ namespace Volian.Print.Library else { XOffset += xoff; - // For Calvert, adjust from the left margin and current section's tab. - if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) + // For Calvert, adjust from the left margin and current section's tab. This is used + // in BGEEOP (see EOP-0/Purpose ). However, it caused BGESTP's to print LossOfAC steps (unnumbered HLS) too + // far to the left. The ForceAlignNullTabWSectHead was introduced so that for that step type (LossOfAC) in STP/OI format, + // the SectData.SectionHeader.Pos was used rather than SectData.SectionNumber.Pos + if (myTab == null && !itemInfo.FormatStepData.ForceAlignNullTabWSectHead && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos; else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead) XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;