From ca0d89faa9f808d4d64c543dddb94f79231400a0 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Fri, 1 Feb 2013 15:02:08 +0000
Subject: [PATCH]

---
 PROMS/Volian.Print.Library/VlnSvgPageHelper.cs |  6 ++----
 PROMS/Volian.Print.Library/vlnTab.cs           | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
index d3c549df..455a4323 100644
--- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
+++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
@@ -104,8 +104,6 @@ namespace Volian.Print.Library
 				DrawMessages(writer.DirectContent);
 				if (!CreatingFoldoutPage)
 					DrawRuler(writer.DirectContent);
-				if ((MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
-					CurrentTOCPageNumber++;
 			}
 			else
 			{
@@ -113,9 +111,9 @@ namespace Volian.Print.Library
 				base.OnEndPage(writer, document);
 				if (!CreatingFoldoutPage)
 					DrawRuler(writer.DirectContent);
-				if ((MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
-					CurrentTOCPageNumber++;
 			}
+			if (MySection.MyDocStyle.StructureStyle.Style==null || (MySection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DontCountInTabOfCont) == 0)
+				CurrentTOCPageNumber++;
 			PageListTopCheckOffHeader = null;
 			PageListLastCheckOffHeader = null;
 			YMultiplier = 1;
diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs
index cc93f11a..d242307e 100644
--- a/PROMS/Volian.Print.Library/vlnTab.cs
+++ b/PROMS/Volian.Print.Library/vlnTab.cs
@@ -168,12 +168,20 @@ namespace Volian.Print.Library
 				cleanTab = origTab;
 				if (CCCs != IIIs)
 				{
-					origTab = origTab + " ";
-					origTab = origTab.TrimStart(" ".ToCharArray());
-					if (mindx>2) // ouch!
-						Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric})  FPL is good with genmac output!
+					
+					if (myparent.MyItemInfo.ActiveFormat.Name.ToUpper().Contains("WST"))	// Temporary for WST development. need better way to do this check
+					{
+						Width = 6.8f * origTab.Length;
+					}
 					else
-						Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric})
+					{
+						origTab = origTab + " ";
+						origTab = origTab.TrimStart(" ".ToCharArray());
+						if (mindx > 2) // ouch!
+							Width = 6f * (origTab.Length - 1); // FPL (macro is after {numeric})  FPL is good with genmac output!
+						else
+							Width = 3 + (6f * origTab.Length); // NSP (macro is before {numeric})
+					}
 				}
 				else
 					Width = GetTextWidth(MyFont, (cleanTab != null ? cleanTab : origTab), symblFontName);//MyFont.CharsToTwips * (cleanTab != null ? cleanTab.Length : origTab.Length);