From 21301832e045f0c31f9b991d3cf943d32b6f1001 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Wed, 8 Jan 2014 20:05:45 +0000
Subject: [PATCH] Changed code to update image reference to use href instead of
 bname attribute name Added header information to xml for image link Replace
 bname with xlink:href for image references Added RNOWidthAdj flag for
 Braidwood

---
 PROMS/fmtxml/GenXmlToSvg.cs   |   4 ++--
 PROMS/fmtxml/RtfToSvg.cs      |   4 ++--
 PROMS/fmtxml/SvgToPdf.cs      |   2 +-
 PROMS/fmtxml/TranslateFMT.XSL | Bin 204810 -> 205120 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)

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("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n");
 			sb.Append("<!--Proprietary Information - Copyright 2012 - Volian Enterprises, Inc. All rights reserved.-->\r\n");
-			sb.Append("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"8in\" height=\"10in\" viewBox=\"0 0 576 720\">\r\n");
+			sb.Append("<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns=\"http://www.w3.org/2000/svg\" width=\"8in\" height=\"10in\" viewBox=\"0 0 576 720\">\r\n");
 			sb.Append(string.Format("  <desc>{0}</desc>\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("    <image x=\"{0}\" y=\"{1}\" width=\"{2}\" height=\"{3}\" bname=\"{4}\"/>\r\n",
+			sb.Append(string.Format("    <image x=\"{0}\" y=\"{1}\" width=\"{2}\" height=\"{3}\" xlink:href=\"{4}\"/>\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 48ca4d6d542adf13205155901a663cebcf2a7b6a..0c33e6e0cb795af05a95112861d011939a0633c7 100644
GIT binary patch
delta 84
zcmeA=z;oabPs0|*I7wDVh7^XZ=@+FKg}28^GA`4aeqaHU(exZ;MlOidWJgZ(=>g7+
lLd-yQlRvi9PId@!ntsfMQDgFj8+q*~To|{XaA9(~4FI6_9ispM

delta 37
tcmX?bh^OlSPs0|*ILYaK%8Uxzr%5ulX-yYcz-ZE*=gPP}&z0%YZ2$}s4dDO)