diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index b01cac7d..071f3791 100644 Binary files a/PROMS/Formats/fmtall/BASEall.xml and b/PROMS/Formats/fmtall/BASEall.xml differ 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 // // // 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;