From 21223b9b1fabdb136e10baa7196608777f3864da Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Mon, 5 Jun 2017 13:14:44 +0000
Subject: [PATCH] =?UTF-8?q?B2017-102:=20For=20figures,=20don=E2=80=99t=20a?=
 =?UTF-8?q?dd=20extra=20line=20for=20change=20bar=20lengths=20B2017-102:?=
 =?UTF-8?q?=20Add=20an=20offset=20for=20width=20to=20locate=20Change=20Bar?=
 =?UTF-8?q?s=20on=20supplemental=20information?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BASEall.xml              | Bin 85052 -> 85090 bytes
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnChangeBar.cs    |   2 +-
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index 75747f4f90b65a56d560c0022c76a9f18fa81d19..b6c4cf441ce1ff02b7fcd8f666ca6d9899c8b958 100644
GIT binary patch
delta 52
zcmdlpgZ0r2)(u=*iopz}3<V6H40#M`4EYQp42cX$4E{iN8iOr^5`!s&Ni(a~c2+G$
Gb0q+0jth<e

delta 18
ZcmaDfgLTgg)(u=*%?4WA4YU}IlmJEX1^@s6

diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index c0dd7594..95e6a425 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -812,6 +812,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _DoPrnDrvrAdjusts, "@DoPrnDrvrAdjusts");
 			} 
 		}
+		private LazyLoad<int?> _SupInfoTabOff;
+		public int? SupInfoTabOff
+		{ 
+			get 
+			{
+				return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff");
+			} 
+		}
 		private LazyLoad<string> _TopOfPageThing;
 		public string TopOfPageThing
 		{ 
diff --git a/PROMS/Volian.Print.Library/vlnChangeBar.cs b/PROMS/Volian.Print.Library/vlnChangeBar.cs
index 48cc806e..f29679f1 100644
--- a/PROMS/Volian.Print.Library/vlnChangeBar.cs
+++ b/PROMS/Volian.Print.Library/vlnChangeBar.cs
@@ -106,7 +106,7 @@ namespace Volian.Print.Library
 			Messages = new SortedDictionary<float, vlnChangeBarMessage>();
 			// if there is an RNO separator, add the separator's height in too.
 			float scale = parent.MyItemInfo.IsRtfRaw ? 0.6f : 1;		// use scale for equations (B2016-265)
-			Height = (scale * parent.Height) * MyPageHelper.YMultiplier + (parent.MyItemInfo.IsFigure?SixLinesPerInch:0);
+			Height = (scale * parent.Height) * MyPageHelper.YMultiplier;   // B2017-102, removed the extra line (was making changebar to long)
 			foreach (vlnPrintObject vpo in parent.PartsBelow)
 			{
 				if (vpo is vlnRNOSeparator)
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 39b3eb89..b09d09c4 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -5321,12 +5321,16 @@ namespace Volian.Print.Library
 		{
 			if (itemInfo.IsSupInfoPart)
 			{
-				XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + 54;	// add in 3/4 inch (54) to allow for enough space for Note/Caution tab
+				// The SupInfoTabOff was added to the base format during initial development to shift the tab over by 3/4 inch (54) to allow for enough space for Note/Caution tab
+				int sitabloc = itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoTabOff == null ? 0 : (int)itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoTabOff;
+				XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + sitabloc;
 				if (myTab != null)
 				{
 					myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12;
 					myTab.Width = 2.5f * myTab.Width;
 				}
+				// B2017-102: need to set width here since using Xoffset because AdjustWidth is called before this adjustment.
+				Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - (sitabloc / 2);
 				return;
 			}
 			float tabWidth = (myTab == null) ? 0 : myTab.Width;
@@ -5968,7 +5972,7 @@ namespace Volian.Print.Library
 				else if (MyParent.WidthNoLimit != 0)
 					Width = adjwidth + MyParent.WidthNoLimit - tabWidth + (myTab == null ? 0 : myTab.TabAlign);
 				else if ((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PageListSpBckgrnd) == E_DocStructStyle.DSS_PageListSpBckgrnd)
-					Width = adjwidth + MyParent.Width - (MyTab!=null?MyTab.Width:0);
+					Width = adjwidth + MyParent.Width - (MyTab != null ? MyTab.Width : 0);
 				else
 					Width = adjwidth + MyParent.Width - tabWidth + (myTab == null ? 0 : myTab.TabAlign);
 			}