Merge pull request 'Development' (#803) from Development into master

Merging changes from dev into master after successful testing.

PROMS/Baseline/Baseline.csproj

@@ -67,7 +67,6 @@
     <Compile Include="frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="frmBaseline.resx">

PROMS/Baseline/GlobalSuppressions.cs

@@ -1,8 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Not modifying Naming Styles")]

PROMS/Baseline/Program.cs

@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline

PROMS/Baseline/frmBaseline.cs

@@ -43,9 +43,12 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Drawing;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Collections.Specialized;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Xml.Serialization;
@@ -70,8 +73,13 @@ namespace Baseline
 	}
 	public partial class frmBaseline : Form
 	{
-        public IgnoreLines MyIgnore { get; set; } = new IgnoreLines();
-        private LastWas myLast = LastWas.Search;
+		private IgnoreLines _MyIgnore = new IgnoreLines();
+		public IgnoreLines MyIgnore
+		{
+			get { return _MyIgnore; }
+			set { _MyIgnore = value; }
+		}
+		private LastWas myLast = LastWas.Search;
 		private Settings MySettings;
 		public string MyStatus
 		{
@@ -143,11 +151,9 @@ namespace Baseline
 			this.WindowState = Properties.Settings.Default.WidnowState;
 			if(Properties.Settings.Default.Ignore != null && Properties.Settings.Default.Ignore != "")
 				MyIgnore = IgnoreLines.Get(Properties.Settings.Default.Ignore);
-            MySettings = new Settings
-            {
-                IgnoreLines = new BindingList<string>()
-            };
-            splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
+			MySettings= new Settings();
+			MySettings.IgnoreLines = new BindingList<string>();
+			splitContainer1.SplitterDistance = Properties.Settings.Default.Split1;
 			splitContainer2.SplitterDistance = Properties.Settings.Default.Split2;
 			splitContainer3.SplitterDistance = Properties.Settings.Default.Split3;
 			if (Properties.Settings.Default.MRU1 != null && Properties.Settings.Default.MRU1.Count > 0)
@@ -234,27 +240,28 @@ namespace Baseline
 			lbProcedures.Items.Clear();
 			lbResults1.Items.Clear();
 			lbResults2.Items.Clear();
-            if (lbDifferent.SelectedItem is FindFile ff)
-            {
-                // Fill Procedure or Result ListBoxes
-                switch (myLast)
-                {
-                    case LastWas.Pagination:
-                        CompareContent(ff.File1, ff.File2);// Compare DebugPagination
-                        break;
-                    case LastWas.Baseline:
-                        CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
-                        break;
-                    case LastWas.Search:
-                        ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
-                        break;
-                    default:
-                        CompareContent(ff.File1, ff.File2);//Default DebugPagination
-                        break;
-                }
-                //CompareOneFile(ff.File1, ff.File2);
-            }
-        }
+			FindFile ff = lbDifferent.SelectedItem as FindFile;
+			if (ff != null)
+			{
+				// Fill Procedure or Result ListBoxes
+				switch (myLast)
+				{
+					case LastWas.Pagination:
+						CompareContent(ff.File1, ff.File2);// Compare DebugPagination
+						break;
+					case LastWas.Baseline:
+						CompareContent3(ff.File1, ff.File2);// Compare DebugMeta
+						break;
+					case LastWas.Search:
+						ShowSearchResults(ff.File1, ff.File2);// Perform search on DebugMeta
+						break;
+					default:
+						CompareContent(ff.File1, ff.File2);//Default DebugPagination
+						break;
+				}
+				//CompareOneFile(ff.File1, ff.File2);
+			}
+		}
 		Procedures MyProcs1;
 		Procedures MyProcs2;
 		/// <summary>
@@ -354,6 +361,13 @@ namespace Baseline
 			lines1 = list1.AsEnumerable<string>();// Convert back to Enumerable to work with LINQ
 			return lines1;
 		}
