B2026-053-Global-Search-should-not-return-partial-matches

.gitignore

@@ -401,5 +401,4 @@ FodyWeavers.xsd
 
 /fmtall
 /genmacall
-*AssemblyInfo.cs
-/PROMS/Baseline/Baseline.sln
+*AssemblyInfo.cs

PROMS/Baseline/frmBaseline.cs

@@ -503,7 +503,7 @@ namespace Baseline
 			string[] fileList = Directory.GetFiles(fi.DirectoryName, patern);
 			// sort the list of file list
 			Array.Sort((string[])fileList);
-			return fileList.FirstOrDefault(); // the PDF file that we what should be top of the list then.
+			return fileList.First(); // the PDF file that we what should be top of the list then.
 		}
 
 		/// <summary>

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -2148,7 +2148,7 @@ namespace VEPROMS
 						//C2019-036 View Only mode work with Checked Out Procedures
 						// View Only Mode is no longer checked out, so no longer has an OwnerID
 						// This will keep those tabs from auto-closing based on the timer
-						if (!myList.Contains(dti.OwnerID) && dti?.MyStepTabPanel?.MyStepPanel?.VwMode != E_ViewMode.View)
+						if (!myList.Contains(dti.OwnerID) && dti.MyStepTabPanel.MyStepPanel.VwMode != E_ViewMode.View)
 						{
 							MyCloseTabList.PushDTI(dti);
 						}
@@ -3578,7 +3578,6 @@ namespace VEPROMS
 			{
 				if (parameter.StartsWith("/P="))
 				{
-					BaseLnSettings.blBaseLine = true;
 					MSWordToPDF.Automatic = true;
 					PromsPrinter.BaselineTesting = true;// Set Baseline Testing property for PROMsPrinter
 					string[] dvstrs = parameter.Substring(3).Split(",".ToCharArray());
@@ -3624,7 +3623,7 @@ namespace VEPROMS
 						}
 						ranAuto = true;
 					}
-					BaseLnSettings.blBaseLine = false;
+
 					if (ranAuto)
 					{
 						this.Close();

PROMS/VEPROMS.CSLA.Library/Extension/DocumentExt.cs

@@ -1258,7 +1258,7 @@ namespace VEPROMS.CSLA.Library
 
 				int lastStart = sel == null ? 0 : sel.Start;
 
-                while (sel != null)
+				while (sel != null)
 				{
 					if (!string.IsNullOrEmpty(sel.Text))
 					{
@@ -1438,7 +1438,7 @@ namespace VEPROMS.CSLA.Library
 
 					lastStart = sel.Start;
 
-                    sel = FindRO();
+					sel = FindRO();
 
 					if (sel != null && !string.IsNullOrEmpty(sel.Text) && sel.Start == lastStart)
 					{
@@ -2124,22 +2124,22 @@ namespace VEPROMS.CSLA.Library
 			bool executeResult = false;
 			LBSelection sel = null;
 
-            while (!executeResult)
+			while (!executeResult)
 			{
 				sel = MyApp.Selection;
 				LBFind find = sel.Find;
 				find.ClearFormatting();
 
-                // Search string format - this is MSWord wildcard format
-                // If you do a search in MSWord, make sure wildcard box is checked and then press the
-                // Special button to see the definitions of the various wildcards
-                // [<] - Less-Than Character
-                // [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
-                // - Dash            
-                // [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
-                //		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
-                // [>] - Greater-Than Character
-                find.Text = "[<][!<> -]@-[!<>]@[>]";
+				// Search string format - this is MSWord wildcard format
+				// If you do a search in MSWord, make sure wildcard box is checked and then press the
+				// Special button to see the definitions of the various wildcards
+				// [<] - Less-Than Character
+				// [!<> -]@ - 1 or more characters not including Less-Than, Greater-Than,  Dash or Space
+				// - Dash
+				// [!<>]@ - 1 or more characters not including Less-Than, Greater-Than.
+				//		a space be included as part of the accessory page id (Callaway, EOP Addendum 37)
+				// [>] - Greater-Than Character
+				find.Text = "[<][!<> -]@-[!<>]@[>]";
 				find.Wrap = LBWdFindWrap.wdFindContinue;
 				find.MatchCase = false;
 				find.MatchWholeWord = false;
@@ -2159,18 +2159,14 @@ namespace VEPROMS.CSLA.Library
 				{
 					tryagain = false;
 					executeResult = find.Execute();
-                    // B2022-053 if the found text does not begin with a "<" and end with a ">", then
-                    //           move past that text and try the Word Find function again.
-                    // B2022-088: [JPR] Find Doc Ro button not working in Word Sections
-                    // B2022-098: [JPR] ROs not being resolved in Word Sections
-                    // B2026-070: When there is a  less-then sign (<) followed by a numeric value in a Word attachment (inside of a table), PROMS thinks the user put in an RO token will generate an RO not found error in the following table row who's text contains <U-Name>.
+					// B2022-053 if the found text does not begin with a "<" and end with a ">", then
+					//           move past that text and try the Word Find function again.
+					// B2022-088: [JPR] Find Doc Ro button not working in Word Sections
+					// B2022-098: [JPR] ROs not being resolved in Word Sections
 					if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
-                    {
-                        int location = sel.Start + sel.Text.Length - 1; //do not do this inline - this needs captured before WholeStory
-
-                        sel.WholeStory();
-                        sel.MoveStart(LBWdUnits.wdCharacter, location);
-                        tryagain = true;
+					{
+						sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
+						tryagain = true;
 					}
 				} while (tryagain);
 
@@ -2195,7 +2191,7 @@ namespace VEPROMS.CSLA.Library
 					sel.MoveStart(LBWdUnits.wdCharacter, 1);
 					executeResult = false;
 				}
-            }
+			}
 
 			if (executeResult) return sel;
 

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -7279,6 +7279,7 @@ namespace VEPROMS.CSLA.Library
 				_ByWordSuffix = byWordSuffix;
 			}
 		}
+
 		private void DataPortal_Fetch(ItemListSearchCriteria criteria)
 		{
 			this.RaiseListChangedEvents = false;

PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs

@@ -262,10 +262,8 @@ namespace VEPROMS.CSLA.Library
                     if (dvi.DocVersionAssociations[0].MyROFst.ROFstID != newfstid)
                     {
                         dv.DocVersionAssociations[0].MyROFst = localROFst.GetJustROFst();
+                        SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                     }
-					// B2026-066 moved this out of if statement above
-					// - was not resetting the datetime and thus not disabling the Update RO Values button and menu item
-                    SetAssociationLastCompleted(dv, DateTime.Now.ToString());
                 }
             }
 

