degree, radical (new)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48007 954022d7-b5bf-4e40-9824-e11837661b57

Word/Math/degree.js

@@ -5,18 +5,16 @@ function CDegreeOrdinary()
     CMathBase.call(this);
 }
 extend(CDegreeOrdinary, CMathBase);
-CDegreeOrdinary.prototype.setContent = function()
+CDegreeOrdinary.prototype.init = function()
 {
-    this.init(1, 2);
+    this.setDimension(1, 2);
 
     var oBase = new CMathContent();
-    oBase.fillPlaceholders();
 
     var oDegree = new CMathContent();
-    oDegree.fillPlaceholders();
     oDegree.setReduct(DEGR_REDUCT);
 
-    this.addMCToContent(1, 2, [oBase, oDegree]);
+    this.addMCToContent(oBase, oDegree);
 }
 CDegreeOrdinary.prototype.old_setContent = function()
 {
@@ -39,7 +37,7 @@ CDegreeOrdinary.prototype.old_setContent = function()
 
     CDegreeOrdinary.superclass.setContent.call(this, oBase, oDegree);
 }
-CDegreeOrdinary.prototype.setIndex = function()
+CDegreeOrdinary.prototype.setIndex = function(index)
 {
     this.index = index;
 }
@@ -197,9 +195,14 @@ CDegreeOrdinary.prototype.getBase = function()
 
 function CIterators()
 {
-    CMathBase.call(this, 2, 1);
+    CMathBase.call(this);
 }
 extend(CIterators, CMathBase);
+CIterators.prototype.init = function()
+{
+    this.setDimension(2, 1);
+    this.setContent();
+}
 CIterators.prototype.setDistance = function()
 {
     var descF = this.elements[0][0].size.height - this.elements[0][0].size.center ,
@@ -239,29 +242,22 @@ CIterators.prototype.getLowerIterator = function()
 
 function CDegreeSubSup(type)
 {
-    CSubMathBase.call(this, 1, 2);
     this.type = type;
+    CSubMathBase.call(this);
 }
 extend(CDegreeSubSup, CSubMathBase);
-CDegreeSubSup.prototype.old_setContent = function()
+CDegreeSubSup.prototype.init = function()
 {
-
-    var oBase = null;
-    if(arguments.length > 0)
-        oBase = arguments[0];
-    else
-    {
-        oBase = new CMathBase(1, 1);
-        oBase.init( this.params );
-        oBase.relate(this);
-        oBase.fillPlaceholders();
-    }
+    var oBase = new CMathContent();
+    this.init_2(oBase);
+}
+CDegreeSubSup.prototype.init_2 = function(oBase)
+{
+    this.setDimension(1, 2);
 
     var oIters = new CIterators();
-    oIters.init( this.params );
-    oIters.relate(this);
-    oIters.fillPlaceholders();
-    oIters.setFont(getTypeDegree(this.params.font), -1);
+    oIters.init();
+    oIters.setReduct(DEGR_REDUCT);
 
     oIters.lUp = 0;
     oIters.lD = 0;
@@ -269,23 +265,22 @@ CDegreeSubSup.prototype.old_setContent = function()
     if(this.type == 0)
     {
         oIters.alignHor(-1, 0);
-        CDegreeSubSup.superclass.setContent.call(this, oBase, oIters);
+        this.addMCToContent(oBase, oIters);
     }
     else
     {
         oIters.alignHor(-1, 1);
-        CDegreeSubSup.superclass.setContent.call(this, oIters, oBase);
+        this.addMCToContent(oIters, oBase);
     }
 }
-CDegreeSubSup.prototype.setContent = function()
+CDegreeSubSup.prototype.old_setContent = function()
 {
-
     var oBase = null;
     if(arguments.length > 0)
         oBase = arguments[0];
     else
     {
-        oBase = new CMathContent(1, 1);
+        oBase = new CMathContent();
         oBase.init( this.params );
         oBase.relate(this);
         oBase.fillPlaceholders();

Word/Math/mathContent.js

@@ -190,6 +190,18 @@ CMathContent.prototype =
             case 3:
                 mathElem = new CDegreeOrdinary();
                 break;
+            case 4:
+                mathElem = new CDegreeSubSup(0);
+                break;
+            case 5:
+                mathElem = new CDegreeSubSup(1);
+                break;
+            case 6:
+                mathElem = new CRadical();
+                break;
+            case 7:
+                mathElem = new CDegreeRadical();
+                break;
         }
 
         if( mathElem !== null )
@@ -280,16 +292,84 @@ CMathContent.prototype =
                 var den = fract.getDenominator();
                 den.addTxt("2");
                 break;
-           /*case 9:
+            case 9:
                 var degr = this.createMComponent(3);
                 degr.init();
                 degr.setIndex(1);
+                degr.fillPlaceholders();
                 break;
             case 10:
                 var degr = this.createMComponent(3);
                 degr.init();
                 degr.setIndex(-1);
-                break;*/
+                degr.fillPlaceholders();
+                break;
+            case 11:
+                var degrSupSup = this.createMComponent(4);
+                degrSupSup.init();
+                degrSupSup.fillPlaceholders();
+                break;
+            case 12:
+                var degrSupSup = this.createMComponent(5);
+                degrSupSup.init();
+                degrSupSup.fillPlaceholders();
+                break;
+            case 13:
+                var degr = this.createMComponent(3);
+                degr.init();
+                degr.setIndex(-1);
+                var base = degr.getBase();
+                base.addTxt("x");
+                var iter = degr.getIterator();
+
+                var degr2 = iter.createMComponent(3);
+                degr2.init();
+                degr2.setIndex(1);
+                var base2 = degr2.getBase();
+                base2.addTxt("y");
+                var iter2 = degr2.getIterator();
+                iter2.addTxt("2");
+
+                break;
+            case 14:
+                var degr = this.createMComponent(3);
+                degr.init();
+                degr.setIndex(1);
+                var base = degr.getBase();
+                base.addTxt("e");
+                var iter = degr.getIterator();
+                iter.addTxt("-iωt");
+                break;
+            case 15:
+                var degr = this.createMComponent(3);
+                degr.init();
+                degr.setIndex(1);
+                var base = degr.getBase();
+                base.addTxt("x");
+                var iter = degr.getIterator();
+                iter.addTxt("2");
+                break;
+            case 16:
+                var degr = this.createMComponent(5);
+                degr.init();
+                var base = degr.getBase();
+                base.addTxt("Y");
+                var iter1 = degr.getUpperIterator();
+                iter1.addTxt("n");
+                var iter2 = degr.getLowerIterator();
+                iter2.addTxt("1");
+                break;
+            case 17:
+                var rad = this.createMComponent(6);
+                rad.init();
+                rad.fillPlaceholders();
+                break;
+            case 18:
+                var rad = this.createMComponent(7);
+                rad.init();
+                rad.fillPlaceholders();
+                break;
+
         }
     },
     removeAreaSelect: function()