From 79d16a33a7b5aeec23877ea13dc3883358899266 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 13 Aug 2020 20:26:14 +0000 Subject: [PATCH] =?UTF-8?q?B2020-113=20=E2=80=93=20Open=20curly=20brackets?= =?UTF-8?q?=20were=20sometimes=20replaced=20with=20=E2=80=9C(![=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 6f4b866d..950c2ac7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -1374,9 +1374,8 @@ namespace VEPROMS.CSLA.Library { // replace \{ & \} with (![ & (!] respectively and then redo at end. The curly braces // are rtf so were getting removed and/or not handled correctly. - string retval = rtf.Replace(@"\{", @" (!["); - retval = retval.Replace(@"\}", @" (!]"); - + string retval = rtf.Replace(@"\{", @"(!["); // B2020-113 don't have a space in the replacement string + retval = retval.Replace(@"\}", @"(!]"); // B2020-113 don't have a space in the replacement string // remove carriage return/newlines after \par commands (these are introduced by rtb // for hard returns, goes into rtb as \par and comes out as \par\r\n): retval = reg1.Replace(retval, "\\par "); @@ -1385,6 +1384,8 @@ namespace VEPROMS.CSLA.Library retval = reg3.Replace(retval, "$1"); // Strip Opening and Closing Braces retval = reg4.Replace(retval, ""); // Strip Clauses - remove anything from curly braces retval = reg5.Replace(retval, ""); // Strip Clauses - remove anything from curly braces + retval = retval.Replace(@"(![", @"\{"); // B2020-113 put user entered open curly braces back in + retval = retval.Replace(@"(!]", @"\}"); // B2020-113 put user entered close curly braces back in retval = reg6.Replace(retval, "$1 "); // add space after token if followed by token retval = reg7.Replace(retval, new MatchEvaluator(StaticReplaceRTFClause)); // take backslash xyz and evaluates them retval = reg8.Replace(retval, "$1"); // remove space between tokens @@ -1406,8 +1407,6 @@ namespace VEPROMS.CSLA.Library if (retval.Length == 0) return ""; if (retval.EndsWith(@"\v")) retval = retval.Remove(retval.Length - 2, 2); retval = _MyItemInfo.RemoveRtfStyles(retval); // RemoveRtfStyles(retval); - retval = retval.Replace(@" (![", @"\{"); - retval = retval.Replace(@" (!]", @"\}"); retval = retval.TrimEnd(' '); return retval; }