PROMS/Volian.Base.Library/BaseLnSettings.cs

@@ -1,8 +0,0 @@
-
-namespace Volian.Base.Library
-{
-	public static class BaseLnSettings
-	{
-		public static bool blBaseLine { get; set; } = false;
-	}
-}

PROMS/Volian.Base.Library/Volian.Base.Library.csproj

@@ -90,7 +90,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseLnSettings.cs" />
     <Compile Include="BigNum.cs" />
     <Compile Include="ByteArrayCompare.cs" />
     <Compile Include="DebugPrint.cs" />

PROMS/Volian.Controls.Library/DSOTabPanel.cs

@@ -613,15 +613,7 @@ namespace Volian.Controls.Library
             _In_DSOTabPanel_Enter = false;
             _MyDisplayTabControl.SelectedDisplayTabItem = MyDisplayTabItem;
             // B2018-070 Position the text cursor - Activate MS Word Panel
-            try
-            {
-                _MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
-            }
-            catch 
-            {
-                //B2026-067 - Do nothing if cannot Position cursor
-            }
-
+            _MyEdWord.GotoItem(EDWordLib.WdGoToItem.wdGoToObject, EDWordLib.WdGoToDirection.wdGoToNext, 0, null);
         }
         #endregion
         #region Public Methods

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -643,9 +643,10 @@ namespace Volian.Controls.Library
                 if (_docVersionInfo != null && fstid != -1 && fstid != MyROFSTLookup.RofstID)
                 {
                     string message = string.Empty;
-                    if (_progressBar?.Text != "RO Check Paused - Other Users In Set" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
+                    if (_progressBar?.Text != "Cannot check-out Working Draft" && !MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
                     {
-                        FinalProgressBarMessage = "RO Check Paused - Other Users In Set";
+                        FlexibleMessageBox.Show(this, message, "Working Draft Has Items Already Checked Out", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                        FinalProgressBarMessage = "Cannot check-out Working Draft";
                     }
                     else if (!MySessionInfo.CanCheckOutItem(_docVersionInfo.VersionID, CheckOutType.DocVersion, ref message))
                     {
@@ -718,7 +719,7 @@ namespace Volian.Controls.Library
                 if (tmpROID != null) ExpandNode(ROFSTLookup.FormatRoidKey(tmpROID, true));
 
                 //doc version would have updated (if needed) so reset flag
-                if (_progressBar?.Text != "RO Check Paused - Other Users In Set")
+                if (_progressBar?.Text != "Cannot check-out Working Draft")
                 {
                     changedDocVersion = false;
                 }

PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs

@@ -94,15 +94,6 @@ namespace Volian.Controls.Library
 			this.label2 = new System.Windows.Forms.Label();
 			this.cbxAnnoTypes = new DevComponents.DotNetBar.Controls.ComboBoxEx();
 			this.tabAnnotationSearch = new DevComponents.DotNetBar.TabItem(this.components);
-			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
-			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
-			this.lblIncTran = new System.Windows.Forms.Label();
-			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
-			this.lblSrchIncTran = new System.Windows.Forms.Label();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.rbFromEditor = new System.Windows.Forms.RadioButton();
-			this.rbFromTree = new System.Windows.Forms.RadioButton();
-			this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
 			this.contextMenuBar1 = new DevComponents.DotNetBar.ContextMenuBar();
 			this.btnCMIFindText = new DevComponents.DotNetBar.ButtonItem();
 			this.btnCMEdit = new DevComponents.DotNetBar.ButtonItem();
@@ -121,6 +112,15 @@ namespace Volian.Controls.Library
 			this.btnAND = new DevComponents.DotNetBar.ButtonItem();
 			this.btnOR = new DevComponents.DotNetBar.ButtonItem();
 			this.btnNOT = new DevComponents.DotNetBar.ButtonItem();
+			this.tabIncTrans = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+			this.btnTranCvtSelToTxt = new System.Windows.Forms.Button();
+			this.lblIncTran = new System.Windows.Forms.Label();
+			this.btnTranCvtAllToTxt = new System.Windows.Forms.Button();
+			this.lblSrchIncTran = new System.Windows.Forms.Label();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.rbFromEditor = new System.Windows.Forms.RadioButton();
+			this.rbFromTree = new System.Windows.Forms.RadioButton();
 			this.advTreeProcSets = new DevComponents.AdvTree.AdvTree();
 			this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
 			this.node1 = new DevComponents.AdvTree.Node();
@@ -168,9 +168,9 @@ namespace Volian.Controls.Library
 			this.tabControlPanel3.SuspendLayout();
 			this.gpSrchAnnoText.SuspendLayout();
 			this.panel4.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			this.tabControlPanel1.SuspendLayout();
 			this.groupBox1.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).BeginInit();
 			this.grpPanSearchResults.SuspendLayout();
@@ -974,118 +974,6 @@ namespace Volian.Controls.Library
 			this.tabAnnotationSearch.Text = "Annotations";
 			this.tabAnnotationSearch.Click += new System.EventHandler(this.tabAnnotationSearch_Click);
 			// 
-			// tabControlPanel1
-			// 
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblIncTran);
-			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
-			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
-			this.tabControlPanel1.Controls.Add(this.groupBox1);
-			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
-			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
-			this.tabControlPanel1.Name = "tabControlPanel1";
-			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
-			this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
-			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
-			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
-			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
-			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
-            | DevComponents.DotNetBar.eBorderSide.Bottom)));
-			this.tabControlPanel1.Style.GradientAngle = 90;
-			this.tabControlPanel1.TabIndex = 17;
-			this.tabControlPanel1.TabItem = this.tabIncTrans;
-			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(( System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
-			// 
-			// btnTranCvtSelToTxt
-			// 
-			this.btnTranCvtSelToTxt.Enabled = false;
-			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
-			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
-			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
-            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtSelToTxt.TabIndex = 3;
-			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
-			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
-			// 
-			// lblIncTran
-			// 
-			this.lblIncTran.AutoSize = true;
-			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
-			this.lblIncTran.Name = "lblIncTran";
-			this.lblIncTran.Size = new System.Drawing.Size(23, 13);
-			this.lblIncTran.TabIndex = 2;
-			this.lblIncTran.Text = "To:";
-			// 
-			// btnTranCvtAllToTxt
-			// 
-			this.btnTranCvtAllToTxt.Enabled = false;
-			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
-			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
-			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
-			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
-            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
-			this.btnTranCvtAllToTxt.TabIndex = 1;
-			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
-			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
-			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
-			// 
-			// lblSrchIncTran
-			// 
-			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
-			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
-			this.lblSrchIncTran.Name = "lblSrchIncTran";
-			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
-			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
-            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
-			this.lblSrchIncTran.TabIndex = 1;
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
-			this.groupBox1.Controls.Add(this.rbFromEditor);
-			this.groupBox1.Controls.Add(this.rbFromTree);
-			this.groupBox1.Location = new System.Drawing.Point(147, 4);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(130, 57);
-			this.groupBox1.TabIndex = 0;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Search Selection";
-			this.groupBox1.Visible = false;
-			// 
-			// rbFromEditor
-			// 
-			this.rbFromEditor.AutoSize = true;
-			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
-			this.rbFromEditor.Name = "rbFromEditor";
-			this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
-			this.rbFromEditor.TabIndex = 1;
-			this.rbFromEditor.TabStop = true;
-			this.rbFromEditor.Text = "From Editor";
-			this.rbFromEditor.UseVisualStyleBackColor = true;
-			// 
-			// rbFromTree
-			// 
-			this.rbFromTree.AutoSize = true;
-			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
-			this.rbFromTree.Name = "rbFromTree";
-			this.rbFromTree.Size = new System.Drawing.Size(73, 17);
-			this.rbFromTree.TabIndex = 0;
-			this.rbFromTree.TabStop = true;
-			this.rbFromTree.Text = "From Tree";
-			this.rbFromTree.UseVisualStyleBackColor = true;
-			// 
-			// tabIncTrans
-			// 
-			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
-			this.tabIncTrans.Name = "tabIncTrans";
-			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
-            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
-			this.tabIncTrans.Text = "Incoming\nTransitions";
-			// 
 			// contextMenuBar1
 			// 
 			this.contextMenuBar1.DockSide = DevComponents.DotNetBar.eDockSide.Top;
@@ -1248,6 +1136,119 @@ namespace Volian.Controls.Library
 			this.btnNOT.Text = "NOT";
 			this.btnNOT.Click += new System.EventHandler(this.btnNOT_Click);
 			// 
+			// tabIncTrans
+			// 
+			this.tabIncTrans.AttachedControl = this.tabControlPanel1;
+			this.tabIncTrans.Name = "tabIncTrans";
+			this.superTooltip1.SetSuperTooltip(this.tabIncTrans, new DevComponents.DotNetBar.SuperTooltipInfo("Search for Incoming Transitions", "", "Finds the Incoming Transitions that point to the current item and convert the tra" +
+            "nsition(s) to text if desired and if have permissions.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 120)));
+			this.tabIncTrans.Text = "Incoming\nTransitions";
+			// 
+			// tabControlPanel1
+			// 
+			this.tabControlPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtSelToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblIncTran);
+			this.tabControlPanel1.Controls.Add(this.btnTranCvtAllToTxt);
+			this.tabControlPanel1.Controls.Add(this.lblSrchIncTran);
+			this.tabControlPanel1.Controls.Add(this.groupBox1);
+			this.tabControlPanel1.DisabledBackColor = System.Drawing.Color.Empty;
+			this.tabControlPanel1.Location = new System.Drawing.Point(0, 34);
+			this.tabControlPanel1.Name = "tabControlPanel1";
+			this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+			this.tabControlPanel1.RightToLeft = System.Windows.Forms.RightToLeft.No;
+			this.tabControlPanel1.Size = new System.Drawing.Size(277, 113);
+			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(253)))), ((int)(((byte)(253)))), ((int)(((byte)(254)))));
+			this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(157)))), ((int)(((byte)(188)))), ((int)(((byte)(227)))));
+			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+            | DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.GradientAngle = 90;
+			this.tabControlPanel1.TabIndex = 17;
+			this.tabControlPanel1.TabItem = this.tabIncTrans;
+			// 
+			// btnTranCvtSelToTxt
+			// 
+			this.btnTranCvtSelToTxt.Enabled = false;
+			this.btnTranCvtSelToTxt.Location = new System.Drawing.Point(121, 63);
+			this.btnTranCvtSelToTxt.Name = "btnTranCvtSelToTxt";
+			this.btnTranCvtSelToTxt.Size = new System.Drawing.Size(145, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtSelToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert Selected Incoming Transitions To Text", "", "Converts selected transitions in the results list to text unless the user does no" +
+            "t have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtSelToTxt.TabIndex = 3;
+			this.btnTranCvtSelToTxt.Text = "Convert Selected To Text";
+			this.btnTranCvtSelToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtSelToTxt.Click += new System.EventHandler(this.btnTranCvtSelToTxt_Click);
+			// 
+			// lblIncTran
+			// 
+			this.lblIncTran.AutoSize = true;
+			this.lblIncTran.Location = new System.Drawing.Point(4, 9);
+			this.lblIncTran.Name = "lblIncTran";
+			this.lblIncTran.Size = new System.Drawing.Size(23, 13);
+			this.lblIncTran.TabIndex = 2;
+			this.lblIncTran.Text = "To:";
+			// 
+			// btnTranCvtAllToTxt
+			// 
+			this.btnTranCvtAllToTxt.Enabled = false;
+			this.btnTranCvtAllToTxt.Location = new System.Drawing.Point(6, 63);
+			this.btnTranCvtAllToTxt.Name = "btnTranCvtAllToTxt";
+			this.btnTranCvtAllToTxt.Size = new System.Drawing.Size(109, 22);
+			this.superTooltip1.SetSuperTooltip(this.btnTranCvtAllToTxt, new DevComponents.DotNetBar.SuperTooltipInfo("Convert All Incoming Transitions To Text", "", "Converts all of the transitions in the results list to text unless the user does " +
+            "not have permission to change text.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 90)));
+			this.btnTranCvtAllToTxt.TabIndex = 1;
+			this.btnTranCvtAllToTxt.Text = "Convert All To Text";
+			this.btnTranCvtAllToTxt.UseVisualStyleBackColor = true;
+			this.btnTranCvtAllToTxt.Click += new System.EventHandler(this.btnTranCvtAllToTxt_Click);
+			// 
+			// lblSrchIncTran
+			// 
+			this.lblSrchIncTran.BackColor = System.Drawing.Color.Transparent;
+			this.lblSrchIncTran.Location = new System.Drawing.Point(34, 9);
+			this.lblSrchIncTran.Name = "lblSrchIncTran";
+			this.lblSrchIncTran.Size = new System.Drawing.Size(239, 40);
+			this.superTooltip1.SetSuperTooltip(this.lblSrchIncTran, new DevComponents.DotNetBar.SuperTooltipInfo("Incoming Transitions", "", "This is the step, section, or procedure for which incoming transitions to it are " +
+            "shown in the list.", null, null, DevComponents.DotNetBar.eTooltipColor.Gray, true, true, new System.Drawing.Size(170, 80)));
+			this.lblSrchIncTran.TabIndex = 1;
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+			this.groupBox1.Controls.Add(this.rbFromEditor);
+			this.groupBox1.Controls.Add(this.rbFromTree);
+			this.groupBox1.Location = new System.Drawing.Point(147, 4);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(130, 57);
+			this.groupBox1.TabIndex = 0;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Search Selection";
+			this.groupBox1.Visible = false;
+			// 
+			// rbFromEditor
+			// 
+			this.rbFromEditor.AutoSize = true;
+			this.rbFromEditor.Location = new System.Drawing.Point(22, 34);
+			this.rbFromEditor.Name = "rbFromEditor";
+			this.rbFromEditor.Size = new System.Drawing.Size(78, 17);
+			this.rbFromEditor.TabIndex = 1;
+			this.rbFromEditor.TabStop = true;
+			this.rbFromEditor.Text = "From Editor";
+			this.rbFromEditor.UseVisualStyleBackColor = true;
+			// 
+			// rbFromTree
+			// 
+			this.rbFromTree.AutoSize = true;
+			this.rbFromTree.Location = new System.Drawing.Point(22, 16);
+			this.rbFromTree.Name = "rbFromTree";
+			this.rbFromTree.Size = new System.Drawing.Size(73, 17);
+			this.rbFromTree.TabIndex = 0;
+			this.rbFromTree.TabStop = true;
+			this.rbFromTree.Text = "From Tree";
+			this.rbFromTree.UseVisualStyleBackColor = true;
+			// 
 			// advTreeProcSets
 			// 
 			this.advTreeProcSets.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
@@ -1406,7 +1407,6 @@ namespace Volian.Controls.Library
 			// 
 			this.lbSrchResultsIncTrans.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 			this.lbSrchResultsIncTrans.CheckBoxesVisible = true;
-			this.lbSrchResultsIncTrans.CheckStateMember = null;
 			this.lbSrchResultsIncTrans.ContainerControlProcessDialogKey = true;
 			this.lbSrchResultsIncTrans.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.lbSrchResultsIncTrans.DragDropSupport = true;
@@ -1733,11 +1733,6 @@ namespace Volian.Controls.Library
 			this.Controls.Add(this.xpSetToSearch);
 			this.Controls.Add(this.tabSearchTypes);
 			this.Controls.Add(this.tabControlPanel1);
-			//B2025-056 Click on Incoming Transitions
-			// This needs to be part of overall control
-			// since if it is part of tabSearchTypes,
-			// then when that is disabled, buttons on
-			// this will be also
 			this.Margin = new System.Windows.Forms.Padding(2);
 			this.Name = "DisplaySearch";
 			this.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -1760,11 +1755,11 @@ namespace Volian.Controls.Library
 			this.gpSrchAnnoText.ResumeLayout(false);
 			this.panel4.ResumeLayout(false);
 			this.panel4.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			this.tabControlPanel1.ResumeLayout(false);
 			this.tabControlPanel1.PerformLayout();
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.contextMenuBar1)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeProcSets)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.advTreeStepTypes)).EndInit();
 			this.grpPanSearchResults.ResumeLayout(false);

