From f6a471dde8249839d95272da38da78c2d6377f44 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 16 Oct 2014 15:59:48 +0000
Subject: [PATCH] Various print format improvements Fix multiple note/caution
 bulletting Improve check off lines (may need further improvement) Fix
 multiple/note caution printing for Calvert Only

---
 PROMS/Formats/fmtall/BGEOIall.xml          | Bin 138210 -> 138096 bytes
 PROMS/Formats/fmtall/BGESTPall.xml         | Bin 146986 -> 146840 bytes
 PROMS/Formats/genmacall/bgeoi.svg          | Bin 14714 -> 14040 bytes
 PROMS/Volian.Print.Library/vlnParagraph.cs |   6 ++++--
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml
index 50eba73b789e4ffab1a909c66fa078de80631d49..6c559be52892a14af9b012b72cd771093158bc1c 100644
GIT binary patch
delta 165
zcmaE~o#Vqcjt!HTC+kV@i8?bRG88kUGJxnDhB6?lh@oWqPHRTl&GVSIFxfjZWB|pI
z8L}Dt8Pb5z1ISBcNCB(!WXNL(0P@m-yc~v1pgAQBwhT%PAwV-qfnrJw3eEm(+x^)X
zHwI0=@{Cb~(;sL<5m05y^#5**?$akkGD>Xsi)37<Io;p@qto;S)r@l6+gcc7rUL-z
C{w(zX

delta 73
zcmV-P0Ji_|wg}?42(Xd^m(XJY471V$v;qNGm$Bmk6@%Uex84Q;m{ON8FaZ#kKpp`m
fx9(X1#wnMOkO3UGh>ZbI0hd^O0Uoy$gaKTaS_&Kj

diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index 7508214c5afbd495fca5b0a0bfa0c3d7d295aefe..c3b96032e50a450c509964e232cc01132b3c4a1c 100644
GIT binary patch
delta 97
zcmZ4WhhxTXj)pCa3sk2II4}xKZ>VSFn*KnQF=Kj%6r<2IPezI9J^G9a)A?i=gSNlX
qX5?a=UZ=q*wp~MmF^*|^P#vQbNOjWmMFxxp2$k(Xl|a=@c0vFvjvk}{

delta 124
zcmbR7n`6}<j)pCa3sl7w7=js6844H@8H#|o1ju$`$Y-dSK2eo%;`BNnMkz+!=@*R{
tgQw5)XDpjur_K0m`w4Z%5++fc+PWEyrdRqf$|GxR2Ws42r_CfK1OOiMBwzpl

diff --git a/PROMS/Formats/genmacall/bgeoi.svg b/PROMS/Formats/genmacall/bgeoi.svg
index 7f96c7da6c83f0d6f0f1b8c349b43d1545750653..5da16c59ae35a9509b282ae816417dd43a5ac86a 100644
GIT binary patch
delta 695
zcmexWbR&1eG5*O5q=hD5<L8q#WUysWVlZIPV=x6mB?bkC3I-#vm<faFWJXD0R<O)u
zMQ(dmu&T+1Y{HWd@G4BcBp?Dd<(q(jIc`%-84Q7DTSCpQgqjVt55-i;$rscFCi97v
zO;*s1nS4cvcBTtV?h;9$zS}qRiM0rVja4(|!xJRHfCUDLIZ;8PVDe~johB3YP2HTO
U`;L(Y#=00@qO!4@6-=U70k)5LnE(I)

delta 271
zcmcbS`>SZfG5$#g0_;W%h75WP7L(VT?4Nu<&usD}0TH0^<Qzef$?LS|OqSE;m^{H$
z11Kdnxj|J7DE<t;blc>4!U>p443JDH+iWGuCkRs0XDEc#mOjHvi|?s35m2(ZMEe~h
RAvHhrF5y$NxzEsx6#!j&W1;{6

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index eee16249..00c91b0d 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -218,7 +218,8 @@ namespace Volian.Print.Library
 								if (box != null)
 								{
 									box.Height = yoff - box.YOffset;  // new height, with children
-									if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
+									if (formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm  ||
+										formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
 									{
 										if (childItemInfo.MyHeader != null && childItemInfo.MyPrevious != null
 										 && ((childItemInfo.MyPrevious.IsCautionOrNotePart && childItemInfo.IsCautionOrNotePart)
@@ -3097,7 +3098,8 @@ namespace Volian.Print.Library
 			if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.Prefix != null && MyItemInfo.FormatStepData.Suffix != null && MyItemInfo.FormatStepData.UseSmartTemplate) return 0;
 			int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
 			if (everyNLines == -99) return 0;
-			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
+			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
+					MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
 			{
 			if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote)  && !MyItemInfo.FormatStepData.SpaceIn
 				&& (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)