Join modules

diff --git a/org/sie-uncompressed.js b/org/sie-uncompressed.js
index ed0bc13..4730cd9 100755 (executable)
--- a/org/sie-uncompressed.js
+++ b/org/sie-uncompressed.js
@@ -1,8 +1,8 @@
-/*!SIE-SVG without Plugin under LGPL2.1 & GPL2.0 & Mozilla Public License\r
+/*SIE-SVG without Plugin under LGPL2.1 & GPL2.0 & Mozilla Public License\r
  *http://sie.sourceforge.jp/\r
  *Usage: <script defer="defer" type="text/javascript" src="sie.js"></script>\r
  */\r
-/*! ***** BEGIN LICENSE BLOCK *****\r
+/* ***** BEGIN LICENSE BLOCK *****\r
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1\r
  *\r
  * The contents of this file are subject to the Mozilla Public License Version\r
@@ -41,7 +41,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.\r
  *\r
  * ***** END LICENSE BLOCK ***** */\r
-/*!\r
+/*\r
  * Copyright (c) 2000 World Wide Web Consortium,\r
  * (Massachusetts Institute of Technology, Institut National de\r
  * Recherche en Informatique et en Automatique, Keio University). All\r
@@ -51,8 +51,7 @@
  * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR\r
  * PURPOSE.\r
  * See W3C License http://www.w3.org/Consortium/Legal/ for more details.\r
- */\r
-/*!MIT License\r
+ *//*!MIT License\r
 See Also MIT-LICENSE.txt\r
 Copyright (c) 2013 dhrname*/\r
 \r
@@ -79,8 +78,6 @@ var _base = {
         F.prototype = this;\r
         s = new F();\r
         this[name] = s;\r
-        /*自身が値であるようなプロパティを設定する*/\r
-        s[name] = s;\r
         F = void 0;\r
         return s;\r
       },\r
@@ -191,7 +188,15 @@ base = function (name) {
       /*キャッシュに登録されている場合は、登録されたオブジェクトを返す*/\r
       return this[name];\r
     } else {\r
-      return (this[name] = _base.obj.up(name));\r
+      var F = _base.F,\r
+           s;\r
+      F.prototype = _base.obj;\r
+      s = new F();\r
+      this[name] = s;\r
+      /*自身が値であるようなプロパティを設定する*/\r
+      s[name] = s;\r
+      F = void 0;\r
+      return s;\r
     }\r
 };\r
 \r
@@ -206,6 +211,14 @@ hash.constructor = false; //constructorはNGハッシュに追加しない
 _base.__ng_ = hash;\r
 hash = proto = void 0;\r
 \r
+/*base.free関数\r
+ *  即時関数の内部で作っていおいたオブジェクトを解放させるための関数\r
+ */\r
+base.free = function() {\r
+  delete _base.obj;\r
+  _base = void 0;\r
+};\r
+\r
 })();\r
 \r
 /*Function Object.create\r
@@ -1411,7 +1424,7 @@ base("$event").up("MutationEvents").mix( {
   /*string*/  prevValue: null,\r
                   newValue: null,\r
                   attrName: null,\r
-  /*unsigned short*/  attrChange: 2\r
+  /*unsigned short*/  attrChange: 2,\r
 } );\r
     // attrChangeType\r
 /*unsigned short  MutationEvent.MODIFICATION  = 1;\r
@@ -1790,7 +1803,7 @@ base("$CSSStyleRule").mix( {
 /*CSSRule*/       parentRule: null,\r
   type: /*CSSRule.STYLE_RULE*/ 1,\r
   selectorText: "",\r
