From fff0233bf3958766795eefc21fb7feb03b319fd4 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 23 Jan 2014 14:25:12 +0000
Subject: [PATCH] Fix B2014-003: parsing of rtf was incorrect for link with
 symbol and text after link

---
 PROMS/Volian.Controls.Library/DisplayText.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/PROMS/Volian.Controls.Library/DisplayText.cs b/PROMS/Volian.Controls.Library/DisplayText.cs
index 50f02c2d..e15e831e 100644
--- a/PROMS/Volian.Controls.Library/DisplayText.cs
+++ b/PROMS/Volian.Controls.Library/DisplayText.cs
@@ -1308,17 +1308,22 @@ namespace Volian.Controls.Library
 			// Find the 'end comment' for this <START], can't count characters
 			// because there may be formatting characters such as \b or \ul before
 			// the \v0
+			int startAdj = 4;
 			int linkIndx = text.IndexOf(@"#Link", index);
 			int endStartTknIndx = text.IndexOf(@"\v0 ", index);
-			if (endStartTknIndx == -1)
-				endStartTknIndx = text.IndexOf(@"\v0", index);
+			int endStartTknIndxNoSpace = text.IndexOf(@"\v0", index);
+			if (endStartTknIndx == -1 || endStartTknIndxNoSpace < endStartTknIndx)
+			{
+				endStartTknIndx = endStartTknIndxNoSpace;
+				startAdj = 3;
+			}
 			int endTextIndx = text.IndexOf(@"\v ", endStartTknIndx);  // find end of text
 			if (endTextIndx == -1)
 				endTextIndx = text.IndexOf(@"\v", endStartTknIndx);
 			int endTextIndx2 = text.IndexOf(@"\v\up0 ", endStartTknIndx);  // find end of text
 			if(endTextIndx2 > 0 && (endTextIndx < 0 || endTextIndx > endTextIndx2))
-				endTextIndx = endTextIndx2; 
-			vte.Text = text.Substring(endStartTknIndx + 4, endTextIndx - endStartTknIndx - 4); // 4 for \v0
+				endTextIndx = endTextIndx2;
+			vte.Text = text.Substring(endStartTknIndx + startAdj, endTextIndx - endStartTknIndx - startAdj); // 4 for \v0
 
 			// Now get the link part.  It can be terminated by a '\v0' or an [END>
 			int endLinkIndxV = text.IndexOf(@"\v0 ", linkIndx);