diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index bb63c755..72e78036 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -115,12 +115,14 @@ namespace VEPROMS.CSLA.Library /// E_FieldToEdit fieldToEdit - identifies the field to edit (number or text) /// bool colorLinks - whether to add color to links /// - public DisplayText(ItemInfo itemInfo, E_EditPrintMode epMode, E_ViewMode vwMode, bool noEdit,E_FieldToEdit fieldToEdit, bool colorLinks, string prefix, string suffix) + public DisplayText(ItemInfo itemInfo, E_EditPrintMode epMode, E_ViewMode vwMode, bool noEdit,E_FieldToEdit fieldToEdit, bool colorLinks, string prefix, string suffix, bool RemoveTrailingHardReturnAndManualPageBreaks) { int profileDepth = ProfileTimer.Push(">>>> DisplayText"); _FieldToEdit = fieldToEdit; _MyItemInfo = itemInfo; - OriginalText = InfoText; + OriginalText = epMode == E_EditPrintMode.Print && RemoveTrailingHardReturnAndManualPageBreaks ? Regex.Replace(InfoText, "(\r|\n|\\\\u160\\?| )+$", "") : InfoText; + //OriginalText = InfoText; + //if (OriginalText != InfoText) Console.WriteLine("ItemId = {0}, {1}", itemInfo.ItemID, OriginalText.Length-InfoText.Length); if (OriginalText.Contains("Prerequisite") && epMode == E_EditPrintMode.Print) OriginalText = Regex.Replace(OriginalText, @"\\{Prerequisite Step: .*?\\}", ""); TextFont = itemInfo.GetItemFont();//GetItemFont();