diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index c0a5f67b..db338ce0 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -407,7 +407,8 @@ namespace Volian.Controls.Library // Group by High Level Steps, Substeps, Cautions, Notes, Figures, Tables while (!parentName.Equals("Base") && !parentName.Equals("Substep") && !parentName.Equals("High") && !parentName.Equals("Caution") && !parentName.Equals("Note") && !parentName.Equals("Table") && - !parentName.Equals("Figure") && !parentName.Equals("Title")) + !parentName.Equals("Figure") && !parentName.Equals("Title") && + !parentName.Equals("And") && !parentName.Equals("Or") && !parentName.Equals("Paragraph")) { StepData tmpsd = (StepData)parnode.Tag; parentName = tmpsd.ParentType; diff --git a/PROMS/Volian.Print.Library/PDFReport.cs b/PROMS/Volian.Print.Library/PDFReport.cs index 63a76906..dfd291db 100644 --- a/PROMS/Volian.Print.Library/PDFReport.cs +++ b/PROMS/Volian.Print.Library/PDFReport.cs @@ -426,7 +426,7 @@ namespace Volian.Print.Library datatable.AddCell(cell); BuildSearchResultsProcSetList(); - datatable.HeaderRows = 3 + (ProcSetList.Count == 1 ? 1 : 0); + datatable.HeaderRows = 4 + (ProcSetList.Count == 1 ? 1 : 0); int splitAt = FindSpitLevel(); // find the split level of the common path - for all procedure sets that use these library documents Color subHeaderColor = new Color(0xD0, 0xF0, 0xD0); @@ -543,6 +543,8 @@ namespace Volian.Print.Library _RegexSearchString = _RegexSearchString + "$"; _RegexSearchString = _RegexSearchString.Replace("[", @"\["); _RegexSearchString = _RegexSearchString.Replace("]", @"\]"); + _RegexSearchString = _RegexSearchString.Replace("(", @"\("); + _RegexSearchString = _RegexSearchString.Replace(")", @"\)"); } return _RegexSearchString; }