diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 124a13f7..9832fb02 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 7be6afba..c3dc370e 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index b5495059..3e9186dc 100644 Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 186afebf..7e03f545 100644 Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index a646ba2b..8074e1f7 100644 Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml index 1cbf2c30..9ef5bbd6 100644 Binary files a/PROMS/Formats/fmtall/BNPPcklall.xml and b/PROMS/Formats/fmtall/BNPPcklall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml index 589fa2b3..2ec949a1 100644 Binary files a/PROMS/Formats/fmtall/BNPPdevall.xml and b/PROMS/Formats/fmtall/BNPPdevall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index d9b8d537..70031546 100644 Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 8c8a761f..0b2b9262 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2187,6 +2187,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _ChangeBarsOnLinkedText, "@ChangeBarsOnLinkedText"); } } + private LazyLoad _SeparateChangeBarsForDiffNotesCautions; + public bool SeparateChangeBarsForDiffNotesCautions + { + get + { + return LazyLoad(ref _SeparateChangeBarsForDiffNotesCautions, "@SeparateChangeBarsForDiffNotesCautions"); + } + } } #endregion #endregion diff --git a/PROMS/Volian.Print.Library/vlnChangeBar.cs b/PROMS/Volian.Print.Library/vlnChangeBar.cs index 0c107fe2..16c2360d 100644 --- a/PROMS/Volian.Print.Library/vlnChangeBar.cs +++ b/PROMS/Volian.Print.Library/vlnChangeBar.cs @@ -131,7 +131,9 @@ namespace Volian.Print.Library // the separator must exist and the previous must have a change bar. // B2019-055 added check if the previous caution or note have the same type number - if ((sep != "") && (tmp.Text == sep) && parent.MyItemInfo.MyPrevious != null && parent.MyItemInfo.MyPrevious.HasChangeBar && (parent.MyItemInfo.MyContent.Type == parent.MyItemInfo.MyPrevious.MyContent.Type)) + // B2019-168 added format flag 'SeparateChangeBarsForDiffNotesCautions' to control when fix for B2019-055 would take affect + if ((sep != "") && (tmp.Text == sep) && parent.MyItemInfo.MyPrevious != null && parent.MyItemInfo.MyPrevious.HasChangeBar + && (!parent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.ChangeBarData.SeparateChangeBarsForDiffNotesCautions || parent.MyItemInfo.MyContent.Type == parent.MyItemInfo.MyPrevious.MyContent.Type)) { if (MyPageHelper.MyParagraphs.ContainsKey(parent.MyItemInfo.MyPrevious.ItemID)) {