From 1f8be43773021088055d5667f60f33b3c3f213c0 Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 18 Oct 2021 11:29:39 +0000 Subject: [PATCH] F2021-060 Do not remove blank line between step and Caution, Note or Warning below it (Caution, Note, Warning are off 1st sub step) B2021-118: On cover page, if procedure title is 3 lines it prints over Revision Number F2021-060 Add double lines for Warning box; B2021-120 Second Bulleted Sub-step type with empty bullet & remove dashed step type --- PROMS/Formats/fmtall/BNPP1all.xml | Bin 187864 -> 187864 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 190606 -> 190904 bytes PROMS/Volian.Print.Library/vlnParagraph.cs | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 6d0019eeac4cd190a2aa32cbf37fe0c2130111ce..a0b00622bba0c2f055299d3c338819c7af547b6b 100644 GIT binary patch delta 39 vcmcbyoBPIY?uHh|EleyK%w`Ox)BmP1U7vm-nn{b*n8Ap_bUSY*)9DfbDS!>2 delta 40 wcmcbyoBPIY?uHh|EleyK(+|ZkiA?89XF4|hLNt>Wt1*KSgYkCWOs3N%06t$0`~Uy| diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 20e82dbd412d685de172951d978cc78190a5def1..595fd00a566674788f3beebefa8e52731090ce60 100644 GIT binary patch delta 256 zcmeCX$i3q-cf%IOjEmDZ9A%W4E@HtXFjaubZTo?Xj0<=ejkhP>WBkuA>d#QXkjjw9 zpuph7P|A=4gsBWA)3e_(_A=&Ae|VNr6i7LWFewA6iMJW0fz-z3jH1&GoS9grPdLY@ zH+|ZB#w+qzO#zze!jKO%HEF6NljwAyy?Ml$xqZP$Mi05^PtGuUY!?tkOYzz1lX t7?arK17U2_<3ySI1Vb1y7%~}>8M0w^OgB8qBs%$w3(xjj;!ImE008JvQhopc delta 162 zcmdmSnY-^Icf%IOjEmDRi7<&x4|vC@wtd${#yvdK`HnK)n;vkMQDFK!VJ3y`E%zBe z@$tGaBr+5;WH6*Mq%bHz1exNd?^w>rH+{n;Mx*K5-ZNg|Mp8R{ y{s+chG)3D_ePr~Io6d5UQDgcaPNtOU1@{?6wqFup3Syt0@REsTJBK9Gh6?~UbUq^h diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 1261b862..ff22195e 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5291,7 +5291,8 @@ namespace Volian.Print.Library // F2021-033: No blank line between hls and its first substep: if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankHlsAndFirstSub && MyItemInfo.IsHigh) { - if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0) return 0; + // F2021-060 Do not remove blank line between step and Caution, Note or Warning below it (Caution, Note, Warning are off 1st sub step) + if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && !MyItemInfo.Steps[0].HasCautionOrNote) return 0; } // F2021-025: Barakah single column no blank line between last Note/Caution/Warning text and bottom line of box // C2021-049: Barakah no blank line between last Note/Caution/Warning text, include sub-step text by using 'IsInCautionOrNote'