Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Callawy & Farley

Browse Source 
Callaway & Farley
This commit is contained in:
Kathy Ruffing
2013-10-17 15:59:40 +00:00
parent 883392a51a
commit 812ca6582e
5 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
PROMS/fmtxml/FmtFileToXml.cs
View File

@@ -20,7 +20,8 @@ using System.ComponentModel;
[Serializable]
public struct FormatData
{
public string Name;
public string Name;
public string ComponentTableFormat;
public string PurchaseOptions;
public string TPL;
//public XtraFlgs XtraFlags;
@@ -908,6 +909,7 @@ public struct Step
public string PageBreakOnStep; // PageBreakOnHighLevelStep, PageBreakOnCautions, PageBreakOnNotes
public string UseOldTemplate;
public string AlignNullTabWSectHead;
public string AlignHLSTabWithSectOvride;
public string TextSubFollowsTextStyle;
public string CautionOrNoteSubstepIndent;
public string TreatAsSequential; // TreatAND_ORasSequential
@@ -1597,6 +1599,7 @@ namespace fmtxml
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
//if (fmtName.ToUpper() != "WCNCKL" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "NSPARP" && fmtName.ToUpper() != "BASE") return;
//if (!fmtName.ToUpper().StartsWith("FNP") && fmtName.ToUpper() != "BASE") return;
try
{
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
@@ -2190,8 +2193,21 @@ namespace fmtxml
// if this format has an associated PSI or TPL file, just read in the string & save
// it.
string otherfile = MyPath + @"\" + fname.Substring(0, fname.LastIndexOf(".")) + @".tpl";
if (File.Exists(otherfile))
// if this is subformat, the tpl file will be name FNP00.TPL for fnp.x00, using 'fnp' as
// an example. check for this too.
bool issub = (fname.ToUpper().Substring(fname.LastIndexOf(".") + 1, 1) == "X");
if (File.Exists(otherfile) && !issub)
fmtdata.TPL = FixXmlString(File.ReadAllText(otherfile));
else
{
if (issub)
{
string subtpl = fname.Substring(0, fname.LastIndexOf(".")) + fname.Substring(fname.Length - 2, 2);
otherfile = MyPath + @"\" + subtpl + @".tpl";
if (File.Exists(otherfile))
fmtdata.TPL = FixXmlString(File.ReadAllText(otherfile));
}
}
// http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char
otherfile = MyPath + @"\" + fname.Substring(0, fname.LastIndexOf(".")) + @".ini";
if (File.Exists(otherfile)) PsiIniToXml(ref fmtdata, otherfile);
@@ -4798,6 +4814,7 @@ namespace fmtxml
#region COMPAREACTIVE
subFmt.FontData = FixInheritedFont(subFmt.FontData, mainFmt.FontData); // Phase 10
if (mainFmt.PurchaseOptions == subFmt.PurchaseOptions) subFmt.PurchaseOptions = null;
if (mainFmt.ComponentTableFormat == subFmt.ComponentTableFormat) subFmt.ComponentTableFormat = null;
if (mainFmt.TPL == subFmt.TPL) subFmt.TPL = null;
if (mainFmt.EditData.EMode == subFmt.EditData.EMode) subFmt.EditData.EMode = null;
if (mainFmt.EditData.PromptForCautionType != null && mainFmt.EditData.PromptForCautionType == subFmt.EditData.PromptForCautionType) subFmt.EditData.PromptForCautionType = "null";
@@ -5306,6 +5323,7 @@ namespace fmtxml
private string StepPartPageBreakOnStep(Step stp) { return stp.PageBreakOnStep; }
private string StepPartUseOldTemplate(Step stp) { return stp.UseOldTemplate; }
private string StepPartAlignNullTabWSectHead(Step stp) { return stp.AlignNullTabWSectHead; }
private string StepPartAlignHLSTabWithSectOvride(Step stp) { return stp.AlignHLSTabWithSectOvride; }
private string StepPartTextSubFollowsTextStyle(Step stp) { return stp.TextSubFollowsTextStyle; }
private string StepPartTreatAsSequential(Step stp) { return stp.TreatAsSequential; }
private string StepPartMatchUpRNO(Step stp) { return stp.MatchUpRNO; }
@@ -5555,6 +5573,7 @@ namespace fmtxml
if (CheckInheritedStr(new StepPartStr(StepPartPageBreakOnStep), step, dicParents)) step.PageBreakOnStep = null;
if (CheckInheritedStr(new StepPartStr(StepPartUseOldTemplate), step, dicParents)) step.UseOldTemplate = null;
if (CheckInheritedStr(new StepPartStr(StepPartAlignNullTabWSectHead), step, dicParents)) step.AlignNullTabWSectHead = null;
if (CheckInheritedStr(new StepPartStr(StepPartAlignHLSTabWithSectOvride), step, dicParents)) step.AlignHLSTabWithSectOvride = null;
if (CheckInheritedStr(new StepPartStr(StepPartTextSubFollowsTextStyle), step, dicParents)) step.TextSubFollowsTextStyle = null;
if (CheckInheritedStr(new StepPartStr(StepPartTreatAsSequential), step, dicParents)) step.TreatAsSequential = null;
if (CheckInheritedStr(new StepPartStr(StepPartMatchUpRNO), step, dicParents)) step.MatchUpRNO = null;