From 576b967f57ffedea67c03aefc1f9c1693a5652d4 Mon Sep 17 00:00:00 2001
From: John Jenko <jjenko@volian.com>
Date: Wed, 30 Sep 2026 10:04:20 -0400
Subject: [PATCH] F2026-023 Code fix to so that single Notes do not get a
 bullet and format tweaks in the EOP and SAMG formats

---
 PROMS/Formats/fmtall/FNPSAM1all.xml  | Bin 87284 -> 87388 bytes
 PROMS/Formats/fmtall/FNPall.xml      | Bin 120052 -> 120126 bytes
 PROMS/Volian.Print.Library/vlnTab.cs |  11 +++++++++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml
index 0c703144ee984a76a15d5f99bbcc04c7484445e5..4d23eb2d415fc465767f6c9e59f86d7e8480335a 100644
GIT binary patch
delta 86
zcmV-c0IC1<sRi7s1+daGlYIRwlW;-|vkEid4U;gmGLxVp1hXJPW-FIqDgj87)>?3q
sGzOCjB%rgfZMq4QU?N77a4-n7o_EFrlVBo9lQ1w8lhAM+v%-5a*)icG!2kdN

delta 121
zcmcb!iuKD%)(w}8CLgF)o17rTHo3rwXY!kJi|JJ=j6#zS#H($tGA`hqp2x+gwpqZj
zOnY*|ezoZaDvTVH&*hu|aV9TN;+Sk;5V6@TFM|^*05rvbWAmHxW6Ve@L?&NQ;hOxw
LLTIyAjnPd2qku3R

diff --git a/PROMS/Formats/fmtall/FNPall.xml b/PROMS/Formats/fmtall/FNPall.xml
index 7ecc88220b4b96e9c6ccbe921c4a1a51275834a3..d7365c350b046c3edfe5f13cd27676a79e745335 100644
GIT binary patch
delta 101
zcmeyel6~JQ_6>1X(+dO`ttNj6;+fpwCpLM3Rn%lLRiVjz)>2TKWAce|vB@8*)iyU+
zzu}o~ki%#;`GPy!<`o`g+LI5Mg-w3oCN{aCWXa?LEx*Y+&03Q@Wt#g+xA&DYro{sQ
D)V(L<

delta 89
zcmdnDiv7z<_6>1XlO5`%CO_ckn%rQ)G5LU_)Z~3uVT=lsC&~*?R<o9Zur>!-8}LqV
n&}1~4Y#_(Ad7np_Hc*?+<f@WWVETf&So4C??F&j7=fwj6-1i~C

diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs
index 40fce490..da93d9df 100644
--- a/PROMS/Volian.Print.Library/vlnTab.cs
+++ b/PROMS/Volian.Print.Library/vlnTab.cs
@@ -162,18 +162,25 @@ namespace Volian.Print.Library
 				//Width = 6 * (4 + origTab1.Trim(" ".ToCharArray()).Length);
 			}
 			else
-				Width = GetTextWidth(MyFont, (Text != null ? Text : origTab), symblFontName); //MyFont.CharsToTwips * (Text != null ? Text.Length : origTab.Length);
+				Width = GetTextWidth(MyFont, (Text != null ? Text : origTab), symblFontName); 
 
 			// Pairie Island (NSP) Caution and Note tabs use a larger font
 			// When using a bullet, we need to use the font size of the Caution/Note text instead of the tab.
 			// To do this we set the TabData.Bullet.Separate to true (currently - 4/26/2013 - only NSP uses this).
 			// Because of the different font sizes, when the Caution/Note did have have a bullet, the positioning 
 			// was off by the lenght of IdentB (the bullet string), thus the "alignAsIfBulleted" bool
+			//           added check if there is previous or next, it must of the same step type to get the bullet
 			if ((myparent.MyItemInfo.FormatStepData != null) && myparent.MyItemInfo.FormatStepData.TabData.Bullet.Separate)
-				if (myparent.MyItemInfo.MyPrevious != null || myparent.MyItemInfo.NextItem != null)
+			{
+			// F2026-023 Farley, when there was a single Note and single Caution off of the same step, the Note was still getting a bullet.
+				if ((myparent.MyItemInfo.MyPrevious != null && (myparent.MyItemInfo.MyPrevious.FormatStepType == myparent.MyItemInfo.FormatStepType)) ||
+					(myparent.MyItemInfo.NextItem != null && (myparent.MyItemInfo.NextItem.FormatStepType == myparent.MyItemInfo.FormatStepType)))
+				{
 					SeparateBullet = true;
+				}
 				else
 					alignAsIfBulleted = true;
+			}
 
 			if (origTab.Contains(@"{!"))
 			{
-- 
2.54.0