PROMS/Volian.Controls.Library/DisplaySearch.cs

@@ -2016,16 +2016,35 @@ namespace Volian.Controls.Library
 					{
 						ReportTitle = string.Format("Search for '{0}'", TextSearchString);
 
+						// C2020-009: Search - Allow search 'By Word'. 
 						string byWordPrefix = string.Empty;
 						string byWordSuffix = string.Empty;
 						if (cbxByWord.Checked)
 						{
-							byWordPrefix = GetByWordSettings(TextSearchString, true);
-							byWordSuffix = GetByWordSettings(TextSearchString, false);
+							// Generate a prefix & suffix to be used in the sql query around the search string.
+							// If the search string starts (prefix)/ends(suffix) with a number, then use an expression that 
+							// does not allow the preceding/following text to have a number, '.', letter or other rtf 
+							// commands.  If the search string starts/ends with a letter, then use an expression that does not
+							// find the preceding/following text that is text, i.e. a letter.
+							if (Regex.IsMatch(TextSearchString, @"^[\d\.]"))        // starts with a number or '.' decimal pt
+							{
+								byWordPrefix = @"[^0-9a-zA-Z.vbpi:\\-]";
+							}
+							else if (Regex.IsMatch(TextSearchString, @"^[a-zA-Z]")) // starts with a letter
+							{
+								byWordPrefix = @"[^a-zA-Z]";
+							}
+							if (Regex.IsMatch(TextSearchString, @"[\d\.]$"))        // ends with a number or decimal
+							{
+								byWordSuffix = @"[^0-9a-zA-Z.vbpi:\\-]";
+							}
+							else if (Regex.IsMatch(TextSearchString, @"[a-zA-Z]$")) // ends with a letter
+							{
+								byWordSuffix = @"[^a-zA-Z]";
+							}
 						}
-
-							SearchString = TextSearchString;
-
+						SearchString = TextSearchString;
+							// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
 						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, TextSearchString /*.Replace(@"\",@"\u9586?")*/, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, cbxIncROTextSrch.Checked ? ItemSearchIncludeLinks.Value : ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, byWordPrefix, byWordSuffix);
 
 						cmbResultsStyleIndex = 3;  // display step text in results
