diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index 651d7580..431dba08 100644 Binary files a/PROMS/Formats/fmtall/FNPSAM1all.xml and b/PROMS/Formats/fmtall/FNPSAM1all.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 9f746944..d0cac8f9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -843,6 +843,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff"); } } + private LazyLoad _SupInfoIncludeParTab; + public bool SupInfoIncludeParTab + { + get + { + return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); + } + } private LazyLoad _TopOfPageThing; public string TopOfPageThing { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index cdfd1e4b..9a9f08ee 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4304,7 +4304,13 @@ namespace Volian.Print.Library else if (itemInfo.MyParent.IsNote) strmytab = "Note"; else - strmytab = ItemInfo.GetCombinedTab(itemInfo.MyParent, itemInfo.MyParent.MyParent.CombinedTab); + { + // B2018-022: use flag to determine whether to pre-pend the parent's tab as part of the supplemental info tab + // (if the procedure tab is long, such as in Farley, the tab overwrites text in the supplemental info pages) + strmytab = itemInfo.ActiveSection.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoIncludeParTab + ? ItemInfo.GetCombinedTab(itemInfo.MyParent, itemInfo.MyParent.MyParent.CombinedTab) + : itemInfo.MyTab.CleanText; + } strmytab = strmytab.Trim(); mytab = new vlnTab(cb, this, strmytab, strmytab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); return mytab;