+		private string GetProcNum(string line)
+		{
+			string retval =  line.Substring(3, line.IndexOf(" | ") - 3);
+			if (retval.Contains("_"))
+				retval = retval.Substring(0, retval.IndexOf("_") - 1);
+			return retval;
+		}
 		/// <summary>
 		/// Include lines for Procedure or Page or Search is true
 		/// Account for Case Insensitive CheckBox
@@ -436,8 +450,8 @@ namespace Baseline
 		private void lbResults1_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			string line=null;
-			if (lbResults1.SelectedItem is string v)
-				line = v;
+			if (lbResults1.SelectedItem is string)
+				line = (string)lbResults1.SelectedItem;
 			Line myLine = lbResults1.SelectedItem as Line;
 				switch (myLast)
 				{
@@ -458,8 +472,8 @@ namespace Baseline
 		{
 
 			string line=null;
-			if(lbResults2.SelectedItem is string v)
-				line = v;
+			if(lbResults2.SelectedItem is string)
+				line = (string)lbResults2.SelectedItem;
 			Line myLine = lbResults2.SelectedItem as Line;
 
 			switch (myLast)
@@ -501,10 +515,16 @@ namespace Baseline
 		/// <returns></returns>
 		private string ParseOutProcedureNumberFromLine(string txt)
 		{
-            // if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
-            // so look for the last occurence of ".." which will be the end of the section information
-            int lidx = txt.LastIndexOf("..");
-            if (lidx > 0)
+			// old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
+			// Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
+			// 1.SBGEN.SC. ==> short path of attachment section "C"
+			// 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
+			string rtnstr = null;
+			int lidx = -1;
+			// if the item is to a high levels step or sub-step the short path as "..S" for each part of the step
+			// so look for the last occurence of ".." which will be the end of the section information
+			lidx = txt.LastIndexOf("..");
+			if (lidx > 0)
 			{
 				lidx = txt.LastIndexOf(".S", lidx); // this will position us to the end of the procedure number
 			}
@@ -512,13 +532,9 @@ namespace Baseline
 			{
 				lidx = txt.LastIndexOf(".S"); // this will position us to the end of the procedure number if there was no step information
 			}
-            // old logic was looking for the first occurence of ".S" in the txt string as the ending point of the procedure nuumber
-            // Beaver Valley has a procedure number "1.SBGEN" in which the old logic would not work
-            // 1.SBGEN.SC. ==> short path of attachment section "C"
-            // 1.SBGEN.SC..S1. ==> short path of Step 1 in attachment section "C"
-            // B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
-            string rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
-            return rtnstr;
+			// B2018-113 - Replace slashes and backslashes with underscores just as PROMS does when creating a PDF file.
+			rtnstr = txt.Substring(8, lidx - 8).Replace("/", "_").Replace("\\", "_");
+			return rtnstr;
 		}
 
 		string exePath;
@@ -600,10 +616,10 @@ namespace Baseline
 				progname = @"C:\Program Files (x86)\IDM Computer Solutions\UltraCompare\UC.exe";
 			System.Diagnostics.ProcessStartInfo psi =
 				new System.Diagnostics.ProcessStartInfo(progname, string.Format(@" -t ""{0}"" ""{1}""", compareFile, baseFile));
-            _ = System.Diagnostics.Process.Start(psi);
-        }
+			System.Diagnostics.Process prc = System.Diagnostics.Process.Start(psi);
+		}
 
-		private readonly ProcessLocationQueue myQueue= new ProcessLocationQueue();
+		private ProcessLocationQueue myQueue= new ProcessLocationQueue();
 		private Timer queueTimer = null;
 		/// <summary>
 		/// Move a Process to a specific screen location - This is done with a timer so 
