From b89fbb7c591e1f8527ec729fc5aeb8f562c27295 Mon Sep 17 00:00:00 2001
From: dhrname <dhrname@users.sourceforge.jp>
Date: Sun, 1 Mar 2015 22:05:21 +0900
Subject: [PATCH] Modify an advance method about a fixed numbe

---
 org/w3c/dom/smil.js          | 12 ++++++++----
 tool/Spec/spec/SvgDomSpec.js | 20 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index f473938..d6b65b5 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -487,7 +487,10 @@ base("$from").of( {
   }
     
 } )
- .mix( {   
+ .mix( {
+   /*advanceメソッドで使われる有効数字の桁数 (小数点の桁数を決めるときに使う)*/
+   degit: 0,
+   
    /*advance メソッド
     * アニメーションの進行具合を示す進捗率 t (0 <= t <= 1)をもとに、現在の呈示値を算出するためのもの
     * callメソッドが前もって呼び出されていることが前提となる*/
@@ -501,15 +504,16 @@ base("$from").of( {
       var str = "",
           numList = this.numList,
           strList = this.strList,
-          fromNumList = this.from.numList;
+          fromNumList = this.from.numList,
+          deg = this.degit;
       for (var i=0,nuli=numList.length;i<nuli;++i) {
         /*$fromと$toを、原点Oからの二つのベクトル (n次空間のベクトル)と考える*/
-        str += ( t * numList[i] + (1 - t) * fromNumList[i] );
+        str += ( t * numList[i] + (1 - t) * fromNumList[i] ).toFixed(deg);
         strList && ( str += strList[i+1] );
       }
       /*文字列はcallメソッドにより、a0aのパターンになっているので、aの部分を追加*/
       str = (strList ? strList[0] : "") + str;
-      numList = strList = fromNumList = i = nuli = void 0;
+      numList = strList = fromNumList = i = nuli = deg = void 0;
       return str;
     }
   } )
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index a674fae..ace22aa 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2995,6 +2995,8 @@ describe("SMIL Animation Spec", function() {
       } );
       /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
       it("should be this for the value (the valid partion)", function() {
+        var deg = 3;
+        
         from.string = "0s";
         from.$to.string = "1s";
         expect(from.$to.call()).toBe(from.$to.numList);
@@ -3006,8 +3008,9 @@ describe("SMIL Animation Spec", function() {
         expect(from.advance(0)).toBe("");
         expect(from.$to.from).toBe(from);
         expect(from.$to.advance(0)).toBe("0s");
+        from.$to.degit = deg;
         for (var i=0;i<1;i+=0.01) {
-          expect(from.$to.advance(i)).toBe(i+"s");
+          expect(from.$to.advance(i)).toBe(i.toFixed(deg)+"s");
         }
         
         from = base("$from").up();
@@ -3023,9 +3026,22 @@ describe("SMIL Animation Spec", function() {
         expect(from.advance(0)).toBe("");
         expect(from.$to.from).toBe(from);
         expect(from.$to.advance(0)).toBe("a0s");
+
+        from.$to.degit = deg;
         for (var i=0;i<1;i+=0.01) {
-          expect(from.$to.advance(i)).toBe("a" +i+ "s");
+          expect(from.$to.advance(i)).toBe("a" +i.toFixed(deg)+ "s");
         }
+        
+        from = base("$from").up();
+        from.up("$to");
+        from.string = "a-10s1.5";
+        from.$to.string = "a10s-3";
+        from.$to.call();
+        from.call();
+        from.$to.degit = 1;
+        expect(from.$to.advance(0)).toEqual("a-10.0s1.5");
+        expect(from.$to.advance(0.4)).toEqual("a-2.0s-0.3");
+        expect(from.$to.advance(1)).toEqual("a10.0s-3.0");
       } );
       /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
       it("should be this for the value (the invalid partion)", function() {
-- 
2.11.0