From 03db9cdbd1bae52e420bb2142024dfdae783329c Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 27 Nov 2012 15:19:51 +0000
Subject: [PATCH]

---
 PROMS/Volian.Print.Library/vlnParagraph.cs | 12 ++++++++----
 PROMS/Volian.Print.Library/vlnTab.cs       |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 69419901..aac8384d 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -525,7 +525,7 @@ namespace Volian.Print.Library
 						MyPageHelper.PageBookmarks.Add(MyItemInfo, ((si.DisplayNumber ?? "") == "" ? "" : si.DisplayNumber + " - ") + si.DisplayText, null);
 					}
 					// Only do foldout page if not done for section break, i.e. check the there's a previous step.
-					if (MyItemInfo.MyPrevious != null && (((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style ?? 0 & E_DocStructStyle.UseSectionFoldout) != 0))) // || MyPageHelper.DoFloatingFoldout))
+					if (MyItemInfo.MyPrevious != null && MyItemInfo.FoldoutIndex()>-1)
 						PromsPrinter.DoFoldoutPage(cb, "HLS", MyPageHelper.TextLayer, MyPageHelper);
 					yPageStart = yTopMargin + YTopMost;
 					DoCheckOffHeader(cb, MyItemInfo, yLocation, yTopMargin, yPageStart);
@@ -566,7 +566,7 @@ namespace Volian.Print.Library
 					cb.PdfDocument.NewPage();
 					ResetDocStyleAndValues(ref yTopMargin, ref yBottomMargin);
 					DebugText.WriteLine("Paginate2");
-					if ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style ?? 0 & E_DocStructStyle.UseSectionFoldout) != 0 || MyPageHelper.DoFloatingFoldout)
+					if (MyItemInfo.FoldoutIndex()>-1)
 						PromsPrinter.DoFoldoutPage(cb, "Break within Step", MyPageHelper.TextLayer, MyPageHelper);	// temporary foldout
 					// If there is a box, adjust the yTopMost to include it.
 					float yTopMost = YTopMost;
@@ -605,7 +605,7 @@ namespace Volian.Print.Library
 							SectionInfo si = MyItemInfo as SectionInfo;
 							MyPageHelper.PageBookmarks.Add(MyItemInfo, ((si.DisplayNumber ?? "") == "" ? "" : si.DisplayNumber + " - ") + si.DisplayText, null);
 						}
-						if ((MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style ?? 0 & E_DocStructStyle.UseSectionFoldout) != 0) // || MyPageHelper.DoFloatingFoldout)
+						if (MyItemInfo.FoldoutIndex() > -1)
 							PromsPrinter.DoFoldoutPage(cb, "HLS (7 lpi) break", MyPageHelper.TextLayer, MyPageHelper);
 					}
 					if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.IsStepSection &&
@@ -1944,7 +1944,11 @@ namespace Volian.Print.Library
 				else	// if no left justify, right align the tab
 				{
 					XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
-					if (myTab != null) myTab.XOffset += tabWidth - myTab.TabAlign;
+					if (myTab != null)
+					{
+						myTab.XOffset += tabWidth - myTab.TabAlign;
+						if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
+					}
 				}
 			}
 		}
diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs
index bb61c6f0..cc93f11a 100644
--- a/PROMS/Volian.Print.Library/vlnTab.cs
+++ b/PROMS/Volian.Print.Library/vlnTab.cs
@@ -130,7 +130,11 @@ namespace Volian.Print.Library
 				Width = (float)myparent.MyItemInfo.FormatStepData.TabData.IdentWidth;
 			else if (CCCs != IIIs)
 			{
-				if (myparent.MyItemInfo.ActiveFormat.Name.Contains("SHE"))	// Temporary for SHE development. need better way to do this check
+				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 if (myparent.MyItemInfo.ActiveFormat.Name.ToUpper().Contains("SHE"))	// Temporary for SHE development. need better way to do this check
 				{
 					if (myparent.MyItemInfo.IsHigh)
 						Width = 6 * origTab.Length;