From 02a65727e9805b37811e8ff4491e05ce64b29e58 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 2 May 2023 13:13:04 +0000 Subject: [PATCH] =?UTF-8?q?B2023-043:=20BVPS=20=E2=80=93=20subscript/super?= =?UTF-8?q?script=20in=20Section=20Titles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BVPS1all.xml | Bin 116292 -> 116446 bytes PROMS/Formats/fmtall/BVPS2all.xml | Bin 91952 -> 92110 bytes PROMS/Formats/fmtall/BVPSAOPall.xml | Bin 130602 -> 130760 bytes PROMS/Formats/fmtall/BVPSAtchall.xml | Bin 111918 -> 112078 bytes PROMS/Formats/fmtall/BVPSBCKall.xml | Bin 76364 -> 76434 bytes PROMS/Formats/fmtall/BVPSDEVall.xml | Bin 41242 -> 41400 bytes PROMS/Formats/fmtall/BVPSNIBCKall.xml | Bin 70760 -> 70830 bytes .../Format/PlantFormat.cs | 9 +++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 7 ++++++- 9 files changed, 15 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BVPS1all.xml b/PROMS/Formats/fmtall/BVPS1all.xml index 3a3ad38caed93658713dd992cbff6ace2f9dad89..369057d32dda448edec22df1c1b4ac370a12ae20 100644 GIT binary patch delta 113 zcmX@o!+x)qeZwEF$v%1#lYJUE_#GKafUt-mlOc(rl%ZsDqMq>N3En)LIk=Z8NIEm* sGvqQ90HsqIih~aM_wMETywYSgJW?ViC08k_!hyVZp delta 27 jcmccD%YLMXeZwEF$qPDpHhXa|Q)u?k+3umkIBgaHt=J1` diff --git a/PROMS/Formats/fmtall/BVPS2all.xml b/PROMS/Formats/fmtall/BVPS2all.xml index 0dec30634cfcccad83584675d0f3f633022f249c..50abfb0b5c8a94b97301913c533094fa2cb33c72 100644 GIT binary patch delta 153 zcmdmRj`iGm)(w}q^n)2v8Il=F7&0018S)rHfOH8%4p1x{%*tSJ1oBH5ih#T%hEj%- z$rJsBH(%n~qwcA|;0)A~%TNH6Ol2qrLJx)jhG3wgBnDdsC7@A7Kz1sSg2Zoj9= H=yL@Cr)wh- delta 39 vcmX@{mwnYA_6oA_WYo3`NcFHMYOkV6^X2PhT}W@Ruq0{JBjML=E>Ln)Az n%1}JndzbX|1+t7Ro0UZSR44zi6PSFVl5H}d1J~wrR(0&%0u(O=$|y15 zR#^a)FPeNZO?7jX{xfIZU?4Y{p@bn5XmH--jTyqijzC@s(4b79p`}0;(4xr)!{jFi U_-RdkkjpZ;A=_*7vtkon0OA`cPyhe` delta 43 zcmV+`0M!4u!vdPZ0K 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);