diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index 0c703144..4d23eb2d 100644 Binary files a/PROMS/Formats/fmtall/FNPSAM1all.xml and b/PROMS/Formats/fmtall/FNPSAM1all.xml differ diff --git a/PROMS/Formats/fmtall/FNPall.xml b/PROMS/Formats/fmtall/FNPall.xml index 7ecc8822..d7365c35 100644 Binary files a/PROMS/Formats/fmtall/FNPall.xml and b/PROMS/Formats/fmtall/FNPall.xml differ 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(@"{!")) {