@@ -616,11 +632,9 @@ namespace Baseline
 		{
 			if (queueTimer == null)
 			{
-                queueTimer = new Timer
-                {
-                    Enabled = false
-                };
-                queueTimer.Tick += queueTimer_Tick;
+				queueTimer = new Timer();
+				queueTimer.Enabled = false;
+				queueTimer.Tick += queueTimer_Tick;
 				queueTimer.Interval = 1000;
 			}
 			myQueue.Add(proc, x, y);
@@ -655,8 +669,8 @@ namespace Baseline
 			string procPatern = string.Format("*{0}*.pdf", proc == string.Empty ? "noProcNumber" : proc);
 			int pagenum = myLine.MyPage.Number;
 			FindFile ff = lbDifferent.SelectedItem as FindFile;
-            string PDFfileName;
-            if (list == 1)
+			string PDFfileName = null;
+			if (list == 1)
 			{
 				FileInfo fi1 = new FileInfo(ff.File1);
 				PDFfileName = GetPFDFileAndPath(fi1, procPatern);
@@ -687,13 +701,11 @@ namespace Baseline
 					return;
 				}
 			}
-            // open the PDF and jump to the page number
-            System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum, PDFfileName))
-            {
-                UseShellExecute = false
-            };
-            _ = System.Diagnostics.Process.Start(psi1);
-        }
+			// open the PDF and jump to the page number
+			System.Diagnostics.ProcessStartInfo psi1 = new System.Diagnostics.ProcessStartInfo(exePath, string.Format("/A \"page={0}\" \"{1}\" ", pagenum,PDFfileName));
+			psi1.UseShellExecute = false;
+			System.Diagnostics.Process p1 = System.Diagnostics.Process.Start(psi1);
+		}
 		/// <summary>
 		/// Perform Debug Meta file comparison for all of the folders within the automated testing folders 
 		/// </summary>
