From 6234a36232b2a4e73218a233247492d750d1da05 Mon Sep 17 00:00:00 2001
From: John <jjenko@volian.com>
Date: Mon, 22 Oct 2012 18:37:52 +0000
Subject: [PATCH] handle NSP Alarms RNOWidthAlt format setting and their RNO
 tabs (NumberSubs)

---
 PROMS/Volian.Print.Library/vlnParagraph.cs | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 68583317..999c2070 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -1889,9 +1889,21 @@ namespace Volian.Print.Library
 					}
 				}
 			}
-			else if (itemInfo.IsRNOPart && !((ItemInfo)itemInfo.ActiveParent).IsHigh)
+			//else if (itemInfo.IsRNOPart && !((ItemInfo)itemInfo.ActiveParent).IsHigh)
+			//{
+			//    // don't adjust for rno
+			//}
+			else if (itemInfo.IsRNOPart && (colOvrd > 0 || !((ItemInfo)itemInfo.ActiveParent).IsHigh))
 			{
-				// don't adjust for rno
+				if (colOvrd > 0)
+				{
+					XOffset = (int)colOvrd;
+					if (!((ItemInfo)itemInfo.MyParent).IsHigh)
+					{
+						ItemInfo hls = itemInfo.MyHLS;
+						XOffset -= (itemInfo.MyTab.Offset - hls.MyTab.Offset);
+					}
+				}
 			}
 			else if (MyParent != null)
 			{
@@ -1903,7 +1915,7 @@ namespace Volian.Print.Library
 					// the tab. The offset of text needs to be adjusted by the 'leftjustify' format variable 
 					// if it existed for this level.
 					myTab.XOffset += tabWidth;
-					if (tableftadj != 0 && myTab.Width<tableftadj) 
+					if (tableftadj != 0 && myTab.Width < tableftadj)
 						tabWidth = myTab.Width = tableftadj;
 					XOffset += tabWidth;
 					myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));
@@ -1941,6 +1953,13 @@ namespace Volian.Print.Library
 				widOvrd = xwid;
 			else
 				widOvrd = itemInfo.FormatStepData == null ? null : itemInfo.FormatStepData.WidthOverride;
+			if (itemInfo.IsRNOPart && itemInfo.ActiveFormat.MyStepSectionLayoutData.RNOWidthAlt != null)
+			{
+				string[] splitRNOWidthAlt = itemInfo.ActiveFormat.MyStepSectionLayoutData.RNOWidthAlt.Split(',');
+				float ovrd = (itemInfo.RNOLevel < splitRNOWidthAlt.Length) ? float.Parse(splitRNOWidthAlt[itemInfo.RNOLevel]) : 0;
+				if (ovrd > 0)
+					widOvrd = ovrd + 6; // Change bars on RNO column (signoff line) would not line up with 16-bit without this - NSP Alarms
+			}
 			if ((widOvrd??0) != 0)
 			{
 				Width = (float)widOvrd;