Fixed a bug where the page number was not being resolved in page number transitions to sections that have a hard return.

Better handling of hard returns

PROMS/Volian.Controls.Library/DisplayText.cs

@@ -307,10 +307,10 @@ namespace Volian.Controls.Library
 				// as a precaution, convert any \~ to \u160?. This is for Hard spaces. see the commentary in the
 				// save portion of this code for an explanation.
 				text = text.Replace(@"\~", @"\u160?");
-				text = text.Replace("\r\n", @"\par ");
+				text = text.Replace("\r\n", @"\line "); // replace a \r\n with a \line instead of a \par
 				//if (text.IndexOf(@"\line") > -1)
-				//    MessageBox.Show("Found rtf line");
-				text = text.Replace(@"\line", @"\par");
+				//	MessageBox.Show("Found rtf line");
+				//text = text.Replace(@"\line", @"\par"); // we don't want to replace the \line part of bug fix B2015-140
 
 				// Now put symbol (for fixed fonts) or unicode font (proportional) around symbols
 				// These fonts are VESymbFix & Arial Unicode MS respectively, and the font table

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -962,7 +962,7 @@ namespace Volian.Controls.Library
 				// using rtf commands to fix various indent bugs including B2015-103).  The following code
 				// puts the rtf indent characters that are stored at beginning of string into correct location
  				// of rtf header (have to be after the \pard).  Otherwise the indents did not show up.
-				Match match = Regex.Match(txt,@"\\fi([-0-9]*) ?\\li([0-9]*)");
+				Match match = Regex.Match(txt,@"\\fi([-0-9]+) ?\\li([0-9]+)");
 				if (match.Success)
 				{
 					string indentStr = @"\fi" + match.Groups[1].Value + @"\li" + match.Groups[2].Value;