SIEコード [1383] (Sie-announce) - SIE

Revision: 1383
          http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1383
Author:   dhrname
Date:     2009-11-01 19:46:08 +0900 (Sun, 01 Nov 2009)

Log Message:
-----------


Modified Paths:
--------------
    branches/05x/053/sie.js

Modified: branches/05x/053/sie.js
===================================================================

--- branches/05x/053/sie.js	2009-10-31 14:26:43 UTC (rev 1382)
+++ branches/05x/053/sie.js	2009-11-01 10:46:08 UTC (rev 1383)
@@ -236,7 +236,7 @@
 //chset childNodesで要素を作成していく
 SVGtoVML.prototype.chset = function _s_chset( /*element*/ ele, /*Matrix*/ matrix, /*float*/w, /*float*/h){
   var nods = ele.childNodes, s = null;
-  var name = "group|shape|defs|STOP|fill|stroke|DIV|SPAN|A|image|rect|USE|FONT-FACE-URI", gname = "DIV|group"; //要素名に合致させる文字列
+  var name = "group|shape|defs|STOP|fill|stroke|DIV|SPAN|A|image|rect|USE|FONTFACEURI", gname = "DIV|group"; //要素名に合致させる文字列
   var cmatrix = matrix; //子要素に継がせるCTM
   var te = nods[0];
   if (te !== void 0) {
@@ -1838,11 +1838,13 @@
 };
 
 function _ie_svgfont() {
-  var tsrc = document.getElementsByTagName("FONT-FACE-URI");
-  for (var i=0;i<tsrc.length;++i) {
-    var src = fsrc[i].getAttribute("xlink:href");
-    getURL(src, _ie_font, [ {id : src.substring(src.indexOf("#"), src.length-1)} ], 1);
-  }
+  try {
+    var tsrc = document.getElementsByTagName("FONTFACEURI");
+    for (var i=0;i<tsrc.length;++i) {
+      var src = tsrc[i].getAttribute("xlink:href");
+      getURL(src, _ie_font, [ {id : src.substring(src.indexOf("#"), src.length-1), style:{}} ], 1);
+    }
+  } catch (e) {stlog.add(e,1847);}
 };
 NAIBU.svgNameSpace = "http://www.w3.org/2000/svg";
 function _ie_font(data) {
@@ -2060,8 +2062,8 @@
     .replace(/\/use>/g, "/v:group>")
     .replace(/<defs(?=\s|>)/g, "<dn:defs")
     .replace(/\/defs>/g, "/dn:defs>")
-    .replace(/<font-face-uri(?=\s|>)/g, "<font-faceURI")
-    .replace(/\/font-face-uri>/g, "/font-faceURI>");
+    .replace(/<font-face-?/g, "<fontface")
+    .replace(/<\/font-face-?/g, "</fontface");
   var ob = document.createElement("v:group");
   var obst = ob.style;
   ob.innerHTML = dc;



Fork

[Sie-announce] SIEコード [1383]