-/*CSSStyleDeclaration*/ style: (base("$CSSStyleDeclaration"))\r
+/*CSSStyleDeclaration*/ style: (base("$CSSStyleDeclaration")),\r
 } ).mix( function() {\r
        this.up("$CSSMediaRule").mix( {\r
          type: /*CSSRule.MEDIA_RULE*/ 4,\r
@@ -1813,7 +1826,7 @@ base("$CSSStyleRule").mix( {
        \r
        this.up("$CSSPageRule").mix( {\r
          type: /*CSSRule.PAGE_RULE*/ 6,\r
-         selectorText: ""\r
+         selectorText: "",\r
        /*CSSStyleDeclaration this.style;*/\r
        } );\r
        \r
@@ -2548,7 +2561,7 @@ base("$event").up("TimeEvents").mix( {
     this.detail = detailArg;\r
   }\r
 } );\r
-//#endif // _SMIL_IDL_\r
+//#endif // _SMIL_IDL_\r
 \r
 \r
 //これを頭に付けたら、内部処理用\r
@@ -4020,12 +4033,11 @@ function SVGFitToViewBox() {
   /*readonly SVGAnimatedPreserveAspectRatio*/ this.preserveAspectRatio = new SVGAnimatedPreserveAspectRatio();\r
 };\r
 function SVGViewSpec(ele) {\r
-  SVGFitToViewBox.apply(this, arguments);\r
+  SVGFitToViewBox.call(this, ele);\r
   /*readonly SVGTransformList*/ this.transform = base("$SVGStringList").$SVGTransformList.up("$1");\r
   /*readonly SVGElement*/       this.viewTarget = ele;\r
   /*readonly DOMString*/        this.viewBoxString = this.preserveAspectRatioString = this.transformString = this.viewTargetString = "";\r
 };\r
-SVGViewSpec.prototype = Object._create(SVGFitToViewBox);\r
 \r
 function SVGGElement(_doc) {\r
   this._tar = _doc.createElement("v:group");\r
@@ -4644,7 +4656,7 @@ base("$SVGMatrix").mix( {
    *行列の積を求めて返す\r
    */\r
   /*SVGMatrix*/ multiply : function(/*SVGMatrix*/ secondMatrix ) {\r
-    var s = base("$SVGMatrix").up("$1"),\r
+    var s = this.$SVGMatrix.up("$1"),\r
         m = secondMatrix,\r
         isf = isFinite,\r
         t = this;\r
@@ -4664,7 +4676,7 @@ base("$SVGMatrix").mix( {
    *逆行列を返す\r
    */\r
   /*SVGMatrix*/ inverse : function() {\r
-    var s = base("$SVGMatrix").up("$1"), \r
+    var s = this.$SVGMatrix.up("$1"), \r
         n = this._determinant();\r
     if (n !== 0) {\r
       s.a = this.d / n;\r
@@ -4679,7 +4691,7 @@ base("$SVGMatrix").mix( {
     }\r
   },\r
   /*SVGMatrix*/ translate : function(/*float*/ x, /*float*/ y ) {\r
-    var m = base("$SVGMatrix").up("$1");\r
+    var m = this.$SVGMatrix.up("$1");\r
     m.e = x;\r
     m.f = y;\r
     var s =  this.multiply(m);\r
@@ -4687,7 +4699,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ scale : function(/*float*/ scaleFactor ) {\r
-    var m = base("$SVGMatrix").up("$1");\r
+    var m = this.$SVGMatrix.up("$1");\r
     m.a = scaleFactor;\r
     m.d = scaleFactor;\r
     var s =  this.multiply(m);\r
@@ -4695,7 +4707,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ scaleNonUniform : function(/*float*/ scaleFactorX, /*float*/ scaleFactorY ) {\r
-    var m = base("$SVGMatrix").up("$1");\r
+    var m = this.$SVGMatrix.up("$1");\r
     m.a = scaleFactorX;\r
     m.d = scaleFactorY;\r
     var s =  this.multiply(m);\r
@@ -4703,7 +4715,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ rotate : function(/*float*/ angle ) {\r
-    var m = base("$SVGMatrix").up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
+    var m = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
     m.a = Math.cos(rad);\r
     m.b = Math.sin(rad);\r
     m.c = -m.b;\r
@@ -4717,7 +4729,7 @@ base("$SVGMatrix").mix( {
     if ((x === 0) || (y === 0) || !isFinite(x) || !isFinite(y)) {\r
       throw (new SVGException(/*SVGException.SVG_INVALID_VALUE_ERR*/ 1));\r
     }\r
-    var m = base("$SVGMatrix").up("$1"), rad = Math.atan2(y, x);\r
+    var m = this.$SVGMatrix.up("$1"), rad = Math.atan2(y, x);\r
     m.a = Math.cos(rad);\r
     m.b = Math.sin(rad);\r
     m.c = -m.b;\r
@@ -4727,28 +4739,28 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ flipX : function() {\r
-    var m = base("$SVGMatrix").up("$1");\r
+    var m = this.$SVGMatrix.up("$1");\r
     m.a = -m.a;\r
     var s =  this.multiply(m);\r
     m = void 0;\r
     return s;\r
   },\r
   /*SVGMatrix*/ flipY : function() {\r
-    var m = base("$SVGMatrix").up("$1");\r
+    var m = this.$SVGMatrix.up("$1");\r
     m.d = -m.d;\r
     var s =  this.multiply(m);\r
     m = void 0;\r
     return s;\r
   },\r
   /*SVGMatrix*/ skewX : function(/*float*/ angle ){\r
-    var m = base("$SVGMatrix").up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
+    var m = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
     m.c = Math.tan(rad);\r
     var s =  this.multiply(m);\r
     m = void 0;\r
     return s;\r
   },\r
   /*SVGMatrix*/ skewY : function(/*float*/ angle ){\r
-    var m = base("$SVGMatrix").up("$1"), rad = angle / 180 * Math.PI;\r
+    var m = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI;\r
     m.b = Math.tan(rad);\r
     var s =  this.multiply(m);\r
     m = void 0;\r
@@ -9159,6 +9171,7 @@ function unsvgtovml() {
     window.onscroll = NAIBU.emptyFunction;\r
     window.detachEvent("onload", NAIBU._main);\r
     NAIBU.freeArg();\r
+    base.free();\r
     base = Object._create = CSS2Properties = NAIBU.xmlhttp = NAIBU = STLog =  void 0;\r
     Array = ActiveXObject = void 0;\r
   } catch(e) {}\r