PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs

@@ -285,16 +285,18 @@ namespace VEPROMS.CSLA.Library
 		#region ROTextConvertMethods
 		// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 		//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-		public static string ROConvertSymbols(string retval, bool arr1, bool arr2)
+		public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null)
 		{
-			if (arr1)
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
+			// _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue)
 			{ 
 				retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow
 				retval = retval.Replace("->", @"\u8594?"); // Right Arrow
 				retval = retval.Replace("<-", @"\u8592?"); // Left Arrow
 			}
-			if (arr2)
+			if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
 			{
 				retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal
 				retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal
@@ -490,7 +492,7 @@ namespace VEPROMS.CSLA.Library
 			return rc;
 		}
 
-		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo)
+		public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols)
 		{
 			roid = FormatRoidKey(roid, true);
 
@@ -502,13 +504,7 @@ namespace VEPROMS.CSLA.Library
 			retval = ReplaceUnicode(retval, DoCaret);
 			// B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing
 			//   step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode.
-
-			//(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
-			//			_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-			bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-			bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-
-			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2);
+			if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval);
 
 			retval = ConvertFortranFormatToScienctificNotation(retval);
 

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

@@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library
 						foreach (ContentRoUsage ro in cont.ContentRoUsages)
 						{
 							RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID);
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							
@@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library
 						ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion);
 						foreach (RoUsageInfo rou in tmp.ContentRoUsages)
 						{
-							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]);
+							string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 							ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID);
 							int mytype = rocc.type;
 							ctmp.FixContentText(rou, myvalue, mytype, myRoFst);

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

@@ -694,12 +694,10 @@ namespace VEPROMS.CSLA.Library
 					// B2017-147: backquotes should be translated to degrees for edit/print:
 					newvalue = newvalue.Replace("`", @"\'b0");
 					// B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it
-					bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-					bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
 					//	is done here so that output (print & edit/view) has symbol, not 2 characters.
 					if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue ||
 						_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue))
-						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2);
+						newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo);
 
 					if (gg != newvalue)
 						text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength);

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

@@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library
 					{
 						string oldText = this.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 						
 						this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this);
@@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library
 						ROCheckCount++;
 						string oldText = itemInfo.MyContent.Text;
 
-						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo);
+						string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 						ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 
 						itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo);
@@ -1184,10 +1184,9 @@ namespace VEPROMS.CSLA.Library
 						if (sectionInfo != null)
 						{
 							// B2023-037: loading print text, resolve the RO symbols 
-
-							bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
-							bool GLTArrows = !itemInfo.IsTable &&  sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
-							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo);
+							bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue;
+							bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue;
+							string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta,    sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows);
 							ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID);
 							itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo);
 						}

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

@@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library
 								{
 									foreach (ItemInfo ii in roUsg.MyContent.ContentItems)
 									{
-										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii);
+										string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 										content.FixContentText(roUsg, val, roch.type, origROFstInfo, true);
 
 										if (content.IsDirty)

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

@@ -1227,9 +1227,7 @@ namespace VEPROMS.CSLA.Library
 					case 0:
 						break;
 					default:
-						//F2024-048 use a hard space (\\u160;) instead of a space in the page number text
-						//          to keep that text together on the page
-						tb.Append(string.Format(" (Page{0}{1})", "\\u160;", tb._ToItem.PageNumber + 1));
+						tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1));
 						break;
 				}
 			}

PROMS/VEPROMS.CSLA.Library/Format/ENums.cs

@@ -58,8 +58,7 @@ namespace VEPROMS.CSLA.Library
 		SectMenuStep = 0x0020,
 		StepAllowNone = 0x0040,
 		StepFirst = 0x0080,
-		StepLast = 0x0100,
-		StepAllChildren = 0x0200
+		StepLast = 0x0100
 	}
 	public enum E_EMode : uint
 	{

PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs

@@ -199,12 +199,9 @@ namespace VEPROMS.CSLA.Library
 			LoadChildren(true);
 		}
 		private bool _allParts = true;
