This commit is contained in:
Kathy Ruffing 2012-09-18 13:28:50 +00:00
parent 67e24b7bd9
commit f39a3dfbaf

View File

@ -367,6 +367,23 @@ namespace VEPROMS.CSLA.Library
(MyDocStyle.StructureStyle.Style & E_DocStructStyle.TableOfContents) == E_DocStructStyle.TableOfContents); (MyDocStyle.StructureStyle.Style & E_DocStructStyle.TableOfContents) == E_DocStructStyle.TableOfContents);
} }
} }
public bool MoreThanOneStepSection()
{
if (IsProcedure || IsSection) return false;
// If 'toitem' is a step, get to section.
ItemInfo par = MyParent;
while (par != null && !par.IsSection) par = par.MyParent;
if (par == null) return false;
par = par.FirstSibling;
int cntStepSect = 0;
while (par != null)
{
if (par.IsStepSection) cntStepSect++;
par = par.NextItem;
}
if (cntStepSect > 1) return true;
return false;
}
#region StepLevel #region StepLevel
private int _StepLevel = -2;// Not yet calculated private int _StepLevel = -2;// Not yet calculated
public int StepLevel public int StepLevel
@ -2184,7 +2201,10 @@ namespace VEPROMS.CSLA.Library
// If token includes 'Wpar', the parent tab prefix's the tab. // If token includes 'Wpar', the parent tab prefix's the tab.
if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1)) if (localPrintLevel > 0 && (tbformat.IndexOf("{numericWpar}") > -1 || tbformat.IndexOf("{alphaWpar}") > -1 || tbformat.IndexOf("{ALPHAWpar}") > -1))
{ {
string parentTab = ((ItemInfo)(ActiveParent)).MyTab.CleanText.Trim(); string parentTab = null;
ItemInfo myparent = ActiveParent as ItemInfo;
if (myparent != null && myparent.IsParagraph) myparent = myparent.ActiveParent as ItemInfo;
parentTab = myparent.MyTab.CleanText.Trim();
tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart(); tbformat = parentTab + (parentTab.EndsWith(".") ? "" : ".") + tbformat.TrimStart();
} }
if (tbformat.IndexOf("#2#") > -1 || tbformat.IndexOf("#1#") > -1) if (tbformat.IndexOf("#2#") > -1 || tbformat.IndexOf("#1#") > -1)