diff --git a/PROMS/Volian.Print.Library/Grid2Pdf.cs b/PROMS/Volian.Print.Library/Grid2Pdf.cs index 1ef6fdd2..880ae1c2 100644 --- a/PROMS/Volian.Print.Library/Grid2Pdf.cs +++ b/PROMS/Volian.Print.Library/Grid2Pdf.cs @@ -805,7 +805,7 @@ namespace Volian.Print.Library // // // get the list of symbol replacements - FormatData fmtdata = (MyFlexGrid.MyDVI != null) ? MyFlexGrid.MyDVI.ActiveFormat.PlantFormat.FormatData : FormatInfo.PROMSBaseFormat.FormatData; + FormatData fmtdata = (MyFlexGrid.GetMyItemInfo().ActiveFormat != null) ? MyFlexGrid.GetMyItemInfo().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++) @@ -827,24 +827,31 @@ namespace Volian.Print.Library rtb.SelectionFont = new System.Drawing.Font(DefaultFont, fnt.Style); changed = true; } - if (rtb.SelectionFont.FontFamily.Name == "VESymbFix" && rtb.SelectedText.Length > 0) + if ((rtb.SelectionFont.FontFamily.Name == "VESymbFix" || rtb.SelectionFont.FontFamily.Name.StartsWith("Arial Unicode")) && rtb.SelectedText.Length > 0) + { + for (int j=0; j", @"\u9586?"); } diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 35e1df00..39b3eb89 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4332,7 +4332,7 @@ namespace Volian.Print.Library private string FixRTFToPrint(string rtf) { // Only do this if the text contains symbols. - if (rtf.Contains("VESymbFix")) + if (rtf.Contains("VESymbFix") || rtf.Contains("Arial Unicode")) { System.Windows.Forms.RichTextBox rtb = new System.Windows.Forms.RichTextBox(); rtb.Rtf = rtf.Replace(@"\\",""); // rename backslash character to avoid RTF confusion @@ -4357,16 +4357,17 @@ namespace Volian.Print.Library // // // get the list of symbol replacements - FormatData fmtdata = (MyItemInfo.MyDocVersion != null) ? MyItemInfo.MyDocVersion.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++) { rtb.Select(i, 1); - if (rtb.SelectionFont.FontFamily.Name == "VESymbFix" && rtb.SelectedText.Length > 0) + if ((rtb.SelectionFont.FontFamily.Name == "VESymbFix" || rtb.SelectionFont.FontFamily.Name.StartsWith("Arial Unicode")) && rtb.SelectedText.Length > 0) { - foreach (ReplaceChar rc in SymReplaceList) + for (int j=0; j