diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 3a3ad38c..369057d3 100644 Binary files a/PROMS/Formats/fmtall/BVPS1all.xml and b/PROMS/Formats/fmtall/BVPS1all.xml differ diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 0dec3063..50abfb0b 100644 Binary files a/PROMS/Formats/fmtall/BVPS2all.xml and b/PROMS/Formats/fmtall/BVPS2all.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAOPall.xml b/PROMS/Formats/fmtall/BVPSAOPall.xml index 7b772cbd..3b4d2a8c 100644 Binary files a/PROMS/Formats/fmtall/BVPSAOPall.xml and b/PROMS/Formats/fmtall/BVPSAOPall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSAtchall.xml b/PROMS/Formats/fmtall/BVPSAtchall.xml index 874fa2d8..6864c795 100644 Binary files a/PROMS/Formats/fmtall/BVPSAtchall.xml and b/PROMS/Formats/fmtall/BVPSAtchall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSBCKall.xml b/PROMS/Formats/fmtall/BVPSBCKall.xml index e71f3093..af152a45 100644 Binary files a/PROMS/Formats/fmtall/BVPSBCKall.xml and b/PROMS/Formats/fmtall/BVPSBCKall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSDEVall.xml b/PROMS/Formats/fmtall/BVPSDEVall.xml index 54843b2f..47f13bf4 100644 Binary files a/PROMS/Formats/fmtall/BVPSDEVall.xml and b/PROMS/Formats/fmtall/BVPSDEVall.xml differ diff --git a/PROMS/Formats/fmtall/BVPSNIBCKall.xml b/PROMS/Formats/fmtall/BVPSNIBCKall.xml index 7144bafc..a3a7823e 100644 Binary files a/PROMS/Formats/fmtall/BVPSNIBCKall.xml and b/PROMS/Formats/fmtall/BVPSNIBCKall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 44a708e2..16e5f64e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -1317,6 +1317,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseOnFirstForSeparatePaginationOnSubSect, "@UseOnFirstForSeparatePaginationOnSubSect"); } } + // B2023-043 for use with Beaver Valley AOP format - allow attributes, such as superscript on section titles when printing + private LazyLoad _SectionTitleWithAttributes; + public bool SectionTitleWithAttributes + { + get + { + return LazyLoad(ref _SectionTitleWithAttributes, "@SectionTitleWithAttributes"); + } + } private LazyLoad _WCNTraining; public bool WCNTraining { diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 22c9b958..afd8b824 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1966,6 +1966,9 @@ i = 0; string myMsg = section.MyDocStyle.Continue.Top.Message; if (myMsg != null && myMsg != string.Empty)stitle = stitle + myMsg; } + // B2023-043: Beaver Valley AOP - allow attributes, such as superscript on section titles when printing + if (section.ActiveFormat.PlantFormat.FormatData.PrintData.SectionTitleWithAttributes) + stitle = section.FormattedDisplayText; // B2021-119: large titles on Landscape Word Attachments are printing on 2 lines. // B2022-149: crash on cast if null int? stl = (int?)section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength; @@ -1990,7 +1993,9 @@ i = 0; { top = top.MyParent; } - plstr = SplitTitle(svgGroup, pageItem, top.DisplayText, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength); + // B2023-043: Beaver Valley AOP - allow attributes, such as superscript on section titles when printing + string tmptitle = (section.ActiveFormat.PlantFormat.FormatData.PrintData.SectionTitleWithAttributes) ? top.FormattedDisplayText : top.DisplayText; + plstr = SplitTitle(svgGroup, pageItem, tmptitle, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionTitleLength, token, plstr, section.ActiveFormat.PlantFormat.FormatData.SectData.SectionNumberAndTitleLength); } else plstr = plstr.Replace(token, string.Empty);