From dbba029be18c7621778677d0b45cde8c513409de Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Fri, 14 Oct 2011 10:18:11 +0000
Subject: [PATCH]

---
 PROMS/fmtxml/FmtFileToXml.cs | 3 +++
 PROMS/fmtxml/FmtToXml.cs     | 7 +++++--
 PROMS/fmtxml/Form1.cs        | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs
index d5ae115d..5f9ca122 100644
--- a/PROMS/fmtxml/FmtFileToXml.cs
+++ b/PROMS/fmtxml/FmtFileToXml.cs
@@ -882,6 +882,7 @@ public struct Step
 	public string PageBreakOnStep;				// PageBreakOnHighLevelStep, PageBreakOnCautions, PageBreakOnNotes
 	public string AlignNullTabWSectHead;
 	public string TextSubFollowsTextStyle;
+	public string CautionOrNoteSubstepIndent;
 	public string TreatAsSequential;			// TreatAND_ORasSequential
 	public string MatchUpRNO;					// MatchUpRNOCautNote
 	public string InPageList;					// RNOInPageList, StpCautNoteTabInPageList, HLSTextInPageList
@@ -4233,6 +4234,7 @@ namespace fmtxml
 			string fnm = MyPath + @"\" + fname;
 			brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite));
 			bool success = ReadInFmtFile(ref fmtdata, ref BaseXtraFlags, fname);
+			AddPlantSpecific(fname, ref fmtdata);
 			FixInactiveForHigh(ref fmtdata);
 			FixInactiveForSubStep(ref fmtdata);
 			FixInactiveForText(ref fmtdata);
@@ -4269,6 +4271,7 @@ namespace fmtxml
 						brFmt = new BinaryReader(File.Open(fnm, System.IO.FileMode.Open, System.IO.FileAccess.ReadWrite, FileShare.ReadWrite));
 						FormatData subdata = new FormatData();
 						success = ReadInFmtFile(ref subdata, ref SubXtraFlags, fi.Name);
+						AddPlantSpecific(fi.Name, ref subdata);
 						//OutputStepFonts(fi.Name, subdata);
 						if (success)
 						{
diff --git a/PROMS/fmtxml/FmtToXml.cs b/PROMS/fmtxml/FmtToXml.cs
index b49aa9b1..36887785 100644
--- a/PROMS/fmtxml/FmtToXml.cs
+++ b/PROMS/fmtxml/FmtToXml.cs
@@ -484,7 +484,7 @@ namespace fmtxml
 		{
 			MyPath = path;
 			fmtName = nm;
-			//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
+			//if (!fmtName.ToUpper().StartsWith("TP") && fmtName.ToUpper() != "BASE") return;
 			try
 			{
 				// get the default base & plant files to use when figuring out inheritance.
@@ -496,7 +496,10 @@ namespace fmtxml
 					if (indx > 0)
 					{
 						LoadPageFile(nm);
-						LoadDocFile(nm);
+						string tmpDocName = fmtName;
+						tmpDocName = tmpDocName.Remove(indx + 1,1);
+						tmpDocName = tmpDocName.Insert(indx + 1, "y");
+						LoadDocFile(tmpDocName);
 					}
 					else
 					{
diff --git a/PROMS/fmtxml/Form1.cs b/PROMS/fmtxml/Form1.cs
index 0a09c5d2..b5694936 100644
--- a/PROMS/fmtxml/Form1.cs
+++ b/PROMS/fmtxml/Form1.cs
@@ -362,7 +362,7 @@ namespace fmtxml
 					FmtToXml fx = new FmtToXml(fn, tbFmtPath.Text);
 				}
 			}
-			fis = di.GetFiles("*.y*");
+			fis = di.GetFiles("*.z*");
 			foreach (FileInfo fi in fis)
 			{
 				if (!Excluded(fi))