B2026-056-Syntax-problem-in-XY-plot

good for testing

.gitignore

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

PROMS/VEPROMS User Interface/frmVEPROMS.cs

@@ -3578,6 +3578,7 @@ 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());
@@ -3623,7 +3624,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,14 +2159,18 @@ 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
+                    // 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>.
 					if (executeResult && !string.IsNullOrEmpty(sel.Text) && !sel.Text.StartsWith("<") && !sel.Text.EndsWith(">"))
-					{
-						sel.MoveStart(LBWdUnits.wdCharacter, sel.Text.Length - 1);
-						tryagain = true;
+                    {
+                        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;
 					}
 				} while (tryagain);
 
@@ -2191,7 +2195,7 @@ namespace VEPROMS.CSLA.Library
 					sel.MoveStart(LBWdUnits.wdCharacter, 1);
 					executeResult = false;
 				}
-			}
+            }
 
 			if (executeResult) return sel;
 

PROMS/Volian.Base.Library/BaseLnSettings.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Volian.Base.Library
+{
+	public static class BaseLnSettings
+	{
+		private static bool _blBaseLine = false;
+		public static bool blBaseLine
+		{
+			get { return _blBaseLine; }
+			set { _blBaseLine = value; }
+		}
+	}
+}

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

@@ -90,6 +90,7 @@
     <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/EditItem.cs

@@ -3684,15 +3684,14 @@ namespace Volian.Controls.Library
 		{
 			ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion, null);
 
-			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);
+			//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);
 
 			if (roc.value == null)
 			{
-				accpgid = accpgid.Replace(@"\u8209?", "-");
-				roc = myLookup.GetROChildByAccPageID(string.Format("<{0}.{1}>", accpgid, multiid), MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				// 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);
 			}
 
 			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/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);
-			
-			string accpgid = accpageid;
-			ROFSTLookup.rochild roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+
+			//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);
 
 			if (roc.value == null)
 			{
-				accpgid = accpgid.Replace(@"\u8209?", "-");
-				roc = myLookup.GetROChildByAccPageID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
+				// try again but this time with the unicode dash
+				roc = myLookup.GetROChildByAccPageID("<" + accpageid + "." + 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/XYPlots/XYPlots.cs

@@ -6,6 +6,7 @@ using System.Windows.Forms;
 using System.Text;
 using System.Drawing;
 using System.Text.RegularExpressions;
+using Volian.Base.Library;
 using VG;
 
 namespace XYPlots
@@ -282,9 +283,12 @@ namespace XYPlots
 		{
 			if (!File.Exists(FileName))
 			{
-				// 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;
+				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;
+				}
 			}
 			// Open the X/Y Plot file
 			try
@@ -293,9 +297,12 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				// cannot open the x/y plot file
-				MessageBox.Show(e.Message, String.Format("Error Opening {0} for Reading", FileName));
-				return false;
+				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;
+				}
 			}
 			int blen = (int)XYPlotFile.Length;
 			int bread = 0;
@@ -309,8 +316,11 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					MessageBox.Show(e.Message, String.Format("Error Reading {0}", FileName));
+					return false;
+				}	
 			}
 			try
 			{
@@ -318,8 +328,11 @@ namespace XYPlots
 			}
 			catch (Exception e)
 			{
-				MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
-				return false;
+				if (!BaseLnSettings.blBaseLine) // B2026-056 suppress messages when running baseline.
+				{
+					MessageBox.Show(e.Message, String.Format("Error Closing {0}", FileName));
+					return false;
+				}
 			}
 			StringBuilder sb = new StringBuilder();
 			for (int i = 0; i < bbuf.Length; i++)
@@ -446,7 +459,7 @@ namespace XYPlots
 			char retval;
 			StringBuilder Lbuff = new StringBuilder();
 			retval = NextChar();
-			if (retval != '"' && retval != '\x1C') // open double quote
+			if (retval != '"' && retval != '\x1C' && !BaseLnSettings.blBaseLine) // open double quote
 				MessageBox.Show("Double Quote not found", "Syntax problem in XY Plot");
 			retval = NextChar();
 			while (retval != 0 && retval != '\n')
@@ -1440,7 +1453,10 @@ namespace XYPlots
 		}
 		private void PrintStackError(string relation, int limit)
 		{
-			MessageBox.Show(String.Format("Position Stack Pointer {0} {1}", relation, limit.ToString()), "Print Stack Error");
+			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");
+			}
 		}
 		private void SavePosition()
 		{
@@ -1658,8 +1674,11 @@ namespace XYPlots
 		}
 		private void err_exit(string msg, string msg2)
 		{
-			MessageBox.Show(msg + "\n" + msg2 + "\n\n This p=Process Will Terminate", "\n## ERROR ## - ");
-			Environment.Exit(255);
+			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);
+			}
 		}
 		private void FindBoxesinArea(int ptval, int flag)
 		{
@@ -1916,7 +1935,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
@@ -1991,10 +2010,14 @@ namespace XYPlots
 						AxisLabel[1] = getint();
 						break;
 					default:
-						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");
+						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;
+						}
 						break;
 				}
 				PrevCommand = Command;

PROMS/XYPlots/XYPlots.csproj

@@ -176,6 +176,10 @@
       <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\" />