@@ -2059,8 +2078,9 @@ namespace Volian.Controls.Library
 
 					if (cbxFndUnLnkROVals.Enabled && cbxFndUnLnkROVals.Checked)
 					{
-
-						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, GetByWordSettings(ROSearchList, true), GetByWordSettings(ROSearchList, false));
+						string ROSearchList2 = exactsearch(ROSearchList); // match exact string
+						// B2022-031 - added a cbxProcSectSrch to filter out procedure and section titles from global search results.
+						SearchResults = ItemInfoList.GetListFromTextSearch(DVISearchList, TypeSearchList, ROSearchList2, cbxBooleanTxtSrch.Checked ? 2 : cbxCaseSensitive.Checked ? 1 : 0, cbxProcSectSrch.Checked ? 1 : 0, ItemSearchIncludeLinks.Nothing, includeRTFformat, includeSpecialChars, unitPrefix, string.Empty, string.Empty);
 						cmbResultsStyleIndex = 3;  // display step text in results
 					}
 					else
@@ -2170,52 +2190,27 @@ namespace Volian.Controls.Library
 			}
 			OnSearchComplete(new DisplaySearchEventArgs(TimeSpan.FromTicks(DateTime.Now.Ticks - start.Ticks)));
 		}
-		private string GetByWordSettings(string ss, bool checkstart)
+
+		private string exactsearch(string SearchString)  // B2026-053
 		{
-
-			// C2020-009: Search - Allow search 'By Word'. 
-
-			//	// Generate a prefix & suffix to be used in the sql query around the search string.
-			//	// If the search string starts (prefix)/ends(suffix) with a number, then use an expression that 
-			//	// does not allow the preceding/following text to have a number, '.', letter or other rtf 
-			//	// commands.  If the search string starts/ends with a letter, then use an expression that does not
-			//	// find the preceding/following text that is text, i.e. a letter.
-
-			if (ss.Length > 0)
+			//string ss = "";
+			StringBuilder ss = new StringBuilder();
+			int sl = SearchString.Length;
+			int LstIdxSp = SearchString.LastIndexOf(' ');
+			if (sl == LstIdxSp + 1) // B2026-053 if ' ' the last char.
 			{
-				//checking start
-				if (checkstart)
-				{
-					// starts with a number or '.' decimal pt
-					if (char.IsNumber(ss, 0) || ss[0] == '.')
-					{
-						return @"[^0-9a-zA-Z.vbpi:\\-]";
-					}
-					// starts with a letter
-					else if (char.IsLetter(ss, 0))
-					{
-						return @"[^a-zA-Z]";
-					}
-				}
-				//checking end
-				else
-				{
-					// ends with a number or '.' decimal pt
-					if (char.IsNumber(ss, ss.Length - 1) || ss[ss.Length - 1] == '.')
-					{
-						return @"[^0-9a-zA-Z.vbpi:\\-]";
-					}
-					// ends with a letter
-					else if (char.IsLetter(ss, ss.Length - 1))
-					{
-						return @"[^a-zA-Z]";
-					}
-				}
+				ss.Append(' ');
+				ss.Append(SearchString); // B2026-053 add a space prefix to make the search exact if the end of the searchString is a space.
 			}
-
-			//default
-			return string.Empty;
+			else
+			{
+				ss.Append(' ');
+				ss.Append(SearchString); // B2026-053 Exact match add spaces before and after searchString.
+				ss.Append(' ');				
+			}
+			return ss.ToString();
 		}
