すべてのモジュールのupメソッドに対して、引数が省略できるところは可能な限り省略した

diff --git a/org/w3c/core.js b/org/w3c/core.js
index 416a533..e457388 100644 (file)
--- a/org/w3c/core.js
+++ b/org/w3c/core.js
@@ -194,7 +194,7 @@ base("DOMImplementation").mix( {
      *ドキュメントタイプを作るためのもの。DTDは<!DOCTYPE[ ]>で表現されうる。\r
      */\r
     /*DocumentType*/ createDocumentType : function(/*string*/ qualifiedName, publicId, systemId) {\r
-      var s = base("$document").up("$1");\r
+      var s = base("$document").up();\r
       s.name = "";\r
       s.entities = new NamedNodeMap();   //パラメタ実体を除く実体の集まり\r
       s.notations = new NamedNodeMap(); //DTDで示した記法の集まり\r
@@ -210,7 +210,7 @@ base("DOMImplementation").mix( {
      */\r
     /*Document*/ createDocument : function( /*string*/ ns, qname, /*DocumentType*/ doctype) {\r
       try {\r
-        var s = base("$document").up("$1");\r
+        var s = base("$document").up();\r
         this._doc_ && (s._document_ = this._doc_);          //_document_プロパティはcreateElementNSメソッドやradialGradient要素やNAIBU._setPaintなどで使う\r
         s.implementation = this;\r
         s.doctype = doctype || null;\r
@@ -454,7 +454,7 @@ base("$document").mix( {
  *テキストのノードを作る\r
  */\r
 /*Text*/               createTextNode : function( /*string*/ data) {\r
-  var s = this.$text.up("$1");\r
+  var s = this.$text.up();\r
   s.data =  s.nodeValue = data+"";\r
   s.length = data.length;\r
   s.ownerDocument = this;\r
@@ -464,7 +464,7 @@ base("$document").mix( {
  *コメントノードを作る\r
  */\r
 /*Comment*/            createComment : function( /*string*/ data) {\r
-  var s = this.$text.$comment.up("$1");\r
+  var s = this.$text.$comment.up();\r
   s.data = s.nodeValue = data;\r
   s.length = data.length;\r
   s.ownerDocument = this;\r
@@ -474,7 +474,7 @@ base("$document").mix( {
  *CDATA領域ノードを作る\r
  */\r
 /*CDATASection*/       createCDATASection : function( /*string*/ data) {\r
-  var s = this.$text.up("$1");\r
+  var s = this.$text.up();\r
   s.nodeType = /*Node.CDATA_SECTION_NODE*/ 4;\r
   s.nodeName = "#cdata-section";\r
   s.data = s.nodeValue = data;\r
@@ -486,7 +486,7 @@ base("$document").mix( {
  *処理命令ノードを作る\r
  */\r
 /*ProcessingInstruction*/ createProcessingInstruction : function( /*string*/ target, /*string*/ data) {\r
-  var s = this.up("$1");\r
+  var s = this.up();\r
   s.nodeType = /*Node.PROCESSING_INSTRUCTION_NODE*/ 7;\r
   s.target = s.nodeName = target;\r
   s.data = s.nodeValue = data;\r
@@ -503,7 +503,7 @@ base("$document").mix( {
  *実体参照ノードを作る\r
  */\r
 /*EntityReference*/    createEntityReference : function( /*string*/ name) {\r
-  return this.up("$1").mix({\r
+  return this.up().mix({\r
     nodeValue: null,\r
     nodeType: /*Node.ENTITY_REFERENCE_NODE*/ 5,\r
     nodeName: name,\r
@@ -578,14 +578,14 @@ base("$document").mix( {
       }\r
     }\r
   } else if (imn === /*Node.ENTITY_NODE*/ 6) {\r
-    s = this.$enetity.up("$1");\r
+    s = this.$enetity.up();\r
     s.publicId = importedNode.publicId;\r
     s.systemId = importedNode.systemId;\r
     s.notationName = importedNode.notationName;\r
   } else if (imn === /*Node.PROCESSING_INSTRUCTION_NODE*/ 7) {\r
     s = this.createProcessingInstruction(importedNode.nodeName, importedNode.nodeValue);\r
   } else if (imn === /*Node.NOTATION_NODE*/ 12) {\r
-    s = this.up("$notation").up("$1");\r
+    s = this.up("$notation").up();\r
     s.publicId = importedNode.publicId;\r
     s.systemId = importedNode.systemId;\r
   } else {\r
@@ -612,9 +612,9 @@ base("$document").mix( {
   } else {\r
     localName = qualifiedName;\r
   }\r
-  ele = this.$element.up("$1").mix({\r
+  ele = this.$element.up().mix({\r
         childNodes: [],\r
-        attributes: this.$element.attributes.up("$1"),   //属性を収納\r
+        attributes: this.$element.attributes.up(),   //属性を収納\r
         ownerDocument: this\r
   });\r
   ele.namespaceURI = namespaceURI;\r
@@ -628,7 +628,7 @@ base("$document").mix( {
  *属性ノードを作る。setAttributeNSで使うため、削除不可\r
  */\r
 /*Attr*/               createAttributeNS : function( /*string*/ namespaceURI, /*string*/ qualifiedName) {\r
-  var attr = this.$attr.up("$1"),\r
+  var attr = this.$attr.up(),\r
       p;\r
   attr.namespaceURI = namespaceURI;\r
   attr.nodeName = attr.name = qualifiedName;\r

diff --git a/org/w3c/dom/css.js b/org/w3c/dom/css.js
index 708c754..32259f8 100644 (file)
--- a/org/w3c/dom/css.js
+++ b/org/w3c/dom/css.js
@@ -110,7 +110,7 @@ base("$CSSStyleRule").mix( {
 } ).mix( function() {\r
        this.up("$CSSMediaRule").mix( {\r
          type: /*CSSRule.MEDIA_RULE*/ 4,\r
-         /*stylesheets::MediaList*/ media: (base("$StyleSheet").$MediaList.up("$1")),\r
+         /*stylesheets::MediaList*/ media: (base("$StyleSheet").$MediaList.up()),\r
          /*CSSRuleList*/ cssRules: [],\r
        \r
          /*long*/ insertRule: function( /*string*/ rule, /*long*/ index) {\r
@@ -136,7 +136,7 @@ base("$CSSStyleRule").mix( {
        this.up("$CSSImportRule").mix( {\r
          type: /*CSSRule.IMPORT_RULE*/ 3,\r
          href: "",\r
-       /*stylesheets::MediaList*/ media: base("$StyleSheet").$MediaList.up("$1"),\r
+       /*stylesheets::MediaList*/ media: base("$StyleSheet").$MediaList.up(),\r
        /*CSSStyleSheet*/ styleSheet: null\r
        } );\r
        \r
@@ -153,7 +153,7 @@ base("$CSSStyleRule").mix( {
  */\r
 base("$CSSStyleDeclaration").mix( {\r
   _new$: function() {\r
-       var s = this.up("$1");\r
+       var s = this.up();\r
     s._list = []; //内部のリスト\r
     s._list._fontSize = s._list._opacity = null;\r
     return s;\r
@@ -277,7 +277,7 @@ base("$CSSStyleDeclaration").mix( {
         ti.setRGBColor(value);\r
       }\r
     } else {\r
-      ti = tg ? tg : base("$CSSValue").$CSSPrimitiveValue.up("$1");\r
+      ti = tg ? tg : base("$CSSValue").$CSSPrimitiveValue.up();\r
     }\r
     ti._priority = priority;\r
     ti.cssText = cssText;\r
@@ -497,19 +497,19 @@ t.CSS_RGBCOLOR                   = 25;*/
 \r
 function RGBColor() {\r
   var cs = base("$CSSValue").$CSSPrimitiveValue;\r
-  this.red = cs.up("$1");\r
-  this.green = cs.up("$1");\r
-  this.blue = cs.up("$1");\r
+  this.red = cs.up();\r
+  this.green = cs.up();\r
+  this.blue = cs.up();\r
   cs = void 0;\r
   this.red.primitiveType = this.green.primitiveType = this.blue.primitiveType = /*CSSPrimitiveValue.CSS_NUMBER*/ 1;\r
 };\r
 \r
 function Rect() {\r
   var cs = base("$CSSValue").$CSSPrimitiveValue;\r
-  this.top = cs.up("$1");\r
-  this.right = cs.up("$1");\r
-  this.bottom = cs.up("$1");\r
-  this.left = cs.up("$1");\r
+  this.top = cs.up();\r
+  this.right = cs.up();\r
+  this.bottom = cs.up();\r
+  this.left = cs.up();\r
   cs = void 0;\r
 };\r
 \r
@@ -778,7 +778,7 @@ base("$document").mix( base("$StyleSheet").DocumentStyle);
 /*CSSStyleSheet*/ base("DOMImplementation").createCSSStyleSheet = function( /*string*/ title, /*string*/ media) {\r
   var s = base("$StyleSheet").up("$CSSStyleSheet")._create();\r
   s.title = title;\r
-  var nm = s.$MediaList.up("$1");\r
+  var nm = s.$MediaList.up();\r
   nm.mediaText = media;\r
   if (media && (media !== "")) {\r
     var mes = media.split(",");  //文字列をコンマで区切って配列に\r

diff --git a/org/w3c/dom/events.js b/org/w3c/dom/events.js
index 586398e..19e46fe 100644 (file)
--- a/org/w3c/dom/events.js
+++ b/org/w3c/dom/events.js
@@ -95,7 +95,7 @@ EventException.prototype = Object._create(DOMException);
 base("$document").mix(function() {\r
 /*void*/  this.addEventListener = function( /*string*/ type, /*EventListener*/ listener, /*boolean*/ useCapture) {\r
   this.removeEventListener(type, listener, useCapture);  //いったん、（あれば）リスナーを離す。\r
-  var s = base("EventListener").up("$1").initialize(useCapture, type, listener), //リスナーを作成\r
+  var s = base("EventListener").up().initialize(useCapture, type, listener), //リスナーを作成\r
       t = type.charAt(0),\r
       that;\r
   this._capter.push(s);                 //このノードにリスナーを登録しておく\r
@@ -273,7 +273,7 @@ function DocumentEvent() {
   /*__$eventプロパティはcreateEventを高速化するために、前もって設定しておいたもの*/\r
   __$event: base("$event"),\r
   createEvent: function( /*string*/ eventType) {\r
-         var evt = ( this.__$event[eventType] ||   this.__$event).up("$1");\r
+         var evt = ( this.__$event[eventType] ||   this.__$event).up();\r
          evt.initialize && evt.initialize();\r
          evt.type = eventType;\r
          evt.timeStamp = +(new Date());\r

diff --git a/org/w3c/dom/stylesheet.js b/org/w3c/dom/stylesheet.js
index 5c09d7a..47dd544 100644 (file)
--- a/org/w3c/dom/stylesheet.js
+++ b/org/w3c/dom/stylesheet.js
@@ -86,7 +86,7 @@ base("$StyleSheet").mix( {
   title:  ""\r
 } )\r
  .on( "_create", function() {\r
-  /*MediaList*/ this.media = this.$MediaList.up("$1");\r
+  /*MediaList*/ this.media = this.$MediaList.up();\r
 } )\r
  .mix( function(_) {\r
 \r
@@ -121,7 +121,7 @@ _.up("$MediaList").mix( {
 } );\r
 \r
 _.LinkStyle = function() {\r
-  /*StyleSheet*/ this.sheet = _.up("$1");\r
+  /*StyleSheet*/ this.sheet = _.up();\r
 };\r
 \r
 _.DocumentStyle = function() {\r

diff --git a/org/w3c/dom/svg.js b/org/w3c/dom/svg.js
index 145ffe0..519d963 100644 (file)
--- a/org/w3c/dom/svg.js
+++ b/org/w3c/dom/svg.js
@@ -359,7 +359,7 @@ base("$document").$element.up("$svgelement").mix( {
 \r
   /*interface SVGLocatable*/\r
   /*SVGRect*/     getBBox: function(){\r
-    var s = base("$SVGRect").up("$1"),\r
+    var s = base("$SVGRect").up(),\r
         data = this._tar.path.value,\r
         vi = this.ownerDocument.documentElement.viewport,\r
         el = vi.width,\r
@@ -526,7 +526,7 @@ base("$SVGNumber")
 /*SVGUnmberListのメソッドはSVGStringListを参照*/\r
 \r
 function SVGAnimatedNumberList() {\r
-  /*readonly SVGNumberList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGNumberList.up("$1");\r
+  /*readonly SVGNumberList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGNumberList.up();\r
 };\r
 /*$SVGLengthオブジェクト\r
  *長さを設定する（単位pxに統一する方便として使う）\r
@@ -628,14 +628,14 @@ base("$SVGLength").mix( {
 } );\r
 function SVGAnimatedLength() {\r
   /*readonly SVGLength*/ this.animVal;\r
-  this.baseVal = base("$SVGLength").up("$1");\r
+  this.baseVal = base("$SVGLength").up();\r
   this.baseVal.unitType = 1;\r
 };\r
 \r
 /*SVGLengthListのメソッドはSVGStringListを参照*/\r
 \r
 function SVGAnimatedLengthList() {\r
-  /*readonly SVGLengthList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGLengthList.up("$1");;\r
+  /*readonly SVGLengthList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGLengthList.up();;\r
 };\r
 \r
 base("$SVGAngle").mix( {\r
@@ -687,13 +687,13 @@ base("$SVGAngle").mix( {
 /*const unsigned short SVGAngle.SVG_ANGLETYPE_RAD         = 3;\r
 /*const unsigned short SVGAngle.SVG_ANGLETYPE_GRAD        = 4;*/\r
 function SVGAnimatedAngle() {\r
-  /*readonly attribute SVGAngle*/ this.baseVal = base("$SVGAngle").up("$1");\r
-  /*readonly attribute SVGAngle*/ this.animVal = base("$SVGAngle").up("$1");\r
+  /*readonly attribute SVGAngle*/ this.baseVal = base("$SVGAngle").up();\r
+  /*readonly attribute SVGAngle*/ this.animVal = base("$SVGAngle").up();\r
 };\r
 \r
 base("$CSSValue").up("$SVGColor").mix( {\r
   _new$: function() {\r
-    /*readonly css::RGBColor*/  this.up("$1").rgbColor  = new RGBColor();\r
+    /*readonly css::RGBColor*/  this.up().rgbColor  = new RGBColor();\r
     return this.$1;\r
   },\r
   // Color Types\r
@@ -928,8 +928,8 @@ base("$SVGRect").mix( {
 } );\r
 \r
 function SVGAnimatedRect() {\r
-  /*readonly SVGRect*/ this.baseVal = base("$SVGRect").up("$1");\r
-/*readonly SVGRect*/ this.animVal  = base("$SVGRect").up("$1");\r
+  /*readonly SVGRect*/ this.baseVal = base("$SVGRect").up();\r
+/*readonly SVGRect*/ this.animVal  = base("$SVGRect").up();\r
 };\r
 \r
 /*SVGUnitTypes = {\r
@@ -939,7 +939,7 @@ function SVGAnimatedRect() {
   /*unsigned short SVG_UNIT_TYPE_OBJECTBOUNDINGBOX : 2\r
 };*/\r
 function SVGStylable() {\r
-  /*readonly attribute SVGAnimatedString*/ this.className = base("$SVGAnimatedString").up("$1");\r
+  /*readonly attribute SVGAnimatedString*/ this.className = base("$SVGAnimatedString").up();\r
   ElementCSSInlineStyle.call(this);\r
 };\r
 /*getPresentationAttributeメソッド\r
@@ -958,7 +958,7 @@ function SVGStylable() {
  *SIEでは、もっぱらXLink言語の処理を行う\r
  */\r
 function SVGURIReference() {\r
-  /*readonly SVGAnimatedString*/ this.href = base("$SVGAnimatedString").up("$1");\r
+  /*readonly SVGAnimatedString*/ this.href = base("$SVGAnimatedString").up();\r
   this._instance = null; //埋め込みの場合に、読み込んだDOMツリーを結び付けておくプロパティ\r
   this._text = "";\r
   this.addEventListener("DOMAttrModified", function(evt){\r
@@ -1389,27 +1389,27 @@ base("$document").$element.$svgelement.up("http://www.w3.org/2000/svgsvg").on("i
   this._currentTime = seconds;\r
 },\r
 /*SVGNumber*/     createSVGNumber: function(){\r
-  return base("$SVGNumber").up("$1");\r
+  return base("$SVGNumber").up();\r
 },\r
 /*SVGAngle*/     createSVGAngle: function(){\r
-  var s = base("$SVGAngle").up("$1");\r
+  var s = base("$SVGAngle").up();\r
   s.unitType = 1;\r
   return s;\r
 },\r
 /*SVGLength*/     createSVGLength: function(){\r
-  var s = base("$SVGLength").up("$1");\r
+  var s = base("$SVGLength").up();\r
   s.unitType = /*SVG_LENGTHTYPE_NUMBER*/ 1;\r
   return s;\r
 },\r
 /*SVGPoint*/      createSVGPoint: function(){\r
-  return base("$SVGPoint").up("$1");\r
+  return base("$SVGPoint").up();\r
 },\r
 /*SVGMatrix*/     createSVGMatrix: function(){\r
   //単位行列を作成\r
-  return base("$SVGMatrix").up("$1");\r
+  return base("$SVGMatrix").up();\r
 },\r
 /*SVGRect*/       createSVGRect: function(){\r
-  return base("$SVGRect").up("$1");\r
+  return base("$SVGRect").up();\r
 },\r
 /*SVGTransform*/  createSVGTransform: function(){\r
   var s = this.createSVGTransformFromMatrix(this.createSVGMatrix());\r
@@ -1522,7 +1522,7 @@ function SVGFitToViewBox() {
 };\r
 function SVGViewSpec(ele) {\r
   SVGFitToViewBox.call(this, ele);\r
-  /*readonly SVGTransformList*/ this.transform = base("$SVGStringList").$SVGTransformList.up("$1");\r
+  /*readonly SVGTransformList*/ this.transform = base("$SVGStringList").$SVGTransformList.up();\r
   /*readonly SVGElement*/       this.viewTarget = ele;\r
   /*readonly DOMString*/        this.viewBoxString = this.preserveAspectRatioString = this.transformString = this.viewTargetString = "";\r
 };\r
@@ -1586,8 +1586,8 @@ function SVGUseElement() {
   /*readonly SVGAnimatedLength*/   this.width = new slen();\r
   /*readonly SVGAnimatedLength*/   this.height = new slen();\r
   slen = void 0;\r
-  /*readonly SVGElementInstance*/ this.instanceRoot = this.up("$1"); //参照先インスタンスのルート\r
-  /*readonly SVGElementInstance*/ this.animatedInstanceRoot = this.up("$1");//アニメの最中のインスタンス。静止中は通常\r
+  /*readonly SVGElementInstance*/ this.instanceRoot = this.up(); //参照先インスタンスのルート\r
+  /*readonly SVGElementInstance*/ this.animatedInstanceRoot = this.up();//アニメの最中のインスタンス。静止中は通常\r
   this.addEventListener("DOMNodeInserted", function(evt){\r
     if (evt.eventPhase === /*Event.BUBBLING_PHASE*/ 3) {\r
       return; //強制終了させる\r
@@ -2117,7 +2117,7 @@ base("$SVGPoint").mix( {
     if (!isFinite(matrix.a) || !isFinite(matrix.b) || !isFinite(matrix.c) || !isFinite(matrix.d) || !isFinite(matrix.e) || !isFinite(matrix.f)) {\r
       throw (new Error("Type Error: 引数の値がNumber型ではありません"));\r
     }\r
-    var s = base("$SVGPoint").up("$1");\r
+    var s = base("$SVGPoint").up();\r
     s.x = matrix.a * this.x + matrix.c * this.y + matrix.e;\r
     s.y = matrix.b * this.x + matrix.d * this.y + matrix.f;\r
     return s;\r
@@ -2144,7 +2144,7 @@ base("$SVGMatrix").mix( {
    *行列の積を求めて返す\r
    */\r
   /*SVGMatrix*/ multiply : function(/*SVGMatrix*/ secondMatrix ) {\r
-    var s = this.$SVGMatrix.up("$1"),\r
+    var s = this.$SVGMatrix.up(),\r
         m = secondMatrix,\r
         isf = isFinite,\r
         t = this;\r
@@ -2164,7 +2164,7 @@ base("$SVGMatrix").mix( {
    *逆行列を返す\r
    */\r
   /*SVGMatrix*/ inverse : function() {\r
-    var s = this.$SVGMatrix.up("$1"), \r
+    var s = this.$SVGMatrix.up(), \r
         n = this._determinant();\r
     if (n !== 0) {\r
       s.a = this.d / n;\r
@@ -2179,7 +2179,7 @@ base("$SVGMatrix").mix( {
     }\r
   },\r
   /*SVGMatrix*/ translate : function(/*float*/ x, /*float*/ y ) {\r
-    var m = this.$SVGMatrix.up("$1");\r
+    var m = this.$SVGMatrix.up();\r
     m.e = x;\r
     m.f = y;\r
     var s =  this.multiply(m);\r
@@ -2187,7 +2187,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ scale : function(/*float*/ scaleFactor ) {\r
-    var m = this.$SVGMatrix.up("$1");\r
+    var m = this.$SVGMatrix.up();\r
     m.a = scaleFactor;\r
     m.d = scaleFactor;\r
     var s =  this.multiply(m);\r
@@ -2195,7 +2195,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ scaleNonUniform : function(/*float*/ scaleFactorX, /*float*/ scaleFactorY ) {\r
-    var m = this.$SVGMatrix.up("$1");\r
+    var m = this.$SVGMatrix.up();\r
     m.a = scaleFactorX;\r
     m.d = scaleFactorY;\r
     var s =  this.multiply(m);\r
@@ -2203,7 +2203,7 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ rotate : function(/*float*/ angle ) {\r
-    var m = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
+    var m = this.$SVGMatrix.up(), rad = angle / 180 * Math.PI; //ラジアン変換\r
     m.a = Math.cos(rad);\r
     m.b = Math.sin(rad);\r
     m.c = -m.b;\r
@@ -2217,7 +2217,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 = this.$SVGMatrix.up("$1"), rad = Math.atan2(y, x);\r
+    var m = this.$SVGMatrix.up(), rad = Math.atan2(y, x);\r
     m.a = Math.cos(rad);\r
     m.b = Math.sin(rad);\r
     m.c = -m.b;\r
@@ -2227,28 +2227,28 @@ base("$SVGMatrix").mix( {
     return s;\r
   },\r
   /*SVGMatrix*/ flipX : function() {\r
-    var m = this.$SVGMatrix.up("$1");\r
+    var m = this.$SVGMatrix.up();\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 = this.$SVGMatrix.up("$1");\r
+    var m = this.$SVGMatrix.up();\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 = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI; //ラジアン変換\r
+    var m = this.$SVGMatrix.up(), 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 = this.$SVGMatrix.up("$1"), rad = angle / 180 * Math.PI;\r
+    var m = this.$SVGMatrix.up(), rad = angle / 180 * Math.PI;\r
     m.b = Math.tan(rad);\r
     var s =  this.multiply(m);\r
     m = void 0;\r
@@ -2261,7 +2261,7 @@ base("$SVGMatrix").mix( {
 } );\r
 \r
 function SVGTransform() {\r
-  /*readonly SVGMatrix*/ this.matrix = base("$SVGMatrix").up("$1");\r
+  /*readonly SVGMatrix*/ this.matrix = base("$SVGMatrix").up();\r
 };\r
     // Transform Types\r
   /*unsigned short*/ SVGTransform.SVG_TRANSFORM_UNKNOWN   = 0;\r
@@ -2278,7 +2278,7 @@ SVGTransform.prototype = {
   /*readonly float*/ angle : 0,\r
   /*void*/ setMatrix : function(/*SVGMatrix*/ matrix ) {\r
     this.type = /*SVGTransform.SVG_TRANSFORM_MATRIX*/ 1;\r
-    var mat = this._matrix.up("$1");\r
+    var mat = this._matrix.up();\r
     mat.a = matrix.a;\r
     mat.b = matrix.b;\r
     mat.c = matrix.c;\r
@@ -2353,7 +2353,7 @@ base("$SVGStringList").$SVGTransformList.mix( {
 } );\r
 \r
 function SVGAnimatedTransformList() {\r
-  /*readonly SVGTransformList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGTransformList.up("$1");\r
+  /*readonly SVGTransformList*/ this.animVal = this.baseVal = base("$SVGStringList").$SVGTransformList.up();\r
 };\r
 \r
 base("SVGPreserveAspectRatio").mix( {\r
@@ -2380,7 +2380,7 @@ base("SVGPreserveAspectRatio").mix( {
 })(base("SVGPreserveAspectRatio"));*/\r
 \r
 function SVGAnimatedPreserveAspectRatio() {\r
-  /*readonly SVGPreserveAspectRatio*/ this.animVal = this.baseVal = base("SVGPreserveAspectRatio").up("$1");\r
+  /*readonly SVGPreserveAspectRatio*/ this.animVal = this.baseVal = base("SVGPreserveAspectRatio").up();\r
 };\r
 \r
 function SVGPathSeg() {\r
@@ -2708,12 +2708,12 @@ function SVGPathElement(_doc) {
   this._tar = _doc.createElement("v:shape");\r
   //interface SVGAnimatedPathData\r
   var sp = base("$SVGStringList").$SVGPathSegList;\r
-  /*readonly SVGPathSegList*/ this.pathSegList = sp.up("$1");\r
+  /*readonly SVGPathSegList*/ this.pathSegList = sp.up();\r
   this.animatedPathSegList = this.pathSegList;\r
-  /*readonly SVGPathSegList*/ this.normalizedPathSegList = sp.up("$1");\r
+  /*readonly SVGPathSegList*/ this.normalizedPathSegList = sp.up();\r
   sp = _doc = void 0;\r
   this.animatedNormalizedPathSegList = this.normalizedPathSegList;\r
-  /*readonly SVGAnimatedNumber*/ this.pathLength = base("$SVGAnimatedNumber").up("$1");\r
+  /*readonly SVGAnimatedNumber*/ this.pathLength = base("$SVGAnimatedNumber").up();\r
   //以下は、d属性に変更があった場合の処理\r
   this.addEventListener("DOMAttrModified", this._attrModi, false);\r
   /*以下の処理は、このpath要素ノードがDOMツリーに追加されて初めて、\r
@@ -3752,7 +3752,7 @@ NAIBU._GenericSVGPolyElement = function (_doc, xclose) {
   this._tar = _doc.createElement("v:shape");\r
   _doc = void 0;\r
   //interface SVGAnimatedPoints\r
-  /*readonly SVGPointList*/   this.animatedPoints = this.points = base("$SVGStringList").$SVGPointList.up("$1");;\r
+  /*readonly SVGPointList*/   this.animatedPoints = this.points = base("$SVGStringList").$SVGPointList.up();;\r
   this.addEventListener("DOMAttrModified", function(evt){\r
     var tar = evt.target;\r
     if (evt.attrName === "points") {\r
@@ -3820,7 +3820,7 @@ function SVGPolygonElement(_doc) {
 \r
 function SVGTextContentElement(_doc) {\r
   /*readonly SVGAnimatedLength*/      this.textLength = new SVGAnimatedLength();\r
-  /*readonly SVGAnimatedEnumeration*/ this.lengthAdjust = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.lengthAdjust = base("$SVGAnimatedEnumeration").up();\r
   this.addEventListener("DOMNodeInserted", function(evt){\r
     var tar = evt.target,\r
         cur = evt.currentTarget,\r
@@ -4494,7 +4494,7 @@ function SVGMarkerElement(_doc) {
   var sl = SVGAnimatedLength;\r
   /*readonly SVGAnimatedLength*/      this.refX = new sl();\r
   /*readonly SVGAnimatedLength*/      this.refY = new sl();\r
-  /*readonly SVGAnimatedEnumeration*/ this.markerUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.markerUnits = base("$SVGAnimatedEnumeration").up();\r
   this.markerUnits.baseVal = /*SVGMarkerElement.SVG_MARKERUNITS_STROKEWIDTH*/ 2;\r
   /*readonly SVGAnimatedLength*/      this.markerWidth = new sl();\r
   /*readonly SVGAnimatedLength*/      this.markerHeight = new sl();\r
@@ -4503,7 +4503,7 @@ function SVGMarkerElement(_doc) {
   this.markerWidth.baseVal.newValueSpecifiedUnits(1, 3);\r
   this.markerHeight.baseVal.newValueSpecifiedUnits(1, 3);\r
   sl = void 0;\r
-  /*readonly SVGAnimatedEnumeration*/ this.orientType = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.orientType = base("$SVGAnimatedEnumeration").up();\r
   this.orientType.baseVal = /*SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE*/ 2;\r
   /*readonly SVGAnimatedAngle*/       this.orientAngle = new SVGAnimatedAngle();\r
     //SVGFitToViewBoxのインターフェースはhttp://www.w3.org/2000/svgsvgオブジェクトで代用\r
@@ -4678,9 +4678,9 @@ base("$CSSStyleRule").$SVGCSSRule.up("$SVGColorProfileRule").mix( {
 \r
 function SVGGradientElement() {\r
   SVGURIReference.apply(this);\r
-  /*readonly SVGAnimatedEnumeration*/   this.gradientUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/   this.gradientUnits = base("$SVGAnimatedEnumeration").up();\r
   /*readonly SVGAnimatedTransformList*/ this.gradientTransform = new SVGAnimatedTransformList();\r
-  /*readonly SVGAnimatedEnumeration*/   this.spreadMethod = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/   this.spreadMethod = base("$SVGAnimatedEnumeration").up();\r
   this.addEventListener("DOMNodeInsertedIntoDocument", function(evt) {\r
     var grad = evt.target,\r
         ele = evt._tar,\r
@@ -4890,7 +4890,7 @@ function SVGRadialGradientElement(_doc) {
 SVGRadialGradientElement.prototype = Object._create(SVGGradientElement);\r
 \r
 function SVGStopElement() {\r
-  /*readonly SVGAnimatedNumber*/ this.offset = base("$SVGAnimatedNumber").up("$1");\r
+  /*readonly SVGAnimatedNumber*/ this.offset = base("$SVGAnimatedNumber").up();\r
   this.addEventListener("DOMAttrModified", function(evt) {\r
     if (evt.attrName === "offset") {\r
       var env = evt.newValue;\r
@@ -4906,8 +4906,8 @@ function SVGStopElement() {
 \r
 function SVGPatternElement() {\r
   var sl = SVGAnimatedLength;\r
-  /*readonly SVGAnimatedEnumeration*/   this.patternUnits = base("$SVGAnimatedEnumeration").up("$1");\r
-  /*readonly SVGAnimatedEnumeration*/   this.patternContentUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/   this.patternUnits = base("$SVGAnimatedEnumeration").up();\r
+  /*readonly SVGAnimatedEnumeration*/   this.patternContentUnits = base("$SVGAnimatedEnumeration").up();\r
   /*readonly SVGAnimatedTransformList*/ this.patternTransform = new SVGAnimatedTransformList();\r
   /*readonly SVGAnimatedLength*/        this.x = new sl();\r
   /*readonly SVGAnimatedLength*/        this.y = new sl();\r
@@ -4922,13 +4922,13 @@ function SVGPatternElement() {
 };\r
 \r
 function SVGClipPathElement() {\r
-  /*readonly SVGAnimatedEnumeration*/ this.clipPathUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.clipPathUnits = base("$SVGAnimatedEnumeration").up();\r
 };\r
 \r
 function SVGMaskElement() {\r
   var sl = SVGAnimatedLength;\r
-  /*readonly SVGAnimatedEnumeration*/ this.maskUnits = base("$SVGAnimatedEnumeration").up("$1");\r
-  /*readonly SVGAnimatedEnumeration*/ this.maskContentUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.maskUnits = base("$SVGAnimatedEnumeration").up();\r
+  /*readonly SVGAnimatedEnumeration*/ this.maskContentUnits = base("$SVGAnimatedEnumeration").up();\r
   /*readonly SVGAnimatedLength*/      this.x = new sl();\r
   /*readonly SVGAnimatedLength*/      this.y = new sl();\r
   /*readonly SVGAnimatedLength*/      this.width = new sl();\r
@@ -4938,15 +4938,15 @@ function SVGMaskElement() {
 \r
 function SVGFilterElement() {\r
   var sl = SVGAnimatedLength;\r
-  /*readonly SVGAnimatedEnumeration*/ this.filterUnits = base("$SVGAnimatedEnumeration").up("$1");\r
-  /*readonly SVGAnimatedEnumeration*/ this.primitiveUnits = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedEnumeration*/ this.filterUnits = base("$SVGAnimatedEnumeration").up();\r
+  /*readonly SVGAnimatedEnumeration*/ this.primitiveUnits = base("$SVGAnimatedEnumeration").up();\r
   /*readonly SVGAnimatedLength*/      this.x = new sl();\r
   /*readonly SVGAnimatedLength*/      this.y = new sl();\r
   /*readonly SVGAnimatedLength*/      this.width = new sl();\r
   /*readonly SVGAnimatedLength*/      this.height = new sl();\r
   sl = void 0;\r
-  /*readonly SVGAnimatedInteger*/     this.filterResX = base("$SVGAnimatedInteger").up("$1");\r
-  /*readonly SVGAnimatedInteger*/     this.filterResY = base("$SVGAnimatedInteger").up("$1");\r
+  /*readonly SVGAnimatedInteger*/     this.filterResX = base("$SVGAnimatedInteger").up();\r
+  /*readonly SVGAnimatedInteger*/     this.filterResY = base("$SVGAnimatedInteger").up();\r
   SVGURIReference.apply(this);\r
   //setFilterRes (/*unsigned long*/ filterResX,/*unsigned long*/ filterResY );\r
 };\r
@@ -4959,15 +4959,15 @@ function SVGFilterPrimitiveStandardAttributes(ele) {
   /*readonly SVGAnimatedLength*/ this.y = new sl();\r
   /*readonly SVGAnimatedLength*/ this.width = new sl();\r
   /*readonly SVGAnimatedLength*/ this.height = new sl();\r
-  /*readonly SVGAnimatedString*/ this.result = base("$SVGAnimatedString").up("$1");\r
+  /*readonly SVGAnimatedString*/ this.result = base("$SVGAnimatedString").up();\r
   sl = void 0;\r
   };\r
 SVGFilterPrimitiveStandardAttributes.prototype = Object._create(SVGStylable);\r
 \r
 function SVGFEBlendElement() {\r
-  /*readonly SVGAnimatedString*/      this.in1 = base("$SVGAnimatedString").up("$1");\r
-  /*readonly SVGAnimatedString*/      this.in2 = base("$SVGAnimatedString").up("$1");\r
-  /*readonly SVGAnimatedEnumeration*/ this.mode = base("$SVGAnimatedEnumeration").up("$1");\r
+  /*readonly SVGAnimatedString*/      this.in1 = base("$SVGAnimatedString").up();\r
+  /*readonly SVGAnimatedString*/      this.in2 = base("$SVGAnimatedString").up();\r
+  /*readonly SVGAnimatedEnumeration*/ this.mode = base("$SVGAnimatedEnumeration").up();\r
   this._fpsa = SVGFilterPrimitiveStandardAttributes(this);\r
 };\r
     // Blend Mode Types\r
@@ -4979,9 +4979,9 @@ function SVGFEBlendElement() {
   /*unsigned short SVGFEBlendElement.SVG_FEBLEND_MODE_LIGHTEN  = 5;*/\r
 \r
 function SVGFEGaussianBlurElement() {\r
-  /*readonly SVGAnimatedString*/ this.in1 = base("$SVGAnimatedString").up("$1");\r
-  /*readonly SVGAnimatedNumber*/ this.stdDeviationX = base("$SVGAnimatedNumber").up("$1");\r
-  /*readonly SVGAnimatedNumber*/ this.stdDeviationY = base("$SVGAnimatedNumber").up("$1");\r
+  /*readonly SVGAnimatedString*/ this.in1 = base("$SVGAnimatedString").up();\r
+  /*readonly SVGAnimatedNumber*/ this.stdDeviationX = base("$SVGAnimatedNumber").up();\r
+  /*readonly SVGAnimatedNumber*/ this.stdDeviationY = base("$SVGAnimatedNumber").up();\r
   this._fpsa = SVGFilterPrimitiveStandardAttributes(this);\r
 };\r
 /*void*/ SVGFEGaussianBlurElement.prototype.setStdDeviation = function(/*float*/ stdDeviationX, /*float*/ stdDeviationY ) {\r
@@ -4997,7 +4997,7 @@ function SVGCursorElement() {
 function SVGAElement(_doc) {\r
   this._tar = _doc.createElement("a");\r
   _doc = void 0;\r
-  /*readonly SVGAnimatedString*/ this.target = base("$SVGAnimatedString").up("$1");\r
+  /*readonly SVGAnimatedString*/ this.target = base("$SVGAnimatedString").up();\r
   this.target.baseVal = "_self";\r
   this.addEventListener("DOMAttrModified", function(evt){\r
     var tar = evt.target;\r
@@ -5112,7 +5112,7 @@ function SVGAElement(_doc) {
 };\r
 \r
 function SVGViewElement() {\r
-  /*readonly SVGStringList*/ this.viewTarget = base("$SVGStringList").up("$1");\r
+  /*readonly SVGStringList*/ this.viewTarget = base("$SVGStringList").up();\r
       //SVGFitToViewBoxのインターフェースを用いる\r
   /*readonly SVGAnimatedRect*/   this.viewBox = new SVGAnimatedRect();\r
   /*readonly SVGAnimatedPreserveAspectRatio*/ this.preserveAspectRatio = new SVGAnimatedPreserveAspectRatio();\r
@@ -5171,10 +5171,10 @@ function SVGScriptElement() {
 base("$event").up("SVGEvents");\r
 \r
 base("$event").SVGZoomEvents = base("$event").UIEvents.up("SVGZoomEvents").on("itnitialize", function() {\r
-  /*readonly SVGRect*/  this.zoomRectScreen = base("$SVGRect").up("$1");\r
+  /*readonly SVGRect*/  this.zoomRectScreen = base("$SVGRect").up();\r
   /*readonly float*/    this.previousScale =  this.newScale = 1;\r
-  /*readonly SVGPoint*/ this.previousTranslate = base("$SVGPoint").up("$1");\r
-  /*readonly SVGPoint*/ this.newTranslate = base("$SVGPoint").up("$1");\r
+  /*readonly SVGPoint*/ this.previousTranslate = base("$SVGPoint").up();\r
+  /*readonly SVGPoint*/ this.newTranslate = base("$SVGPoint").up();\r
 });\r
 \r
 function SVGAnimationElement() {\r
@@ -5698,7 +5698,7 @@ function SVGAnimateElement(){
           ttr = tar.targetElement,\r
           tta = ttr[attrName];\r
       /*tar.valuesのリスト:  ["12px", "13px"]\r
-       *tar._valueList:   [(base("$SVGPoint").up("$1")), (base("$SVGPoint").up("$1"))]\r
+       *tar._valueList:   [(base("$SVGPoint").up()), (base("$SVGPoint").up())]\r
        *  tar.valuesを機械が理解できるように変換したものがtar._valueList\r
        *この_valueListプロパティはアニメの際に使うので、_valuesプロパティはアニメ中に使わないことに注意\r
        */\r
@@ -5967,7 +5967,7 @@ function SVGAnimateMotionElement(){
     /*アニメーション中に変化すべき値をanimValプロパティに入力して、\r
      *baseValと同じような値に設定。\r
      */\r
-    trans.animVal = base("$SVGStringList").$SVGTransformList.up("$1");;\r
+    trans.animVal = base("$SVGStringList").$SVGTransformList.up();;\r
     if (trans.baseVal.numberOfItems !== 0) {\r
       trans.animVal.initialize(trans.baseVal.createSVGTransformFromMatrix(trans.baseVal.consolidate().matrix));\r
     } else {\r
@@ -6179,7 +6179,7 @@ function SVGAnimateTransformElement() {
     /*アニメーション中に変化すべき値をanimValプロパティに入力して、\r
      *baseValと同じような値に設定。\r
      */\r
-    trans.animVal = base("$SVGStringList").$SVGTransformList.up("$1");\r
+    trans.animVal = base("$SVGStringList").$SVGTransformList.up();\r
     if (trans.baseVal.numberOfItems !== 0) {\r
       trans.animVal.initialize(trans.baseVal.createSVGTransformFromMatrix(trans.baseVal.getItem(0).matrix));\r
     }\r