@@ -773,10 +785,11 @@ namespace Baseline
 		}
 		private void lbProcedures_SelectedIndexChanged(object sender, EventArgs e)
 		{
-            //Initialize Results List Box
-            if (!(lbProcedures.SelectedItem is Procedure myProc)) return; // clicked on the white space (blank line) in the list of different procedures
-                                                                          //TODO: May need to consider if there are duplicate procedure numers and titles
-            Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
+			//Initialize Results List Box
+			Procedure myProc = lbProcedures.SelectedItem as Procedure;
+			if (myProc == null) return; // clicked on the white space (blank line) in the list of different procedures
+			//TODO: May need to consider if there are duplicate procedure numers and titles
+			Procedure myProc1 = MyProcs1.Find(x => x.Number == myProc.Number && x.Title == myProc.Title);
 			// Build the results ListBox for the left window
 			lbResults1.Items.Clear();
 			if (myProc1 != null)
@@ -823,13 +836,28 @@ namespace Baseline
 		};
 	public class Settings
 	{
-        public BindingList<string> IgnoreLines { get; set; }
-    }
+		private BindingList<string> _IgnoreLines;
+		public BindingList<string> IgnoreLines
+		{
+			get { return _IgnoreLines; }
+			set { _IgnoreLines = value; }
+		}
+	}
 	public partial class FindFile
 	{
-        public string File1 { get; set; }
-        public string File2 { get; set; }
-        public FindFile(string file1, string file2)
+		private string _File1;
+		public string File1
+		{
+			get { return _File1; }
+			set { _File1 = value; }
+		}
+		private string _File2;
+		public string File2
+		{
+			get { return _File2; }
+			set { _File2 = value; }
+		}
+		public FindFile(string file1, string file2)
 		{
 			File1 = file1;
 			File2 = file2;
@@ -837,16 +865,19 @@ namespace Baseline
 	}
 	public partial class FindFiles : List<FindFile>
 	{
-		private readonly string _FileName;
-        public string FileName => _FileName;
-        /// <summary>
-        /// Build list of DocVersion Folders with differences
-        /// </summary>
-        /// <param name="path1">Base path</param>
-        /// <param name="path2">Compare path</param>
-        /// <param name="fileName">filename</param>
-        /// <param name="myIgnore">Ignore list</param>
-        public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
+		private string _FileName;
+		public string FileName
+		{
+			get { return _FileName; }
+		}
+		/// <summary>
+		/// Build list of DocVersion Folders with differences
+		/// </summary>
+		/// <param name="path1">Base path</param>
+		/// <param name="path2">Compare path</param>
+		/// <param name="fileName">filename</param>
+		/// <param name="myIgnore">Ignore list</param>
+		public FindFiles(string path1, string path2, string fileName,IgnoreLines myIgnore)
 		{
 			DirectoryInfo di1 = new DirectoryInfo(path1);
 			DirectoryInfo di2 = new DirectoryInfo(path2);
@@ -1072,16 +1103,34 @@ namespace Baseline
 	// Text - the line of text
 	public partial class Procedure
 	{
-        public string Number { get; set; }
-        public string Title { get; set; }
-        public Pages MyPages { get; set; } = new Pages();
-        public Procedure(string number, string title)
+		private string _Number;
+		public string Number
 		{
-			Number = number;
-			Title = title;
+			get { return _Number; }
+			set { _Number = value; }
 		}
-        public override string ToString() => string.Format("{0} - {1}", Number, Title);
-    }
+		private string _Title;
+		public string Title
+		{
+			get { return _Title; }
+			set { _Title = value; }
+		}
+		private Pages _MyPages = new Pages();
+		public Pages MyPages
+		{
+			get { return _MyPages; }
+			set { _MyPages = value; }
+		}
+		public Procedure(string number, string title)
+		{
+			_Number = number;
+			_Title = title;
+		}
+		public override string ToString()
+		{
+			return string.Format("{0} - {1}", Number, Title);
+		}
+	}
 	public partial class Procedures : List<Procedure>
 	{
 		// Sample data for a Procedure Number line
@@ -1112,34 +1161,77 @@ namespace Baseline
 	}
 	public partial class Page
 	{
-        public int Number { get; set; }
+		private int _Number;
+		public int Number
+		{
+			get { return _Number; }
+			set { _Number = value; }
+		}
+		private Lines _MyLines = new Lines();
 
-        public Lines MyLines { get; set; } = new Lines();
-        public Page(int number) => Number = number;
-        public override string ToString() => string.Format("Page {0}", Number);
-    }
+		public Lines MyLines
+		{
+			get { return _MyLines; }
+			set { _MyLines = value; }
+		}
+		public Page(int number)
+		{
+			_Number = number;
+		}
+		public override string ToString()
+		{
+			return string.Format("Page {0}", Number);
+		}
+	}
 	public partial class Pages : List<Page>
 	{
-        public void Add(int number) => Add(new Page(number));
-    }
+		public void Add(int number)
+		{
+			Add(new Page(number));
+		}
+	}
 	public partial class Line
 	{
-        public Procedure MyProc { get; set; }
-        public Page MyPage { get; set; }
-        public string Text { get; set; }
-        public Line(string text) => Text = text;
-        public Line(string text, Procedure myProc, Page myPage)
+		private Procedure _MyProc;
+		public Procedure MyProc
 		{
-			Text = text;
-			MyProc = myProc;
-			MyPage = myPage;
+			get { return _MyProc; }
+			set { _MyProc = value; }
 		}
-        public override string ToString() => Text;
-    }
+		private Page _MyPage;
+		public Page MyPage
+		{
+			get { return _MyPage; }
+			set { _MyPage = value; }
+		}
+		private string _Text;
+		public string Text
+		{
+			get { return _Text; }
+			set { _Text = value; }
+		}
+		public Line(string text)
+		{
+			_Text = text;
+		}
+		public Line(string text, Procedure myProc, Page myPage)
+		{
+			_Text = text;
+			_MyProc = myProc;
+			_MyPage = myPage;
+		}
+		public override string ToString()
+		{
+			return Text;
+		}
+	}
 	public partial class Lines : List<Line>
 	{
-        public void Add(string text) => Add(new Line(text));
-    }
+		public void Add(string text)
+		{
+			Add(new Line(text));
+		}
+	}
 	[Serializable]
 	public partial class IgnoreLine
 	{
@@ -1177,12 +1269,21 @@ namespace Baseline
 		public IgnoreLines()
 		{
 		}
-        public void Add(string text, Relation searchType, bool active) => Add(new IgnoreLine(text, searchType, active));
-        // Convert IgnoreLines to string (XML)
-        public override string ToString() => GenericSerializer<IgnoreLines>.StringSerialize(this);
-        // Convert string to IgnoreLines
-        public static IgnoreLines Get(string xml) => GenericSerializer<IgnoreLines>.StringDeserialize(xml);
-    }
+		public void Add(string text, Relation searchType, bool active)
+		{
+			Add(new IgnoreLine(text, searchType, active));
+		}
+		// Convert IgnoreLines to string (XML)
+		public override string ToString()
+		{
+			return GenericSerializer<IgnoreLines>.StringSerialize(this);
+		}
+		// Convert string to IgnoreLines
+		public static IgnoreLines Get(string xml)
+		{
+			return GenericSerializer<IgnoreLines>.StringDeserialize(xml);
+		}
+	}
 	/// <summary>
 	/// This is a simple serializer that takes a class and converts it to and from string (XML)
 	/// </summary>
