From 982c0b54de9fcff70087c8bed3db668a23e0a1a3 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Mon, 30 Sep 2013 18:26:58 +0000
Subject: [PATCH] Use Hex format for the RO DB ID for RO Searches.

---
 PROMS/fmtxml/FmtFileToXml.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs
index 08a43a58..7c7bb630 100644
--- a/PROMS/fmtxml/FmtFileToXml.cs
+++ b/PROMS/fmtxml/FmtFileToXml.cs
@@ -924,6 +924,9 @@ public struct Step
 	public string StartLineWithDash;
 	public string BlankLineBeforeSubStep;
 	public string AlwaysTab;					// AlwaysTabNote, AlwaysTabCaution, AlwaysTabCaution2
+	//for Comanche Peak by jcb
+	public bool NoSpaceMultipleRNOs;
+	//end for Comanche Peak by jcb
 	public string MixCautionsAndNotes;
 	public string NumberHighLevel;				// NumberHighLevelRNO
 	public string OffsetTab;
@@ -1537,7 +1540,7 @@ namespace fmtxml
 
 		#region SectionTransitionVariables
 		private string DefaultSectionTransStrTypeB = "{Sect Num}, {Sect Title}, {First Step}";
-		private string DefaultSectionTransStrTypeBNone = "{Sect Hdr}, Step {Sect Num}{First Step}";  //original
+		private string DefaultSectionTransStrTypeBNone = "{Sect Hdr}, Step {SectNum}{First Step}";  //original
 		private string[] DefaultSectionTransFormatStr = 
 		{
 			"{Proc Num}, {Proc Title}, Step {Sect Num}{First Step}",
@@ -1545,7 +1548,7 @@ namespace fmtxml
 			"{Sect Num}{First Step}, {.}, {.}, {.} and {Sect Num}{Last Step}",
 			"{Sect Num}{First Step} thru {Sect Num}{Last Step}",
 			"{Sect Num}, Step {?.Sect Num}{First Step}",
-			"{Sect Hdr}, Step {Sect Num}{First Step}"
+			"{Sect Hdr}, Step {SectNum}{First Step}"
 		};
 		// made up the following strings so that the token processing for setting
 		// up the menu enums would work as expected.  These are only used in this migration
@@ -4632,11 +4635,13 @@ namespace fmtxml
 				wkstr = Regex.Replace(wkstr, @"\x16([^\x16]*?)(?:\x16|\Z)", @"\ul $1\ulnone ");
 
 				//narrator
-				wkstr = Regex.Replace(wkstr, @"\x86([^\x86 ]*?)(?:[\x86]|(?= )|\Z)(.*?)", @"\f{Narrator}$1\f0$2");
+				//wkstr = Regex.Replace(wkstr, @"\x86([^\x86 ]*?)(?:[\x86]|(?= )|\Z)(.*?)", @"\f{Narrator}$1\f0$2");
+				wkstr = Regex.Replace(wkstr, @"\x86([^\x86 ]*?)(?:[\x86]|(?= )|\Z)(.*?)", @"$1$2");
 
 				// remove hanging indent, vertical tab
 				wkstr = Regex.Replace(wkstr, @"\x02", @"\NonSupported Hanging Indent (Hex x02)");
-				wkstr = Regex.Replace(wkstr, @"\x0B", @"\NonSupported Vertical Tab (Hex x0b");
+				//wkstr = Regex.Replace(wkstr, @"\x0B", @"\NonSupported Vertical Tab (Hex x0b");
+				wkstr = Regex.Replace(wkstr, @"\x0B", @"");
 
 				// remove some unknown chars for ano & fpl - these plants are not supported
 				// as of conversion date.