Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'Development' into B2026-077

Browse Source
This commit is contained in:
mschill
2026-09-30 10:08:22 -04:00
parent 7da1f86c86 abe0444275
commit e0614051f8
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PROMS/Formats/fmtall/FNPSAM1all.xml
BIN
View File
Binary file not shown.
PROMS/Formats/fmtall/FNPall.xml
BIN
View File
Binary file not shown.
PROMS/Volian.Print.Library/vlnTab.cs
+9 -2
View File
@@ -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(@"{!"))
{