@@ -1210,7 +1311,7 @@ namespace Baseline
 			string ss = s.Replace("encoding=\"utf-16\"", "");
 			XmlSerializer xs = new XmlSerializer(typeof(T));
 			UTF8Encoding enc = new UTF8Encoding();
-            byte[] arrBytData = enc.GetBytes(ss);
+			Byte[] arrBytData = enc.GetBytes(ss);
 			using (MemoryStream ms = new MemoryStream(arrBytData))
 			{
 				t = (T)xs.Deserialize(ms);
@@ -1224,9 +1325,12 @@ namespace Baseline
 	public class NonXsiTextWriter : XmlTextWriter
 	{
 		public NonXsiTextWriter(TextWriter w) : base(w) { }
-        public NonXsiTextWriter(Stream w, Encoding encoding)
-            : base(w, encoding) => Formatting = Formatting.Indented;
-        public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
+		public NonXsiTextWriter(Stream w, Encoding encoding)
+			: base(w, encoding)
+		{
+			this.Formatting = Formatting.Indented;
+		}
+		public NonXsiTextWriter(string filename, Encoding encoding) : base(filename, encoding) { }
 		bool _skip = false;
 		public override void WriteStartAttribute(string prefix, string localName, string ns)
 		{
@@ -1268,16 +1372,32 @@ namespace Baseline
 		public const short SWP_NOZORDER = 0X4;
 		public const int SWP_SHOWWINDOW = 0x0040;
 
-        public System.Diagnostics.Process Process { get; set; }
-        public int X { get; set; }
-        public int Y { get; set; }
-        public ProcessLocation(System.Diagnostics.Process process, int x, int y)
+		private System.Diagnostics.Process _Process;
+
+		public System.Diagnostics.Process Process
+		{
+			get { return _Process; }
+			set { _Process = value; }
+		}
+		private int _X;
+		public int X
+		{
+			get { return _X; }
+			set { _X = value; }
+		}
+		private int _Y;
+		public int Y
+		{
+			get { return _Y; }
+			set { _Y = value; }
+		}
+		public ProcessLocation(System.Diagnostics.Process process, int x, int y)
 		{
 			Process = process;
 			X = x;
 			Y = y;
 		}
-		private static bool FoxitSettingInfo = true;
+		private static Boolean FoxitSettingInfo = true;
 
 		/// <summary>
 		/// MoveIt() moves the window containing the PDF viewer to the right so the two pdf viewer windows will not overlap.
@@ -1298,8 +1418,11 @@ namespace Baseline
 	}
 	public class ProcessLocationQueue: Queue<ProcessLocation>
 	{
-        public void Add(System.Diagnostics.Process process, int x, int y) => Enqueue(new ProcessLocation(process, x, y));
-        public void ProcessNext()
+		public void Add(System.Diagnostics.Process process, int x, int y)
+		{
+			Enqueue(new ProcessLocation(process,x,y));
+		}
+		public void ProcessNext()
 		{
 			ProcessLocation pl = Dequeue();
 			pl.MoveIt();

PROMS/Baseline/frmSettings.cs

@@ -1,4 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Baseline
@@ -12,7 +19,17 @@ namespace Baseline
 			set {
 				_MyIgnore = value; 
 				dgv.DataSource=null;
+				//dgvcSearchType.ValueType = typeof(Relation);
+				//dgvcSearchType.ValueMember = "Value";
+				//dgvcSearchType.DisplayMember = "Display";
+				//dgvcSearchType.DataSource = new Relation[] { Relation.Contains, Relation.StartsWith, Relation.EndsWith, Relation.Regex }
+				//.Select(x => new { Display = x.ToString(), Value = x })
+				//.ToList();
 				dgv.DataSource=value;
+				//dgvcSearchType.DataSource =
+				//new List<Relation>((Relation[]) Enum.GetValues(typeof(Relation)))
+				//.Select(x => new { Display=x.ToString(), Value=(int)x })
+				//.ToList();;
 			}
 		}
 		public frmSettings(IgnoreLines myIgnore)
@@ -29,16 +46,19 @@ namespace Baseline
 			col.ValueType = typeof(Relation);
 		}
 
-        private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e) => Console.WriteLine("Here");
-        private void btnOK_Click(object sender, EventArgs e)
+		private void dgv_DataError(object sender, DataGridViewDataErrorEventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.OK;
-			Close();
+			Console.WriteLine("Here");
+		}
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			this.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.Close();
 		}
 		private void btnCancel_Click(object sender, EventArgs e)
 		{
-			DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			Close();
+			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.Close();
 		}
 	}
 }