+
 		private void ClearResults()     // B2021-103 if no results when RNO only, clear results list.  (moved from btnSearch_Click)
 		{
 			if (tabSearchTypes.SelectedTab != tabSearchTypes.Tabs[4])

PROMS/Volian.Controls.Library/EditItem.cs

@@ -3684,14 +3684,15 @@ namespace Volian.Controls.Library
 		{
 			ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
 
-			//B2022-083: Support Conditional RO Values
-			//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
-			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid.Replace(@"\u8209?", "-"), multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+			string accpgid = accpageid;
+			
+			//B2022 - 083: Support Conditional RO Values
+			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 
 			if (roc.value == null)
 			{
-				// try again but this time with the unicode dash
-				roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpageid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				accpgid = accpgid.Replace(@"\u8209?", "-");
+				roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 			}
 
 			if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019

PROMS/Volian.Controls.Library/VlnFlexGrid.Designer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows.Forms;
 
 namespace Volian.Controls.Library
 {
@@ -78,7 +79,10 @@ namespace Volian.Controls.Library
 			// VlnFlexGrid
 			// 
 			this.Rows.DefaultSize = 19;
-			
+			this.AllowDrop = true;
+			this.DragEnter += new DragEventHandler(Control_DragEnter);
+			this.DragDrop += new DragEventHandler(Control_DragDrop);
+
 			((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 			this.ResumeLayout(false);
 

PROMS/Volian.Controls.Library/VlnFlexGrid.cs

@@ -1,22 +1,23 @@
-using System;
-using System.ComponentModel;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Xml;
-using System.IO;
-using Volian.Controls.Library;
-using VEPROMS.CSLA.Library;
 using C1.Win.C1FlexGrid;
 using C1.Win.C1SpellChecker;
-using System.Text.RegularExpressions;
-using System.Xml.Serialization;
-using Volian.Base.Library;
+using DevComponents.DotNetBar.Controls;
 using JR.Utils.GUI.Forms;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using System.Xml;
+using System.Xml.Serialization;
+using VEPROMS.CSLA.Library;
+using Volian.Base.Library;
+using Volian.Controls.Library;
 
 namespace Volian.Controls.Library
 {
@@ -4438,11 +4439,28 @@ namespace Volian.Controls.Library
 		//        }
 
 		//}
+		private void Control_DragEnter(object sender, DragEventArgs e)
+		{
+			if (e.Data.GetDataPresent(DataFormats.Text))
+			{
+				e.Effect = DragDropEffects.Copy; // Allow copy
+			}
+			else
+			{
+				e.Effect = DragDropEffects.None; // Disallow
+			}
+		}
+		private void Control_DragDrop(object sender, DragEventArgs e)
+		{
+			string data = (string)e.Data.GetData(DataFormats.Text);
+			// Process the data (e.g., display it in a TextBox)
+			this.Text = data;
+		}
 		#region Uneven Selections
-			/// <summary>
-			/// True if the top and bottom row of the selection is the same for every column
-			/// </summary>
-			public bool EvenSelection
+		/// <summary>
+		/// True if the top and bottom row of the selection is the same for every column
+		/// </summary>
+		public bool EvenSelection
 			{
 				get
 				{

PROMS/Volian.Print.Library/VlnSvgPageHelper.cs

@@ -1659,14 +1659,14 @@ i = 0;
 		private string ROLookup(string accpageid, string multiid, string deflt, string overrideChild)
 		{
 			ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, overrideChild);
-
-			//C2026-047 first try the RO Lookup with the ascii dash character in the accpageid. If not found, try again with the unicode dash
-			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpageid.Replace(@"\u8209?", "-") + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+			
+			string accpgid = accpageid;
+			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 
 			if (roc.value == null)
 			{
-				// try again but this time with the unicode dash
-				roc = myLookup.GetROChildByAccPageID("<" + accpageid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				accpgid = accpgid.Replace(@"\u8209?", "-");
+				roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
 			}
 
 			if (!deflt.StartsWith("[") && !string.IsNullOrEmpty(roc.value) && roc.value.Trim().Length > 0) // don't return val if it's an empty or blank string - jsj 01-28-2019

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -1,10 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+//using System.Drawing;
 using System.Text.RegularExpressions;
 using System.IO;
 using iTextSharp.text.pdf;
 using iTextSharp.text;
+using Itenso.Rtf;
+using Itenso.Rtf.Parser;
+using Itenso.Rtf.Interpreter;
+using Itenso.Rtf.Support;
 using Volian.Controls.Library;
 using VEPROMS.CSLA.Library;
 using Volian.Base.Library;
@@ -155,44 +160,13 @@ namespace Volian.Print.Library
 						childItemInfo.SetHeader(childItemInfo.FormatStepData.TabData.Font, lastHeader);
 						lastHeader = null;
 					}
-					// B2026-072 Caution/Note off of an RNO sub-step was printing on top of the parent AER sub-step text
-					//           ex: Farley Unit 1 AOPs 1-AOP-1.0, Procedure Steps section, step 8.4.1
-					// if printing a Caution or Note type that is in the RNO column and we are a printing a two column section
-					if ((childItemInfo.IsCaution || childItemInfo.IsNote) && childItemInfo.IsInRNO && childItemInfo.ColumnMode>0)
-					{
-						// get the starting positon of the RNO column
-						float colR = float.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[childItemInfo.ColumnMode]);
-						// get the starting position of the Caution or Note
-						float startColOfCautionNote = xoff;
-						if (bxIndx != null)
-						{
-							// if it is a boxed Caution or Note, then get the starting colun of the box
-							Box bx = childItemInfo.ActiveFormat.PlantFormat.FormatData.BoxList[(int)bxIndx];
-							startColOfCautionNote = bx.Start??0;
-						}
-						// If the starting positon of Caution/Note is in the AER column, find the y position of the last text line of
-						// the AER parent to the RNO step. 
-						if (startColOfCautionNote < colR) 
-						{
-							vlnParagraph tparent = Parent;
-							while (tparent.MyItemInfo.IsInRNO) tparent = tparent.MyParent; // find the parent AER sub-step
-							if (tparent != Parent && tparent.MyItemInfo.IsInSubStep)
-							{
-								// add the height of the AER sub-step text to its starting yoffset 
-								float tyoff = tparent.YOffset + tparent.Height;
-								// while the position in the AER column (tyoff) is greater then or equal to starting position
-								// of the Note or Caution, move down the page a line at time.
-								// SixLinesPerInch adjusts for when we are printing in compress mode.
-								while (tyoff >= yoff) yoff += vlnPrintObject.SixLinesPerInch;
-							}
-						}
-					}
 					// if the format has MatchUpRNOCautNote, then add a line to yoff, if not at top of rno column.
 					if (childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.MatchUpRNO)
 					{
 						if (childItemInfo.MyParent != null && childItemInfo.MyParent.MyParent != null && !childItemInfo.MyParent.MyParent.IsHigh)
 						{
 							yoff += vlnPrintObject.SixLinesPerInch;
+							Parent.AdjustForMatchUpRNO = vlnPrintObject.SixLinesPerInch;	// B2020-112
 						}
 					}
 					// if this is a caution/note and it has a caution/note substep, do it before this caution/note, so that
@@ -1580,6 +1554,7 @@ namespace Volian.Print.Library
 		}
 		private static bool DoSubs = true;      // flag whether to print substeps (don't if doing continued checklist header)
 		public float AdjustForXBlankW1stLevSub = 0;		// B2020-112    this & next line
+		public float AdjustForMatchUpRNO = 0;
 		protected float _ContinueHeight = 0;
 		public virtual float ContinueHeight
 		{
@@ -7195,6 +7170,11 @@ namespace Volian.Print.Library
 			//	//Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para);
 			//	adjust -= para.MyParent.AdjustForXBlankW1stLevSub;
 			//}
+			//if (para.AdjustForMatchUpRNO != 0 && (para.ChildrenAbove == null || para.ChildrenAbove.Count == 0))
+			//	adjust -= para.AdjustForMatchUpRNO;
+			//else if (para.MyParent.AdjustForMatchUpRNO != 0 && (para.MyParent.ChildrenAbove != null && para.MyParent.ChildrenAbove.Count > 0) 
+			//	&& para.MyParent.ChildrenAbove[0] == para)
+			//	adjust -= para.MyParent.AdjustForMatchUpRNO;
 
 			if (!this[stepLevel].ContainsKey(-(yLocation + adjust)))
 				this[stepLevel].Add(-(yLocation + adjust), para);

PROMS/XYPlots/XYPlots.cs

@@ -6,7 +6,6 @@ using System.Windows.Forms;
 using System.Text;
 using System.Drawing;
 using System.Text.RegularExpressions;
-using Volian.Base.Library;
 using VG;
 
 namespace XYPlots
@@ -283,12 +282,9 @@ namespace XYPlots
 		{
 			if (!File.Exists(FileName))
 			{
-				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-				{
-					// File does not exist, show error message
-					MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File");
-					return false;
-				}
+				// File does not exist, show error message
+				MessageBox.Show(String.Format("X/Y Plot File {0} Does Not Exist", FileName), "Error Opening X/Y Plot File");
+				return false;
 			}
 			// Open the X/Y Plot file
 			try
@@ -297,12 +293,9 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-				{
-					// cannot open the x/y plot file
-					MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
-					return false;
-				}
+				// cannot open the x/y plot file
+				MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
+				return false;
 			}
 			int blen = (int)XYPlotFile.Length;
 			int bread = 0;
@@ -316,11 +309,8 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-				{
-					MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
-					return false;
-				}	
+				MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
+				return false;
 			}
 			try
 			{
@@ -328,11 +318,8 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-				{
-					MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
-					return false;
-				}
+				MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
+				return false;
 			}
 			StringBuilder sb = new StringBuilder();
 			for (int i = 0; i < bbuf.Length; i++)
@@ -459,7 +446,7 @@ namespace XYPlots
 			char retval;
 			StringBuilder Lbuff = new StringBuilder();
 			retval = NextChar();
-			if (retval != '"' && retval != '\x1C' && !BaseLnSettings.blBaseLine) // open double quote
+			if (retval != '"' && retval != '\x1C') // open double quote
 				MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot");
 			retval = NextChar();
 			while (retval != 0 && retval != '\n')
@@ -1453,10 +1440,7 @@ namespace XYPlots
 		}
 		private void PrintStackError(string relation, int limit)
 		{
-			if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-			{
-				MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
-			}
+			MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
 		}
 		private void SavePosition()
 		{
@@ -1674,11 +1658,8 @@ namespace XYPlots
 		}
 		private void err_exit(string msg, string msg2)
 		{
-			if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
-			{
-				MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
-				Environment.Exit(255);
-			}
+			MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
+			Environment.Exit(255);
 		}
 		private void FindBoxesinArea(int ptval, int flag)
 		{
@@ -1935,7 +1916,7 @@ namespace XYPlots
 		{
 			// MSWord enters left and right double-quotes when you press the double-quote key
 			//B2017 - Replace left and right double-quotes with normal double-quotes
-			 PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"');
+			PlotCommands = PlotCommands.Replace('\u201C', '"').Replace('\u201D', '"');
 			LoadBuffFromString(PlotCommands);
 				Setup();
 //#if DEBUG
@@ -2010,14 +1991,10 @@ namespace XYPlots
 						AxisLabel[1] = getint();
 						break;
 					default:
-						if (BaseLnSettings.blBaseLine == false) // B2026-056 suppress messages when running baseline.
-						{
-							if (PrevCommand.Equals(null))
-								MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
-							else
-								MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command");
-							break;
-						}
+						if (PrevCommand.Equals(null))
+							MessageBox.Show("Check the first line of the X/Y Plot definition.", "Unrecognized Graph Command");
+						else
+							MessageBox.Show(string.Format("Problem with the X/Y Plot Command after {0}", PrevCommand.ToString()), "Unrecognized Graph Command");
 						break;
 				}
 				PrevCommand = Command;

PROMS/XYPlots/XYPlots.csproj

@@ -176,10 +176,6 @@
       <Project>{52D74078-3822-410E-889B-464BD21AAB9E}</Project>
       <Name>VG</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Volian.Base.Library\Volian.Base.Library.csproj">
-      <Project>{aeee9fd1-6892-45e2-a67e-418c06d46ff9}</Project>
-      <Name>Volian.Base.Library</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />