From 2b4e139dbdb5e0bc455935661f125afe6d463263 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 13 Aug 2013 12:03:59 +0000 Subject: [PATCH] --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 9832afdd..f16126e4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2557,12 +2557,23 @@ namespace VEPROMS.CSLA.Library 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("#"); string ofst = tbformat.Substring(indxlb+1, 3); - _MyTab.Offset = Convert.ToInt32(ofst.Substring(0, 1)) * 10; - tbformat = tbformat.Replace("#2#", "").Replace("#1#", ""); + _MyTab.Offset = Convert.ToInt32(ofst.Substring(0, 1)) * (int)FormatStepData.TabData.Font.CPI; + 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' // 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; tbformat = tbformat.Replace("{Section Prefix}", SectionPrefix(tbformat)); } + int ordinal = Ordinal; string alpha = AlphabeticalNumbering(ordinal); tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); @@ -3328,6 +3340,8 @@ namespace VEPROMS.CSLA.Library MyFont = font; } public int Offset; + public int Position; + private float _RNOTabWidthAdjust = 0; public float RNOTabWidthAdjust {