PROMS/Volian.Print.Library/PromsPrinter.cs

@@ -1418,9 +1418,7 @@ namespace Volian.Print.Library
 							float yoff = 0;
 							if (_MyHelper.DidFirstPageDocStyle) yoff = origYoff - (float)mySection.MyDocStyle.Layout.TopMargin;
 							// C2018-004 create meta file for baseline compares
-
-							Volian.Base.Library.BaselineMetaFile.WriteLine("WD Height={0} Width={1} scPgCnt={2} locEnd={3} pdfSz={4} xOff={5} yOff={6} ScPgNum {7}", fgPage.Height, fgPage.Width, sectPageCount, Truncate(locEndOfWordDoc, 2), Truncate(pdfSize, 2), (float)(mySection.MyDocStyle.Layout.MSWordXAdj ?? 0.0), (float)(mySection.MyDocStyle.Layout.MSWordYAdj ?? 0.0) + yoff, pageNumber);
-
+							Volian.Base.Library.BaselineMetaFile.WriteLine("WD Height={0} Width={1} scPgCnt={2} locEnd={3} pdfSz={4} xOff={5} yOff={6} ScPgNum {7}", fgPage.Height, fgPage.Width, sectPageCount, locEndOfWordDoc, pdfSize, (float)(mySection.MyDocStyle.Layout.MSWordXAdj ?? 0.0), (float)(mySection.MyDocStyle.Layout.MSWordYAdj ?? 0.0) + yoff, pageNumber);
 							AddImportedPageToLayer(cb.PdfWriter.DirectContent, _MSWordLayer, fgPage, (float)(mySection.MyDocStyle.Layout.MSWordXAdj ?? 0), (float)(mySection.MyDocStyle.Layout.MSWordYAdj ?? 0) + yoff);
 							// B2019-102 Handle PDF Destinations for Word Sections
 							if (ii == 0 && _MyHelper.MyPromsPrinter.SaveLinks)
@@ -1535,12 +1533,6 @@ namespace Volian.Print.Library
 			}
 			ProfileTimer.Pop(profileDepth);
 		}
-		public static float Truncate(float value, int digits)
-		{
-			double mult = Math.Pow(10.0, digits);
-			double result = Math.Truncate(mult * value) / mult;
-			return (float)result;
-		}
 		// B2019-152: AddMergedLandscapePage adds entries to the dictionary that keeps track of what pages in a pdf are landscape
 		// so that if merge is done, the pages that are landscaped can have landscaped page numbers placed on them
 		public static void AddMergedLandscapePage(VlnSvgPageHelper _MyHelper, string PDFFile)

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);