1. убрала текстовые настройки для отрисовки мат объектов (вместо этого запрос ctrPrp) для "чтения"

2. переделала remove_internal для удаления объектов


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

Word/Math/accent.js

@@ -17,6 +17,7 @@
 function CCircumflex()
 {
     //this.incline = 0;
+    this.Parent = null;
     this.turn = TURN_0;
 }
 CCircumflex.prototype.setTurn = function(turn)
@@ -25,7 +26,7 @@ CCircumflex.prototype.setTurn = function(turn)
 }
 CCircumflex.prototype.fixSize = function(mesure, bIncl)
 {
-    var alpha = this.txtPrp.FontSize/36;
+    var alpha = this.Parent.getCtrPrp().FontSize/36;
 
     var width = 3.88*alpha;
     var height = 3.175*alpha;
@@ -77,9 +78,9 @@ CCircumflex.prototype.draw = function(pGraphics)
     var x = this.pos.x,
         y = this.pos.y;
 
-    var fontSize = this.txtPrp.FontSize;
-
+    var fontSize = this.Parent.getCtrPrp().FontSize;
     var penW = fontSize*g_dKoef_pt_to_mm*this.PEN_W;
+
     penW *= 96/25.4;
 
     // g_dKoef_px_to_mm = 25.4/96
@@ -173,23 +174,24 @@ CCircumflex.prototype.draw = function(pGraphics)
     pGraphics.SetIntegerGrid(intGrid);
 
 }
-CCircumflex.prototype.setTxtPrp = function(txtPrp)
-{
-    this.txtPrp = txtPrp;
-}
 CCircumflex.prototype.setPosition = function(pos)
 {
     this.pos = pos;
 }
