From 33976e8d2b9903dcacba6713896f75acda5b1f05 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Wed, 21 Feb 2018 16:53:37 +0000
Subject: [PATCH] set the default Font and Size for bullets Changed the
 function the replaces symbols to be able to be used for tabs. Used the
 function that replaces symbols so that it is used for tabs.

---
 PROMS/Formats/fmtall/BASEall.xml             | Bin 85222 -> 85540 bytes
 PROMS/Volian.Print.Library/vlnParagraph.cs   |  12 ++++--------
 PROMS/Volian.Print.Library/vlnPrintObject.cs |   2 ++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index b01cac7df2db65b2f881c82abee7c56036f3128e..071f3791be0482f26fef7318c60a74d9ac234063 100644
GIT binary patch
delta 191
zcmaDhlXb}))(smnCr>dK;CEvvVn_u-Uxs{!Jcj(q8_mQO^%?9K6c}t66d81ZP=UdX
z!HB_t!H~fM$OF;FllNw-h6e+6l>lW^fOHx|B10)d4w&x-HVGt?24och>141-F+(Op
zF;GP+&>oO1h+hTdDKI2~_2z)hE1vu?U3AhHw#h=N8j~*svrP_Rm0<@t2<Vi}8#7HG
F0{{S{EF1s;

delta 18
acmZ27hxOS^)(smnCyS*EZ2p&}_80(DISAJP

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index bb643ee9..0710dfe7 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -467,7 +467,6 @@ namespace Volian.Print.Library
 		{
 			// Don't print section titles for supplemental information because the title is 'Supplemental Information':
 			if (MyItemInfo.IsSection && MyPromsPrinter.SupInfoPrintType == E_SupInfoPrintType.SupInfoPdfPrint) return yPageStart;
-
 			//if(PartsAbove.Count > 0 && PartsAbove[0] is vlnHeader)
 			//	if (PartsLeft.Count > 0 && PartsLeft[0] is vlnTab)
 			//		//if((PartsLeft[0] as vlnTab).Text[0] != '\u25CF')
@@ -2104,8 +2103,6 @@ namespace Volian.Print.Library
 					float mytmpfloat = sectContPara.ParagraphToPdf(cb, yTopMargin, yTopMargin, yBottomMargin);
 					if (sectContPara.SectionContinuePrinted)
 						yPageStart -= sectContPara.Height + SixLinesPerInch;
-					else
-						Console.WriteLine("'No Header 1','{0}',{1},{2}", MyItemInfo.ShortPath, MyItemInfo.MyDocStyle.CancelSectTitle, MyItemInfo.MyDocStyle.SpecialStepsFoldout);
 				}
 				else
 				{
@@ -2113,8 +2110,6 @@ namespace Volian.Print.Library
 					float mytmpfloat = sectContPara.ParagraphToPdf(cb, yTopMargin, yTopMargin, yBottomMargin);
 					if (sectContPara.SectionContinuePrinted)
 						yPageStart -= sectContPara.Height + SixLinesPerInch;
-					else
-						Console.WriteLine("'No Header 1','{0}',{1},{2}", MyItemInfo.ShortPath, MyItemInfo.MyDocStyle.CancelSectTitle, MyItemInfo.MyDocStyle.SpecialStepsFoldout);
 				}
 			}
 
@@ -4521,10 +4516,11 @@ namespace Volian.Print.Library
 					Rtf = Rtf.Replace("{Backspace}", "");
 				}
 			}
-			Rtf = FixRTFToPrint(Rtf);
+			Rtf = FixRTFToPrint(MyItemInfo, Rtf);
 			ProfileTimer.Pop(profileDepth);
 		}
-		private string FixRTFToPrint(string rtf)
+		// F2018-013 Changed to static and public so that it can be used with step identifiers for bullets
+		public static string FixRTFToPrint(ItemInfo myItemInfo, string rtf)
 		{
 			// Only do this if the text contains symbols.
             if ((rtf.Contains("VESymbFix") || rtf.Contains(Volian.Base.Library.vlnFont.ProportionalSymbolFont))) // C2017-036 get best available proportional font for symbols
@@ -4553,7 +4549,7 @@ namespace Volian.Print.Library
 					//</ReplaceSymbolChars-->
 					//
 					// get the list of symbol replacements
-					FormatData fmtdata = (MyItemInfo.ActiveFormat != null) ? MyItemInfo.ActiveFormat.PlantFormat.FormatData : FormatInfo.PROMSBaseFormat.FormatData;
+					FormatData fmtdata = (myItemInfo.ActiveFormat != null) ? myItemInfo.ActiveFormat.PlantFormat.FormatData : FormatInfo.PROMSBaseFormat.FormatData;
 					ReplaceSymbolCharList SymReplaceList = (fmtdata != null && fmtdata.SectData.ReplaceSymbolCharList != null) ? fmtdata.SectData.ReplaceSymbolCharList : null;
 					// Look at one character at a time
 					for (int i = 0; i < rtb.TextLength; i++)
diff --git a/PROMS/Volian.Print.Library/vlnPrintObject.cs b/PROMS/Volian.Print.Library/vlnPrintObject.cs
index 5d4140e2..3a4f6d7f 100644
--- a/PROMS/Volian.Print.Library/vlnPrintObject.cs
+++ b/PROMS/Volian.Print.Library/vlnPrintObject.cs
@@ -521,6 +521,8 @@ namespace Volian.Print.Library
 		{
 			foreach (vlnPrintObject part in this)
 			{
+				// F2018-013 Replace Symbols as necesasary on tabs (consistent bullets)
+				if(part.Rtf != null) part.Rtf = vlnParagraph.FixRTFToPrint(part.MyParent.MyItemInfo, part.Rtf);
 				yPageStart = part.ToPdf(cb, yPageStart, ref yTopMargin, ref yBottomMargin);
 			}
 			return yPageStart;