diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 26674cc3..90ee2987 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -108,6 +108,7 @@ namespace fmtxml fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Prestige Elite Tall"; fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "10"; fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "None"; + fmtdata.StepData[6].WidthOverride = "421"; // Note (original 16-bit font) fmtdata.StepData[7].Font.FontFamily = "Prestige Elite Tall"; @@ -121,6 +122,7 @@ namespace fmtxml fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Prestige Elite Tall"; fmtdata.StepData[7].TabData.Bullet.Font.FontSize = "10"; fmtdata.StepData[7].TabData.Bullet.Font.FontStyle = "None"; + fmtdata.StepData[7].WidthOverride = "401"; //// Cautions use Arial Font for Tab (instead of Script) and //// any bullets following the tab are at a different point size @@ -135,6 +137,7 @@ namespace fmtxml //fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Arial"; //fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "10"; //fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "Bold"; + //fmtdata.StepData[6].WidthOverride = 421; ////fmtdata.StepData[20] = fmtdata.StepData[6]; ////fmtdata.StepData[20].Type = "Caution1"; @@ -212,6 +215,7 @@ namespace fmtxml //fmtdata.StepData[7].TabData.Ident = "Note "; //fmtdata.StepData[7].TabData.RNOIdent = "Note "; ////fmtdata.StepData[7].TabData.IdentWid = "65.4"; + //fmtdata.StepData[7].WidthOverride = 401; ////fmtdata.StepData[22] = fmtdata.StepData[7]; ////fmtdata.StepData[22].Type = "Note1"; @@ -323,6 +327,12 @@ namespace fmtxml case "NSP.PAG": AddNSPPage(ref pgstyles); break; + case "NSPAB.PAG": + AddNSPABPage(ref pgstyles); + break; + case "NSPAB.Z01": + AddNSPABPage_Z01(ref pgstyles); + break; case "SHE.PAG": AddSHEPage(ref pgstyles); break; @@ -373,6 +383,80 @@ namespace fmtxml pgstyles.PgStyles[8].Items[1].Col = -16; // {HEADER1} pgstyles.PgStyles[8].Items[5].Col = -16; // {BOX4} } + private void AddNSPABPage(ref PageStyles pgstyles) + { + //Procedure Steps + //{PS-CONFSTATE} + pgstyles.PgStyles[0].Items[1].Col = 294; + //{COVERPROCTITLE} + pgstyles.PgStyles[0].Items[6].Col = 293; + //{EOPNUM} + pgstyles.PgStyles[0].Items[7].Col = 505; + //{REV} + pgstyles.PgStyles[0].Items[8].Col = 513; + //Page {PAGE} of {OF} + pgstyles.PgStyles[0].Items[9].Col = 513; + //{PS-CONFSTATE} + pgstyles.PgStyles[0].Items[10].Col = 287; + + //Purpose and Entry + //{PS-CONFSTATE} + pgstyles.PgStyles[1].Items[1].Col = 287; + //{COVERPROCTITLE} + pgstyles.PgStyles[1].Items[5].Col = 293; + //{EOPNUM} + pgstyles.PgStyles[1].Items[6].Col = 505; + //{REV} + pgstyles.PgStyles[1].Items[7].Col = 513; + //Page {PAGE} of {OF} + pgstyles.PgStyles[1].Items[8].Col = 513; + //{PS-CONFSTATE} + pgstyles.PgStyles[1].Items[9].Col = 287; + + //Cover Page + //{PS-CONFSTATE} + pgstyles.PgStyles[2].Items[1].Col = 250; + //{COVERPROCTITLE} + pgstyles.PgStyles[2].Items[6].Col = 249; + //{EOPNUM} + pgstyles.PgStyles[2].Items[7].Col = 511; + //{REV} + pgstyles.PgStyles[2].Items[8].Col = 513; + //Page {PAGE} of {OF} + pgstyles.PgStyles[2].Items[9].Col = 507; + //{PS-CONFSTATE} + pgstyles.PgStyles[2].Items[13].Col = 250; + } + private void AddNSPABPage_Z01(ref PageStyles pgstyles) + { + //Background Text - First Page + //{PS-CONFSTATE} + pgstyles.PgStyles[0].Items[1].Col = 294; + //{COVERPROCTITLE} + pgstyles.PgStyles[0].Items[5].Col = 292; + //{EOPNUM} + pgstyles.PgStyles[0].Items[6].Col = 505; + //{REV} + pgstyles.PgStyles[0].Items[7].Col = 513; + //Page {PAGE} of {OF} + pgstyles.PgStyles[0].Items[8].Col = 512; + //{PS-CONFSTATE} + pgstyles.PgStyles[0].Items[12].Col = 287; // 294; + + //Background Text - Blank Page + //{PS-CONFSTATE} + pgstyles.PgStyles[1].Items[1].Col = 294; + //{COVERPROCTITLE} + pgstyles.PgStyles[1].Items[5].Col = 292; + //{EOPNUM} + pgstyles.PgStyles[1].Items[6].Col = 505; + //{REV} + pgstyles.PgStyles[1].Items[7].Col = 513; + //Page {PAGE} of {OF} + pgstyles.PgStyles[1].Items[8].Col = 512; + //{PS-CONFSTATE} + pgstyles.PgStyles[1].Items[10].Col = 287; // 294; + } private void AddRGESam1Page(ref PageStyles pgstyles) { // CoverPage - add the Revision to the pagelist diff --git a/PROMS/fmtxml/FmtToXml.cs b/PROMS/fmtxml/FmtToXml.cs index b831ae6c..b5a9f715 100644 --- a/PROMS/fmtxml/FmtToXml.cs +++ b/PROMS/fmtxml/FmtToXml.cs @@ -651,7 +651,7 @@ namespace fmtxml } } bool didLineDraw = false; - for (short i=0;i