From f79bc0cb634876db4f9d2bf0990e9ba53bffd42a Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 27 Mar 2013 16:10:23 +0000
Subject: [PATCH]

---
 .../Extension/TransitionExt.cs                |   7 +++++--
 PROMS/fmtxml/WST1all.xml                      | Bin 92864 -> 93550 bytes
 PROMS/fmtxml/WST2all.xml                      | Bin 83882 -> 84160 bytes
 PROMS/fmtxml/WSTALRall.xml                    | Bin 57282 -> 57744 bytes
 PROMS/fmtxml/WSTBCKall.xml                    | Bin 72034 -> 73052 bytes
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index 0d40aaef..ff56396b 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -664,7 +664,10 @@ namespace VEPROMS.CSLA.Library
 								thisTab =   thisTab.Trim(" ".ToCharArray());
 								if (hasDelim && !thisTab.EndsWith(".") && !thisTab.EndsWith(")")) thisTab = thisTab + ".";
 							}
-							sret = thisTab + sret;
+							// RHM 20130326 2039 - I added the logic to limit the addition of the section tab to 
+							// the existing tab if it starts the same.
+							// Westinghouse/System Procs/WRS-101/Add6/4.2.7  Transition to 4.2.5
+							if(sret == "" || !sret.StartsWith(thisTab)) sret = thisTab + sret;
 						}
 						pitem = pitem.ActiveParent as ItemInfo;
 						if (pitem == null) break;
@@ -722,7 +725,7 @@ namespace VEPROMS.CSLA.Library
 				string tmpStr = tb.ToString();
 				if (tmpStr.ToUpper().EndsWith(", STEP ")) 
 					tb.Remove(tb.Length - 7, 7);  // 7 is length of ", Step "
-				else if (tb.Prefix != null && tb.Prefix.StartsWith(")"))
+				else if (tb.Prefix != null && tb.Prefix.StartsWith(")") && (tb.ToString().IndexOf("(")>-1))
 					tb.Append(")");
 				return true;
 			}
diff --git a/PROMS/fmtxml/WST1all.xml b/PROMS/fmtxml/WST1all.xml
index 096b0dda4b356613cfab35ddb03d8e4c5838398e..9b60087a88c619011118864b7515d4fcd3553803 100644
GIT binary patch
delta 436
zcmb7;%PT}-7{=ezTrni3I0yALX2GOM(pj)jLeeZ4*-yD-CLtu{QZm`e%y|?Gx3#G;
zeA!8}JL4SZ#Day@#CDSW1?FO6YxVa2dVkOJrk`yeueQ|7EV>mBhN2-Zhi}F50y(_K
zwH;S8WQFmUvs?w(jUCdUM~MWHO*r|$g-7_qcs6k?6m9uk!o1w|dn+L@7vbroUqC4C
zQu?e)>g(66#OG=Uk6d+D{@DFEpLgN$+K24j2u63^eDQXx3OQp~V7Sb*B4%3ohkBGx
z%Q%H)>=_NH)f;hrpD7T_GBG@<BHDB}g1Wn!(E`m7qjl;dKekoTQkYGq=qR(eQDS4J
zh&N3_>OUzhjM_@sG)~hrNh|rTVVa^P+N5^uo4q*IFR-E2Az=E8-EpJ7_;Jjv!KcOw
i9BI{u<U<b*ObJn4f@TK599A&Zdl;G!?A&V{pL_#V<Ex<n

delta 284
zcmaENi}k=&)(zJ(Cg*Jvm>jSwU~@#~9?8iKd0@`uh|G%3d@VdOlg*kFHqTnn!#R1?
zLbb^sR>y2!u}X;%#M%5|^#{hu1{>X=GI^8pa<V3G*itsxVXf2Tf9uO8uh_&lxnaY%
z$vjhBHZRzi!UeQRV{*a+smU9*P22o$PYw5EfzxK26;38GPX2OMWOCdIiOIW8oq)5u
z&WKEYa!O}%6;Qn4oDf(ZA|}MH$574S!;m<+@ud7@g|h;a?aoV0_Bp$1@{&_xlkG0@
zO<r)4XL8*+A;lzyRE8pkS_Y8%V1^PPuYf^;!H=PoA(sIxH~INF+sOi_%qCCB=9qlr
MxX9)g=iBB208d1NVE_OC

