diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 75747f4f..b6c4cf44 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ 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 _SupInfoTabOff; + public int? SupInfoTabOff + { + get + { + return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff"); + } + } private LazyLoad _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(); // 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); }