This commit is contained in:
Kathy Ruffing 2012-04-02 15:27:01 +00:00
parent aa8faea595
commit f385991f05

View File

@ -147,19 +147,10 @@ namespace Volian.Print.Library
int meindx = origTab.IndexOf(@"}", mindx);
string macro = origTab.Substring(mindx, meindx - mindx + 1);
// Width for placement of macro should be position in the string where the macro was located.
//WCN Needs lwidth with -1 commented out:
//float lwidth = MyFont.CharsToTwips * (origTab.Length - meindx); // - 1);
// FPL, RGE Needs lwidth with -1
float lwidth = MyFont.CharsToTwips * (origTab.Length - meindx - 1);
//MyMacro = new vlnMacro(-2+xoffset - lwidth, yoffset, macro.Substring(2, macro.Length - 3)); // NSP
//MyMacro = new vlnMacro(30 + xoffset - lwidth, yoffset, macro.Substring(2, macro.Length - 3)); // TP
MyMacro = new vlnMacro(xoffset - lwidth, yoffset, macro.Substring(2, macro.Length - 3)); // WCN
MyMacro = new vlnMacro(xoffset - lwidth, yoffset, macro.Substring(2, macro.Length - 3));
origTab = origTab.Replace(macro, "");
//WCN Needs origTab = origTab + " ");
//origTab = origTab + " ";
//RGE tabs are too far over with origTab = origTab + " ";
// FPL does adjustment below:
cleanTab = origTab;
if (CCCs != IIIs)
{
@ -180,7 +171,6 @@ namespace Volian.Print.Library
// if this tab was underlined, we may need to add partial underlining back in, if it was
// removed when the bullet was added.
if (myparent.MyItemInfo.ItemID == 588) Console.WriteLine("here");
if (removedUnderline)
{
int sep = origTab.IndexOfAny(". ".ToCharArray());