diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 866a5c26..44d07c8f 100644 Binary files a/PROMS/Formats/fmtall/BVPS1all.xml and b/PROMS/Formats/fmtall/BVPS1all.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAtchall.xml b/PROMS/Formats/fmtall/BVPSAtchall.xml index aec35d2b..8e5b0f59 100644 Binary files a/PROMS/Formats/fmtall/BVPSAtchall.xml and b/PROMS/Formats/fmtall/BVPSAtchall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 54b34824..7a7e1336 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -577,6 +577,18 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _FooterLength, "@FooterLength"); } } + // B2023-052: Beaver Valley - Inconsistent change bar location + private LazyLoad _AbsChgBarAdj; + [Category("Location")] + [DisplayName("Absolute change bar adjustment for margin differences")] + [Description("Absolute change bar adjustment for margin differences")] + public float? AbsChgBarAdj + { + get + { + return LazyLoad(ref _AbsChgBarAdj, "@AbsChgBarAdj"); + } + } #endregion #region LeftMargin private LazyLoad _LeftMargin; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index e2b1124d..5cf697d8 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5562,6 +5562,10 @@ namespace Volian.Print.Library !itemInfo.IsInRNO)) msgAlign = Element.ALIGN_RIGHT; float coltotwips = col * itemInfo.FormatStepData.Font.CharsToTwips; if (cbd.AbsoluteFixedChangeColumn) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips; + // B2023-052: Beaver Valley - Inconsistent change bar location - used AbsoluteFixedChangeColumn flag, but the LeftMargin + // was still added in, thus sections had different locations for change bar if sections had different left margin. Use + // adjustment, 'AbsChgBarAdj' + coltotwips += itemInfo.MyDocStyle.Layout.AbsChgBarAdj ?? 0; if (itemInfo.IsFigure) coltotwips = col * itemInfo.ActiveFormat.PlantFormat.FormatData.Font.CharsToTwips; return new vlnChangeBar(cb, this, (float)itemInfo.MyDocStyle.Layout.LeftMargin + coltotwips, yoff, msgAlign, myPageHelper.ChangeBarDefinition.MyChangeBarText == PrintChangeBarText.RevNum,