diff --git a/PROMS/fmtxml/WST2all.xml b/PROMS/fmtxml/WST2all.xml
index d2b6ac6f7a179750b7dd5d427e752121b9f8d4db..eb62d122a212d50814397d9114a5a62b7357fde1 100644
GIT binary patch
delta 236
zcmZ40&w5}Y>w@~pW%&w|w;d4JEKpy@Ir&1m*<?K{jmZzngC^T_b8NoX@q`g3u-T@2
z4&&sKd?lcAsmTFTj3(b=lAF9BL2h$G?<>a1?}~UPNA!OKs+O31?>FD%giNl<PJvRB
z{KYnJn4rf6)#$WYVfH<q$@i9VFcwc%TrNFXY()fTFhdDLDnkJSSY&hC3K2#m1sSV6
zm=zc_CjVV2%cwc|;ws_EK5O`x?HTkYpI<9EX}J>A93*9|nhYQfva2K+H8;OrwSNu(
Dd|Y2y

delta 221
zcmX>wk#$u+>w@~p+qMgAHmEP-oZJu^FnLcm$L6@sCybLPG^kAu2n^Z0r+W_L<a5aa
zlP{#lfCPXlq&A22&0w5tF^O;TkN$5!m28u>0wpHDDpuQUFwuu=^1rDX(=RwO%1xf&
zE4BIG>;pWLlU7Sij$7$7`P_0advn}M5k{b30<#W-!sLgmWF>(#Lp6gvgC0XLLn=cu
lLkW=Y!H~jGG}&>P{N$9?aYU%xxXg6&y|o;hZPv8R0RVKIR7C&)

diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml
index 05836de48ffc062a8c6deafb43211f17c4f76fde..aecc3545f7605b8396cfd8ec11ab4eabd59511ec 100644
GIT binary patch
delta 501
zcmZ{g-7AA(7{>2yS-z6OWE?zL#(^2mmNJ~kfmYV+gv>UP&1M^uk9@Rqa&g9bOZgaH
z%Ug1wh;kqY@)yWoup>E;-0zD62YP$zzOU<d-Ov5Jx7UV^J3}@<h1aCO{Y5Emyrar|
z%2k91y#*^%9!Q&JWq4yvhnHj>6K16KF4a(^&2t^1v0{vDy}{w>gS2Q;F1KxkKV&y@
z>ou6)ol~wPr*XNKn)&OY2t{dvf)pS@V-({)%+(+bkek}LinBXKekKHUQHXrZgjp4w
zh_GX&1lQxN&uWa7-5_f|W`dkca9-u&ObYJCH7bE=eMO7Vrm2%dOigM|fM!??vF7Jo
zh`TVSg}N<#?lR?bzeJDcvkpFX*bhtbk+C5sJCNHmqT#@V_ajj-z!wGiVR5Wxt6|T0
z|0;@<DcAj#@Oa#d=z$SWC+7MlzHfm#$;N--`wfEnwM~|O9SmhFVL3AYKP69{(uhvE
cO4o$i!*<AWKAfi+q|ah}0_yV0j@;1t1&8vV%>V!Z

delta 292
zcmbPmnEB9t<_#Pzlid~wOg<2iH2KdYhshVpj5hPM-s76gm#el}V8RE+$pKT{K%B_}
z6Y@6ynKXlOa$G6j<ONf{0R`D6ubV0{`N2%SNtF_l6++}Tf19euHThh-z~q2DiOCm^
zNC7p;Ox`iKVzbOb2e!=yD+HJ(A6joRIb@T`<UOmF0NE0g*7!`mu#s=_k@aGm)`&2I
zgeF_8_2ATDP++KLuxHSl?7LB%QD^ePwZg0(3@HpnllO0w2dT!TiXE(qp?328bx*~C
m`Wb>5QW=sNN`U4;Wf*iOA6(&xQ_gUuGthBDn`<_R7y<yKOl?vC

diff --git a/PROMS/fmtxml/WSTBCKall.xml b/PROMS/fmtxml/WSTBCKall.xml
index 12c87accc9ed3b1254eeba2d59fb954b26de1446..5e1504634034bc8862e0463572e9e01cb0b70062 100644
GIT binary patch
delta 725
zcmaJ;OGq106un~9s9D$q{6wsiw2RbF8-myxglheDk%ACGjEV_yLIr=sq?=NSP-yA)
zKyV=v#m0>baYUTS#OI>xBHeV8m5Xj0T)4A%oyO20mEp}h@4j=+z3<-h15-{j?Yomm
zf0B?st5f=txoV`kE3p`OjNr_ul1#Ogl?1%o8)evGdVb9g2_64l!n<u(_IK7<@zH|Q
z=OzTw7X^Y9t}l&vHSI=Xp<em6`>QVGpice<Xo;3-j%1o8i6Ru`^8%xB^3xc37{zIk
zV$7IlEHi#fA^wL8iaA>0_$;5^@tQZ>ZoJqVYXKYfjyEx^)kD(ks8Rb2oYx;Z-WXnS
z>R`2>ahP)q@*ZLLIQzu#Q;Z;$aUnQq#!*2jX}!qn?ur5CMDZ-!0L!V>V11u5Bd2v$
z``Jh47p<UQYesLTt=vZ;I7It@Z(8w3cNQIGB!<j5%al5`;83?3PFuRIc8RN$=smrp
zr>Iq%9`R12M(4sDALCxd_ysb3peIG%gN&`}R&#aI0FSVjRCI5Kp8GSn{?=0LqeQQH
z0@0iN_^r2A6?zR@R^YR4MNl~5)ttsme4^XHdHn@`2p<wB5m;0=Rz)Q))lzPa>bVo=
MS>F09S@Ct^8igwCng9R*

delta 415
zcmcb!i{;TKmJJ5eCU1KqusLDc9nQ%IrmIaZXbaiAZGjdeoD;QZ4&&r2<vAdk$x(}>
zHh)+$gK_enR=&womVE=NVw<edWj8sXKyGqFuGpp(&jcpl*{d?S!HaD&+di?$Gj=9S
zo^nWNa?x&?$=`O>LD?a;3Je+y3Jl>4nG7Wi89*`*$OExbfpjuMDMJwurUFGvfc#=0
zD;dbjWXK1r)0`~0r+o6N10q0EB_^-gqXjV)Xxpb<R+IMGz@-xQiNK}!cF9bZI|y=!
z#AK*Aqu%7ged3ercF9eCvRi2Kul<`QUpZt1R3#9Z1hle<p_W09p_(BWXmu(>0nj0S
zK!@crz~mra2mv}ufguryQ-BUk1458a+)n?v%X+fHA-l<I4wy`yvPWVv#9a_J)Fqpb
I9G(#g0Q$F_;s5{u