From 5fd0ff9e71011d3c4e0a36c7bb1ffef43d9c7a4d Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 3 Jun 2025 10:46:41 -0400 Subject: [PATCH] F2025-015 Shearon Harris add sub-steps in Notes and Cautions and to add an Open Bullet sub-step type in both the EOP and AOP formats. --- PROMS/Formats/fmtall/SHEAall.xml | Bin 77134 -> 79016 bytes PROMS/Formats/fmtall/SHEall.xml | Bin 77130 -> 78994 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 3 ++- PROMS/Volian.Print.Library/vlnTab.cs | 5 +++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PROMS/Formats/fmtall/SHEAall.xml b/PROMS/Formats/fmtall/SHEAall.xml index ce0eed34d1e54cefd5b6db5d3b64310433605099..847ad8e5548128f22e0d7780309a65845526b0a3 100644 GIT binary patch delta 837 zcmah{O=}ZT6g_PMQX?8ef>F?UnUY{-`jG^oqOBnKfmpS+v_eZEolcwJ#Aq77Hg@N_ z^nwe2fy+Yo7QuBF#g!Xt7e#+Ucb@x_sa6-|F>mg@@4j>Hx$ka$i+}tTU*GGKJufBQ zqgi>EH}Wa}n0|6?KQ5)=^oDooWKjxT^bFo`#Kh5#ed?MRdV=Zpq6J^&*> zyv*AEiIw|IYBAjAs?b&?+LMUeXU2lfP(6lc0hg*#f@oi)t<=#i?apiZFR4DX#0HVt zGW>S`8|rgi|P=?X1vVvJ^F2MjL*X?I<26#1vzse)Z^p#9=@{Qax^g*n zcLvV&L{Bp)P9h^;on$mgvfH0Jb!c`_lw$d6Vw$Cewvs1uekw0JUY3*j@8sM(YH|$U zUPV+{<^dpWrPTiYH(5dvT@7*E4EJ%j*Y0Oz)s6RPkK6ej5yy1?xHd*+PH+DP_-4C= delta 39 xcmV+?0NDSi=>*Q&1hD2QlTe5TlTbiFv#=@-F_WN31Oq$(FOv-&8?&}z^3hPg5A*;4 diff --git a/PROMS/Formats/fmtall/SHEall.xml b/PROMS/Formats/fmtall/SHEall.xml index b2d912dae16c071e45e1741d6785f783d2ca6c32..868f873779d2f3480620a38365a444f3d7c225c1 100644 GIT binary patch delta 857 zcmah{O;1x%5Iu#)7^{)cVvq)MTcMT@ZHpn%@Rf97&?q9P8;MDIJcRISp*+7>6!-^yVJE1@wllXvgDxifR_Id{H%3s--JcR%#YZjX`o z+1c8szHq4aaUh+I7&J`Y&U7cPBgx1Eyv7<_jPvgfR$8&fzm*u9>PGK_gt8!7^jT>#SmB1C6 zUdP8Wvkk%bT6Hz{3deB|CA?%t84e1(oQp-~lu%@z!)VFkrZG?CEN)VD zrP!Kgp3jpyT!FrlQCR|bhZ&1DLn#@axilrD7{R(kU(tgq73dZJUr+$gVjBd6uTk=w zq-#)^U^{K)P|*VYrxs$xUZdWAo{Hp7D5a5M*6=m#`^0jomc3T_nu^(NB&nMj?1~4E zlfeYe;S5U}CZR;MdA6iF-G07#nj%xTB$>Z(G)tMmyY zZzA3DWam^cUqT+Cl6)TM;F`F6iR-?J$5moGi~lAO4JeHv!vWE!T$7!)XszY()WKgt CXSd-1 delta 39 xcmV+?0NDSM=>*E!1hBLzlQ2FGli()=lMp}>li(%bvnnenFq4oU1hXt+X3|bZ5AFZ} diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 668e1cf5..6408a619 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -6097,9 +6097,10 @@ namespace VEPROMS.CSLA.Library } private bool IsLowestLevelStep { + //F2025-015 added check for IsInCautionOrNote for sub-step inside Notes and Cautions get { - return (!(IsCaution || IsNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote)); + return (!(IsCaution || IsNote || IsInCautionOrNote || IsTable || IsFigure || Steps != null || MyParent.IsCaution || MyParent.IsNote)); } } private bool RNOsHighHasCheckOff() diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs index 893530d6..40fce490 100644 --- a/PROMS/Volian.Print.Library/vlnTab.cs +++ b/PROMS/Volian.Print.Library/vlnTab.cs @@ -69,7 +69,7 @@ namespace Volian.Print.Library private string symblsStr = "\u25CF\u0394"; // string of possible symbol character in a tab // add symbol characters as needed // "\u25CF" - solid bullet - // \x0394 - delta + // \u0394 - delta private System.Drawing.FontStyle GetSysFontStyle(VE_Font f) { @@ -267,7 +267,8 @@ namespace Volian.Print.Library } } Rtf = GetRtf(origTab, vFont); - Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 "); // delta 0x0394 + Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 "); // delta 0x0394 + Rtf = Rtf.Replace("\u03BF", @"\f1\u959?\f0 "); // F2025-015 lowercase omicron check with hex value replace with RTF string if (ScriptCaution) { Rtf = GetRtf("\u25CFCaution ", vFont);