1. runPrp, ctrPrp для операторов, accent, group characters, матриц,...

1. runPrp, ctrPrp для операторов, accent, group characters, матриц, минимаксных функций, math functions
2. изменена функция удаления элементов из контента с учетом runPrp

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

Word/Math/accent.js

@@ -592,7 +592,7 @@ CSign.prototype.draw = function(pGraphics)
 CSign.prototype.setTxtPrp = function(txtPrp)
 {
     this.txtPrp = txtPrp;
-    this.sign.setTxtPrp(txtPrp);
+    //this.sign.setTxtPrp(txtPrp);
 }
 
 function old_CAccent()

Word/Math/base.js

@@ -10,8 +10,6 @@ function CMathBase()
 
     this.CurPos_X = 0;
     this.CurPos_Y = 0;
-    this.empty = false;
-    this.SUBCONTENT = true;
     this.reduct = 1;
 
     this.nRow = 0;

Word/Math/limit.js

@@ -57,7 +57,7 @@ CLimit.prototype.init = function(props)
     this.setDimension(2, 1);
 
     var oBase = new CMathContent();
-    oBase.setOwnTPrp({Italic: false});
+    //oBase.setOwnTPrp({Italic: false});
 
     var oIter = new CMathContent();
     oIter.setReduct(DEGR_REDUCT);
@@ -99,7 +99,8 @@ CLimit.prototype.getIterator = function()
 }
 CLimit.prototype.setDistance = function()
 {
-    this.dH = 0.03674768518518519*this.getTxtPrp().FontSize;
+    //this.dH = 0.03674768518518519*this.getTxtPrp().FontSize;
+    this.dH = 0.03674768518518519*this.getPrpToControlLetter().FontSize;
 }
 
 
@@ -146,9 +147,9 @@ CMathFunc.prototype.init = function()
     this.setDimension(1, 2);
     this.setContent();
 
-    var runPrp = new CTextPr();
-    runPrp.Italic = false;
-    this.elements[0][0].addRunPrp(runPrp);
+    //var runPrp = new CTextPr();
+    //runPrp.Italic = false;
+    //this.elements[0][0].addToBeginningRPrp(runPrp);
 
     //this.elements[0][0].setOwnTPrp({Italic: false});  // trigonometrical function
     //this.elements[0][0].mergeTxtPrp({Italic: false}); // trigonometrical function

Word/Math/mathText.js

@@ -55,9 +55,6 @@ function CMathText()
     this.bJDraw = false;
     this.bMText  = false;
 
-
-    /*this.SUBCONTENT = false;
-    this.empty = false;*/
     //this.Parent = null;
 
     /*this.TxtPrp = new CMathTextPrp();
@@ -512,10 +509,6 @@ function old_CMathText(params)
 
     this.bMText = params.bMText ? true : false;
 
-
-    this.SUBCONTENT = false;
-    this.empty = false;
-
     this.transform =
     {
         sx:  1,

Word/Math/matrix.js

@@ -159,7 +159,8 @@ CMathMatrix.prototype.setRuleGap = function(space, rule, gap, minGap)
 }
 CMathMatrix.prototype.recalculateSize = function()
 {
-    var txtPrp = this.getTxtPrp();
+    //var txtPrp = this.getTxtPrp();
+    var txtPrp = this.getPrpToControlLetter();
 
     var interval = this.getLineGap(txtPrp);
     this.gaps.column[0] = 0;
@@ -514,5 +515,5 @@ CEqArray.prototype.old_init = function(props)
 }
 CEqArray.prototype.getElement = function(num)
 {
-    return this.elements[num][y];
+    return this.elements[num][0];
 }
\ No newline at end of file

Word/Math/operators.js

@@ -4625,6 +4625,11 @@ CCharacter.prototype.recalculateSize = function()
 {
     var content = this.elements[0][0];
 
+    var rPrp = this.getPrpToControlLetter();
+    rPrp.Italic = false;
+
+    g_oTextMeasurer.SetFont(rPrp);
+
     this.operator.fixSize(this.elements[0][0].size.width);
 
     var width = content.size.width > this.operator.size.width ? content.size.width : this.operator.size.width,
@@ -4664,6 +4669,11 @@ CCharacter.prototype.align = function(element)
 CCharacter.prototype.draw = function(pGraphics)
 {
     this.elements[0][0].draw(pGraphics);
+
+    var rPrp = this.getPrpToControlLetter();
+    rPrp.Italic = false;
+
+    pGraphics.SetFont(rPrp);
     this.operator.draw(pGraphics);
 }
 CCharacter.prototype.findDisposition = function(pos)