diff --git a/PROMS/fmtxml/GenXmlToSvg.cs b/PROMS/fmtxml/GenXmlToSvg.cs index 1a2205f0..484eebad 100644 --- a/PROMS/fmtxml/GenXmlToSvg.cs +++ b/PROMS/fmtxml/GenXmlToSvg.cs @@ -505,8 +505,8 @@ namespace fmtxml Bitmap bmp= new Bitmap(str); bmap.SetAttribute("width",bmp.Width.ToString()+"px"); bmap.SetAttribute("height",bmp.Height.ToString()+"px"); - //bmap.SetAttribute("xlink:href",str); - bmap.SetAttribute("bname",str); + bmap.SetAttribute("xlink:href", str); + //bmap.SetAttribute("href", str); return bmap; } diff --git a/PROMS/fmtxml/RtfToSvg.cs b/PROMS/fmtxml/RtfToSvg.cs index 874c90a2..17a19b52 100644 --- a/PROMS/fmtxml/RtfToSvg.cs +++ b/PROMS/fmtxml/RtfToSvg.cs @@ -162,7 +162,7 @@ namespace fmtxml { sb.Append("\r\n"); sb.Append("\r\n"); - sb.Append("\r\n"); + sb.Append("\r\n"); sb.Append(string.Format(" {0}\r\n", file.Name.ToLower().Replace(".rtf", ""))); svg = true; return svg; @@ -234,7 +234,7 @@ namespace fmtxml string bmWidth = bmp.Width.ToString() + "px"; string bmHeight = bmp.Height.ToString() + "px"; //Console.WriteLine("'{0}'", bmFileName); - sb.Append(string.Format(" \r\n", + sb.Append(string.Format(" \r\n", TwipsToPointsX(bitmapMatch.Groups[1].Value), TwipsToPointsY(bitmapMatch.Groups[2].Value), bmWidth, diff --git a/PROMS/fmtxml/SvgToPdf.cs b/PROMS/fmtxml/SvgToPdf.cs index f78a2b04..e69dc592 100644 --- a/PROMS/fmtxml/SvgToPdf.cs +++ b/PROMS/fmtxml/SvgToPdf.cs @@ -170,7 +170,7 @@ namespace fmtxml fsty = (float) System.Convert.ToDouble(cmdele.GetAttribute("y")); int scale=1; if (cmdele.HasAttribute("scale")) scale = System.Convert.ToInt32(cmdele.GetAttribute("scale")); - string fname = cmdele.GetAttribute("bname"); + string fname = cmdele.GetAttribute("xlink:href"); Bitmap bm = new Bitmap(fname); Image img = Image.FromFile(fname); rc = new RectangleF(); diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 48ca4d6d..0c33e6e0 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