-		private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP)
-		public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false)
+		public virtual void LoadChildren(bool allParts)
 		{
 			_allParts = allParts;
-			// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-			_excludeTablesFigsEqu = excldTablesFigEq;
 			if (!_ChildrenLoaded)
 			{
 				this.Nodes.Clear();
@@ -265,10 +262,6 @@ namespace VEPROMS.CSLA.Library
 					if (!skipIt)
 					{
 						VETreeNode tmp = new VETreeNode(o, _allParts);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						bool isTableFigEqu = tmp.Text.Equals("Table") ||
-									tmp.Text.Equals("Figure") ||
-									tmp.Text.Equals("Equation");
 						if (o.HasChildren)
 						{
 							if (o is PartInfo)
@@ -286,8 +279,7 @@ namespace VEPROMS.CSLA.Library
 							tmp._ChildrenLoaded = true;// Reset the children loaded flag
 						if (lastWasSection)
 							this.Nodes.Insert(0, tmp);
-						// B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions
-						else if (!_excludeTablesFigsEqu || !isTableFigEqu)
+						else
 							this.Nodes.Add(tmp);
 						// if last thing was section & this is step, do insert - i.e. so that steps go before sections.
 						lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section);

PROMS/Volian.Controls.Library/DisplayRO.cs

@@ -903,9 +903,9 @@ namespace Volian.Controls.Library
 						// Pad to 16 to store in the RoUsage table.
 						string padroid = ROFSTLookup.FormatRoidKey(roc.roid, true);
 						string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyROFST.RODbID);
-						
+
 						// Resolve symbols and scientific notation in the RO return value
-						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo);
+						string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false);
 
 						MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID));
 					}

PROMS/Volian.Controls.Library/DisplayTransition.cs

@@ -898,11 +898,7 @@ namespace Volian.Controls.Library
 			// allow this (12/2/09).  Note that this was changed to not allow transitions
 			// to RNOs (10/2010), this 'feature' will be added at some later date.
 			tn.ChildrenLoaded = false;
-			// F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children.
-			E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI;
-			bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren);
-			bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list
-			tn.LoadChildren(loadAllChildren, excludeTableFigEqu); 
+			tn.LoadChildren(false); 
 		}
 		private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e)
 		{
@@ -944,9 +940,7 @@ namespace Volian.Controls.Library
 		private void HideStepTreeIfNeeded()
 		{
 			string trnFmt = _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransFormat;
-			// F2024-047 Added check for {Step Text} so that the step tree is displayed
-			//           Needed for BNPP transition to step text only for standard text
-			bool showStepList = trnFmt.Contains("{First Step}") || trnFmt.Contains("{Step Text}");
+			bool showStepList = trnFmt.Contains("{First Step}");
 			if (!showStepList)
 				tvTran.Nodes.Clear(); // clear the tree view of steps if not needed for selected transition
 			tvTran.Enabled = showStepList; // show the tree view of steps?
@@ -1342,13 +1336,7 @@ namespace Volian.Controls.Library
 				return;
 			}
 			// B2015-170 - don't allow a transition to step that is not sequential
-			// B2024-019  - but allow if TranFmt only contains {Step Text}
-			//            - Calvert uses {Step Text} but also includes step number
-			//            - Barakah (BNPP) uses just {Step Text} to link to standard text
-			bool onlyStepText = false;
-			if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}"))
-				onlyStepText = true;
-			if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
+			if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered))
 			{
 				FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.",
 					"Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);

PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -563,7 +563,7 @@ namespace Volian.Controls.Library
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
 			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,
-			 false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			 false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void SaveROWithAnnotation_Click(object sender, EventArgs e)
@@ -580,7 +580,7 @@ namespace Volian.Controls.Library
 			string padroid = (myroid.Length <= 12) ? myroid + "0000" : myroid;
 			string linktxt = string.Format(@"#Link:ReferencedObject:<NewID> {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID);
 			// Resolve symbols and scientific notation in the RO return value
-			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value);
+			string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); //ConvertSymbolsAndStuff(selectedChld.value);
 			MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID));
 		}
 		private void NoROFound_Click(object sender, EventArgs e)