diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 27eab4f9..1c5482b9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1239,7 +1239,7 @@ namespace VEPROMS.CSLA.Library retval = retval.Replace("\r\n", ";"); return retval; } - private static string StripRtfFormatting(string rtf) + public static string StripRtfFormatting(string rtf) { string retval = rtf; retval = Regex.Replace(retval, @"\\b0 ?", ""); @@ -1252,8 +1252,8 @@ namespace VEPROMS.CSLA.Library //retval = Regex.Replace(retval, @"\\super ?", ""); //retval = Regex.Replace(retval, @"\\sub ?", ""); //retval = Regex.Replace(retval, @"\\nosupersub ?", ""); - retval = Regex.Replace(retval, @"\\up[30] ?", ""); - retval = Regex.Replace(retval, @"\\dn[30] ?", ""); + retval = Regex.Replace(retval, @"\\up[320] ?", ""); + retval = Regex.Replace(retval, @"\\dn[320] ?", ""); return retval; } public static string StripLinks(string rtf) @@ -1752,7 +1752,7 @@ namespace VEPROMS.CSLA.Library } } private ItemInfo _ActiveSection = null; - public ItemInfo MyActiveSection { get { return _ActiveSection; } } + public ItemInfo MyActiveSection { get { return ActiveSection; } } public ItemInfo ActiveSection { get @@ -1889,7 +1889,7 @@ namespace VEPROMS.CSLA.Library return _MyHeader; } set - { + { _MyHeader = value; } } @@ -1993,6 +1993,7 @@ namespace VEPROMS.CSLA.Library if (IsCaution || IsNote) tbformat = CheckNoteCautionTab(tbformat); int ordinal = Ordinal; + if (!IsSection && !IsProcedure) tbformat = tbformat.Replace("{Section Prefix}", this.MyActiveSection.MyTab.CleanText); string alpha = AlphabeticalNumbering(ordinal); tbformat = tbformat.Replace("{alpha}", alpha.ToLower()); tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());