From b92bdb34665b0fcde78dc8ab7017647e70069bc2 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 16 Nov 2021 13:50:28 +0000
Subject: [PATCH] =?UTF-8?q?C2021-061=20don=E2=80=99t=20process=20replace?=
 =?UTF-8?q?=20words=20if=20they=20are=20delimited=20with=20=E2=80=9C()?=
 =?UTF-8?q?=E2=80=9D=20or=20=20=E2=80=9C,=E2=80=99=20(quotes=20from=2011/3?=
 =?UTF-8?q?/21)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BNPP1all.xml             | Bin 189420 -> 189430 bytes
 PROMS/Formats/fmtall/BNPPalrall.xml           | Bin 206086 -> 206096 bytes
 .../Extension/DisplayText.cs                  |   4 ++--
 .../Format/PlantFormat.cs                     |  15 ++++++++++++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 8d86bbd3950418e0cb05bb4eaf634dde59d26d0a..eca9b25d1dd7b08488b01623ed193f305a07ee14 100644
GIT binary patch
delta 44
zcmaEJocr5x?hRK01p^oo8HyNE8S)sy8S;Uwl*xs`lFeTN+rI=dZvPU<^kX6bfP@i?

delta 22
ecmex%ocqmj?hRK0o9_j--wR~ielL(oViEw6SqoPH

diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index 9af0ecec3e2db9476087685e97bd71cb4fdc9b22..7c4477e14402a576fd9032b887ddff31e6095a09 100644
GIT binary patch
delta 32
ocmZoW#WUd)&ju$i&H#o)h9ZVkhP-A+uXaZ-#_f(?Oh<140JSd*0ssI2

delta 27
jcmbPmil^-q&ju&2=|-+hQq5^z?P*?&+ta+5R^0*sl?@7k

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
index 8cf6048f..f50d846f 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs
@@ -2123,8 +2123,8 @@ namespace VEPROMS.CSLA.Library
 							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;
+							if (_MyItemInfo != null && _MyItemInfo.ActiveFormat != null && _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.NoReplaceQuoteParenWords)
+								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 13a49071..1721c0b5 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -1683,6 +1683,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _height, "@height");
 			}
 		}
+		private LazyLoad<string> _hasAppl;
+		public string hasAppl
+		{
+			get
+			{
+				return LazyLoad(ref _hasAppl, "@hasAppl");
+			}
+		}
 	}
 	#endregion
 	#region SIAll
@@ -2443,12 +2451,13 @@ namespace VEPROMS.CSLA.Library
 			}
 		}
 		// C2021-061:  For Barakah don't do replace if word is surrounded by " or '
-		private LazyLoad<bool> _NoReplaceQuoteWords;
-		public bool NoReplaceQuoteWords
+		//	Initial fix was 11/3/21.  Added parens do the quotes on 11/16/21
+		private LazyLoad<bool> _NoReplaceQuoteParenWords;
+		public bool NoReplaceQuoteParenWords
 		{
 			get
 			{
-				return LazyLoad(ref _NoReplaceQuoteWords, "@NoReplaceQuoteWords");
+				return LazyLoad(ref _NoReplaceQuoteParenWords, "@NoReplaceQuoteParenWords");
 			}
 		}
 		private LazyLoad<bool> _UseMetaSections;