diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index d9971a9a..87087194 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -683,7 +683,7 @@ public struct TOC public float TofCSecTitlePos; public byte TofCSecTitleLen; public float TofCPageNumPos; - public byte TofCSpaceChar; + public string TofCSpaceChar; public byte TofCLineSpacing; public VE_Font Font; } @@ -1566,7 +1566,7 @@ namespace fmtxml } BuildDictionaryText(); fmtName = alias; - //if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return; + //if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return; //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; @@ -2568,7 +2568,8 @@ namespace fmtxml toc.TofCSecTitleLen = brFmt.ReadByte(); tmpfloat1 = Convert.ToInt16(brFmt.ReadSByte()); toc.TofCPageNumPos = 72 * (tmpfloat1 / 12); - toc.TofCSpaceChar = brFmt.ReadByte(); + byte tofCSpaceChar = brFmt.ReadByte(); + toc.TofCSpaceChar = tofCSpaceChar == 0 ? null : Convert.ToString(Convert.ToChar(tofCSpaceChar)); toc.TofCLineSpacing = brFmt.ReadByte(); toc.Font = LoadVE_FontByte(); ; accsec.TableOfContentsData = toc; @@ -4948,7 +4949,7 @@ namespace fmtxml if (maccsec.TableOfContentsData.TofCSecTitlePos == saccsec.TableOfContentsData.TofCSecTitlePos) subFmt.SectData.AccSectionData.TableOfContentsData.TofCSecTitlePos = NullInt; if (maccsec.TableOfContentsData.TofCSecTitleLen == saccsec.TableOfContentsData.TofCSecTitleLen) subFmt.SectData.AccSectionData.TableOfContentsData.TofCSecTitleLen = NullByte; if (maccsec.TableOfContentsData.TofCPageNumPos == saccsec.TableOfContentsData.TofCPageNumPos) subFmt.SectData.AccSectionData.TableOfContentsData.TofCPageNumPos = NullInt; - if (maccsec.TableOfContentsData.TofCSpaceChar == saccsec.TableOfContentsData.TofCSpaceChar) subFmt.SectData.AccSectionData.TableOfContentsData.TofCSpaceChar = NullByte; + if (maccsec.TableOfContentsData.TofCSpaceChar == saccsec.TableOfContentsData.TofCSpaceChar) subFmt.SectData.AccSectionData.TableOfContentsData.TofCSpaceChar = null; if (maccsec.TableOfContentsData.TofCLineSpacing == saccsec.TableOfContentsData.TofCLineSpacing) subFmt.SectData.AccSectionData.TableOfContentsData.TofCLineSpacing = NullByte; subFmt.SectData.AccSectionData.TableOfContentsData.Font = FixInheritedFont(saccsec.TableOfContentsData.Font, maccsec.TableOfContentsData.Font); // Phase 9 subFmt.SectData.StepSectionData.StpSectLayData.VertStyle = FixInheritedFont(ssctlay.VertStyle, msctlay.VertStyle);// Phase 13 diff --git a/PROMS/fmtxml/WST1all.xml b/PROMS/fmtxml/WST1all.xml index 51ff31b6..5d05e923 100644 Binary files a/PROMS/fmtxml/WST1all.xml and b/PROMS/fmtxml/WST1all.xml differ diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml index 906822eb..793acef7 100644 Binary files a/PROMS/fmtxml/WST2all.xml and b/PROMS/fmtxml/WST2all.xml differ diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index fc761a12..7aa058bb 100644 Binary files a/PROMS/fmtxml/WSTALRall.xml and b/PROMS/fmtxml/WSTALRall.xml differ diff --git a/PROMS/fmtxml/wst1.svg b/PROMS/fmtxml/wst1.svg index 0923a18e..6e31a676 100644 Binary files a/PROMS/fmtxml/wst1.svg and b/PROMS/fmtxml/wst1.svg differ diff --git a/PROMS/fmtxml/wst2.svg b/PROMS/fmtxml/wst2.svg index 37f74a26..ff2b396e 100644 Binary files a/PROMS/fmtxml/wst2.svg and b/PROMS/fmtxml/wst2.svg differ diff --git a/PROMS/fmtxml/wstalr.svg b/PROMS/fmtxml/wstalr.svg index 570445b7..082920df 100644 Binary files a/PROMS/fmtxml/wstalr.svg and b/PROMS/fmtxml/wstalr.svg differ