From ecc9a866e3befc8ca3063fd984c1e1d976b6215c Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Fri, 17 Jun 2016 14:45:51 +0000
Subject: [PATCH] Continue development VCB1 format:  Only underline top section
 (if subsections) VCB1 format:  Format flag to only underline top section (if
 subsections) VCB1: step widths

---
 PROMS/Formats/fmtall/vcb1all.xml              | Bin 68670 -> 69632 bytes
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |   9 ++++++++-
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   6 +++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/vcb1all.xml b/PROMS/Formats/fmtall/vcb1all.xml
index a83b11694cbf384fb0356337b3eac7792a00a1b9..e7fd3d6f78c61a3fa9cfc23ed579b24cb696b9c7 100644
GIT binary patch
delta 479
zcmZ`#-7AA}6h80AwAsvT&C0~Pk@AsdHpy2Qp%~lV`M6QY1ub06g^2kNa1<$;J0;or
zQA(y=aG@wJ<$~R~ol<HPXSk%(spp(}&hwlnwkd|fVx(0R9AIbdqDm>$f|GeP*St!C
zUYLRa%;Ag9kR`)3%zzKZVGM%k87M``SAhkl3=C*<St#4f<4TrN6@&>Q&B8d|YR$MJ
z7h~9z$&xvpoZzIx^@jL5=ftXgKSmDfzLAeT?%gY}@<fY|$9Y9QXa^U_&_(KQ=%%Tk
zx|^^cdZ3lC7o!n_U;`U+7mb)u>(`DNevN2xawr#f&NV2VcujrK0v$w<U>@4&oQuj&
z^wmqF`e&ADD`Wh|j1MtA>MjN?|H-Ef$!R+zZZtZ<N>^PJNdOuN+o>G%RXHc&liKjN
zp$c4#TG198#>kt<nhv+@8_hf?Q3#(;g%rDuSrW?v0mnum&$%#^%2(7tHT}7pI>q77
qATAu1vC-!br9ewIl03^u1GFTT(EVD15ARBL_jbkqkl1c&JLe0Fxso{m

delta 181
zcmV;m080OWpai~{1h7H`li&#mvq}U62m?0&F|$z&%>t7k4q~&o4^je?fQ}B65RnG6
zS`tzL12F(Nv#%4ul(T@(U;(qxsa^$>(5WJm{J~z6!0H5(T&g~k{^}}|xa<zIfU_hr
z1vCIN04|py0s$eD%;^Y|wCNU;koO{!pzv_BbmsH|ll=W+w_pMRGy${z>Lv-3eDIW)
j;0gh7vnchv1(SU6hLd>zF0+*T$^w^Q0s+9Y9{=JH3g1v5

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 5b341da4..90446767 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -2585,7 +2585,14 @@ namespace VEPROMS.CSLA.Library
 						font = format.PlantFormat.FormatData.Font;
 						break;
 					case 1: // section
-						font = format.PlantFormat.FormatData.SectData.SectionHeader.Font;
+						if (format.PlantFormat.FormatData.SectData.SectionHeader.OnlyUnderlineTopSect && MyParent.IsSection)
+						{
+							VE_Font hdrFont = format.PlantFormat.FormatData.SectData.SectionHeader.Font;
+							E_Style es = (E_Style)(hdrFont.Style & E_Style.Bold);
+							font = new VE_Font(hdrFont.Family, (int)hdrFont.Size, es, (float)hdrFont.CPI);
+						}
+						else
+							font = format.PlantFormat.FormatData.SectData.SectionHeader.Font;
 						break;
 					case 2: // step types
 						int typindx = type - 20000;  // what to do for other types rather than steps
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index e9b098cd..776894d2 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -2033,6 +2033,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _Level0Big, "@Level0Big");
 			}
 		}
+		private LazyLoad<bool> _OnlyUnderlineTopSect;
+		public bool OnlyUnderlineTopSect
+		{
+			get
+			{
+				return LazyLoad(ref _OnlyUnderlineTopSect, "@OnlyUnderlineTopSect");
+			}
+		}
 		private VE_Font _Font;
 		public VE_Font Font
 		{
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 49fcefe2..9b7eda93 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -5434,7 +5434,11 @@ namespace Volian.Print.Library
 		private float AdjustMetaWidth(ItemInfo itemInfo, FormatInfo formatInfo, float adjwidth)
 		{
 			SectData sd = formatInfo.PlantFormat.FormatData.SectData;
-			if (sd.UseMetaSections)
+			if (((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections))
+			{
+				adjwidth = MyTab != null ? -MyTab.Width : 0;
+			}
+			else if (sd.UseMetaSections)
 			{
 				if (sd.StepSectionData.StepSectionLayoutData.TieTabToLevel)
 				{