Bring up to date with Dev -- clearing merge conflicts

This commit is contained in:
2026-09-30 10:23:57 -04:00
16 changed files with 11 additions and 12789 deletions
+8 -1
View File
@@ -129,11 +129,18 @@ namespace Volian.Print.Library
// 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(@"{!"))
{