From fd21ef8e662a3ad37e59fe08c166a61c6bf6508d Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Tue, 9 Apr 2019 15:58:55 +0000
Subject: [PATCH] B2019-055 (re-fix of B2019039) Removed previous format change
 which caused issues entering hold points after a note B2019-055 (re-fix of
 B2019039) added logic to check if previous note or caution have the same Type
 number in determining if the change bar should be extended from the previous
 change bar.

---
 PROMS/Formats/fmtall/BNPP1all.xml          | Bin 166842 -> 166766 bytes
 PROMS/Formats/fmtall/BNPP2all.xml          | Bin 168962 -> 168886 bytes
 PROMS/Formats/fmtall/BNPPsamall.xml        | Bin 165506 -> 165430 bytes
 PROMS/Volian.Print.Library/vlnChangeBar.cs |   3 ++-
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 4c54ffb9a55c9e45aca709c62bb57ad75e4b453b..773698779d0341672016a411fa3568024b2f664e 100644
GIT binary patch
delta 31
ncmdlro$K8+t_@y#(_=0&3QP_#<!j!e*S<xMar+iMCbn1r&|eGM

delta 78
zcmaDijceC*t_@y#(*6v23^@#y3{DKCKstvZm7#<om?4oNmmzgBzp*%P2vDv7D5}6<
e%b+lQ<9$Zy=?blkY|U|c?QwdH+vD_@1Y!X<*c31T

diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml
index d8a895b8db133f6cd0e2786f847c026a4a6a9966..b010e49414f9e8ec678dd972122939453ebc0ac3 100644
GIT binary patch
delta 27
jcmZo#!L@BU*M=6I>2YTn1)3k|v_H^c-2Om^NhuuwrwR)|

delta 85
zcmdnCoU3UC*M=4yX@7=1h8%`U1}BD6Af3aI%22`(%#g^C%aA&mUtgRz1SnSk6jflb
mWl)%YaT=rSv<gO+$x#MelPwJRnm6dQZ_r`fzCnkHEgb;KQ5N3-

diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml
index dce4e156c4cc489263aeadc66c4191bce175b5c5..84767ba65165914c96294b4ff39f07d88a4e3591 100644
GIT binary patch
delta 32
ocmZqb<=WQ6wINAodd_i1f$0n8FtRis(rG`W!?^vB4%2~10NAGt{r~^~

delta 82
zcmdni!`0NwwINAI+MgkhA%~%o!HJ<1Narx5GL$d`GbA$PGNev^t0&GI0+cHNiYhSJ
iGAK+JoX;pb{XjD#%VaGBuI2`v_68ls?F~9i+advmY8Fxe

diff --git a/PROMS/Volian.Print.Library/vlnChangeBar.cs b/PROMS/Volian.Print.Library/vlnChangeBar.cs
index cc2ee5e6..0c107fe2 100644
--- a/PROMS/Volian.Print.Library/vlnChangeBar.cs
+++ b/PROMS/Volian.Print.Library/vlnChangeBar.cs
@@ -130,7 +130,8 @@ namespace Volian.Print.Library
 					{
 						// the separator must exist and the previous must have a change bar.
 
-						if ((sep != "") && (tmp.Text == sep) && parent.MyItemInfo.MyPrevious != null && parent.MyItemInfo.MyPrevious.HasChangeBar)
+						// 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))
 						{
 							if (MyPageHelper.MyParagraphs.ContainsKey(parent.MyItemInfo.MyPrevious.ItemID))
 							{