+CCircumflex.prototype.relate = function(parent)
+{
+    this.Parent = parent;
+}
 
 
 function CLine()
 {
     this.PEN_W = 0.04;
+    this.Parent = null;
 }
 CLine.prototype.fixSize = function(measure)
 {
-    var alpha = this.txtPrp.FontSize/36;
+    var alpha = this.Parent.getCtrPrp().FontSize/36;
 
     var height = 1.68*alpha;
     var width  = 4.938*alpha;
@@ -200,7 +202,8 @@ CLine.prototype.fixSize = function(measure)
 }
 CLine.prototype.draw = function(pGraphics)
 {
-    var penW = this.txtPrp.FontSize*g_dKoef_pt_to_mm*this.PEN_W;
+    var fontSize = this.Parent.getCtrPrp().FontSize;
+    var penW = fontSize*g_dKoef_pt_to_mm*this.PEN_W;
     //penW *= 96/25.4;
 
     //var penY = penW/2*25.4/96; //для того чтобы линии совпадали (для одинарной и двойной черты)
@@ -227,18 +230,19 @@ CLine.prototype.setPosition = function(pos)
 {
     this.pos = pos;
 }
-CLine.prototype.setTxtPrp = function(txtPrp)
+CLine.prototype.relate = function(parent)
 {
-    this.txtPrp = txtPrp;
+    this.Parent = parent;
 }
 
 function CDoubleLine()
 {
     this.PEN_W = 0.04;
+    this.Parent = null;
 }
 CDoubleLine.prototype.fixSize = function(measure)
 {
-    var alpha = this.txtPrp.FontSize/36;
+    var alpha = this.Parent.getCtrPrp().FontSize/36;
 
     var height = 2.843*alpha;
     var width  = 4.938*alpha;
@@ -251,13 +255,10 @@ CDoubleLine.prototype.setPosition = function(pos)
 {
     this.pos = pos;
 }
-CDoubleLine.prototype.setTxtPrp = function(txtPrp)
-{
-    this.txtPrp = txtPrp;
-}
 CDoubleLine.prototype.draw = function(pGraphics)
 {
-    var penW = this.txtPrp.FontSize*g_dKoef_pt_to_mm*this.PEN_W;
+    var fontSize = this.Parent.getCtrPrp().FontSize;
+    var penW = fontSize*g_dKoef_pt_to_mm*this.PEN_W;
     //penW *= 96/25.4;
 
     //var penY = penW/2*25.4/96; //для того чтобы линии совпадали (для одинарной и двойной черты)
@@ -282,13 +283,17 @@ CDoubleLine.prototype.draw = function(pGraphics)
     pGraphics.ds();
 
 }
+CDoubleLine.prototype.relate = function(parent)
+{
+    this.Parent = parent;
+}
 
 function CTilde()
 {
 }
 CTilde.prototype.fixSize = function()
 {
-    var betta = this.txtPrp.FontSize/36;
+    var betta = this.Parent.getCtrPrp().FontSize/36;
 
     var width = 9.047509765625*betta; // реальная на отрисовке width 7.495282031249999
     var height = 2.469444444444444*betta;
@@ -332,8 +337,7 @@ CTilde.prototype.draw = function(pGraphics)
     var XX = new Array(),
         YY = new Array();
 
-    var fontSize = this.txtPrp.FontSize;
-
+    var fontSize = this.Parent.getCtrPrp().FontSize;
     var textScale = fontSize/1000, // 1000 pt
         alpha = textScale*25.4/96 /64 ; // g_dKoef_px_to_mm = 25.4/96
 
@@ -383,9 +387,9 @@ CTilde.prototype.setPosition = function(pos)
 {
     this.pos = pos;
 }
-CTilde.prototype.setTxtPrp = function(txtPrp)
+CTilde.prototype.relate = function(parent)
 {
-    this.txtPrp = txtPrp;
+    this.Parent = parent;
 }
 
 function CBreve()
@@ -398,7 +402,7 @@ CBreve.prototype.setTurn = function(tturn)
 }
 CBreve.prototype.fixSize = function()
 {
-    var betta = this.txtPrp.FontSize/36;
+    var betta = this.Parent.getCtrPrp().FontSize/36;
 
     var width =  4.2333333333333325*betta;
     var height = 2.469444444444445*betta;
@@ -442,8 +446,7 @@ CBreve.prototype.draw = function(pGraphics)
     var XX = new Array(),
         YY = new Array();
 
-    var fontSize = this.txtPrp.FontSize;
-
+    var fontSize = this.Parent.getCtrPrp().FontSize;
     var textScale = fontSize/1000, // 1000 pt
         alpha = textScale*25.4/96 /64 ; // g_dKoef_px_to_mm = 25.4/96
 
@@ -500,15 +503,16 @@ CBreve.prototype.draw = function(pGraphics)
     pGraphics.SetIntegerGrid(intGrid);
 
 }
-CBreve.prototype.setTxtPrp = function(txtPrp)
+CBreve.prototype.relate = function(parent)
 {
-    this.txtPrp = txtPrp;
+    this.Parent = parent;
 }
 
 function CSign()
 {
     this.sign = new CMathText();
     this.type = null;
+    this.Parent = null;
 }
 CSign.prototype.setSign = function(props)
 {
@@ -575,7 +579,7 @@ CSign.prototype.fixSize = function(bIncline)
 {
     this.sign.recalculateSize();
 
-    this.dH = 0.7*this.txtPrp.FontSize/36;
+    this.dH = 0.7*this.Parent.getCtrPrp().FontSize/36;
 
     var height = this.sign.size.height + this.dH,
         width = this.sign.size.widthG;
@@ -589,10 +593,9 @@ CSign.prototype.draw = function(pGraphics)
 {
     this.sign.draw(pGraphics);
 }
-CSign.prototype.setTxtPrp = function(txtPrp)
+CSign.prototype.relate = function(parent)
 {
-    this.txtPrp = txtPrp;
-    //this.sign.setTxtPrp(txtPrp);
+    this.Parent = parent;
 }
 
 function old_CAccent()
@@ -1083,7 +1086,4 @@ CAccent.prototype.getCenter = function()
 CAccent.prototype.getProps = function()
 {
     var prps = {};
-
-
-
 }

Word/Math/base.js

@@ -80,6 +80,9 @@ CMathBase.prototype =
             this.alignment.wdt[u] = CENTER;
 
     },
+
+
+    ///////// RunPrp, CtrPrp
     setCtrPrp: function(runPrp)
     {
         this.CtrPrp.Merge(runPrp); // only runPrp for paragraph
@@ -89,9 +92,19 @@ CMathBase.prototype =
         var ctrPrp = new CTextPr();
         ctrPrp.Merge(DEFAULT_RUN_PRP);
         ctrPrp.Merge(this.CtrPrp);
+        ctrPrp.Merge(this.Composition.GetFirstPrp() );
+        return ctrPrp;
+    },
+    getCtrPrp_2: function()
+    {
+        var ctrPrp = new CTextPr();
+        ctrPrp.Merge(DEFAULT_RUN_PRP);
+        ctrPrp.Merge(this.CtrPrp);
+
         return ctrPrp;
     },
-    getPrpToControlLetter: function()
+    // getPrpToControlLetter => getCtrPrp
+    old_getPrpToControlLetter: function()
     {
         var rPrp = new CTextPr();
         //rPrp.Merge(DEFAULT_RUN_PRP);
@@ -100,6 +113,18 @@ CMathBase.prototype =
 
         return rPrp;
     },
+    addRPrp: function(rPrp)
+    {
+        for(var i=0; i < this.nRow; i++)
+            for(var j = 0; j < this.nCol; j++)
+            {
+                if( !this.elements[i][j].IsJustDraw())
+                    this.elements[i][j].addRPrp(rPrp);
+            }
+    },
+    /////////
+
+
     setComposition: function(composition)
     {
         this.Composition = composition;

Word/Math/borderBox.js

@@ -53,8 +53,7 @@ CBorderBox.prototype.recalculateSize = function()
     var height = ss.height;
     var center = ss.center;
 
-    //this.gapBrd = this.getTxtPrp().FontSize*0.08104587131076388;
-    this.gapBrd = this.getPrpToControlLetter().FontSize*0.08104587131076388;
+    this.gapBrd = this.getCtrPrp().FontSize*0.08104587131076388;
 
     if(this.bTop)
     {
@@ -74,9 +73,7 @@ CBorderBox.prototype.recalculateSize = function()
 CBorderBox.prototype.draw = function(pGraphics)
 {
     this.elements[0][0].draw(pGraphics);
-
-    //var penW = this.getTxtPrp().FontSize* 25.4/96 * 0.08 ;
-    var penW = this.getPrpToControlLetter().FontSize* 25.4/96 * 0.08 ;
+    var penW = this.getCtrPrp().FontSize* 25.4/96 * 0.08 ;
 
     if(this.bTop)
     {

Word/Math/fraction.js

@@ -48,8 +48,7 @@ CFraction.prototype.getCenter = function()
 
     if(this.type == BAR_FRACTION || this.type == NO_BAR_FRACTION)
     {
-        //var penW = this.getTxtPrp().FontSize* 25.4/96 * 0.08 /2;
-        var penW = this.getPrpToControlLetter().FontSize* 25.4/96 * 0.08 /2;
+        var penW = this.getCtrPrp().FontSize* 25.4/96 * 0.08 /2;
         center = this.elements[0][0].size.height + penW;
     }
     else if(this.type == SKEWED_FRACTION)
@@ -74,7 +73,7 @@ CFraction.prototype.draw = function(pGraphics)
 }
 CFraction.prototype.drawBarFraction = function(pGraphics)
 {
-    var ctrPrp = this.getPrpToControlLetter();
+    var ctrPrp = this.getCtrPrp();
     var penW = ctrPrp.FontSize* this.reduct* 25.4/96 * 0.08;
 
     var x1 = this.pos.x,
@@ -94,8 +93,8 @@ CFraction.prototype.drawBarFraction = function(pGraphics)
 }
 CFraction.prototype.drawSkewedFraction = function(pGraphics)
 {
-    var ctrPrp = this.getPrpToControlLetter();
-    //var fontSize = this.getTxtPrp().FontSize;
+    var ctrPrp = this.getCtrPrp();
+
     var penW = ctrPrp.FontSize/12.5*g_dKoef_pix_to_mm;
 
     var gap = this.gapSlash/2 - penW/7.5;
@@ -199,7 +198,7 @@ CFraction.prototype.drawLinearFraction = function(pGraphics)
         x2 = this.pos.x + this.elements[0][0].size.width + shift,
         y2 = this.pos.y + this.size.center + desc;
 
-    var ctrPrp = this.getPrpToControlLetter();
+    var ctrPrp = this.getCtrPrp();
     var penW = ctrPrp.FontSize/12.5*g_dKoef_pix_to_mm;
 
     pGraphics.SetFont(ctrPrp);
@@ -248,7 +247,7 @@ CFraction.prototype.recalculateSize = function()
 }
 CFraction.prototype.recalculateSkewed = function()
 {
-    var ctrPrp = this.getPrpToControlLetter();
+    var ctrPrp = this.getCtrPrp();
     this.gapSlash = 5.011235894097222 * ctrPrp.FontSize/36;
     var _width = this.elements[0][0].size.width + this.gapSlash + this.elements[0][1].size.width;
     var _height = this.elements[0][0].size.height + this.elements[0][1].size.height;
@@ -260,7 +259,7 @@ CFraction.prototype.recalculateLinear = function()
 {
     var H = this.elements[0][0].size.center + this.elements[0][1].size.height - this.elements[0][1].size.center;
     //var txtPrp = this.getTxtPrp();
-    var ctrPrp = this.getPrpToControlLetter();
+    var ctrPrp = this.getCtrPrp();
 
     var gap = 5.011235894097222*ctrPrp.FontSize/36;
 
@@ -393,6 +392,7 @@ CNumerator.prototype.recalculateSize = function()
     var arg = this.elements[0][0].size;
     //var txtPrp = this.getTxtPrp();
     //txtPrp.FontSize *= this.Parent.reduct;
+
     var ctrPrp = this.getCtrPrp();
 
     var Descent = arg.height - arg.ascent; // baseLine
@@ -454,6 +454,7 @@ CDenominator.prototype.recalculateSize = function()
     var arg = this.elements[0][0].size;
     /*var txtPrp = this.getTxtPrp();
     txtPrp.FontSize *= this.Parent.reduct;*/
+
     var ctrPrp = this.getCtrPrp();
 
     var gap = 7.832769097222222 * ctrPrp.FontSize/36,

Word/Math/limit.js

@@ -99,8 +99,7 @@ CLimit.prototype.getIterator = function()
 }
 CLimit.prototype.setDistance = function()
 {
-    //this.dH = 0.03674768518518519*this.getTxtPrp().FontSize;
-    this.dH = 0.03674768518518519*this.getPrpToControlLetter().FontSize;
+    this.dH = 0.03674768518518519*this.getCtrPrp().FontSize;
 }
 
 
@@ -157,8 +156,7 @@ CMathFunc.prototype.init = function()
 }
 CMathFunc.prototype.setDistance = function()
 {
-    //this.dW = this.getTxtPrp().FontSize/6*g_dKoef_pt_to_mm;
-    this.dW = this.getPrpToControlLetter().FontSize/6*g_dKoef_pt_to_mm;
+    this.dW = this.getCtrPrp().FontSize/6*g_dKoef_pt_to_mm;
 }
 CMathFunc.prototype.getFName = function()
 {

Word/Math/matrix.js

@@ -4,8 +4,7 @@ function CMathMatrix()
     this.lineGapRow = 1;
     this.gaps = null;
     this.plcHide = false;
-	this.row = 0;
-	this.column = 0;
+
 
     this.spaceRow =
     {
@@ -29,6 +28,11 @@ function CMathMatrix()
         column: new Array()
     };
 
+    ////  special for "read"  ////
+    this.row = 0;
+    this.column = 0;
+    ////
+
     CMathBase.call(this);
 }
 extend(CMathMatrix, CMathBase);
@@ -161,8 +165,7 @@ CMathMatrix.prototype.setRuleGap = function(space, rule, gap, minGap)
 }
 CMathMatrix.prototype.recalculateSize = function()
 {
-    //var txtPrp = this.getTxtPrp();
-    var txtPrp = this.getPrpToControlLetter();
+    var txtPrp = this.getCtrPrp();
 
     var interval = this.getLineGap(txtPrp);
     this.gaps.column[0] = 0;
@@ -466,7 +469,6 @@ CMathMatrix.prototype.baseJustification = function(type)
 ////
 function CEqArray()
 {
-	this.row = 0;
     CMathMatrix.call(this);
 }
 extend(CEqArray, CMathMatrix);

Word/Math/radical.js

@@ -9,7 +9,7 @@ function CSignRadical()
 }
 CSignRadical.prototype.draw = function(pGraphics)
 {
-    var txtPrp = this.Parent.getPrpToControlLetter();
+    var txtPrp = this.Parent.getCtrPrp();
     //var txtPrp = this.Parent.getTxtPrp();
     var penW = txtPrp.FontSize*g_dKoef_pt_to_mm*0.042;
 
@@ -80,7 +80,7 @@ CSignRadical.prototype.draw = function(pGraphics)
 CSignRadical.prototype.recalculateSize = function()
 {
     //var txtPrp = this.Parent.getTxtPrp();
-    var txtPrp = this.Parent.getPrpToControlLetter();
+    var txtPrp = this.Parent.getCtrPrp();
     var sizeArg = this.Parent.getBase().size;
 
     var height, width;
@@ -223,7 +223,7 @@ CRadical.prototype.recalculateSize = function()
 
         var width = degr.width - wTick + sign.width;
 
-        var txtPrp = this.getPrpToControlLetter();
+        var txtPrp = this.getCtrPrp();
         var plH = 9.877777777777776 * txtPrp.FontSize /36;
 
         if( sign.height < plH )