From bca68b2fd01f0af24f1c978af03ca6466a040650 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 16 Dec 2013 15:43:08 +0000 Subject: [PATCH] Support 'BoldHighLevel' format flag and fix section tabs with spaces. --- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index a3b94768..2b954703 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1736,6 +1736,7 @@ namespace VEPROMS.CSLA.Library int typindx = type - 20000; // what to do for other types rather than steps font = format.PlantFormat.FormatData.StepDataList[typindx].Font; if (typindx == _ParagraphType) font = AdjustForTextSubFollowsTextStyle(format,typindx,font); + if (IsRNOPart && MyParent.IsHigh && FormatStepData.BoldHighLevel) font = BoldTextStyle(font); break; } } @@ -1745,6 +1746,14 @@ namespace VEPROMS.CSLA.Library } return font; } + private VE_Font BoldTextStyle(VE_Font font) + { + E_Style myStyle = (E_Style) font.Style; + myStyle |= E_Style.Bold; + if (myStyle != font.Style) + font = new VE_Font(font.Family, (int)font.Size, myStyle, (float)font.CPI); + return font; + } private const int _ParagraphType=24; protected VE_Font AdjustForTextSubFollowsTextStyle(VE_Font font) { @@ -4900,13 +4909,17 @@ namespace VEPROMS.CSLA.Library string ch = DisplayNumber != null && DisplayNumber != "" ? DisplayNumber.Substring(0,1) : null; int Snum = GetSectionNum(); if (Snum == -1) + { + if (ch[0] == ' ') ch = DisplayNumber != null && DisplayNumber.TrimStart() != "" ? DisplayNumber.TrimStart().Substring(0, 1) : null; retStr = ch + "."; - else { - string tmp = DisplayNumber.IndexOf(".")>-1?DisplayNumber.Substring(0,DisplayNumber.IndexOf(".")):DisplayNumber; + } + else + { + string tmp = DisplayNumber.IndexOf(".") > -1 ? DisplayNumber.Substring(0, DisplayNumber.IndexOf(".")) : DisplayNumber; if (underline) - retStr = @"\ul " + tmp + "." + Snum.ToString() + @"\ul0 "; - else - retStr = tmp + "." + Snum.ToString(); + retStr = @"\ul " + tmp + "." + Snum.ToString() + @"\ul0 "; + else + retStr = tmp + "." + Snum.ToString(); } return retStr; } @@ -4919,7 +4932,7 @@ namespace VEPROMS.CSLA.Library // if there is a number after the '.', return it as a number. For example if it is 001, return a 1: string tmpstr = indx+1= 0) return -1; if (tmpstr == null) return 0; Int32 x;