From 5cc512234ecb1bc17d30452ce73aa6c9cb760739 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 11 Nov 2014 15:45:11 +0000
Subject: [PATCH] =?UTF-8?q?RNO=20xoffset=20RNO=20xoffset=20&=20=E2=80=9CIm?=
 =?UTF-8?q?proved=20Box=20with=20Paragraph=E2=80=9D=20printing=20=E2=80=9C?=
 =?UTF-8?q?Improved=20Box=20with=20Paragraph=E2=80=9D=20box=20location=20f?=
 =?UTF-8?q?ix=20possible=20null=20reference=20for=20determining=20auto=20i?=
 =?UTF-8?q?ndent=20of=20meta-sections=20Calvert:=20using=20format=20flag?=
 =?UTF-8?q?=20IdentWidth=20in=20defining=20tab=20width=20if=20it=20is=20se?=
 =?UTF-8?q?t=20in=20format=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BGEOI_00all.xml       | Bin 114328 -> 114376 bytes
 PROMS/Formats/fmtall/BGEOIall.xml          | Bin 139196 -> 139294 bytes
 PROMS/Formats/fmtall/BGESTPall.xml         | Bin 149168 -> 149262 bytes
 PROMS/Formats/genmacall/bgeoi.svg          | Bin 16570 -> 16572 bytes
 PROMS/Formats/genmacall/bgestp.svg         | Bin 16516 -> 16518 bytes
 PROMS/Volian.Print.Library/vlnParagraph.cs |   4 ++--
 PROMS/Volian.Print.Library/vlnTab.cs       |   2 ++
 7 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/BGEOI_00all.xml b/PROMS/Formats/fmtall/BGEOI_00all.xml
index 9f205be8037119b5914ccf5ed799f48dde31c894..91b2b338c749f68e74262b4004169c70c3820527 100644
GIT binary patch
delta 64
zcmbR7m+iz~whaeZb)6aV8FCnc7(y5l8IpjkR0dlHB?dzVBL)Ko9Uy7KU<RZ?d@}~6
O=Dn=j_p&nH-T?p_ybn|W

delta 18
acmX@{mu<#hwhaeZn?JB_|G>(4V+R0U#0ilA

diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml
index 2dc20fe2df32a72d6cf6eedcb503733a70df2a83..e4c11162354b9c37b29e12625f211f7870bbb321 100644
GIT binary patch
delta 92
zcmV-i0HgoBzX+bd2(XA512F(HgNGTnhZzC4C6|080SXOQ0BHbZ0CWIo06hRAmw__@
yNw<DK0X7|%yj=kdmrfx8Bn?IYVE}9Za{y%kA^;$laZLe*m*6A;LbrNd0Ybv=<{EJT

delta 49
zcmbPtfMd^ojtw1>%{`Ladn6gRsZQ?-VRYEO$ez(mc6yF7qrfyD#**oMra-Y<v5YQ<
E0OH&dTL1t6

diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index 64a301b125522251de167dbe5cba0e32d06fbb23..3dd6aef0b0f0a76bb99bd05f8275bc219b953d5f 100644
GIT binary patch
delta 88
zcmdnc%h}h**|3GtD_qi(A%!88A&;SiA)Fx-$Sz^XV6bISVlbNi(40wpx`G0u!S=3j
sMm~<|3lbQ4rgtbYs!SG>=9|7mpHX0XLjYsR^aK8k4%=fA7(<=`041#%CjbBd

delta 43
zcmeC{<J{28*|3GtD}1_y3Zv8ZHQ|gr9Mfe?83m>{1TdCNKj6>kuzgnoW5_cAK#vaZ

diff --git a/PROMS/Formats/genmacall/bgeoi.svg b/PROMS/Formats/genmacall/bgeoi.svg
index cd26c0ca8425dc2b8c7eede76557ef5c08603a36..79e02a880d9b6a9cfad3477876ea4dcb2d3ee769 100644
GIT binary patch
delta 18
Zcmdnh$hfDGaRUn<vo3?_W>&tfMgTbY1y29~

delta 18
acmdnf$hfPKaRUqA<X4<Ln}zsR836!8T?T#t

diff --git a/PROMS/Formats/genmacall/bgestp.svg b/PROMS/Formats/genmacall/bgestp.svg
index 36a46b650ad496ca06873ce7e9a4535dcf3c625c..ebeaa9959411894558e802b0a2fb875ab11156d5 100644
GIT binary patch
delta 18
ZcmZo^WNd3>-0+W=S(m|d^MBq}BLF}<2BiQ1

delta 18
ZcmZo`WNc|<-0+Wg@*7T`%{+WnMgT^$2G;-p

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index b0cc6e37..8642195e 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -2245,9 +2245,9 @@ namespace Volian.Print.Library
 									offset += (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
 								else
 								{
-									float autoIndent = 0;
 									SectionConfig sc = itemInfo.MyParent.MyConfig as SectionConfig;
-									offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset : MyParent.MyTab.XOffset;
+									offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset 
+										: (MyParent.MyTab != null)?MyParent.MyTab.XOffset:XOffset;
 								}
 							}
 							else
diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs
index d707eb1c..eeca6b62 100644
--- a/PROMS/Volian.Print.Library/vlnTab.cs
+++ b/PROMS/Volian.Print.Library/vlnTab.cs
@@ -183,6 +183,8 @@ namespace Volian.Print.Library
 					float? tPtPerChar1 = myparent.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.TabPtsPerChar;
 					if (tPtPerChar1 != null)
 						Width = (float)tPtPerChar1 * origTab.Length;
+					else if ((myparent.MyItemInfo.FormatStepData != null) && (myparent.MyItemInfo.FormatStepData.TabData.IdentWidth ?? 0) > 0)
+						Width = (float)myparent.MyItemInfo.FormatStepData.TabData.IdentWidth;
 					else
 					{
 						origTab = origTab + " ";