This commit is contained in:
2013-06-14 14:22:00 +00:00
parent 5d975e0f8e
commit ad2e39dc4d
5 changed files with 146 additions and 191 deletions

View File

@@ -1431,7 +1431,7 @@ namespace VEPROMS.CSLA.Library
string number = DisplayNumber;
//if (cont.Type >= 20000) number = Ordinal.ToString() + ".";
if (cont.Type >= 20000) number = MyTab==null?"":MyTab.CleanText;
return string.Format("{0} {1}", number, DisplayText).Trim();
return string.Format("{0} {1}", number, DisplayText).Trim(); // Need TrimEnd(); for IP3
//return string.Format("{0} {1}", number, cont.Text).Trim();
//return string.Format("{0} {1}", cont.Number, cont.Text);
//return "Now is the time for all good men to come to the aid of their country!";
@@ -2426,6 +2426,7 @@ namespace VEPROMS.CSLA.Library
{
_MyTab.CleanText = ((ItemInfo)ActiveParent).MyTab.CleanText;
_MyTab.Text = ((ItemInfo)ActiveParent).MyTab.Text;
_MyTab.RNOTabWidthAdjust = ((ItemInfo)ActiveParent).FormatStepData.TabData.RNOAdjustTabSize??0;
if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOExcludeMacros)
_MyTab.Text = Regex.Replace(_MyTab.Text, "{!.+?}", " ");
if (((ItemInfo)ActiveParent).FormatStepData.TabData.RNOIdentPrint.Contains("{asterisk}"))
@@ -3290,6 +3291,12 @@ namespace VEPROMS.CSLA.Library
MyFont = font;
}
public int Offset;
private float _RNOTabWidthAdjust = 0;
public float RNOTabWidthAdjust
{
get { return _RNOTabWidthAdjust; }
set { _RNOTabWidthAdjust = value; }
}
public int AsteriskOffset;
private static Regex _ReplaceSymbols = new Regex("^[^0-9A-Za-z]*"); // trim anything that isn't an ascii alpha/numeric from the beginning
public string CleanTextNoSymbols