diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 78e7bfa1..57398a92 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ diff --git a/PROMS/Formats/fmtall/WCNSAMall.xml b/PROMS/Formats/fmtall/WCNSAMall.xml index 31088b0e..367f8f4f 100644 Binary files a/PROMS/Formats/fmtall/WCNSAMall.xml and b/PROMS/Formats/fmtall/WCNSAMall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 43118c10..68c19ca2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -854,6 +854,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); } } + private LazyLoad _SupInfoAdjustXOffForLongTab; + public bool SupInfoAdjustXOffForLongTab + { + get + { + return LazyLoad(ref _SupInfoAdjustXOffForLongTab, "@SupInfoAdjustXOffForLongTab"); + } + } private LazyLoad _TopOfPageThing; public string TopOfPageThing { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 9a36d53a..6d4b1a1c 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5588,7 +5588,10 @@ namespace Volian.Print.Library myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12; // B2017-253 - Limit the tab offset to 2 points inside the left margin myTab.XOffset = Math.Max(myTab.XOffset,itemInfo.MyDocStyle.Layout.LeftMargin ?? 72)+2; + float mytbwidth = myTab.Width; myTab.Width = 2.5f * myTab.Width; + // C2018-022: adjust xoffset of text by 12 if the tab would overwrite the text and the format flag is on: + if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoAdjustXOffForLongTab && myTab.XOffset + mytbwidth > XOffset) XOffset += 12; } // 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);