From 87956b4b42ef1932f7d9e23311d02fdaf50be277 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Fri, 1 Feb 2013 14:53:11 +0000
Subject: [PATCH]

---
 PROMS/fmtxml/FmtFileToXml.cs |   9 +++++----
 PROMS/fmtxml/WST1all.xml     | Bin 71102 -> 71268 bytes
 PROMS/fmtxml/WST2all.xml     | Bin 59710 -> 59964 bytes
 PROMS/fmtxml/WSTALRall.xml   | Bin 46552 -> 46592 bytes
 PROMS/fmtxml/wst1.svg        | Bin 5682 -> 5914 bytes
 PROMS/fmtxml/wst2.svg        | Bin 6534 -> 6770 bytes
 PROMS/fmtxml/wstalr.svg      | Bin 3218 -> 3424 bytes
 7 files changed, 5 insertions(+), 4 deletions(-)

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 51ff31b6a6c59d1fb4b5f12ad7ddaefa7e3b0765..5d05e92343d7b6e6f4202e364c7db51862b0e0cc 100644
GIT binary patch
delta 149
zcmV;G0BZlfs|4h%1hAGT12q6JlW!*-v$iLG3zI-HqytU>Pm}R6Cj(9ZPqPs-vlo*j
zL>L1g03ee=IXjbhU>dVNPYwaIDolcp0X36R*;kWLyh4{?3js`*HVpv|v!L9V8ke9F
z0iLtg_v8VWIs^eqvp)Lz0Ru4rFqeM@0qK>{0S=R*0w9-W2LWc2p5zphz`P{09R8vg
DE*dt0

delta 185
zcmaE|hGpMsmJQR?navmsCg-cmZr-L|$36Li2+L+2lOFNOK?{T?JA~+L=JQ!KVe*Hg
z5t{|>nn*JmOfLLAck`nkPZ*~M2r=@hx-jH3<S~>mI0NZYFv}B2hA<>DBr*6iq=Cir
qCJRmzo<2c{(QdQA?_Z2ldl*$F>;3(rsl%YaK$8BH&C~v!69)hvkUJOv

diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml
index 906822ebcfae15bec275425db95c0367f443f03d..793acef77c3e08e3ae7c959bcadcacbb3f1ee9ac 100644
GIT binary patch
delta 263
zcmdmYiFwZz<_%^7%*G5xlYjF|ZVnRg;F&C-!!mh;_>##+5+ajxq=lIM82l$UN+?hM
zz{Rq8o=l4HWI08)$$u0SCifX|F)B=+s3kr*!HZ{dfPn{yCoKw6I5|OEZ}S}k1uaIC
z$rs}x3KXJ^m`xaJCmX7{Zk`q0r^0N?U^sc<ikq7oW{EIOc38=>xuE+V<K|y2P0UDA
zYZy1*+b+jE`N(;@%?W)KOh{5dU45&)CO>FgG`a6!29Va9EU>l!NH5tOH_Z*%5IH`e
S&BmJ-uGq?hq#tZ_f*}B{8)l{e

delta 187
zcmdmUg?Zm4<_%^7%mxewlYjF|ZVnRg;F<h^i)Hg9*%aZ)OH@=Q%NTM^o)oSy`Gbwn
z<QPM<$ssW=n{OE^XaTj<PM#R9I9V>nh|yqkV9Zq&Mw7{jM`Sl2n01M1aziuA=DePJ
zjGKS7HZj8`vY0mC*&)ZgS)qR$6I>9edci@j%>q*=vBJgf@G%;L44Zsl*1pXZtL|{a
KWxz%x7y<yKc}<7_

diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml
index fc761a1247700ec244e15431ed722a3defbc9183..7aa058bbea8dc210663955bec0aaf1be59a751ae 100644
GIT binary patch
delta 58
zcmccdnyKLp(*~{;>cI@D49N^744Dl140#N`42eKq5s+=mpu|wkpvd6NV8T$#pfs7$
LN_4Z_ie0<_;{p!2

delta 22
ecmZp8!*t^{(*~{;llxXLnat5)u$gV;FCGAa#R|ay

diff --git a/PROMS/fmtxml/wst1.svg b/PROMS/fmtxml/wst1.svg
index 0923a18e44ff66fba77aecc47bfcb07b00a657f6..6e31a676b8ebbb7299ff7a37f83d6ac7493a64f0 100644
GIT binary patch
delta 28
kcmdm_GfQuS3@@`2gXv^LChf_2j0Tg%*zGo7;7Q^H0Cu7X1poj5

delta 12
TcmbQGw@GJ%4DV(ZJ~2)J96keN

diff --git a/PROMS/fmtxml/wst2.svg b/PROMS/fmtxml/wst2.svg
index 37f74a264f53c4aaa0ec05741879c2fc47676153..ff2b396ea49937493327f82e809d7a2935133360 100644
GIT binary patch
delta 104
zcmZoO{$#RYf+({ggYo3aqN<FhlRt8bZaycvhFPAI!G<B7L4hHYA%($~L5abc!30R!
yG4L{QF>o?)PG)2l7S?4jVz2;;Dlk-n)#x%9PM*jPG7fCe<a44qjGU8mB_#p8U=?Km

delta 37
tcmexl(q_D2f+({QgVE&4qN<ZWaEfg{C%T52$A&?lp_rkJA)UdF0RZyQ3g`d;

diff --git a/PROMS/fmtxml/wstalr.svg b/PROMS/fmtxml/wstalr.svg
index 570445b792e66731d5b7368e8a7b0a1d3a292790..082920df1d06cea074a4c45bd182ad3beffe7ef3 100644
GIT binary patch
delta 100
zcmbOv`9Nwz8_(n(ZV_%11|<eN23`g(2F}UvnZ?bGfqVsqN(Ms)TOdmpNE?AgDu6Ud
f#Du{dDpCm*0jrsOkTH?RhC!d9n4ydz9cUr|hX4>o

delta 20
bcmaDLHA!+q8xM~SgFZtsLm5LlgB=3^K&J%l