Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

Merge pull request '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.' (#566) from F2025-015_SharonHarris into Development

Browse Source 
Reviewed-on: #566
This commit is contained in:
Paul Larsen 2025-06-03 11:43:26 -04:00
commit 80f3568dbd
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/SHEAall.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/SHEall.xml
View File

Binary file not shown.

3
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -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()

3
PROMS/Volian.Print.Library/vlnTab.cs
View File

@ -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)
{
@ -268,6 +268,7 @@ namespace Volian.Print.Library
}
Rtf = GetRtf(origTab, vFont);
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);