Skip to content

S
sdkjs
Commit 4518ee0c authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@48782 954022d7-b5bf-4e40-9824-e11837661b57
parent 0e67351b
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 131 deletions
Word/Math/base.js
View file @ 4518ee0c
......@@ -102,9 +102,8 @@ CMathBase.prototype =
},
setTxtPrp: function(txtPrp)
{
this.TxtPrp = new CMathTextPrp();
//this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
//this.TxtPrp.Merge(this.OwnTPrp);
for(var i=0; i < this.nRow; i++)
for(var j = 0; j < this.nCol; j++)
......
Word/Math/logarithm.js
View file @ 4518ee0c
......@@ -56,7 +56,8 @@ CMinimaxFunc.prototype.init = function()
this.setDimension(2, 1);
var oBase = new CMathContent();
oBase.mergeTxtPrp({Italic: false});
//oBase.mergeTxtPrp({Italic: false});
oBase.setTxtPrp({Italic: false});
var oIter = new CMathContent();
oIter.setReduct(DEGR_REDUCT);
......@@ -131,7 +132,9 @@ CMathFunc.prototype.init = function()
{
this.setDimension(1, 2);
this.setContent();
this.elements[0][0].mergeTxtPrp({Italic: false}); // trigonometrical function
this.elements[0][0].setTxtPrp({Italic: false}); // trigonometrical function
//this.elements[0][0].mergeTxtPrp({Italic: false}); // trigonometrical function
}
CMathFunc.prototype.setDistance = function()
{
......
Word/Math/mathContent.js
View file @ 4518ee0c
......@@ -118,88 +118,13 @@ CMathContent.prototype =
this.g_mContext = new dist(0,0,0,0);
this.content.push( new mathElem(new CEmpty(), new dist(0,0,0,0), 0) );
},
old_ChangeTxtPrp: function(txtPrp)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(txtPrp);
},
old_old_setTxtPrp: function(txtPrp, start, end) //parent properties
{
this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
this.TxtPrp.Merge(this.OwnTPrp);
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(this.TxtPrp);
},
old_changeTxtPrp: function(txtPrp, bAll)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
if(bAll)
this.setTxtPrp(txtPrp, 0, this.content.length);
else
this.setTxtPrp(txtPrp, start, end);
},
old_setTxtPrp: function(txtPrp, bAll)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
if(bAll)
{
this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
//this.TxtPrp.Merge(this.OwnTPrp);
start = 0;
end = this.content.length;
}
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(txtPrp);
},
setTxtPrp: function(txtPrp)
{
this.TxtPrp = new CMathTextPrp();
//this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
this.changeTxtPrp(txtPrp, 0, this.content.length);
this.setTPrpToInterval(txtPrp, 0, this.content.length);
},
setTxtPrp_2: function(txtPrp)
changeTxtPrp: function(txtPrp)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
......@@ -214,9 +139,9 @@ CMathContent.prototype =
}
}
this.changeTxtPrp(txtPrp, start, end);
this.setTPrpToInterval(txtPrp, start, end);
},
changeTxtPrp: function(txtPrp, start, end)
setTPrpToInterval: function(txtPrp, start, end)
{
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(txtPrp);
......@@ -225,14 +150,6 @@ CMathContent.prototype =
{
this.OwnTPrp.Merge(txtPrp);
},
old_setRunPrp: function(txtPrp)
{
this.setTxtPrp(txtPrp);
},
mergeTxtPrp: function(txtPrp)
{
this.textPrp.Merge(txtPrp);
},
getRunPrp: function(pos)
{
var runPrp = new CMathTextPrp();
......@@ -286,7 +203,7 @@ CMathContent.prototype =
if(start !== end)
{
var txtPrp = this.content[start].value.getOwnTPrp();
var txtPrp = this.content[start].value.getOwnTPrp();
for(var i = start + 1; i < end; i++)
{
......@@ -338,10 +255,89 @@ CMathContent.prototype =
TComp.Merge( this.getRunPrp(start) );
TComp.Merge(this.Composition.TxtPrp);
}
return TComp;
},
old_ChangeTxtPrp: function(txtPrp)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(txtPrp);
},
old_old_setTxtPrp: function(txtPrp, start, end) //parent properties
{
this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
this.TxtPrp.Merge(this.OwnTPrp);
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(this.TxtPrp);
},
old_changeTxtPrp: function(txtPrp, bAll)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
if(bAll)
this.setTxtPrp(txtPrp, 0, this.content.length);
else
this.setTxtPrp(txtPrp, start, end);
},
old_setTxtPrp: function(txtPrp, bAll)
{
var start, end;
if( this.selection.startPos != this.selection.endPos )
{
start = this.selection.startPos;
end = this.selection.endPos;
if(start > end)
{
tmp = start;
start = end;
end = tmp;
}
}
if(bAll)
{
this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
//this.TxtPrp.Merge(this.OwnTPrp);
start = 0;
end = this.content.length;
}
for(var i = start; i < end; i++)
this.content[i].value.setTxtPrp(txtPrp);
},
old_setRunPrp: function(txtPrp)
{
this.setTxtPrp(txtPrp);
},
old_setComposition: function(Compos)
{
this.Composition = Compos;
......@@ -482,7 +478,6 @@ CMathContent.prototype =
if( mathElem !== null )
{
mathElem.relate(this);
//mathElem.setComposition(this.Composition);
mathElem.setReduct(this.reduct);
var runPrp = this.getRunPrp(this.CurPos);
mathElem.setTxtPrp( runPrp );
......@@ -1363,7 +1358,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("sin");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1378,7 +1373,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("cos");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1393,7 +1388,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("tan");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1408,7 +1403,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("csc");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1423,7 +1418,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("sec");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1438,7 +1433,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("cot");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1504,7 +1499,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("sinh");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1519,7 +1514,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("cosh");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1534,7 +1529,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("tanh");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1549,7 +1544,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("csch");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1564,7 +1559,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("sech");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1579,7 +1574,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("coth");
var iter = degr.getIterator();
iter.addTxt("-1");
......@@ -1785,7 +1780,7 @@ CMathContent.prototype =
degr.init();
degr.setIndex(-1);
var base = degr.getBase();
base.mergeTxtPrp({Italic: false});
base.setTxtPrp({Italic: false});
base.addTxt("log");
var iter = degr.getIterator();
iter.fillPlaceholders();
......
Word/Math/mathText.js
View file @ 4518ee0c
......@@ -149,7 +149,6 @@ CMathText.prototype =
{
this.TxtPrp = new CMathTextPrp();
this.TxtPrp.Merge(txtPrp);
},
setLIterator: function(bIterator)
{
......
Word/Math/nary.js
View file @ 4518ee0c
......@@ -129,7 +129,7 @@ CNaryUnd.prototype.init = function(sign)
}
CNaryUnd.prototype.setDistance = function()
{
var zetta = this.Parent.getTxtPrp().FontSize* 25.4/96;
var zetta = this.getTxtPrp().FontSize* 25.4/96;
this.dH = zetta*0.25;
}
CNaryUnd.prototype.getCenter = function()
......@@ -158,7 +158,7 @@ CNaryOvr.prototype.init = function(sign)
}
CNaryOvr.prototype.setDistance = function()
{
var zetta = this.Parent.getTxtPrp().FontSize* 25.4/96;
var zetta = this.getTxtPrp().FontSize* 25.4/96;
this.dH = zetta*0.1;
}
CNaryOvr.prototype.getCenter = function()
......@@ -191,7 +191,7 @@ CNaryUndOvr.prototype.init = function(sign)
}
CNaryUndOvr.prototype.recalculateSize = function()
{
var zetta = this.Parent.getTxtPrp().FontSize* 25.4/96;
var zetta = this.getTxtPrp().FontSize* 25.4/96;
this.gapTop = zetta*0.25;
this.gapBottom = zetta*0.1;
......@@ -284,8 +284,8 @@ CNaryUndOvr.prototype.getUpperIterator = function()
function CNaryOperator(flip)
{
this.TxtPrp = new CMathTextPrp();
this.bFlip = (flip == -1);
this.sizeGlyph = null;
}
CNaryOperator.prototype.draw = function()
......@@ -298,7 +298,7 @@ CNaryOperator.prototype.draw = function()
var XX = new Array(),
YY = new Array();
var textScale = this.Parent.getTxtPrp().FontSize/850; // 1000 pt
var textScale = this.getTxtPrp().FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
// g_dKoef_px_to_mm = 25.4/96
......@@ -361,6 +361,14 @@ CNaryOperator.prototype.Resize = function()
{
this.recalculateSize();
}
CNaryOperator.prototype.setTxtPrp = function(txtPrp)
{
this.TxtPrp.Merge(txtPrp);
}
CNaryOperator.prototype.getTxtPrp = function()
{
return this.TxtPrp;
}
function CSigma()
{
......@@ -477,7 +485,7 @@ CSigma.prototype.getCoord = function()
X[35] = 16252; Y[35] = 5200;
var textScale = this.Parent.getTxtPrp().FontSize/850; // 1000 pt
var textScale = this.getTxtPrp().FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64;
var h1 = Y[0] - Y[21],
......@@ -548,7 +556,7 @@ CSigma.prototype.calculateSizeGlyph = function()
{
// пока размер не меняем в зависимости от высоты аргумента
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 8.997900390624999*betta,
_height = 11.994444444444444*betta;
......@@ -679,7 +687,7 @@ CProduct.prototype.getCoord = function()
X[62] = 67894; Y[62] = 0;
var textScale = this.Parent.getTxtPrp().FontSize/850, // 1000 pt
var textScale = this.getTxtPrp().FontSize/850, // 1000 pt
alpha = textScale*25.4/96 /64;
var h1 = Y[9],
......@@ -709,7 +717,7 @@ CProduct.prototype.getCoord = function()
}
CProduct.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 10.312548828125*betta,
_height = 11.994444444444444*betta;
......@@ -780,7 +788,7 @@ CUnion.prototype.getCoord = function()
}
CUnion.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
this.gap = 0.93*betta;
var _width = 9.38*betta,
......@@ -898,7 +906,7 @@ CLogicalOr.prototype.getCoord = function()
X[6] = 10613; Y[6] = 0;
X[7] = 0; Y[7] = 0;
var textScale = this.Parent.getTxtPrp().FontSize/850, // 1000 pt
var textScale = this.getTxtPrp().FontSize/850, // 1000 pt
alpha = textScale*25.4/96 /64;
var w1 = X[1],
......@@ -929,7 +937,7 @@ CLogicalOr.prototype.getCoord = function()
}
CLogicalOr.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 9.6159*betta,
_height = 11.994444444444444*betta;
......@@ -1158,7 +1166,7 @@ CIntegral.prototype.old_drawPath = function(XX, YY)
}
CIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 8.624*betta,
_height = 13.7*betta;
......@@ -1198,7 +1206,7 @@ CDoubleIntegral.prototype.drawPath = function(XX, YY)
}
CDoubleIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 14.2296*betta,
_height = 13.7*betta;
......@@ -1248,7 +1256,7 @@ CTripleIntegral.prototype.drawPath = function(XX, YY)
}
CTripleIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 18.925368*betta,
_height = 13.7*betta;
......@@ -2689,7 +2697,7 @@ CContourIntegral.prototype.draw = function()
WW = coord2.W,
HH = coord2.H;
var textScale = this.Parent.getTxtPrp().FontSize/850;// 1000 pt
var textScale = this.getTxtPrp().FontSize/850;// 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
var shX = (WW - W)*alpha/2,
......@@ -2733,7 +2741,7 @@ CContourIntegral.prototype.draw = function()
}
CContourIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 8.624*betta,
_height = 13.7*betta;
......@@ -3192,7 +3200,7 @@ CSurfaceIntegral.prototype.draw = function()
HH = coord2.H;
var textScale = this.Parent.getTxtPrp().FontSize/850; // 1000 pt
var textScale = this.getTxtPrp().FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
......@@ -3238,7 +3246,7 @@ CSurfaceIntegral.prototype.draw = function()
}
CSurfaceIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 14.2296*betta,
_height = 13.7*betta;
......@@ -3767,7 +3775,7 @@ CVolumeIntegral.prototype.draw = function()
HH = coord2.H;
var textScale = this.Parent.getTxtPrp().FontSize/850; // 1000 pt
var textScale = this.getTxtPrp().FontSize/850; // 1000 pt
var alpha = textScale*25.4/96 /64; // коэффициент; используется для того чтобы перевести координаты в миллиметры
......@@ -3813,7 +3821,7 @@ CVolumeIntegral.prototype.draw = function()
}
CVolumeIntegral.prototype.calculateSizeGlyph = function()
{
var betta = this.Parent.getTxtPrp().FontSize/36;
var betta = this.getTxtPrp().FontSize/36;
var _width = 18.925368*betta,
_height = 13.7*betta;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7