This commit is contained in:
parent
92665a84e6
commit
2b4e139dbd
@ -2557,12 +2557,23 @@ namespace VEPROMS.CSLA.Library
|
|||||||
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
|
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (tbformat.IndexOf("#2#") > -1 || tbformat.IndexOf("#1#") > -1)
|
if (!IsHigh && (MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_UnNumLikeRoman) == E_DocStructStyle.DSS_UnNumLikeRoman)
|
||||||
|
tbformat = "{alpha}. ";
|
||||||
|
|
||||||
|
if (tbformat.IndexOf("#2#") > -1)
|
||||||
{
|
{
|
||||||
int indxlb = tbformat.IndexOf("#");
|
int indxlb = tbformat.IndexOf("#");
|
||||||
string ofst = tbformat.Substring(indxlb+1, 3);
|
string ofst = tbformat.Substring(indxlb+1, 3);
|
||||||
_MyTab.Offset = Convert.ToInt32(ofst.Substring(0, 1)) * 10;
|
_MyTab.Offset = Convert.ToInt32(ofst.Substring(0, 1)) * (int)FormatStepData.TabData.Font.CPI;
|
||||||
tbformat = tbformat.Replace("#2#", "").Replace("#1#", "");
|
tbformat = tbformat.Replace("#2#", "");
|
||||||
|
}
|
||||||
|
if (tbformat.IndexOf("{Pos") > -1)
|
||||||
|
{
|
||||||
|
int begPos = tbformat.IndexOf("{Pos");
|
||||||
|
int endPos = tbformat.IndexOf("}");
|
||||||
|
string ofst = tbformat.Substring(begPos + 4, endPos-begPos-4);
|
||||||
|
_MyTab.Position = -(Convert.ToInt32(ofst) * (int)FormatStepData.TabData.Font.CPI);
|
||||||
|
tbformat = tbformat.Remove(begPos,endPos+1);
|
||||||
}
|
}
|
||||||
// if this is a caution/note type determine where 'NOTE/CAUTION' tab goes, as tab or as 'header'
|
// if this is a caution/note type determine where 'NOTE/CAUTION' tab goes, as tab or as 'header'
|
||||||
// and also determine whether the tab itself gets converted to a bullet.
|
// and also determine whether the tab itself gets converted to a bullet.
|
||||||
@ -2576,6 +2587,7 @@ namespace VEPROMS.CSLA.Library
|
|||||||
if (ActiveSection.MyTab.CleanText != null && ActiveSection.MyTab.CleanText != "" && tmpsectpref != string.Empty) trimTabStart = true;
|
if (ActiveSection.MyTab.CleanText != null && ActiveSection.MyTab.CleanText != "" && tmpsectpref != string.Empty) trimTabStart = true;
|
||||||
tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat));
|
tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat));
|
||||||
}
|
}
|
||||||
|
|
||||||
int ordinal = Ordinal;
|
int ordinal = Ordinal;
|
||||||
string alpha = AlphabeticalNumbering(ordinal);
|
string alpha = AlphabeticalNumbering(ordinal);
|
||||||
tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
|
tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
|
||||||
@ -3328,6 +3340,8 @@ namespace VEPROMS.CSLA.Library
|
|||||||
MyFont = font;
|
MyFont = font;
|
||||||
}
|
}
|
||||||
public int Offset;
|
public int Offset;
|
||||||
|
public int Position;
|
||||||
|
|
||||||
private float _RNOTabWidthAdjust = 0;
|
private float _RNOTabWidthAdjust = 0;
|
||||||
public float RNOTabWidthAdjust
|
public float RNOTabWidthAdjust
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user