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

added NSP specific, removed IdentWid’s

Browse Source 
removed IdentWid’s, added TabBullet
setup DocStyle to inherit from the section’s default, not Base, added Plant specific for PageStyles (pagelist)
This commit is contained in:
John Jenko
2012-06-18 20:21:26 +00:00
parent 0e9a7efdae
commit f41b211187
3 changed files with 265 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
PROMS/fmtxml/FmtFileToXml.cs
View File

@@ -1003,14 +1003,15 @@ public struct Tab
public string IdentAltPrint;
public string RNOIdentEdit;
public string RNOIdent;
public string IdentEditWid;
public string IdentWid;
public string RNOIdentEditWid;
public string RNOIdentWid;
//public string IdentEditWid;
//public string IdentWid;
//public string RNOIdentEditWid;
//public string RNOIdentWid;
public string Justify; // from tbstyle - None, CENTER, LEFT, RIGHT
public string UsePreviousStyle;
public COMacro[] MacroList;
public VE_Font Font;
public VE_Font Font;
public TabBullet Bullet;
}
[Serializable]
public struct COMacro
@@ -1093,6 +1094,13 @@ public struct RO
public string CapFirstLetterInHighRO; //CAPFIRSTLETTERINHIGHSP
/* End of Format flags */
}
[Serializable]
public struct TabBullet
{
public string Separate;
public VE_Font Font;
}
[Flags]
public enum E_TransitionMenus : uint
{
@@ -2727,9 +2735,9 @@ namespace fmtxml
if (Tabindx[i] == j)
{
fmtdata.StepData[i + 1].TabData.IdentEdit = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 0], true);
fmtdata.StepData[i + 1].TabData.IdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
//fmtdata.StepData[i + 1].TabData.IdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
fmtdata.StepData[i + 1].TabData.Ident = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 1], true);
fmtdata.StepData[i + 1].TabData.IdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
//fmtdata.StepData[i + 1].TabData.IdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
break;
}
}
@@ -3133,9 +3141,9 @@ namespace fmtxml
if (Tabindx[i] == j)
{
fmtdata.StepData[i + 1].TabData.RNOIdentEdit = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 0], fmtdata.StepData[i].StepNumberForHighLevel == "True");
fmtdata.StepData[i + 1].TabData.RNOIdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
//fmtdata.StepData[i + 1].TabData.RNOIdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
fmtdata.StepData[i + 1].TabData.RNOIdent = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 1], fmtdata.StepData[i].StepNumberForHighLevel == "True");
fmtdata.StepData[i + 1].TabData.RNOIdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
//fmtdata.StepData[i + 1].TabData.RNOIdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
break;
}
}
@@ -5215,10 +5223,10 @@ namespace fmtxml
private string StepPartTabIdent(Step stp) { return stp.TabData.Ident; }
private string StepPartTabRNOIdentEdit(Step stp) { return stp.TabData.RNOIdentEdit; }
private string StepPartTabRNOIdent(Step stp) { return stp.TabData.RNOIdent; }
private string StepPartTabIdentEditWid(Step stp) { return stp.TabData.IdentEditWid; }
private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; }
private string StepPartTabRNOIdentEditWid(Step stp) { return stp.TabData.RNOIdentEditWid; }
private string StepPartTabRNOIdentWid(Step stp) { return stp.TabData.RNOIdentWid; }
//private string StepPartTabIdentEditWid(Step stp) { return stp.TabData.IdentEditWid; }
//private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; }
//private string StepPartTabRNOIdentEditWid(Step stp) { return stp.TabData.RNOIdentEditWid; }
//private string StepPartTabRNOIdentWid(Step stp) { return stp.TabData.RNOIdentWid; }
private string StepPartTabJustify(Step stp) { return stp.TabData.Justify; }
// Do the flags:
@@ -5422,10 +5430,10 @@ namespace fmtxml
if (CheckInheritedStr(new StepPartStr(StepPartTabIdent), step, dicParents)) step.TabData.Ident = null;
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEdit), step, dicParents)) step.TabData.RNOIdentEdit = null;
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdent), step, dicParents)) step.TabData.RNOIdent = null;
if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEditWid), step, dicParents)) step.TabData.IdentEditWid = NullString;
if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString;
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEditWid), step, dicParents)) step.TabData.RNOIdentEditWid = NullString;
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentWid), step, dicParents)) step.TabData.RNOIdentWid = NullString;
//if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEditWid), step, dicParents)) step.TabData.IdentEditWid = NullString;
//if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString;
//if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEditWid), step, dicParents)) step.TabData.RNOIdentEditWid = NullString;
//if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentWid), step, dicParents)) step.TabData.RNOIdentWid = NullString;
if (CheckInheritedStr(new StepPartStr(StepPartTabJustify), step, dicParents)) step.TabData.Justify = null;
//if (CheckInheritedStr(new StepPartStr(StepPartTabCheckOff), step, dicParents)) step.TabData.CheckOff = null;