This commit is contained in:
2013-02-01 15:02:08 +00:00
parent 9023e7c899
commit ca0d89faa9
2 changed files with 15 additions and 9 deletions

View File

@@ -168,12 +168,20 @@ namespace Volian.Print.Library
cleanTab = origTab;
if (CCCs != IIIs)
{
origTab = origTab + " ";
origTab = origTab.TrimStart(" ".ToCharArray());
if (mindx>2) // ouch!
Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric}) FPL is good with genmac output!
if (myparent.MyItemInfo.ActiveFormat.Name.ToUpper().Contains("WST")) // Temporary for WST development. need better way to do this check
{
Width = 6.8f * origTab.Length;
}
else
Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric})
{
origTab = origTab + " ";
origTab = origTab.TrimStart(" ".ToCharArray());
if (mindx > 2) // ouch!
Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric}) FPL is good with genmac output!
else
Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric})
}
}
else
Width = GetTextWidth(MyFont, (cleanTab != null ? cleanTab : origTab), symblFontName);//MyFont.CharsToTwips * (cleanTab != null ? cleanTab.Length : origTab.Length);