diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index db42871d..1b2ab9f5 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5325,6 +5325,8 @@ namespace Volian.Print.Library // B2022-017: Barakah within note/caution, if note has substeps, there should be a blank line between note & 1st substep // B2022-027: Barakah blank line not printing after list within another list. Rewrote code for all of these issues so that // code looks up parents to see if they have next before returning a 0 (no blank line) + // B2022-042: double Caution followed by Critical Step missing bullet + // F2022-010: substeps in multiple notes, cautions, warning print differently if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoBlankLastNoteCautionWarn && (MyItemInfo.IsInCautionOrNote)) { if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && (MyItemInfo.NextItem == null)) // there are no sub-steps, see if any parents have next @@ -5340,6 +5342,7 @@ namespace Volian.Print.Library } if (!par.IsInCautionOrNote || (par != null && par.MyContent.Type != par.NextItem.MyContent.Type)) return 0; } + if ((MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0) && MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type) return 0; } if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch; // B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants.