This commit is contained in:
2013-04-17 12:31:14 +00:00
parent bc923f77a0
commit f0d9003d0d
15 changed files with 134 additions and 76 deletions

View File

@@ -34,6 +34,9 @@ namespace fmtxml
case "NSPARP":
AddNSPARPfmt(ref fmtdata);
break;
case "SHE":
AddSHEfmt(ref fmtdata);
break;
}
}
@@ -313,6 +316,19 @@ namespace fmtxml
fmtdata.StepData[1].TabData.RNOIdentEdit = "";
fmtdata.StepData[1].TabData.RNOIdent = "";
}
private void AddSHEfmt(ref FormatData fmtdata)
{
fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,198,144";
fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "0,186,0";
fmtdata.StepData[2].TabData.Ident = " {numeric}.";
fmtdata.StepData[2].TabData.RNOIdent = " .";
fmtdata.StepData[7].TabData.Ident = @" \ul NOTE\ulnone";
fmtdata.StepData[26].TabData.Ident = @" \ul NOTE\ulnone";
fmtdata.StepData[7].TabData.NoTrim = "True"; // need this field in stepdata/tabdata.
fmtdata.StepData[9].TabData.Ident = "{asterisk} {numeric}.";
fmtdata.StepData[18].TabData.Ident = null;
fmtdata.StepData[18].TabData.RNOIdent = null;
}
}
public partial class FmtToXml
@@ -354,6 +370,17 @@ namespace fmtxml
{
// Procedure Steps
pgstyles.PgStyles[0].Items[1].Col = 78; // Column for BOX5 needed adjusted to match 16bit
pgstyles.PgStyles[2].Items[2].Col = 315; // Adjust columns on PSI items for cover page.
pgstyles.PgStyles[2].Items[3].Col = 315;
pgstyles.PgStyles[2].Items[4].Col = 315;
pgstyles.PgStyles[2].Items[5].Col = 315;
pgstyles.PgStyles[2].Items[6].Col = 315;
pgstyles.PgStyles[2].Items[7].Col = 315;
pgstyles.PgStyles[2].Items[8].Col = 315;
pgstyles.PgStyles[2].Items[9].Col = 315;
pgstyles.PgStyles[3].Items[1].Col = 447; // Adjust columns on some PSI for cover page.
pgstyles.PgStyles[3].Items[2].Col = 447;
pgstyles.PgStyles[3].Items[3].Col = 447;
}
// NSP_ALL
private void AddNSPPage(ref PageStyles pgstyles)

View File

@@ -1009,6 +1009,7 @@ public struct Tab
//public string RNOIdentWid;
public string Justify; // from tbstyle - None, CENTER, LEFT, RIGHT
public string UsePreviousStyle;
public string NoTrim;
public COMacro[] MacroList;
public VE_Font Font;
public TabBullet Bullet;
@@ -5239,7 +5240,7 @@ namespace fmtxml
//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; }
private string StepPartTabTrim(Step stp) { return stp.TabData.NoTrim; }
// Do the flags:
private string StepPartDoubleSpace(Step stp) { return stp.DoubleSpace; }
private string StepPartEnhancedStepNumFromPrev(Step stp) { return stp.EnhancedStepNumFromPrev; }
@@ -5446,6 +5447,7 @@ namespace fmtxml
//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(StepPartTabTrim), step, dicParents)) step.TabData.NoTrim = null;
//if (CheckInheritedStr(new StepPartStr(StepPartTabCheckOff), step, dicParents)) step.TabData.CheckOff = null;
// substructures - Tab - Font

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.