From svnnotify ＠ sourceforge.jp Fri Oct 2 21:30:39 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 02 Oct 2009 21:30:39 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzA0XSAgU1ZHVmlld1Nw?= =?utf-8?b?ZWPjgqrjg5bjgrjjgqfjgq/jg4jjga7kv67mraM=?= Message-ID: <1254486639.668204.7825.nullmailer@users.sourceforge.jp> Revision: 1304 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1304 Author: dhrname Date: 2009-10-02 21:30:38 +0900 (Fri, 02 Oct 2009) Log Message: ----------- SVGViewSpecオブジェクトの修正 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-09-30 12:45:12 UTC (rev 1303) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-02 12:30:38 UTC (rev 1304) @@ -1259,7 +1259,7 @@ SVGElement.constructor = Element; SVGElement.prototype = new Element(); /*getPresentationAttribute - *プレゼンテーション属性の値を得る。これはCSSのスタイルの設定値を定めるときや、内部の動的処理に役立つ + *プレゼンテーション属性の値をCSSValueとして得る。これはCSSのスタイルの設定値を定めるときや、内部の動的処理に役立つ */ /*css::CSSValue*/ SVGElement.prototype.getPresentationAttribute = function(/*DOMString*/ name ) { var s = new CSSValue(), tgn = this.attributes.getNamedItemNS(null, name); @@ -1921,20 +1921,20 @@ /*readonly SVGAnimatedPreserveAspectRatio*/ this.preserveAspectRatio = new SVGAnimatedPreserveAspectRatio(); return this; }; -function SVGViewSpec() { +function SVGViewSpec(ele) { SVGFitToViewBox.apply(this, arguments); - /*readonly SVGTransformList*/ this.transform = null; - /*readonly SVGElement*/ this.viewTarget = null; + /*readonly SVGTransformList*/ this.transform = new SVGTransformList(); + /*readonly SVGElement*/ this.viewTarget = ele; /*readonly DOMString*/ this.viewBoxString = ""; /*readonly DOMString*/ this.preserveAspectRatioString = ""; /*readonly DOMString*/ this.transformString = ""; /*readonly DOMString*/ this.viewTargetString = ""; + this.tar = ele; return this; }; SVGViewSpec.constructor = SVGFitToViewBox; SVGViewSpec.prototype = new SVGFitToViewBox(); SVGViewSpec.prototype.read = function(){ - this.tar = ele; var vb = this.viewBoxString; if (vb) { var ovb = vb.replace(/^\s+|\s+$/g, "").split(/[\s,]+/); @@ -1986,7 +1986,8 @@ try { if (!this.viewBoxString) { this._tx = this._ty = 0; - return new SVGMatrix(1, 0, 0, 1, 0, 0); + var s = this.transform.createSVGTransformFromMatrix((new SVGMatrix(1, 0, 0, 1, 0, 0))); + this.transform.appendItem(s); } var vbx = vB.x, vby = vB.y, vbw = vB.width, vbh = vB.height; var rw = vw / vbw, rh = vh / vbh; @@ -2035,8 +2036,8 @@ this._ty = ty; ttps.marginLeft = this._tx+ "px"; ttps.marginTop = this._ty+ "px"; - var m = new SVGMatrix(xr, 0, 0, yr, 0, 0); - return m; + var s = this.transform.createSVGTransformFromMatrix((new SVGMatrix(xr, 0, 0, yr, 0, 0))); + this.transform.appendItem(s); } catch(e) {stlog.add(e,1031);}} From svnnotify ＠ sourceforge.jp Fri Oct 2 21:42:59 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 02 Oct 2009 21:42:59 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzA1XQ==?= Message-ID: <1254487379.175460.24434.nullmailer@users.sourceforge.jp> Revision: 1305 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1305 Author: dhrname Date: 2009-10-02 21:42:59 +0900 (Fri, 02 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-02 12:30:38 UTC (rev 1304) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-02 12:42:59 UTC (rev 1305) @@ -1275,8 +1275,8 @@ /*interface SVGLocatable*/ /*SVGRect*/ SVGElement.prototype.getBBox = function(){ var s = new SVGRect(); - s.x = this.tar.style.left; - s.y = this.tar.style.top; + s.x = this.tar.clientLeft; + s.y = this.tar.clientTop; s.width = this.tar.clientWidth; s.height = this.tar.clientHeight; return s; @@ -1296,7 +1296,8 @@ return (this.viewportElement.getCTM()); }; /*getTransformToElementメソッド - *これは、elementへの変換行列を計算して返す + *これは、あるelementへの変換行列を計算して返す + *たとえば、親要素から子要素への変換行列を算出することが可能 */ /*SVGMatrix*/ SVGElement.prototype.getTransformToElement = function(/*SVGElement*/ element ){ var s = this.getCTM().inverse().multiply(element.getCTM()); @@ -1803,7 +1804,8 @@ this.children = []; //子要素 var sw = this.width.baseVal.value, sh = this.height.baseVal.value; this.currentView.read(); - this.transform._matrix = this.currentView.set(w, h, this.tarParent); //this.transform._matrixを加工する + this.currentView.set(w, h, this.tarParent); + this.transform._matrix = this.currentView.transform.cosolidate(); //this.transform._matrixを加工する this.chset(this,tar, this.transform._matirx, sw, sh); var backr = document.createElement("v:rect"); //背景の作成 backr.style.position = "absolute"; @@ -1988,6 +1990,7 @@ this._tx = this._ty = 0; var s = this.transform.createSVGTransformFromMatrix((new SVGMatrix(1, 0, 0, 1, 0, 0))); this.transform.appendItem(s); + return; } var vbx = vB.x, vby = vB.y, vbw = vB.width, vbh = vB.height; var rw = vw / vbw, rh = vh / vbh; From svnnotify ＠ sourceforge.jp Fri Oct 2 22:58:01 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 02 Oct 2009 22:58:01 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzA2XQ==?= Message-ID: <1254491881.856931.29198.nullmailer@users.sourceforge.jp> Revision: 1306 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1306 Author: dhrname Date: 2009-10-02 22:58:01 +0900 (Fri, 02 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-02 12:42:59 UTC (rev 1305) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-02 13:58:01 UTC (rev 1306) @@ -2642,7 +2642,17 @@ SVGPathElement.prototype = new SVGElement(); SVGPathElement.prototype.read = function(){ this.d = this.getNamedItemNS(null, "d").nodeValue; + var tra = this.getNamedItemNS(null, "transform").nodeValue; + if (tra) { + var tta = this.transform.animVal; + var commands = tra.match(NAIBU.comR); + var degits = tra.match(NAIBU.degR); + } }; +//あらかじめ正規表現オブジェクトを生成しておく +NAIBU.comaR = /[A-Za-z]+(?=\s*\()/g; +NAIBU.degR = /[\-\d\.e]+/g; + SVGPathElement.prototype.set = function( /*float*/ w, /*float*/ h) { var dat = ""; try { @@ -2653,7 +2663,7 @@ .replace(/[\s,]{2,}|\s/g, ",") .replace(/([\d.])-/g, "$1,-"); var D = eval('('+dd+')'); //ここまでd属性のパーサ - var ttm = this.transformable; + var ttm = this.getCTM(); var preCom; var x = 0, y = 0; //現在の点の絶対座標 var x0 = 0, y0 = 0; //subpath の始点の絶対座標 From svnnotify ＠ sourceforge.jp Sat Oct 3 19:20:39 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 03 Oct 2009 19:20:39 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzA3XSAgZ2V0Q1RN44Oh?= =?utf-8?b?44K944OD44OJ44Gu5a6f6KOF?= Message-ID: <1254565239.245133.17689.nullmailer@users.sourceforge.jp> Revision: 1307 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1307 Author: dhrname Date: 2009-10-03 19:20:39 +0900 (Sat, 03 Oct 2009) Log Message: ----------- getCTMメソッドの実装 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-02 13:58:01 UTC (rev 1306) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-03 10:20:39 UTC (rev 1307) @@ -873,87 +873,6 @@ return grad; } -//transform属性を処理 -function TransformList( /*element*/ ele) { - this.on = true; - try { - var ep = ele.parentNode; - var tf = ""; - if (ele.getAttribute("transform")) { - tf = ele.getAttribute("transform"); - } - while(ep.tagName == "group" || ep.tagName == "A") { //先祖要素のtransform属性を取得 - if (ep.getAttribute("transform")) { - tf = ep.getAttribute("transform") + tf; - ele.setAttribute("transform",tf); - } - ep = ep.parentNode; - } - this.tr = new Transform(); - var tft = ele.getAttribute("transform"); - if (tft) { - var coma = tft.match(/[A-Za-z]+(?=\s*\()/g); - var list = tft.match(/\([^\)]+\)/g); - this.tr.matrix = this.tr.getMatrix(list[0],coma[0]); - for (var i=1;i Revision: 1308 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1308 Author: dhrname Date: 2009-10-03 19:41:54 +0900 (Sat, 03 Oct 2009) Log Message: ----------- さらにgetCTMを修正 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-03 10:20:39 UTC (rev 1307) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-03 10:41:54 UTC (rev 1308) @@ -1228,32 +1228,35 @@ t = this.ownerDocument.documentElement.createSVGTransform(); degli = deg.length; if (degli === 6) { - a = parseFloat(deg[0]); b = parseFloat(deg[1]); c = parseFloat(deg[2]); d = parseFloat(deg[3]); e = parseFloat(deg[4]); f = parseFloat(deg[5]); + var m = this.ownerDocument.documentElement.createSVGMatrix() + m.a = parseFloat(deg[0]); b = parseFloat(deg[1]); m.c = parseFloat(deg[2]); m.d = parseFloat(deg[3]); m.e = parseFloat(deg[4]); m.f = parseFloat(deg[5]); + t.setMatrix(m); } else { rad = parseFloat(deg[0]) / 180 * Math.PI; if (degli === 3) { - var cx = parseFloat(deg[1]), cy = parseFloat(deg[2]); - a = Math.cos(rad); b = Math.sin(rad); c = -b; d = a; e = (1-a)*cx-c*cy; f = -b*cx+(1-d)*cy; + t.setRotate(rad, parseFloat(deg[1]), parseFloat(deg[2])); + } else if (degli <= 2) { switch (com) { case "translate": - a = 1; b = 0; c = 0; d = 1; e = parseFloat(deg[0]); f = parseFloat(deg[1] || 0); + t.setTranslate(parseFloat(deg[0]); parseFloat(deg[1] || 0)); break; case "scale": - a = parseFloat(deg[0]); b = 0; c = 0; d = parseFloat(deg[1] || deg[0]); e = 0; f = 0; + t.setScale(parseFloat(deg[0]), parseFloat(deg[1] || deg[0])); break; case "rotate": - a = Math.cos(rad); b = Math.sin(rad); c = -b; d = a; e = 0; f = 0; + t.setRotate(rad, 0, 0); break; case "skewX": - a = 1; b = 0; c = Math.tan(rad); d = 1; e = 0; f = 0; + t.setSkewX(rad); break; case "skewY": - a = 1; b = Math.tan(rad); c = 0; d = 1; e = 0; f = 0; + t.setSkewY(rad); break; } } } + this.transform.animVal.appendItem(t); lis = com = deg = rad = null; } list = coma = mat = null; @@ -1261,7 +1264,7 @@ } catch(e) {stlog.add(e,816);} } var n = this.transform.animVal.consolidate(); - n = n ? n.matrix : this.documentElement.createSVGMatrix(); + n = n ? n.matrix : this.ownerDocument.documentElement.createSVGMatrix(); this.transform._matrix = this.parentNode.getCTM().multiply(n); } return (this.transform._matrix); From svnnotify ＠ sourceforge.jp Sat Oct 3 23:06:24 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 03 Oct 2009 23:06:24 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzA5XSAxLCAgU1ZHQ29s?= =?utf-8?b?b3Ljga7lrp/oo4U=?= Message-ID: <1254578784.908740.4682.nullmailer@users.sourceforge.jp> Revision: 1309 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1309 Author: dhrname Date: 2009-10-03 23:06:24 +0900 (Sat, 03 Oct 2009) Log Message: ----------- 1, SVGColorの実装 2, GetSVGDocumentオブジェクトの一部実装 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-03 10:41:54 UTC (rev 1308) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-03 14:06:24 UTC (rev 1309) @@ -1261,7 +1261,7 @@ } list = coma = mat = null; } - } catch(e) {stlog.add(e,816);} + } catch(e) {} } var n = this.transform.animVal.consolidate(); n = n ? n.matrix : this.ownerDocument.documentElement.createSVGMatrix(); @@ -1270,7 +1270,7 @@ return (this.transform._matrix); }; /*SVGMatrix*/ SVGElement.prototype.getScreenCTM = function(){ - return (this.viewportElement.getCTM()); + return (this.ownerDocument.documentElement.getCTM()); }; /*getTransformToElementメソッド *これは、あるelementへの変換行列を計算して返す @@ -1464,16 +1464,33 @@ /*void*/ SVGColor.prototype.setRGBColor = function(/*DOMString*/ rgbColor ){ this.colorType = SVGColor.SVG_COLORTYPE_RGBCOLOR; - if (rgbColor.indexOf("%", 5) > 0) { // %を含むrgb形式の場合 - return rgbColor.replace(/[\d.]+%/g, function(s) { + this.cssText = rgbColor; + var tkr = this.keywords[rgbColor] + if (tkr !== void 0) { + rgbColor = tkr; + } + if (rgbColor.indexOf("%", 5) > 0) { // %を含むrgb形式の場合 + rgbColor = rgbColor.replace(/[\d.]+%/g, function(s) { return Math.round(2.55 * parseFloat(s)); }); + } else if (rgbColor.indexOf("#") > 0) } //#を含む場合 + rgbColor = rgbColor.replace(/[\dA-F][\dA-F]/g, function(s) { + return parseInt(s, 16); + }); } - this.cssText = rgbColor; + var s = rgbColor.match(/\d+/g); + this.rgbColor.r = parseInt(s[0]); + this.rgbColor.g = parseInt(s[1]); + this.rgbColor.b = parseInt(s[2]); } // raises( SVGException ); /*void*/ SVGColor.prototype.setColor =function(/*unsigned short*/ colorType, /*DOMString*/ rgbColor, /*DOMString*/ iccColor ){ - + if (colorType === 1) { + this.setRGBColor(rgbColor); + } else if (colorType === 3) { + this.colorType - SVGColor.SVG_COLORTYPE_CURRENTCOLOR; + this.setRGBColor(this.style.getProperty("color")); + } } // raises( SVGException ); //色キーワード @@ -2124,7 +2141,12 @@ function GetSVGDocument() { var obje = document.getElementsByTagName("object"); //HTML内のobject要素を探し出して、メソッドを結びつける - /*SVGDocument getSVGDocument = function(){} + for (var i=0;i Revision: 1310 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1310 Author: dhrname Date: 2009-10-03 23:15:04 +0900 (Sat, 03 Oct 2009) Log Message: ----------- getPropertyValueメソッドのキャメル記法の修正 Modified Paths: -------------- branches/DOM/org/w3c/dom/css.js Modified: branches/DOM/org/w3c/dom/css.js =================================================================== --- branches/DOM/org/w3c/dom/css.js 2009-10-03 14:06:24 UTC (rev 1309) +++ branches/DOM/org/w3c/dom/css.js 2009-10-03 14:15:04 UTC (rev 1310) @@ -193,7 +193,7 @@ /*string*/ getPropertyValue : function( /*string*/ propertyName) { var tg = this.getPropertyCSSValue(propertyName); if (tg) { //見つかった場合 - return (tg[propertyName]); + return (tg[propertyName.replace(/\-[a-z]/g, (function(s){return s.toUpperCase();}))]); } else { return ""; } From svnnotify ＠ sourceforge.jp Sat Oct 3 23:15:52 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 03 Oct 2009 23:15:52 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzExXSAgc2V0UHJvcGVy?= =?utf-8?b?dHnjgpJzZXRQcm9wZXJ0eVZhbHVl44Gr5L+u5q2j?= Message-ID: <1254579352.846650.15573.nullmailer@users.sourceforge.jp> Revision: 1311 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1311 Author: dhrname Date: 2009-10-03 23:15:52 +0900 (Sat, 03 Oct 2009) Log Message: ----------- setPropertyをsetPropertyValueに修正 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-03 14:15:04 UTC (rev 1310) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-03 14:15:52 UTC (rev 1311) @@ -1489,7 +1489,7 @@ this.setRGBColor(rgbColor); } else if (colorType === 3) { this.colorType - SVGColor.SVG_COLORTYPE_CURRENTCOLOR; - this.setRGBColor(this.style.getProperty("color")); + this.setRGBColor(this.style.getPropertyValue("color")); } } // raises( SVGException ); From svnnotify ＠ sourceforge.jp Sun Oct 4 21:47:28 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 04 Oct 2009 21:47:28 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzEyXSAgU1ZHUGF0aEVs?= =?utf-8?b?ZW1lbnTjga7kv67mraM=?= Message-ID: <1254660448.674799.8254.nullmailer@users.sourceforge.jp> Revision: 1312 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1312 Author: dhrname Date: 2009-10-04 21:47:28 +0900 (Sun, 04 Oct 2009) Log Message: ----------- SVGPathElementの修正 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-03 14:15:52 UTC (rev 1311) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-04 12:47:28 UTC (rev 1312) @@ -2640,16 +2640,13 @@ SVGPathElement.constructor = SVGElement; SVGPathElement.prototype = new SVGElement(); SVGPathElement.prototype.read = function(){ - this.d = this.getNamedItemNS(null, "d").nodeValue; + this.d = this.getNamedItemNS(null, "d"); }; -//あらかじめ正規表現オブジェクトを生成しておく -NAIBU.comaR = /[A-Za-z]+(?=\s*\()/g; -NAIBU.degR = /[\-\d\.e]+/g; SVGPathElement.prototype.set = function( /*float*/ w, /*float*/ h) { var dat = ""; try { - var dd = this.d + var dd = this.d.nodeValue .replace(/\s*([A-DF-Z])/gi, '],["$1" ') //convert to JSON array .replace(/^\],/, "[") .replace(/\s*$/, "]]") @@ -2740,8 +2737,7 @@ var ele = this.tar; ele.path = dat + " e"; ele.coordsize = w + " " + h; - this.paint.set(w, h, this.transformable); - ttm = this.transformable = this.paint = this.d = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = w = h = null; + ttm = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = w = h = null; } catch(e) {stlog.add(e,372);} }; From svnnotify ＠ sourceforge.jp Mon Oct 5 22:43:16 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Oct 2009 22:43:16 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzEzXSAgU1ZHUmVjdEVs?= =?utf-8?b?ZW1lbnTjga5zZXTjg6Hjgr3jg4Pjg4njgpLlrp/oo4Xplovlp4s=?= Message-ID: <1254750196.564141.31663.nullmailer@users.sourceforge.jp> Revision: 1313 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1313 Author: dhrname Date: 2009-10-05 22:43:16 +0900 (Mon, 05 Oct 2009) Log Message: ----------- SVGRectElementのsetメソッドを実装開始 Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-04 12:47:28 UTC (rev 1312) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-05 13:43:16 UTC (rev 1313) @@ -2642,7 +2642,6 @@ SVGPathElement.prototype.read = function(){ this.d = this.getNamedItemNS(null, "d"); }; - SVGPathElement.prototype.set = function( /*float*/ w, /*float*/ h) { var dat = ""; try { @@ -2898,7 +2897,56 @@ }; SVGRectElement.constructor = SVGElement; SVGRectElement.prototype = new SVGElement(); +SVGRectElement.prototype.read = function( /*element*/ rect, /*Matrix*/ matrix, /*float*/ w, h) { + this.tar = rect; + try { + this.x.animVal = newValueSpecified((this.getNamedItem(null, "x") || 0), w); + this.y = new STLength((rect.getAttribute("y") || 0), h); + this.width = new STLength(rect.getAttribute("svgwidth"), w); + this.height = new STLength(rect.getAttribute("svgheight"), h); + var rx = rect.getAttribute("rx"), ry = rect.getAttribute("ry"); + if (rx || ry) { + this.rx = new STLength((rx || ry), w); + this.ry = new STLength((ry || rx), h); + if (this.rx.value > this.width.value / 2) { //rx属性が幅より大きければ、幅の半分を属性に設定 + this.rx.value = this.width.value / 2; + } + if (this.ry.value > this.height.value / 2) { + this.ry.value = this.height.value / 2; + } + } + this.paint = new NAIBU.PaintColor(rect); + this.transformable = NAIBU.transformToCTM(rect,matrix); + w = h = rx = ry = null; + } catch(ee) {stlog.add(ee,545);} + return this; +} +SVGRectElement.prototype.set = function rectset(w,h) { + try { + var x = this.x.value, y = this.y.value, xw = x + this.width.value, yh = y + this.height.value; + var list; + if (this.rx) { + var rx = this.rx.value, ry = this.ry.value; + var rrx = rx * 0.55228, rry = ry * 0.55228; + var a = xw - rx, b = x + rx, c = y + ry, d = yh - ry; + list = ["m",b,y, "l",a,y, "c",a+rrx,y,xw,c-rry,xw,c, "l",xw,d, "c",xw,d+rry,a+rrx,yh,a,yh, "l",b,yh, "c",b-rrx,yh,x,d+rry,x,d, "l",x,c, "c",x,c-rry,b-rrx,y,b,y]; + } else { + list = ["m",x,y, "l",x,yh, xw,yh, xw,y, "x e"]; + } + var ttm = this.getCTM(); + var pl = new PList(list); + var plm = pl.matrixTransform(ttm); + var dat = plm.list.join(" "); + } catch(e) {stlog.add(e,564);} + try { + var ele = this.tar; + ele.path = dat; + ele.coordsize = w + " " + h; + dat = list = pl = plm = ttm = this.transformable = w = h = null; //解放 + } catch(ee) {stlog.add(ee,576);} +} + function SVGCircleElement() { SVGElement.apply(this, arguments); /*readonly SVGAnimatedLength*/ this.cx = new SVGAnimatedLength(0); From svnnotify ＠ sourceforge.jp Tue Oct 6 22:55:16 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Oct 2009 22:55:16 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzE0XSBTVkcgSU4gSFRN?= =?utf-8?q?L?= Message-ID: <1254837316.679371.24626.nullmailer@users.sourceforge.jp> Revision: 1314 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1314 Author: dhrname Date: 2009-10-06 22:55:16 +0900 (Tue, 06 Oct 2009) Log Message: ----------- SVG IN HTML Added Paths: ----------- trunk/svginhtml.html Added: trunk/svginhtml.html =================================================================== --- trunk/svginhtml.html (rev 0) +++ trunk/svginhtml.html 2009-10-06 13:55:16 UTC (rev 1314) @@ -0,0 +1,62 @@ +? + +Sie Reader + + + + + + + + + + + \ No newline at end of file From svnnotify ＠ sourceforge.jp Thu Oct 8 21:15:11 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 08 Oct 2009 21:15:11 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzE1XQ==?= Message-ID: <1255004111.012078.15437.nullmailer@users.sourceforge.jp> Revision: 1315 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1315 Author: dhrname Date: 2009-10-08 21:15:10 +0900 (Thu, 08 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/svginhtml.html Modified: trunk/svginhtml.html =================================================================== --- trunk/svginhtml.html 2009-10-06 13:55:16 UTC (rev 1314) +++ trunk/svginhtml.html 2009-10-08 12:15:10 UTC (rev 1315) @@ -1,6 +1,6 @@ ? -Sie Reader +SVG in HTML - SIE @@ -17,8 +17,8 @@ } } document.getElementById("hogehoge").innerHTML = source; - alert(document.getElementById("hogehoge").innerHTML); - if (/a/[-1] !== 'a'){ //Firefoxだったらfalseを返す + var isOpera = (window.opera !== void 0); //Operaだったらtrueを返す + if (isOpera){ svgtovml(); } } @@ -26,8 +26,10 @@ document.write('
'); document.write(' +

SVG in HTML - SIE

+ +

SVG in HTML - SIE

From svnnotify ＠ sourceforge.jp Fri Oct 9 21:19:52 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Oct 2009 21:19:52 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzE4XSAgaHJlZuWxng==?= =?utf-8?b?5oCn44KSeGxpbmsgOiBocmVm5bGe5oCn44Gr5L+u5q2j44GZ44KL5L2c5qWt?= =?utf-8?b?44KS6L+95Yqg?= Message-ID: <1255090792.588486.7394.nullmailer@users.sourceforge.jp> Revision: 1318 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1318 Author: dhrname Date: 2009-10-09 21:19:52 +0900 (Fri, 09 Oct 2009) Log Message: ----------- href属性をxlink:href属性に修正する作業を追加 Modified Paths: -------------- branches/05x/051/sie.js Modified: branches/05x/051/sie.js =================================================================== --- branches/05x/051/sie.js 2009-10-08 14:20:50 UTC (rev 1317) +++ branches/05x/051/sie.js 2009-10-09 12:19:52 UTC (rev 1318) @@ -70,10 +70,10 @@ if (isMSIE) { setVMLNameSpace(); var da = {}; - da.obj = []; da.obj[i] = ary[i]; da.num = i + 1; da.content = ait; da.success = true; + da.obj = []; da.obj[i] = ary[i]; da.num = i + 1; da.content = ait.replace(/\shref=/g, " xlink:href="); da.success = true; ca(da); } else { - var s = textToSVG(ait,ary[i].getAttribute("width"),ary[i].getAttribute("height")); + var s = textToSVG(ait.replace(/\shref=/g, " xlink:href="),ary[i].getAttribute("width"),ary[i].getAttribute("height")); ary[i].parentNode.insertBefore(s,ary[i]); } } @@ -424,7 +424,7 @@ } catch(e) {stlog.add(e,236);} try { //以下は、テキストの幅であるtextLengthを算出する - var arr = this.tspan, textLength = 0, fontSize = this.paint.fontSize, atfontSize = 0, fij = /[fijlt.,:;]/g; //fontSizeは親要素の文字サイズ。atfontSizeは各span要素のサイズ。 + var arr = this.tspan, textLength = 0, fontSize = this.paint.fontSize, atfontSize = 0, fij = /[fijlt.,:;1]/g; //fontSizeは親要素の文字サイズ。atfontSizeは各span要素のサイズ。 for (var i=0,s={dx:0,dy:0},arri=arr.length;i Revision: 1319 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1319 Author: dhrname Date: 2009-10-09 22:17:52 +0900 (Fri, 09 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/svginhtml.js Modified: trunk/svginhtml.js =================================================================== --- trunk/svginhtml.js 2009-10-09 12:19:52 UTC (rev 1318) +++ trunk/svginhtml.js 2009-10-09 13:17:52 UTC (rev 1319) @@ -33,7 +33,7 @@ if (sc[i].getAttribute("type") === "text/svg") { source = sc[i].text.replace(/]*)>/g, '") - .replace(/\shref=/g, "xlnk:href=") + .replace(/\shref=/g, " xlink:href=") .replace(/<\/(body|html)>/g, ""); } } @@ -52,11 +52,10 @@ var source = ""; source = data.content.replace(/]*)>/g, '") - .replace(/\shref=/g, "xlnk:href=") + .replace(/\shref=/g, " xlink:href=") .replace(/<\/(body|html)>/g, ""); var n = source.indexOf("svginhtml.js"); - source = source.substring(n+25, source.length-1); - alert(source); + source = source.substring(n+24, source.length-1); document.getElementById("hogehoge").innerHTML = source; svgtovml(); } From svnnotify ＠ sourceforge.jp Fri Oct 9 23:09:59 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Oct 2009 23:09:59 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzIwXQ==?= Message-ID: <1255097399.181814.26537.nullmailer@users.sourceforge.jp> Revision: 1320 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1320 Author: dhrname Date: 2009-10-09 23:09:59 +0900 (Fri, 09 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/DOM/org/w3c/dom/svg.js Modified: branches/DOM/org/w3c/dom/svg.js =================================================================== --- branches/DOM/org/w3c/dom/svg.js 2009-10-09 13:17:52 UTC (rev 1319) +++ branches/DOM/org/w3c/dom/svg.js 2009-10-09 14:09:59 UTC (rev 1320) @@ -2900,11 +2900,11 @@ SVGRectElement.prototype.read = function( /*element*/ rect, /*Matrix*/ matrix, /*float*/ w, h) { this.tar = rect; try { - this.x.animVal = newValueSpecified((this.getNamedItem(null, "x") || 0), w); - this.y = new STLength((rect.getAttribute("y") || 0), h); - this.width = new STLength(rect.getAttribute("svgwidth"), w); - this.height = new STLength(rect.getAttribute("svgheight"), h); - var rx = rect.getAttribute("rx"), ry = rect.getAttribute("ry"); + this.x.animVal = newValueSpecified((this.getAttributeNS(null, "x") || 0), w); + this.y = new STLength((rect.getAttributeNS(null,"y") || 0), h); + this.width = new STLength(rect.getAttributeNS(null,"width"), w); + this.height = new STLength(rect.getAttributeNS(null,"height"), h); + var rx = rect.getAttributeNS(null,"rx"), ry = rect.getAttributeNS(null,"ry"); if (rx || ry) { this.rx = new STLength((rx || ry), w); this.ry = new STLength((ry || rx), h); @@ -2916,7 +2916,6 @@ } } this.paint = new NAIBU.PaintColor(rect); - this.transformable = NAIBU.transformToCTM(rect,matrix); w = h = rx = ry = null; } catch(ee) {stlog.add(ee,545);} return this; From svnnotify ＠ sourceforge.jp Sun Oct 11 21:15:37 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 11 Oct 2009 21:15:37 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzIxXSAgeGxpbmvjgas=?= =?utf-8?b?6Zai44GZ44KL5aSJ5o+b44KSc2llIC4ganPjgavnp7vjgZfjgZ8=?= Message-ID: <1255263337.185036.17953.nullmailer@users.sourceforge.jp> Revision: 1321 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1321 Author: dhrname Date: 2009-10-11 21:15:37 +0900 (Sun, 11 Oct 2009) Log Message: ----------- xlinkに関する変換をsie.jsに移した Modified Paths: -------------- trunk/svginhtml.js Modified: trunk/svginhtml.js =================================================================== --- trunk/svginhtml.js 2009-10-09 14:09:59 UTC (rev 1320) +++ trunk/svginhtml.js 2009-10-11 12:15:37 UTC (rev 1321) @@ -33,7 +33,6 @@ if (sc[i].getAttribute("type") === "text/svg") { source = sc[i].text.replace(/]*)>/g, '") - .replace(/\shref=/g, " xlink:href=") .replace(/<\/(body|html)>/g, ""); } } @@ -52,7 +51,6 @@ var source = ""; source = data.content.replace(/]*)>/g, '") - .replace(/\shref=/g, " xlink:href=") .replace(/<\/(body|html)>/g, ""); var n = source.indexOf("svginhtml.js"); source = source.substring(n+24, source.length-1); From svnnotify ＠ sourceforge.jp Sun Oct 11 21:26:37 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 11 Oct 2009 21:26:37 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzIyXSAgZm9udC1zaXpl?= =?utf-8?b?5bGe5oCn44KS5LuY5Yqg?= Message-ID: <1255263997.393942.32318.nullmailer@users.sourceforge.jp> Revision: 1322 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1322 Author: dhrname Date: 2009-10-11 21:26:37 +0900 (Sun, 11 Oct 2009) Log Message: ----------- font-size属性を付加 Modified Paths: -------------- trunk/svginhtml.html Modified: trunk/svginhtml.html =================================================================== --- trunk/svginhtml.html 2009-10-11 12:15:37 UTC (rev 1321) +++ trunk/svginhtml.html 2009-10-11 12:26:37 UTC (rev 1322) @@ -1,16 +1,38 @@ -? +? SVG in HTML - SIE - +

SVG in HTML - SIE

- - + + + Hello World! + +

Source

+
+<html>
+<head>
+<title>SVG in HTML - SIE</title>
+<meta http-equiv="Content-Type" content="text/html; charset=urf-8">
+<script defer="defer" type="text/javascript" src="sie.js"></script>
+</head>
+<body>
+<script type="text/javascript" src="svginhtml.js"></script>
+<h1>SVG in HTML - SIE</h1>
+<svg width="200" height="200">
+ <a href="http://sie.sourceforge.jp/">
+  <rect x="20" y="30" width="30" height="300" fill="red"/>
+  <text x="40" y="50" font-family="sans-serif" font-size="34px">Hello World!</text>
+ </a>
+</svg>
+</body>
+</html>
+
"); + doc.loadXML(str); + var font = doc.getElementById(data.obj[0].id); + var familyName = font.getElementsByTagNameNS(NAIBU.svgNameSpace, "font-face").item(0).getAttribute("font-family"); if (familyName) { var textElements = document.getElementByTagName("div"); for (var i=0,tli=textElements.length;i -1) { + var ti = textElements[i], ts = ti.style, tsff = (!!ts.fontFamily) ? ts.fontFamily : "serif"; + if (tsff.indexOf(familyName) > -1) { NAIBU._ie_createFont(ti, font); } } @@ -1864,12 +1868,70 @@ if (data !== void 0) { //dataがある場合 for (var i=0,gli=glyphs.length;i -1) { + //fontSizeと文字数をかけた長さ分、ずらしていく + var x = dx + fontSize * index, y = dy + fontSize * index; + ti.insertBefore(path); + NAIBU.pathData(glyphs[i].getAttribute("d"), path, true, x, y); + } + } + } else { + NAIBU._ie_createFont(node, font); + } + node = node.nextSibling; + } +}; +//IE以外のブラウザ用 +function _noie_svgfont() { + var obj = document.getElementsByTagName("object"); + for (var i=0;i -1) { + NAIBU._ie_createFont(ti, font); + } + } + } + } +}; +NAIBU._noie_createFont = function(/*Element*/ ti, /*Element*/ font) { + var node = ti.firstChild, data, glyphs = font.getElementsByTagNameNS(NAIBU.svgNameSpace, "glyph"); + var dx = parseFloat((ti.getAttributeNS(null, "x") || 0)), dy = parseFloat((ti.getAttributeNS(null, "y") || 0)), fontSize = parseFloat((ti.getProperty("font-size") || 12)); + while(node) { + data = node.data; + if (data !== void 0) { //dataがある場合 + for (var i=0,gli=glyphs.length;i Revision: 1377 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1377 Author: dhrname Date: 2009-10-29 23:24:40 +0900 (Thu, 29 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-28 14:39:41 UTC (rev 1376) +++ branches/05x/053/sie.js 2009-10-29 14:24:40 UTC (rev 1377) @@ -318,6 +318,7 @@ getURL(this.emd[n].src,ca,this.emd,n+1); } catch(e) {stlog.add(e,185);this.next();} } else { //全要素の読み込みが終われば + _ie_svgfont(); //SVGFontを作動させる } } catch(e) {stlog.add(e,293);this.onumber++;this.next();} }; From svnnotify ＠ sourceforge.jp Thu Oct 29 23:31:34 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 29 Oct 2009 23:31:34 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzc4XQ==?= Message-ID: <1256826694.021388.29636.nullmailer@users.sourceforge.jp> Revision: 1378 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1378 Author: dhrname Date: 2009-10-29 23:31:33 +0900 (Thu, 29 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-29 14:24:40 UTC (rev 1377) +++ branches/05x/053/sie.js 2009-10-29 14:31:33 UTC (rev 1378) @@ -318,7 +318,6 @@ getURL(this.emd[n].src,ca,this.emd,n+1); } catch(e) {stlog.add(e,185);this.next();} } else { //全要素の読み込みが終われば - _ie_svgfont(); //SVGFontを作動させる } } catch(e) {stlog.add(e,293);this.onumber++;this.next();} }; @@ -333,7 +332,7 @@ var tep = tei.parentNode; tep.insertBefore(s,tei); tep.removeChild(tei); - teli--; + teli--; } } catch(e) {stlog.add(e,294);} }; @@ -1841,7 +1840,7 @@ getURL(src, _ie_font, [ {id : src.substring(src.indexOf("#"), src.length-1)} ], 1); } }; -NAIBU.svgNameSpace = "http://www.w3.org/2000/svg" +NAIBU.svgNameSpace = "http://www.w3.org/2000/svg"; function _ie_font(data) { if (data.sucesse) { //responsXMLはDTD処理を行う可能性があるため、ここでは使わない From svnnotify ＠ sourceforge.jp Fri Oct 30 22:21:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 30 Oct 2009 22:21:50 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzc5XSAgU1ZHRm9udA==?= =?utf-8?b?44Gu5L+u5q2j44Go6YGp55So?= Message-ID: <1256908910.079727.7026.nullmailer@users.sourceforge.jp> Revision: 1379 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1379 Author: dhrname Date: 2009-10-30 22:21:50 +0900 (Fri, 30 Oct 2009) Log Message: ----------- SVGFontの修正と適用 Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-29 14:31:33 UTC (rev 1378) +++ branches/05x/053/sie.js 2009-10-30 13:21:50 UTC (rev 1379) @@ -88,8 +88,11 @@ document.body.appendChild(oba); NAIBU.STObject.next(); success = true; - } else if (/a/[-1] === 'a'){ //Firefoxだったらtrueを返す - NAIBU.STObject.ffnext(); + } else { + if (/a/[-1] === 'a'){ //Firefoxだったらtrueを返す + NAIBU.STObject.ffnext(); + } + _noie_svgfont(); } } //他のページに移動する際に起動 @@ -318,6 +321,7 @@ getURL(this.emd[n].src,ca,this.emd,n+1); } catch(e) {stlog.add(e,185);this.next();} } else { //全要素の読み込みが終われば + _ie_svgfont(); } } catch(e) {stlog.add(e,293);this.onumber++;this.next();} }; @@ -1834,7 +1838,7 @@ }; function _ie_svgfont() { - var tsrc = document.getEelmentsByTagName("FONT-FACE-URI"); + var tsrc = document.getElementsByTagName("FONT-FACE-URI"); for (var i=0;i Revision: 1380 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1380 Author: dhrname Date: 2009-10-30 23:37:02 +0900 (Fri, 30 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-30 13:21:50 UTC (rev 1379) +++ branches/05x/053/sie.js 2009-10-30 14:37:02 UTC (rev 1380) @@ -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", gname = "DIV|group"; //要素名に合致させる文字列 + var name = "group|shape|defs|STOP|fill|stroke|DIV|SPAN|A|image|rect|USE|FONT-FACE=URI", gname = "DIV|group"; //要素名に合致させる文字列 var cmatrix = matrix; //子要素に継がせるCTM var te = nods[0]; if (te !== void 0) { From svnnotify ＠ sourceforge.jp Fri Oct 30 23:39:30 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 30 Oct 2009 23:39:30 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzgxXQ==?= Message-ID: <1256913570.551572.5759.nullmailer@users.sourceforge.jp> Revision: 1381 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1381 Author: dhrname Date: 2009-10-30 23:39:30 +0900 (Fri, 30 Oct 2009) Log Message: ----------- Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-30 14:37:02 UTC (rev 1380) +++ branches/05x/053/sie.js 2009-10-30 14:39:30 UTC (rev 1381) @@ -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|FONT-FACE-URI", gname = "DIV|group"; //要素名に合致させる文字列 var cmatrix = matrix; //子要素に継がせるCTM var te = nods[0]; if (te !== void 0) { From svnnotify ＠ sourceforge.jp Sat Oct 31 23:26:43 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 31 Oct 2009 23:26:43 +0900 Subject: [Sie-announce] =?utf-8?b?U0lF44Kz44O844OJIFsxMzgyXSAgZm9udC1mYWNl?= =?utf-8?b?LXVyaeimgee0oOOBruODkOOCsOOCkuS/ruatow==?= Message-ID: <1256999203.816774.6716.nullmailer@users.sourceforge.jp> Revision: 1382 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1382 Author: dhrname Date: 2009-10-31 23:26:43 +0900 (Sat, 31 Oct 2009) Log Message: ----------- font-face-uri要素のバグを修正 Modified Paths: -------------- branches/05x/053/sie.js Modified: branches/05x/053/sie.js =================================================================== --- branches/05x/053/sie.js 2009-10-30 14:39:30 UTC (rev 1381) +++ branches/05x/053/sie.js 2009-10-31 14:26:43 UTC (rev 1382) @@ -2059,7 +2059,9 @@ .replace(//g, "/v:group>") .replace(/)/g, "/g, "/dn:defs>"); + .replace(/\/defs>/g, "/dn:defs>") + .replace(/)/g, "/g, "/font-faceURI>"); var ob = document.createElement("v:group"); var obst = ob.style; ob.innerHTML = dc;