From 3f47ed8825b4d95a771ee65bdd5802fce2d9e041 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 3 Nov 2021 15:04:58 +0000
Subject: [PATCH] =?UTF-8?q?C2021-061=20BNPPalr=20&=20BNPP1=20don=E2=80=99t?=
 =?UTF-8?q?=20process=20replace=20words=20if=20they=20are=20delimited=20wi?=
 =?UTF-8?q?th=20=E2=80=9C,=E2=80=99=20(double=20&=20single=20quote)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 3 +++
 PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs    | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index eb72dd6f..8cf6048f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2122,6 +2122,9 @@ namespace VEPROMS.CSLA.Library
 							string wordMatchBeg = Regex.IsMatch(replaceWord.Substring(0, 1), @"\W") ? "" : @"(?<=\W|^)";
 							string wordMatchEnd = Regex.IsMatch(replaceWord.Substring(replaceWord.Length - 1, 1), @"\W") ? "" : @"(?=\W|$)";
 							string pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-)" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-)" + wordMatchEnd;
+							// C2021-061:  For Barakah don't do replace if word is surrounded by " or ', i.e. they are no longer delimiters
+							if (_MyItemInfo != null && _MyItemInfo.ActiveFormat != null && _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.NoReplaceQuoteWords)
+								pat = wordMatchBeg + @"(?<!\\u160\?|\\u8209\?|\\b|\-|""|')" + replaceWord + @"(?!\\u160\?|\\u8209\?|\-|""|')" + wordMatchEnd;
 							dicReplaceRegex.Add(rs, new Regex(pat, myOptions));
 							//ProfileTimer.Pop(profileDepth3);
 						}
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 71d3cccd..13a49071 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -2442,6 +2442,15 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _ReplaceWordsInROs, "@ReplaceWordsInROs");
 			}
 		}
+		// C2021-061:  For Barakah don't do replace if word is surrounded by " or '
+		private LazyLoad<bool> _NoReplaceQuoteWords;
+		public bool NoReplaceQuoteWords
+		{
+			get
+			{
+				return LazyLoad(ref _NoReplaceQuoteWords, "@NoReplaceQuoteWords");
+			}
+		}
 		private LazyLoad<bool> _UseMetaSections;
 		public bool UseMetaSections
 		{