Skip to content

S
sdkjs
Commit a38fcf86 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@49771 954022d7-b5bf-4e40-9824-e11837661b57
parent 6722aa1e
Hide whitespace changes
Inline Side-by-side
Showing with 496 additions and 81 deletions
Word/Math/diacritical.js
View file @ a38fcf86
......@@ -89,7 +89,7 @@ CBaseDiacritic.prototype.getBase = function()
return this.elements[0][0];
}
function CCircumflex()
function old_CCircumflex()
{
this.AUG = 5;
this.ANGLE = 0.1;
......@@ -98,12 +98,12 @@ function CCircumflex()
CBaseDiacritic.call(this);
}
extend(CCircumflex, CBaseDiacritic);
CCircumflex.prototype.setIndex = function(index)
extend(old_CCircumflex, CBaseDiacritic);
old_CCircumflex.prototype.setIndex = function(index)
{
this.index = index;
}
CCircumflex.prototype.recalculateSize = function()
old_CCircumflex.prototype.recalculateSize = function()
{
var alpha = this.getTxtPrp().FontSize/36;
......@@ -144,7 +144,7 @@ CCircumflex.prototype.recalculateSize = function()
this.size = {width: _width, height: _height, center: _center};
}
CCircumflex.prototype.draw = function()
old_CCircumflex.prototype.draw = function()
{
this.elements[0][0].draw();
......@@ -255,6 +255,173 @@ CCircumflex.prototype.draw = function()
}
function CCircumflex()
{
this.incline = 0;
this.turn = 0;
CBaseDiacritic.call(this);
}
extend(CCircumflex, CBaseDiacritic);
CCircumflex.prototype.setTurn = function(turn)
{
this.turn = turn;
}
CCircumflex.prototype.recalculateSize = function(mSize, bIncl)
{
var alpha = this.getTxtPrp().FontSize/36;
this.accentSize.width = 3.88*alpha;
this.accentSize.height = 3.175*alpha;
var augm = 0.9*mSize.width/this.accentSize.width;
if(augm < 1)
augm = 1;
else if (augm > 5)
augm = 5;
var angle = 0.1;
if( bIncl )
this.incline = mSize.height*angle;
var width = augm*this.accentSize.width,
height = augm*this.accentSize.height,
center = height/2;
/*var Arg = this.elements[0][0].size,
Accent = {width: augm*this.accentSize.width, height: this.accentSize.height};
var _height = Arg.height + Accent.height;
var _center = Arg.center + Accent.height;
var incline = 0;
if( this.IsIncline() )
incline = Arg.height*this.ANGLE;
if(Arg.width < Accent.width)
{
this.shiftAccent = incline;
this.shiftArg = (Arg.width - Accent.width)/2;
_width = Accent.width + incline;
}
else
{
var align = (Arg.width - Accent.width)/2 + incline;
_width = Arg.width > Accent.width + align ? Arg.width : Accent.width + align ;
this.shiftAccent = align;
this.shiftArg = 0;
}*/
this.size = {width: width, height: height, center: center};
}
CCircumflex.prototype.draw = function()
{
this.elements[0][0].draw();
var x = this.pos.x + this.shiftAccent,
y = this.pos.y;
var fontSize = this.getTxtPrp().FontSize;
var penW = fontSize*g_dKoef_pt_to_mm*this.PEN_W;
penW *= 96/25.4;
// g_dKoef_px_to_mm = 25.4/96
var textScale = fontSize/1000, // 1000 pt
alpha = textScale*25.4/96 /64;
var X = new Array(),
Y = new Array();
X[0] = 0; Y[0] = 2373;
X[1] = 9331; Y[1] = 15494;
X[2] = 14913; Y[2] = 15494;
X[3] = 23869; Y[3] = 2373;
X[4] = 20953; Y[4] = 0;
X[5] = 12122; Y[5] = 10118;
X[6] = 11664; Y[6] = 10118;
X[7] = 2833; Y[7] = 0;
X[8] = 0; Y[8] = 2373;
var XX = new Array(),
YY = new Array();
var W = this.size.width/alpha;
var a1 = X[3] - X[0], b1 = W, c1 = X[2] - X[1],
a2 = X[4] - X[7], b2 = W - 2*X[7], c2 = X[5] - X[6] ; //X[8] = 0
var RX = new Array();
for(var i = 0; i < X.length; i++)
RX[i] = 1;
RX[0] = RX[2] = (b1 - c1)/(a1-c1);
RX[4] = RX[6] = (b2 - c2)/(a2-c2);
XX[0] = XX[8] = X[0];
YY[0] = YY[8] = Y[0];
for(var i = 0; i< 4; i++)
{
XX[1 + i] = XX[i] + RX[i]*(X[1+i] - X[i]);
XX[7-i] = XX[8 - i] + RX[7-i]*(X[7-i] - X[8-i]);
YY[1+i] = Y[1+i];
YY[7-i] = Y[7-i];
}
var a,b;
if(this.turn == TURN_0) // вверх
{
a = 0;
b = 1;
}
else if(this.turn == TURN_MIRROR_0)
{
a = YY[1];
b = -1;
}
for(var i = 0; i < XX.length; i++)
{
XX[i] = x + XX[i]*alpha ;
YY[i] = y + (a + b*YY[i])*alpha;
}
var intGrid = MathControl.pGraph.GetIntegerGrid();
MathControl.pGraph.SetIntegerGrid(false);
MathControl.pGraph.p_width(penW*1000);
MathControl.pGraph.b_color1(0,0,0, 255);
MathControl.pGraph._s();
MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._l(XX[1], YY[1]);
MathControl.pGraph._l(XX[2], YY[2]);
MathControl.pGraph._l(XX[3], YY[3]);
MathControl.pGraph._l(XX[4], YY[4]);
MathControl.pGraph._l(XX[5], YY[5]);
MathControl.pGraph._l(XX[6], YY[6]);
MathControl.pGraph._l(XX[7], YY[7]);
MathControl.pGraph._l(XX[8], YY[8]);
MathControl.pGraph._l(XX[9], YY[9]);
MathControl.pGraph._l(XX[10], YY[10]);
MathControl.pGraph._l(XX[11], YY[11]);
MathControl.pGraph.df();
MathControl.pGraph.SetIntegerGrid(intGrid);
}
function CLine()
{
//0x302, 0x333
......@@ -355,7 +522,7 @@ CLine.prototype.draw_doubleLine = function()
}
// TODO: установить смещение в зависимости от наклона буквы (как в CAccent)
// TODO: установить смещение в зависимости от наклона буквы (как в old_CAccent)
function CSign()
{
this.index = null;
......@@ -596,7 +763,111 @@ CSign.prototype.draw_breve = function(up)
}
function CAccent()
function CTilde()
{
CBaseDiacritic.call(this);
}
extend(CTilde, CBaseDiacritic);
CTilde.prototype.recalculateSize = function()
{
var betta = this.getTxtPrp().FontSize/36;
var width = 9.047509765625*betta; // реальная на отрисовке width 7.495282031249999
var height = 2.469444444444444*betta;
this.size = {width: width, heigth: height};
}
CTilde.prototype.draw = function()
{
var X = new Array(),
Y = new Array();
X[0] = 0; Y[0] = 3066;
X[1] = 2125; Y[1] = 7984;
X[2] = 5624; Y[2] = 11256;
X[3] = 9123; Y[3] = 14528;
X[4] = 13913; Y[4] = 14528;
X[5] = 18912; Y[5] = 14528;
X[6] = 25827; Y[6] = 10144;
X[7] = 32742; Y[7] = 5760;
X[8] = 36324; Y[8] = 5760;
X[9] = 39865; Y[9] = 5760;
X[10] = 42239; Y[10] = 7641;
X[11] = 44614; Y[11] = 9522;
X[12] = 47030; Y[12] = 13492;
X[13] = 50362; Y[13] = 11254;
X[14] = 48571; Y[14] = 7544;
X[15] = 44697; Y[15] = 3772;
X[16] = 40823; Y[16] = 0;
X[17] = 35283; Y[17] = 0;
X[18] = 29951; Y[18] = 0;
X[19] = 23098; Y[19] = 4384;
X[20] = 16246; Y[20] = 8768;
X[21] = 12622; Y[21] = 8768;
X[22] = 9581; Y[22] = 8768;
X[23] = 7290; Y[23] = 6845;
X[24] = 4999; Y[24] = 4922;
X[25] = 3249; Y[25] = 1243;
X[26] = 0; Y[26] = 3066;
var XX = new Array(),
YY = new Array();
var fontSize = this.getTxtPrp().FontSize;
var textScale = fontSize/1000, // 1000 pt
alpha = textScale*25.4/96 /64 ; // g_dKoef_px_to_mm = 25.4/96
var align = this.size.width - X[13]*alpha;
var x = this.pos.x + align/2,
y = this.pos.y;
for(var i = 0; i < X.length; i++)
{
XX[i] = x + X[i]*alpha;
YY[i] = y + (Y[5] - Y[i])*alpha*0.65; // сжали !
}
var penW = fontSize*g_dKoef_pt_to_mm*this.PEN_W;
penW *= 96/25.4;
var intGrid = MathControl.pGraph.GetIntegerGrid();
MathControl.pGraph.SetIntegerGrid(false);
MathControl.pGraph.p_width(penW*1000);
MathControl.pGraph.b_color1(0,0,0, 255);
MathControl.pGraph._s();
MathControl.pGraph._m(XX[0], YY[0]);
MathControl.pGraph._c(XX[0], YY[0], XX[1], YY[1], XX[2], YY[2] );
MathControl.pGraph._c(XX[2], YY[2], XX[3], YY[3], XX[4], YY[4] );
MathControl.pGraph._c(XX[4], YY[4], XX[5], YY[5], XX[6], YY[6] );
MathControl.pGraph._c(XX[6], YY[6], XX[7], YY[7], XX[8], YY[8] );
MathControl.pGraph._c(XX[8], YY[8], XX[9], YY[9], XX[10], YY[10] );
MathControl.pGraph._c(XX[10], YY[10], XX[11], YY[11], XX[12], YY[12] );
MathControl.pGraph._l(XX[13], YY[13]);
MathControl.pGraph._c(XX[13], YY[13], XX[14], YY[14], XX[15], YY[15] );
MathControl.pGraph._c(XX[15], YY[15], XX[16], YY[16], XX[17], YY[17] );
MathControl.pGraph._c(XX[17], YY[17], XX[18], YY[18], XX[19], YY[19] );
MathControl.pGraph._c(XX[19], YY[19], XX[20], YY[20], XX[21], YY[21] );
MathControl.pGraph._c(XX[21], YY[21], XX[22], YY[22], XX[23], YY[23] );
MathControl.pGraph._c(XX[23], YY[23], XX[24], YY[24], XX[25], YY[25] );
MathControl.pGraph._l(XX[26], YY[26]);
MathControl.pGraph.df();
MathControl.pGraph.SetIntegerGrid(intGrid);
}
CTilde.prototype.setPosition = function(pos)
{
this.pos = pos;
}
function old_CAccent()
{
this.index = null;
this.DIACR_ANGLE = 0.1;
......@@ -604,8 +875,8 @@ function CAccent()
CMathBase.call(this);
}
// посмотреть смещение у диакритических знаков
extend(CAccent, CMathBase);
CAccent.prototype.init = function(index)
extend(old_CAccent, CMathBase);
old_CAccent.prototype.init = function(index)
{
this.index = index;
this.setDimension(2, 1);
......@@ -629,7 +900,7 @@ CAccent.prototype.init = function(index)
this.addMCToContent(oAccent, oBase);
}
CAccent.prototype.recalculateSize = function()
old_CAccent.prototype.recalculateSize = function()
{
var first = this.elements[0][0].size,
second = this.elements[1][0].size;
......@@ -660,11 +931,11 @@ CAccent.prototype.recalculateSize = function()
this.size = {width: width, height: height, center: center};
}
CAccent.prototype.getCenter = function()
old_CAccent.prototype.getCenter = function()
{
return this.elements[0][0].size.height + this.elements[1][0].size.center + this.dH;
}
CAccent.prototype.setPosition = function(pos)
old_CAccent.prototype.setPosition = function(pos)
{
this.pos = {x: pos.x, y: pos.y - this.size.center};
......@@ -714,11 +985,102 @@ CAccent.prototype.setPosition = function(pos)
this.elements[1][0].setPosition(pos2);
}
CAccent.prototype.IsIncline = function()
old_CAccent.prototype.IsIncline = function()
{
return this.elements[1][0].IsIncline();
}
CAccent.prototype.setDistance = function()
old_CAccent.prototype.setDistance = function()
{
this.dH = 0.7*this.getTxtPrp().FontSize/36;
}
\ No newline at end of file
}
function CAccent()
{
this.bDiacritic = true;
this.type = null;
this.accent = null;
CMathBase.call(this);
}
extend(old_CAccent, CMathBase);
CAccent.prototype.init = function(props)
{
var code = props.chr.value.charCodeAt(0);
var bDot = code === 0x307 || props.chr.type === ACCENT_ONE_DOT,
b2Dots = code === 0x308 || props.chr.type === ACCENT_TWO_DOTS,
b3Dots = code === 0x20DB || props.chr.type === ACCENT_THREE_DOTS,
bAccGrave = code === 0x300 || props.chr.type === ACCENT_GRAVE,
bAccAcute = code === 0x301 || props.chr.type === ACCENT_ACUTE;
if(bDot || b2Dots || b3Dots || bAccGrave || bAccAcute)
{
this.accent = new CMathText();
this.accent.add(code);
this.type = props.chr.type;
}
else if(code === 0x302 || props.chr.type === ACCENT_CIRCUMFLEX)
{
this.accent = new CCircumflex();
this.accent.setTurn(TURN_0);
}
else if(code === 0x30C || props.chr.type === ACCENT_COMB_CARON)
{
this.accent = new CCircumflex();
this.accent.setTurn(TURN_MIRROR_0);
}
else if(code === 0x332 || props.chr.type === ACCENT_LINE)
{
this.accent = new CLine();
this.accent.setPrp(SINGLE_LINE);
}
else if(code === 0x333 || props.chr.type === ACCENT_DOUBLE_LINE)
{
this.accent = new CLine();
this.accent.setPrp(DOUBLE_LINE);
}
else
{
this.accent = new CMathText();
this.accent.add(code);
this.type = MATH_TEXT;
this.bDiacritic = false;
}
this.setDimension(1, 1);
this.setContent();
}
CAccent.prototype.recalculateSize = function()
{
var content = this.elements[0][0];
this.dH = 0.7*this.getTxtPrp().FontSize/36;
if(this.bDiacritic)
this.accent.fixSize(content.size.width, content.Incline());
var height = this.accent.size.height + content.size.height,
center = this.accent.size.height + content.size.center;
var accW;
if(this.bDiacritic)
accW = this.accent.size.width + this.accent.incline;
else
accW = this.accent.size.width;
var width = accW > content.size.width ? accW : content.size.width;
this.size = {width: width, height: height, center: center};
//var height = first.height + second.height + this.dH;
//var center = this.elements[0][0].size.height + this.elements[1][0].size.center + this.dH;
}
CAccent.prototype.setPosition = function(pos)
{
this.pos = {x: pos.x, y: pos.y - this.size.center};
var pos =
{
x: this.pos.x + (this.size.width - this.elements[0][0].size.width)/2;
};
this.elements[0][0].setPosition()
}
Word/Math/limit.js
View file @ a38fcf86
......@@ -57,6 +57,7 @@ CLimit.prototype.init = function(props)
this.setDimension(2, 1);
var oBase = new CMathContent();
oBase.setOwnTPrp({Italic: false});
var oIter = new CMathContent();
......@@ -73,7 +74,7 @@ CLimit.prototype.getCenter = function()
if(this.type == LIMIT_LOW)
center = this.elements[0][0].size.center;
else if(this.type == LIMIT_UP)
center = this.elements[0][0].size.height + this.elements[1][0].size.center;
center = this.elements[0][0].size.height + this.dH + this.elements[1][0].size.center;
return center;
}
......
Word/Math/logarithm.js
View file @ a38fcf86
......@@ -17,7 +17,6 @@ CLogarithm.prototype.setContent = function()
oBase.addText("log");
//oBase.setContent.apply(oBase, NameFunctions.minimax[3] );
var oFunc = new CDegreeOrdinary(-1);
oFunc.init(this.params);
oFunc.relate(this);
......
Word/Math/mathContent.js
View file @ a38fcf86
......@@ -42,8 +42,6 @@ function mathElem(_val)
//TODO
//переделать/продумать DotIndef, т.к. при перетаскивании из одного места в другое флаг DotIndef может измениться для другого контента
//TODO
//сделать более понятным индефикатор bMText
//TODO
//пересмотреть this.dW и this.dH
......@@ -55,37 +53,16 @@ function mathElem(_val)
//сделать, чтобы курсор выставлялся только, где это действительно необходимо
//в качетве позиции для контента передавать положение baseLine для него
//TODO
//indefSize убрать
//TODO
//переделать CDegree
//TODO
//убрать CSymbol
//TODO
//пересмотреть/убрать CSubMathBase
//TODO
//переделать степень для случая с 2-мя итераторами : посмотреть как сделано для n-арного оператора
//TODO
//сделать у радикала степень
// TODO Refactoring
// 1. переделать mouseMove (вызов из this.SelectContent, а не из this.Root, далее если state == false, подниматься наверх)
// 1. (!!) повтор IsIncline, IsHighElement
// 2. (!!) переделать add / add_mathComponent / addText / addLetter
// 3. home/end if( IsTarget() )
// 4. relate => сделать 2 функции : одну установить базовый контент корнем(Root) и функцию установить родительский класс (setParent)
// 5. update_widthContent добавить в recalculateSize (убрать recalculate в CMathContent)
// 6. (скорее всего) убрать coordWOGaps
// 7. убрать getMetricsLetter
// 8. setFont и updateTextPrp переделать (сделать, чтобы font менялся для заселекченной части контента)
// 1.
// 2. (!!) повтор IsIncline, IsHighElement
function CMathContent()
......@@ -135,6 +112,12 @@ 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) );
},
setPrp: function(prp) //текстовые настройки
{
this.OwnTPrp.Merge(prp);
for(var i = 0; i < this.content.length; i++)
this.content[i].value.setOwnTPrp(prp);
},
setTxtPrp: function(txtPrp)
{
this.TxtPrp.Merge(txtPrp);
......@@ -3975,9 +3958,18 @@ CMathContent.prototype =
arg2.addTxt("θ");
break;
case 152:
var diac = this.addMComponent(15);
/*var diac = this.addMComponent(15);
diac.init(3);
diac.fillPlaceholders();
diac.fillPlaceholders();*/
var delim = this.addMComponent(MATH_GROUP_CHARACTER);
var props =
{
chr: {value: "."},
location: LOCATION_TOP,
justif: VJUST_BOT
};
delim.init(props);
delim.fillPlaceholders();
break;
case 153:
var diac = this.addMComponent(15);
......@@ -4060,8 +4052,46 @@ CMathContent.prototype =
delim.fillPlaceholders();
break;
case 165:
var lim = this.addMComponent(MATH_LIMIT);
var props =
{
type: LIMIT_UP
};
lim.init(props);
var iter = lim.getIterator();
iter.fillPlaceholders();
var func = lim.getFName();
func.setPrp({Italic: true});
var grCh = func.addMComponent(MATH_GROUP_CHARACTER);
var props2 =
{
chr: {type: BRACKET_CURLY_TOP},
location: LOCATION_TOP,
justif: VJUST_BOT
};
grCh.init(props2);
grCh.fillPlaceholders();
break;
case 166:
var lim = this.addMComponent(MATH_LIMIT);
var props =
{
type: LIMIT_LOW
};
lim.init(props);
var iter = lim.getIterator();
iter.fillPlaceholders();
var func = lim.getFName();
func.setPrp({Italic: true});
var grCh = func.addMComponent(MATH_GROUP_CHARACTER);
var props2 =
{
chr: {type: BRACKET_CURLY_BOTTOM},
location: LOCATION_BOT,
justif: VJUST_TOP
};
grCh.init(props2);
grCh.fillPlaceholders();
break;
case 167:
var delim = this.addMComponent(MATH_GROUP_CHARACTER);
......
Word/Math/mathTypes.js
View file @ a38fcf86
......@@ -74,10 +74,10 @@ var ARROW_LR = 20;
var HALF_ARROW_LEFT = 21;
var HALF_ARROW_RIGHT = 22;
var DELIMITER_TURN_0 = 0;
var DELIMITER_TURN_180 = 1;
var DELIMITER_TURN_MIRROR_0 = 2;
var DELIMITER_TURN_MIRROR_180 = 3;
var TURN_0 = 0;
var TURN_180 = 1;
var TURN_MIRROR_0 = 2;
var TURN_MIRROR_180 = 3;
var DELIMITER_SHAPE_MATH = 0;
var DELIMITER_SHAPE_CENTERED = 1;
......@@ -85,6 +85,19 @@ var DELIMITER_SHAPE_CENTERED = 1;
var LIMIT_LOW = 0;
var LIMIT_UP = 1;
var ACCENT_ONE_DOT = 0;
var ACCENT_TWO_DOTS = 1;
var ACCENT_THREE_DOTS = 2;
var ACCENT_GRAVE = 3;
var ACCENT_ACUTE = 4;
var ACCENT_CIRCUMFLEX = 5;
var ACCENT_COMB_CARON = 6;
var ACCENT_LINE = 7;
var ACCENT_DOUBLE_LINE = 8;
var SINGLE_LINE = 9;
var DOUBLE_LINE = 10;
var MATH_TEXT = 11;
var MATRIX_CENTER = 0;
var MATRIX_TOP = 1;
var MATRIX_BOTTOM = 2;
\ No newline at end of file
Word/Math/operators.js
View file @ a38fcf86
......@@ -18,6 +18,7 @@ function CGlyphOperator()
this.penW = 1; // px
this.TxtPrp = new CMathTextPrp();
this.bGlyph = true;
}
CGlyphOperator.prototype.init = function(props)
......@@ -1017,7 +1018,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1027,7 +1028,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1037,7 +1038,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1047,7 +1048,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1057,7 +1058,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1067,7 +1068,7 @@ function GetGlyph(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1078,7 +1079,7 @@ function GetGlyph(chr, location)
{
location: location,
//location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1089,7 +1090,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_RIGHT,
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1100,7 +1101,7 @@ function GetGlyph(chr, location)
{
location: location,
//location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1111,7 +1112,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1122,7 +1123,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1133,7 +1134,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_MIRROR_0
turn: TURN_MIRROR_0
};
operator.init(props);
}
......@@ -1144,7 +1145,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_MIRROR_180
turn: TURN_MIRROR_180
};
operator.init(props);
}
......@@ -1155,7 +1156,7 @@ function GetGlyph(chr, location)
{
location: location,
//location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1166,7 +1167,7 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1177,14 +1178,17 @@ function GetGlyph(chr, location)
{
//location: DELIMITER_LOCATION_LEFT,
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
else if( chr.value === "" || chr.type === BRACKET_EMPTY)
operator = -1;
else
operator = -1;
{
operator = new CMathText();
operator.add(chr.value.charCodeAt(0));
}
return operator;
......@@ -1201,7 +1205,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: LOCATION_BOT,
turn: DELIMITER_TURN_MIRROR_0
turn: TURN_MIRROR_0
};
operator.init(props);
}
......@@ -1212,7 +1216,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1222,7 +1226,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_MIRROR_0
turn: TURN_MIRROR_0
};
operator.init(props);
}
......@@ -1232,7 +1236,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1242,7 +1246,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
......@@ -1252,7 +1256,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1262,7 +1266,7 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.init(props);
}
......@@ -1272,10 +1276,15 @@ function GetGlyph_GrChr(chr, location)
var props =
{
location: location,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.init(props);
}
else
{
operator = new CMathText();
operator.add(chr.value.charCodeAt(0));
}
return operator;
}
......@@ -1575,7 +1584,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.ini(props);
}
......@@ -1585,7 +1594,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.ini(props);
}
......@@ -1595,7 +1604,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.ini(props);
}
......@@ -1605,7 +1614,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.ini(props);
}
......@@ -1615,7 +1624,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.ini(props);
}
......@@ -1625,7 +1634,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.ini(props);
}
......@@ -1635,7 +1644,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_LEFT,
turn: DELIMITER_TURN_0
turn: TURN_0
};
operator.ini(props);
}
......@@ -1645,7 +1654,7 @@ CBaseDelimiter.prototype.getOperator = function(chr)
var props =
{
location: DELIMITER_LOCATION_RIGHT,
turn: DELIMITER_TURN_180
turn: TURN_180
};
operator.ini(props);
}
......@@ -4349,6 +4358,7 @@ COperator.prototype.draw = function()
}
COperator.prototype.fixSize = function(measure)
{
if(this.glyph !== -1)
{
this.glyph.fixSize(measure);
......
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