Skip to content

S
sdkjs
Commit c50806b1 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov
Browse files
Options

добавлены случаи при удалении, когда выделяется вся формула 

SetRunEmptyToContent вызывается для каждого контента
символы в виде юникода

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56878 954022d7-b5bf-4e40-9824-e11837661b57
parent d6de06ae
Show whitespace changes
Inline Side-by-side
Showing with 251 additions and 554 deletions
Word/Editor/Math.js
View file @ c50806b1
......@@ -225,14 +225,6 @@ ParaMath.prototype =
Remove : function(Direction, bOnAddText)
{
var oContent = this.GetSelectContent();
/*var Comp = oContent.Content.GetParent();
Comp.SetSelectAll();
Comp.SelectToParent();
this.bSelectionUse = true;*/
if (oContent.Start == oContent.End)
{
var oElem = oContent.Content.getElem(oContent.Start);
......@@ -240,7 +232,12 @@ ParaMath.prototype =
if (oElem.typeObj == MATH_COMP)
this.RemoveElem(oContent, Direction, bOnAddText);
else if (oElem.typeObj == MATH_PLACEHOLDER && bOnAddText == false)
return;
{
var Comp = oContent.Content.GetParent();
Comp.SetSelectAll();
Comp.SelectToParent();
this.bSelectionUse = true;
}
else if (oElem.typeObj == MATH_PLACEHOLDER && bOnAddText == true)
{
History.Create_NewPoint();
......@@ -261,11 +258,74 @@ ParaMath.prototype =
}
else //pararun
{
if ((Direction > 0 && oElem.State.ContentPos + 1 > oElem.Content.length) || (Direction < 0 && oElem.State.ContentPos - 1 < 0))
if (Direction < 0 && oElem.State.ContentPos - 1 < 0) //backspase
{
if (oContent.Content.CurPos - 1 >= 0)//слева есть элементы
{
var prevElem = oContent.Content.getElem(oContent.Start - 1);
if (prevElem.typeObj == MATH_COMP) //слева композиция
{
this.Set_Select_ToMComp(Direction);
return;
}
else //слева ран
{
History.Create_NewPoint();
prevElem.Remove(Direction, bOnAddText);
if(prevElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
{
var Items = [];
Items.push(prevElem.Parent.content[0]);
prevElem.Parent.content.splice( 0, 1 );
History.Add(prevElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: 0});
prevElem.Parent.CurPos--;
}
return;
}
}
else //переходим на уровень выше и выделяем композицию
{
var Comp = oContent.Content.GetParent();
Comp.SetSelectAll();
Comp.SelectToParent();
this.bSelectionUse = true;
}
}
else if (Direction > 0 && oElem.State.ContentPos + 1 > oElem.Content.length) //delete
{
if (oContent.Content.CurPos + 1 >= oContent.Content.content.length) //переходим на уровень выше и выделяем композицию
{
var Comp = oContent.Content.GetParent();
Comp.SetSelectAll();
Comp.SelectToParent();
this.bSelectionUse = true;
}
else //справа есть элемент
{
var nextElem = oContent.Content.getElem(oContent.Start + 1);
if (nextElem.typeObj == MATH_COMP) //справа композиция
{
this.Set_Select_ToMComp(Direction);
return;
}
else //справа ран
{
History.Create_NewPoint();
nextElem.State.ContentPos = 0;
nextElem.Remove(Direction, bOnAddText);
if(nextElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
{
var Items = [];
Items.push(nextElem.Parent.content[0]);
nextElem.Parent.content.splice( 0, 1 );
History.Add(nextElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: 0});
}
return;
}
}
}
History.Create_NewPoint();
oElem.Remove(Direction, bOnAddText);
if(oElem.Content.length == 0 && !bOnAddText) //тк pararun пустой, удаляем его
......@@ -274,6 +334,8 @@ ParaMath.prototype =
Items.push(oElem.Parent.content[0]);
oElem.Parent.content.splice( 0, 1 );
History.Add(oElem.Parent, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: 0});
if (Direction < 0)
oContent.Content.CurPos--;
}
}
}
......@@ -297,6 +359,7 @@ ParaMath.prototype =
{
Items.push(oContent.Content.content[i]);
oContent.Content.content.splice( i, 1 );
if (Direction < 0)
oContent.Content.CurPos--;
}
History.Add(oContent.Content, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: oContent.Start});
......
Word/Editor/Serialize2.js
View file @ c50806b1
......@@ -7317,7 +7317,6 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
res = this.bcr.Read1(length, function(t, l){
return oThis.boMathr.ReadMathArg(t,l,oMathPara.Root);
});
oMathPara.Root.SetRunEmptyToContent(true);
}
else if (c_oSerParType.Hyperlink == type) {
var oHyperlinkObj = {Link: null, Anchor: null, Tooltip: null, History: null, DocLocation: null, TgtFrame: null};
......@@ -8406,6 +8405,8 @@ function Binary_oMathReader(stream)
}
else
res = c_oSerConstants.ReadUnknown;
oElem.SetRunEmptyToContent(true);
return res;
};
this.ReadMathArgPr = function(type, length, oElem)
......@@ -8441,7 +8442,7 @@ function Binary_oMathReader(stream)
var oThis = this;
if (c_oSer_OMathBottomNodesValType.Val === type)
{
props.begChr = this.stream.GetString2LE(length);
props.begChr = this.stream.GetString2LE(length).charCodeAt(0);
}
else
res = c_oSerConstants.ReadUnknown;
......@@ -8729,7 +8730,7 @@ function Binary_oMathReader(stream)
var oThis = this;
if (c_oSer_OMathBottomNodesValType.Val === type)
{
var text = this.stream.GetString2LE(length);
var text = this.stream.GetString2LE(length).charCodeAt(0);
props.chr = text;
}
else
......@@ -8941,7 +8942,7 @@ function Binary_oMathReader(stream)
var oThis = this;
if (c_oSer_OMathBottomNodesValType.Val === type)
{
props.endChr = this.stream.GetString2LE(length);
props.endChr = this.stream.GetString2LE(length).charCodeAt(0);
}
else
res = c_oSerConstants.ReadUnknown;
......@@ -9752,7 +9753,6 @@ function Binary_oMathReader(stream)
res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oOMathPara.Root);
});
oOMathPara.Root.SetRunEmptyToContent(true);
}
else if (c_oSer_OMathContentType.OMathParaPr === type)
{
......@@ -9911,7 +9911,10 @@ function Binary_oMathReader(stream)
if (oDeg.content && length == 0 && props.degHide !== true)
oDeg.content.fillPlaceholders();
else if ( oDeg.content && length == 0 && props.degHide == true)
{
oDeg.content.degHide = true;
oDeg.content = null;
}
res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oDeg.content);
......@@ -10005,7 +10008,7 @@ function Binary_oMathReader(stream)
var oThis = this;
if (c_oSer_OMathBottomNodesValType.Val === type)
{
props.sepChr = this.stream.GetString2LE(length);
props.sepChr = this.stream.GetString2LE(length).charCodeAt(0);
}
else
res = c_oSerConstants.ReadUnknown;
......
Word/Math/mathContent.js
View file @ c50806b1
......@@ -5053,6 +5053,7 @@ CMathContent.prototype =
this.Parent = Parent;
}
if (!this.bRoot && this.content.length == 0)
if (!this.degHide)
this.fillPlaceholders();
var lng = this.content.length;
......@@ -6996,17 +6997,14 @@ CMathContent.prototype =
{
case 1: var oFraction = new CFraction(props);
this.CreateFraction(oFraction, this, null, null);
oFraction.fillPlaceholders();
break;
case 2: props = {ctrPrp: new CTextPr(), type:SKEWED_FRACTION};
var oFraction = new CFraction(props);
this.CreateFraction(oFraction, this, null, null);
oFraction.fillPlaceholders();
break;
case 3: props = {ctrPrp: new CTextPr(), type:LINEAR_FRACTION};
var oFraction = new CFraction(props);
this.CreateFraction(oFraction, this, null, null);
oFraction.fillPlaceholders();
break;
case 4: var oBox = new CBox(props);
this.CreateElem(oBox, this)
......@@ -7015,7 +7013,6 @@ CMathContent.prototype =
//здесь выставляем для oElem argPr.argSz=-1; этой обертки нет
var oFraction = new CFraction(props);
this.CreateFraction(oFraction, oElem, null, null);
oFraction.fillPlaceholders();
break;
case 5: var oFraction = new CFraction(props);
var sNum = "dx";
......@@ -7045,32 +7042,24 @@ CMathContent.prototype =
case 10: props = {ctrPrp: new CTextPr(), type:DEGREE_SUPERSCRIPT};
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, this, null, null, null);
oDegree.fillPlaceholders();
break;
case 11: props = {ctrPrp: new CTextPr(), type:DEGREE_SUBSCRIPT};
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, this, null, null, null);
oDegree.fillPlaceholders();
break;
case 12: props = {ctrPrp: new CTextPr(), type:DEGREE_SubSup};
var oDegree = new CDegreeSubSup(props);
this.CreateDegree(oDegree, this, null, null, null);
var oSub = oDegree.getLowerIterator();
oSub.fillPlaceholders();
var oSup = oDegree.getUpperIterator();
oSup.fillPlaceholders();
var oElem = oDegree.getBase();
oElem.fillPlaceholders();
break;
case 13: props = {ctrPrp: new CTextPr(), type:DEGREE_PreSubSup};
var oDegree = new CDegreeSubSup(props);
this.CreateDegree(oDegree, this, null, null, null);
var oSub = oDegree.getLowerIterator();
oSub.fillPlaceholders();
var oSup = oDegree.getUpperIterator();
oSup.fillPlaceholders();
var oElem = oDegree.getBase();
oElem.fillPlaceholders();
break;
case 14: props = {ctrPrp: new CTextPr(), type:DEGREE_SUBSCRIPT};
var oDegree = new CDegree(props);
......@@ -7104,29 +7093,25 @@ CMathContent.prototype =
var oDegreeSubSup = new CDegreeSubSup(props);
this.CreateDegree(oDegreeSubSup, this, sBase, sSup, sSub);
break;
case 18: props = {ctrPrp: new CTextPr(), type:SQUARE_RADICAL, degHede:true};
case 18: props = {ctrPrp: new CTextPr(), type:SQUARE_RADICAL, degHide:true};
var oRadical = new CRadical(props);
this.CreateRadical(oRadical, this, null, null);
oRadical.fillPlaceholders();
break;
case 19: props = {ctrPrp: new CTextPr(), type:DEGREE_RADICAL};
var oRadical = new CRadical(props);
this.CreateRadical(oRadical, this, null, null);
oRadical.fillPlaceholders();
break;
case 20: props = {ctrPrp: new CTextPr(), type:DEGREE_RADICAL};
var sDeg = "2";
var oRadical = new CRadical(props);
this.CreateRadical(oRadical, this, null, sDeg);
var oElem = oRadical.getBase();
oElem.fillPlaceholders();
break;
case 21: props = {ctrPrp: new CTextPr(), type:DEGREE_RADICAL};
var sDeg = "3";
var oRadical = new CRadical(props);
this.CreateRadical(oRadical, this, null, sDeg);
var oElem = oRadical.getBase();
oElem.fillPlaceholders();
break;
case 22: var oFraction = new CFraction(props);
this.CreateElem(oFraction, this);
......@@ -7135,10 +7120,13 @@ CMathContent.prototype =
var sText = "-b" + String.fromCharCode(177);
this.AddText(oElemNum, sText);
props = {ctrPrp: new CTextPr(), type:DEGREE_RADICAL, degHede:true};
props = {ctrPrp: new CTextPr(), type:DEGREE_RADICAL, degHide:true};
var oRadical = new CRadical(props);
this.CreateElem(oRadical, oElemNum);
var oElem = oRadical.getBase();
var oDeg = oRadical.getDegree();
oDeg.degHide = true;
oDeg = null;
props = {ctrPrp: new CTextPr(), type:DEGREE_SUPERSCRIPT};
var oDegree = new CDegree(props);
......@@ -7153,9 +7141,12 @@ CMathContent.prototype =
var oElemDen = oFraction.getDenominator();
this.AddText(oElemDen, "2a");
break;
case 23: props = {ctrPrp: new CTextPr(), type:SQUARE_RADICAL, degHede:true};
case 23: props = {ctrPrp: new CTextPr(), type:SQUARE_RADICAL, degHide:true};
var oRadical = new CRadical(props);
this.CreateElem(oRadical, this);
var oDeg = oRadical.getDegree();
oDeg.degHide = true;
oDeg = null;
var oElem = oRadical.getBase();
props = {ctrPrp: new CTextPr(), type:DEGREE_SUPERSCRIPT};
......@@ -7176,7 +7167,6 @@ CMathContent.prototype =
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 25: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup};
var oNary = new CNary(props);
......@@ -7184,9 +7174,6 @@ CMathContent.prototype =
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 26: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr};
var oNary = new CNary(props);
......@@ -7194,154 +7181,101 @@ CMathContent.prototype =
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 27: var sVal = String.fromCharCode(8748);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:sVal};
case 27: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:8748};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 28: var sVal = String.fromCharCode(8748);
props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:sVal};
case 28: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:8748};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 29: var sVal = String.fromCharCode(8748);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:sVal};
case 29: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:8748};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 30: var sVal = String.fromCharCode(8749);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:sVal};
case 30: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:8749};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 31: var sVal = String.fromCharCode(8749);
props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:sVal};
case 31: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:8749};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 32: var sVal = String.fromCharCode(8749);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:sVal};
case 32: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:8749};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 33: var sVal = String.fromCharCode(8750);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:sVal};
case 33: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:8750};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 34: var sVal = String.fromCharCode(8750);
props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:sVal};
case 34: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:8750};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 35: var sVal = String.fromCharCode(8750);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:sVal};
case 35: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:8750};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 36: var sVal = String.fromCharCode(8751);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:sVal};
case 36: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:8751};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 37: var sVal = String.fromCharCode(8751);
props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:sVal};
case 37: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:8751};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 38: var sVal = String.fromCharCode(8751);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:sVal};
case 38: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:8751};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 39: var sVal = String.fromCharCode(8752);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:sVal};
case 39: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, subHide:true, supHide:true, chr:8752};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 40: var sVal = String.fromCharCode(8752);
props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:sVal};
case 40: props = {ctrPrp: new CTextPr(), limLoc:NARY_SubSup, chr:8752};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 41: var sVal = String.fromCharCode(8752);
props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:sVal};
case 41: props = {ctrPrp: new CTextPr(), limLoc:NARY_UndOvr, chr:8752};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 42: props = {ctrPrp: new CTextPr(), diff:1};
var sVal = "dx";
......@@ -7358,337 +7292,224 @@ CMathContent.prototype =
var oBox = new CBox(props);
this.CreateBox(oBox,this,sVal);
break;
case 45: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 45: props = {ctrPrp: new CTextPr(), chr:8721, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 46: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 46: props = {ctrPrp: new CTextPr(), chr:8721, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 47: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 47: props = {ctrPrp: new CTextPr(), chr:8721, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 48: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 48: props = {ctrPrp: new CTextPr(), chr:8721, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 49: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 49: props = {ctrPrp: new CTextPr(), chr:8721, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 50: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 50: props = {ctrPrp: new CTextPr(), chr:8719, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 51: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 51: props = {ctrPrp: new CTextPr(), chr:8719, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 52: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 52: props = {ctrPrp: new CTextPr(), chr:8719, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 53: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 53: props = {ctrPrp: new CTextPr(), chr:8719, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 54: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 54: props = {ctrPrp: new CTextPr(), chr:8719, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 55: var sChar = String.fromCharCode(8720);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 55: props = {ctrPrp: new CTextPr(), chr:8720, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 56: var sChar = String.fromCharCode(8720);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 56: props = {ctrPrp: new CTextPr(), chr:8720, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 57: var sChar = String.fromCharCode(8720);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 57: props = {ctrPrp: new CTextPr(), chr:8720, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 58: var sChar = String.fromCharCode(8720);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 58: props = {ctrPrp: new CTextPr(), chr:8720, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 59: var sChar = String.fromCharCode(8720);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 59: props = {ctrPrp: new CTextPr(), chr:8720, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 60: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 60: props = {ctrPrp: new CTextPr(), chr:8899, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 61: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 61: props = {ctrPrp: new CTextPr(), chr:8899, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 62: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 62: props = {ctrPrp: new CTextPr(), chr:8899, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 63: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 63: props = {ctrPrp: new CTextPr(), chr:8899, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 64: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 64: props = {ctrPrp: new CTextPr(), chr:8899, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 65: var sChar = String.fromCharCode(8898);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 65: props = {ctrPrp: new CTextPr(), chr:8898, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 66: var sChar = String.fromCharCode(8898);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 66: props = {ctrPrp: new CTextPr(), chr:8898, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 67: var sChar = String.fromCharCode(8898);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 67: props = {ctrPrp: new CTextPr(), chr:8898, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 68: var sChar = String.fromCharCode(8898);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 68: props = {ctrPrp: new CTextPr(), chr:8898, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 69: var sChar = String.fromCharCode(8898);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 69: props = {ctrPrp: new CTextPr(), chr:8898, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 70: var sChar = String.fromCharCode(8897);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 70: props = {ctrPrp: new CTextPr(), chr:8897, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 71: var sChar = String.fromCharCode(8897);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 71: props = {ctrPrp: new CTextPr(), chr:8897, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 72: var sChar = String.fromCharCode(8897);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 72: props = {ctrPrp: new CTextPr(), chr:8897, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 73: var sChar = String.fromCharCode(8897);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 73: props = {ctrPrp: new CTextPr(), chr:8897, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 74: var sChar = String.fromCharCode(8897);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 74: props = {ctrPrp: new CTextPr(), chr:8897, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 75: var sChar = String.fromCharCode(8896);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, subHide:true, supHide:true};
case 75: props = {ctrPrp: new CTextPr(), chr:8896, limLoc:NARY_UndOvr, subHide:true, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 76: var sChar = String.fromCharCode(8896);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr};
case 76: props = {ctrPrp: new CTextPr(), chr:8896, limLoc:NARY_UndOvr};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 77: var sChar = String.fromCharCode(8896);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup};
case 77: props = {ctrPrp: new CTextPr(), chr:8896, limLoc:NARY_SubSup};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
var oSup = oNary.getUpperIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
oSup.fillPlaceholders();
break;
case 78: var sChar = String.fromCharCode(8896);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_UndOvr, supHide:true};
case 78: props = {ctrPrp: new CTextPr(), chr:8896, limLoc:NARY_UndOvr, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 79: var sChar = String.fromCharCode(8896);
props = {ctrPrp: new CTextPr(), chr:sChar, limLoc:NARY_SubSup, supHide:true};
case 79: props = {ctrPrp: new CTextPr(), chr:8896, limLoc:NARY_SubSup, supHide:true};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,null,null);
var oElem = oNary.getBase();
var oSub = oNary.getLowerIterator();
oElem.fillPlaceholders();
oSub.fillPlaceholders();
break;
case 80: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, supHide:true};
case 80: props = {ctrPrp: new CTextPr(), chr:8721, supHide:true};
var oNary = new CNary(props);
this.CreateElem(oNary,this);
var narySub = oNary.getLowerIterator();
......@@ -7704,15 +7525,12 @@ CMathContent.prototype =
var oFraction = new CFraction(props);
this.CreateFraction(oFraction, delimiterBase, "n", "k");
break
case 81: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar};
case 81: props = {ctrPrp: new CTextPr(), chr:8721};
var oNary = new CNary(props);
this.CreateNary(oNary,this,null,"i=0","n");
var oElem = oNary.getBase();
oElem.fillPlaceholders();
break;
case 82: var sChar = String.fromCharCode(8721);
props = {ctrPrp: new CTextPr(), chr:sChar, supHide:true};
case 82: props = {ctrPrp: new CTextPr(), chr:8721, supHide:true};
var oNary = new CNary(props);
this.CreateElem(oNary,this);
var narySub = oNary.getLowerIterator();
......@@ -7734,8 +7552,7 @@ CMathContent.prototype =
var delimiterBase = oDelimiter.getBase(0);
this.AddText(delimiterBase, "i,j");
break;
case 83: var sChar = String.fromCharCode(8719);
props = {ctrPrp: new CTextPr(), chr:sChar};
case 83: props = {ctrPrp: new CTextPr(), chr:8719};
var oNary = new CNary(props);
this.CreateElem(oNary, this);
var narySup = oNary.getUpperIterator();
......@@ -7748,8 +7565,7 @@ CMathContent.prototype =
var oSSub = new CDegree(props);
this.CreateDegree(oSSub, naryBase, "A", null, "k");
break;
case 84: var sChar = String.fromCharCode(8899);
props = {ctrPrp: new CTextPr(), chr:sChar};
case 84: props = {ctrPrp: new CTextPr(), chr:8899};
var oNary = new CNary(props);
this.CreateElem(oNary,this);
......@@ -7778,202 +7594,140 @@ CMathContent.prototype =
case 85: props = {ctrPrp: new CTextPr(), column:1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 86: props = {ctrPrp: new CTextPr(), column:1, begChr:"[", endChr:"]"};
case 86: props = {ctrPrp: new CTextPr(), column:1, begChr:91, endChr:93};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 87: props = {ctrPrp: new CTextPr(), column:1, begChr:"{", endChr:"}"};
case 87: props = {ctrPrp: new CTextPr(), column:1, begChr:123, endChr:125};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 88: var sBeg = String.fromCharCode(10216);
var sEnd = String.fromCharCode(10217);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:sEnd};
case 88: props = {ctrPrp: new CTextPr(), column:1, begChr:10216, endChr:10217};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 89: var sBeg = String.fromCharCode(9123);
var sEnd = String.fromCharCode(9126);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:sEnd};
case 89: props = {ctrPrp: new CTextPr(), column:1, begChr:9123, endChr:9126};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 90: var sBeg = String.fromCharCode(9121);
var sEnd = String.fromCharCode(9124);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:sEnd};
case 90: props = {ctrPrp: new CTextPr(), column:1, begChr:9121, endChr:9124};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 91: var sChr = String.fromCharCode(124);
props = {ctrPrp: new CTextPr(), column:1, begChr:sChr, endChr:sChr};
case 91: props = {ctrPrp: new CTextPr(), column:1, begChr:124, endChr:124};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 92: var sChr = String.fromCharCode(8214);
props = {ctrPrp: new CTextPr(), column:1, begChr:sChr, endChr:sChr};
case 92: props = {ctrPrp: new CTextPr(), column:1, begChr:8214, endChr:8214};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 93: var sChr = String.fromCharCode(91);
props = {ctrPrp: new CTextPr(), column:1, begChr:sChr, endChr:sChr};
case 93: props = {ctrPrp: new CTextPr(), column:1, begChr:91, endChr:91};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 94: var sChr = String.fromCharCode(93);
props = {ctrPrp: new CTextPr(), column:1, begChr:sChr, endChr:sChr};
case 94: props = {ctrPrp: new CTextPr(), column:1, begChr:93, endChr:93};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 95: props = {ctrPrp: new CTextPr(), column:1, begChr:"]", endChr:"["};
case 95: props = {ctrPrp: new CTextPr(), column:1, begChr:93, endChr:91};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 96: var sBeg = String.fromCharCode(10214);
var sEnd = String.fromCharCode(10215);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:sEnd};
case 96: props = {ctrPrp: new CTextPr(), column:1, begChr:10214, endChr:10215};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 97: props = {ctrPrp: new CTextPr(), column:2};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 98: props = {ctrPrp: new CTextPr(), column:2, begChr:"{", endChr:"}"};
case 98: props = {ctrPrp: new CTextPr(), column:2, begChr:123, endChr:125};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 99: var sBeg = String.fromCharCode(10216);
var sEnd = String.fromCharCode(10217);
props = {ctrPrp: new CTextPr(), column:2, begChr:sBeg, endChr:sEnd};
case 99: props = {ctrPrp: new CTextPr(), column:2, begChr:10216, endChr:10217};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 100: var sBeg = String.fromCharCode(10216);
var sEnd = String.fromCharCode(10217);
props = {ctrPrp: new CTextPr(), column:3, begChr:sBeg, endChr:sEnd};
case 100: props = {ctrPrp: new CTextPr(), column:3, begChr:10216, endChr:10217};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 101: props = {ctrPrp: new CTextPr(), column:1, endChr:""};
case 101: props = {ctrPrp: new CTextPr(), column:1, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 102: props = {ctrPrp: new CTextPr(), column:1, begChr:""};
case 102: props = {ctrPrp: new CTextPr(), column:1, begChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 103: props = {ctrPrp: new CTextPr(), column:1, begChr:"[", endChr:""};
case 103: props = {ctrPrp: new CTextPr(), column:1, begChr:91, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 104: props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:"]"};
case 104: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:93};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 105: props = {ctrPrp: new CTextPr(), column:1, begChr:"{", endChr:""};
case 105: props = {ctrPrp: new CTextPr(), column:1, begChr:123, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 106: props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:"}"};
case 106: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:125};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 107: var sBeg = String.fromCharCode(10216);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 107: props = {ctrPrp: new CTextPr(), column:1, begChr:10216, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 108: var sEnd = String.fromCharCode(10217);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 108: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:10217};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 109: var sBeg = String.fromCharCode(9123);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 109: props = {ctrPrp: new CTextPr(), column:1, begChr:9123, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 110: var sEnd = String.fromCharCode(9126);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 110: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:9126};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 111: var sBeg = String.fromCharCode(9121);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 111: props = {ctrPrp: new CTextPr(), column:1, begChr:9121, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 112: var sEnd = String.fromCharCode(9124);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 112: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:9124};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 113: var sBeg = String.fromCharCode(124);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 113: props = {ctrPrp: new CTextPr(), column:1, begChr:124, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 114: var sEnd = String.fromCharCode(124);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 114: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:124};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 115: var sBeg = String.fromCharCode(8214);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 115: props = {ctrPrp: new CTextPr(), column:1, begChr:8214, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 116: var sEnd = String.fromCharCode(8214);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 116: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:8214};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 117: var sBeg = String.fromCharCode(10214);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:""};
case 117: props = {ctrPrp: new CTextPr(), column:1, begChr:10214, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 118: var sEnd = String.fromCharCode(10215);
props = {ctrPrp: new CTextPr(), column:1, begChr:"", endChr:sEnd};
case 118: props = {ctrPrp: new CTextPr(), column:1, begChr:-1, endChr:10215};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
oDelimiter.fillPlaceholders();
break;
case 119: props = {ctrPrp: new CTextPr(), column:1, begChr:"{", endChr:""};
case 119: props = {ctrPrp: new CTextPr(), column:1, begChr:123, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var oElem = oDelimiter.getBase(0);
......@@ -7981,9 +7735,8 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), row:2};
var oEqArr = new CEqArray(props);
this.CreateElem(oEqArr,oElem);
oEqArr.fillPlaceholders();
break;
case 120: props = {ctrPrp: new CTextPr(), column:1, begChr:"{", endChr:""};
case 120: props = {ctrPrp: new CTextPr(), column:1, begChr:123, endChr:-1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var oElem = oDelimiter.getBase(0);
......@@ -7991,12 +7744,10 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), row:3};
var oEqArr = new CEqArray(props);
this.CreateElem(oEqArr,oElem);
oEqArr.fillPlaceholders();
break;
case 121: props = {ctrPrp: new CTextPr(), type:NO_BAR_FRACTION};
var oFraction = new CFraction(props);
this.CreateFraction(oFraction, this, null, null);
oFraction.fillPlaceholders();
break;
case 122: props = {ctrPrp: new CTextPr(), column:1};
var oDelimiter = new CDelimiter(props);
......@@ -8006,7 +7757,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), type:NO_BAR_FRACTION};
var oFraction = new CFraction(props);
this.CreateFraction(oFraction,oElem,null,null);
oFraction.fillPlaceholders();
break;
case 123: this.AddText(this, "f");
props = {ctrPrp: new CTextPr(), column:1};
......@@ -8016,7 +7766,7 @@ CMathContent.prototype =
this.AddText(del1Elem, "x");
this.AddText(this, "=");
props = {ctrPrp: new CTextPr(), column:1, begChr:"{", endChr:""};
props = {ctrPrp: new CTextPr(), column:1, begChr:123, endChr:-1};
var oDelimiter2 = new CDelimiter(props);
this.CreateElem(oDelimiter2,this);
var del2Elem = oDelimiter2.getBase(0);
......@@ -8040,9 +7790,7 @@ CMathContent.prototype =
var oFraction = new CFraction(props);
this.CreateFraction(oFraction,oElem,"n","k");
break;
case 125: var sBeg = String.fromCharCode(10216);
var sEnd = String.fromCharCode(10217);
props = {ctrPrp: new CTextPr(), column:1, begChr:sBeg, endChr:sEnd};
case 125: props = {ctrPrp: new CTextPr(), column:1, begChr:10216, endChr:10217};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var oElem = oDelimiter.getBase(0);
......@@ -8057,7 +7805,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "sin", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 127: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8065,7 +7812,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "cos", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 128: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8073,7 +7819,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "tan", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 129: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8081,7 +7826,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "csc", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 130: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8089,7 +7833,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "sec", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 131: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8097,7 +7840,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "cot", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 132: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8109,7 +7851,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 133: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8121,7 +7862,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 134: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8133,7 +7873,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 135: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8145,7 +7884,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 136: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8157,7 +7895,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 137: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8169,7 +7906,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 138: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8177,7 +7913,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "sinh", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 139: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8185,7 +7920,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "cosh", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 140: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8193,7 +7927,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "tanh", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 141: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8201,7 +7934,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "csch", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 142: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8209,7 +7941,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "sech", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 143: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8217,7 +7948,6 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "coth", props);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 144: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8229,7 +7959,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 145: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8241,7 +7970,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 146: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8253,7 +7981,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 147: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8265,7 +7992,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 148: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8277,7 +8003,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 149: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8289,7 +8014,6 @@ CMathContent.prototype =
var oDegree = new CDegree(props);
this.CreateDegree(oDegree, oFName, sBase, sSup, null);
var oElem = oFunc.getArgument();
oElem.fillPlaceholders();
break;
case 150: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
......@@ -8344,139 +8068,99 @@ CMathContent.prototype =
var oArgDen = oFuncDen.getArgument();
this.AddText(oArgDen, argText);
break;
case 153: var sChr = String.fromCharCode(775);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 153: props = {ctrPrp: new CTextPr(), chr:775};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 154: var sChr = String.fromCharCode(776);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 154: props = {ctrPrp: new CTextPr(), chr:776};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 155: var sChr = String.fromCharCode(8411);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 155: props = {ctrPrp: new CTextPr(), chr:8411};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 156: var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 157: var sChr = String.fromCharCode(780);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 157: props = {ctrPrp: new CTextPr(), chr:780};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 158: var sChr = String.fromCharCode(769);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 158: props = {ctrPrp: new CTextPr(), chr:769};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 159: var sChr = String.fromCharCode(768);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 159: props = {ctrPrp: new CTextPr(), chr:768};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 160: var sChr = String.fromCharCode(774);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 160: props = {ctrPrp: new CTextPr(), chr:774};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 161: var sChr = String.fromCharCode(771);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 161: props = {ctrPrp: new CTextPr(), chr:771};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 162: var sChr = String.fromCharCode(773);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 162: props = {ctrPrp: new CTextPr(), chr:773};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 163: var sChr = String.fromCharCode(831);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 163: props = {ctrPrp: new CTextPr(), chr:831};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 164: var sChr = String.fromCharCode(9182);
props = {ctrPrp: new CTextPr(), chr:sChr, pos:VJUST_TOP, vertJc:VJUST_BOT};
case 164: props = {ctrPrp: new CTextPr(), chr:9182, pos:VJUST_TOP, vertJc:VJUST_BOT};
oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,this);
oGroupChr.fillPlaceholders();
break;
case 165: oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,this);
oGroupChr.fillPlaceholders();
break;
case 166: props = {ctrPrp: new CTextPr(), type:LIMIT_UP};
var oLimUpp = new CLimit(props);
this.CreateElem(oLimUpp,this);
var oLim = oLimUpp.getIterator();
oLim.fillPlaceholders();
var oElem = oLimUpp.getFName();
var sChr = String.fromCharCode(9182);
props = {ctrPrp: new CTextPr(), chr:sChr, pos:VJUST_TOP, vertJc:VJUST_BOT};
props = {ctrPrp: new CTextPr(), chr:9182, pos:VJUST_TOP, vertJc:VJUST_BOT};
oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
var grElem = oGroupChr.getBase();
grElem.fillPlaceholders();
break;
case 167: props = {ctrPrp: new CTextPr(), type:LIMIT_LOW};
var oLimLow = new CLimit(props);
this.CreateElem(oLimLow,this);
var oLim = oLimLow.getIterator();
oLim.fillPlaceholders();
var oElem = oLimLow.getFName();
oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
var grElem = oGroupChr.getBase();
grElem.fillPlaceholders();
break;
case 168: var sChr = String.fromCharCode(8406);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 168: props = {ctrPrp: new CTextPr(), chr:8406};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 169: var sChr = String.fromCharCode(8407);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 169: props = {ctrPrp: new CTextPr(), chr:8407};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 170: var sChr = String.fromCharCode(8417);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 170: props = {ctrPrp: new CTextPr(), chr:8417};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 171: var sChr = String.fromCharCode(8400);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 171: props = {ctrPrp: new CTextPr(), chr:8400};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 172: var sChr = String.fromCharCode(8401);
props = {ctrPrp: new CTextPr(), chr:sChr};
case 172: props = {ctrPrp: new CTextPr(), chr:8401};
var oAcc = new CAccent(props);
this.CreateElem(oAcc,this);
oAcc.fillPlaceholders();
break;
case 173: var oBorderBox = new CBorderBox(props);
this.CreateElem(oBorderBox,this);
oBorderBox.fillPlaceholders();
break;
case 174: var oBorderBox = new CBorderBox(props);
this.CreateElem(oBorderBox,this);
......@@ -8495,11 +8179,9 @@ CMathContent.prototype =
case 175: props = {ctrPrp: new CTextPr(), pos:LOCATION_TOP};
var oBar = new CBar(props);
this.CreateElem(oBar,this);
oBar.fillPlaceholders();
break;
case 176: var oBar = new CBar(props);
this.CreateElem(oBar,this);
oBar.fillPlaceholders();
break;
case 177: props = {ctrPrp: new CTextPr(), pos:LOCATION_TOP};
var oBar = new CBar(props);
......@@ -8523,7 +8205,6 @@ CMathContent.prototype =
case 180: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), type:DEGREE_SUBSCRIPT};
......@@ -8534,12 +8215,10 @@ CMathContent.prototype =
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(sSubBase, "log", props);
var oSub = oSSub.getLowerIterator();
oSub.fillPlaceholders();
break;
case 181: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), sty:"p"};
this.AddText(oFName, "log", props);
......@@ -8547,7 +8226,6 @@ CMathContent.prototype =
case 182: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), type:LIMIT_LOW};
......@@ -8559,19 +8237,16 @@ CMathContent.prototype =
this.AddText(oElem, "lim", props);
var oLim = oLimLow.getIterator();
oLim.fillPlaceholders();
break;
case 183: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), type:LIMIT_LOW};
var oLimLow = new CLimit(props);
this.CreateElem(oLimLow, oFName);
var oLim = oLimLow.getIterator();
oLim.fillPlaceholders();
var oElem = oLimLow.getFName();
props = {ctrPrp: new CTextPr(), sty:"p"};
......@@ -8580,14 +8255,12 @@ CMathContent.prototype =
case 184: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), type:LIMIT_LOW};
var oLimLow = new CLimit(props);
this.CreateElem(oLimLow, oFName);
var oLim = oLimLow.getIterator();
oLim.fillPlaceholders();
var oElem = oLimLow.getFName();
props = {ctrPrp: new CTextPr(), sty:"p"};
......@@ -8596,7 +8269,6 @@ CMathContent.prototype =
case 185: var oFunc = new CMathFunc(props);
this.CreateElem(oFunc,this);
var oArg = oFunc.getArgument();
oArg.fillPlaceholders();
oFName = oFunc.getFName();
props = {ctrPrp: new CTextPr(), sty:"p"};
......@@ -8705,140 +8377,115 @@ CMathContent.prototype =
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8592);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8592}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 196: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8594}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 197: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8592);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8592}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 198: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8594}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 199: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8656);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8656}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 200: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8658);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8658}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 201: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8656);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8656}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 202: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8658);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8658}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 203: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8596);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8596}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 204: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8596);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8596}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 205: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8660);
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:sChr}
props = {ctrPrp: new CTextPr(), pos:VJUST_TOP, chr:8660}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 206: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8660);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8660}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
oGroupChr.fillPlaceholders();
break;
case 207: props = {ctrPrp: new CTextPr(), opEmu:1};
var oBox = new CBox(props);
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8594}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
var groupElem = oGroupChr.getBase();
......@@ -8849,53 +8496,44 @@ CMathContent.prototype =
this.CreateElem(oBox,this);
var oElem = oBox.getBase();
var sChr = String.fromCharCode(8594);
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:sChr}
props = {ctrPrp: new CTextPr(), vertJc:VJUST_BOT, chr:8594}
var oGroupChr = new CGroupCharacter(props);
this.CreateElem(oGroupChr,oElem);
var groupElem = oGroupChr.getBase();
var sText = String.fromCharCode(8710);
this.AddText(groupElem,sText);
break;
case 209: props = {ctrPrp: new CTextPr(), column:2, row:1, mcJc:"center"};
case 209: props = {ctrPrp: new CTextPr(), column:2, row:1, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 210: props = {ctrPrp: new CTextPr(), column:1, row:2, mcJc:"center"};
case 210: props = {ctrPrp: new CTextPr(), column:1, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 211: props = {ctrPrp: new CTextPr(), column:3, row:1, mcJc:"center"};
case 211: props = {ctrPrp: new CTextPr(), column:3, row:1, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 212: props = {ctrPrp: new CTextPr(), column:1, row:3, mcJc:"center"};
case 212: props = {ctrPrp: new CTextPr(), column:1, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 213: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
case 213: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 214: props = {ctrPrp: new CTextPr(), column:3, row:2, mcJc:"center"};
case 214: props = {ctrPrp: new CTextPr(), column:3, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 215: props = {ctrPrp: new CTextPr(), column:2, row:3, mcJc:"center"};
case 215: props = {ctrPrp: new CTextPr(), column:2, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 216: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:"center"};
case 216: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
oMatrix.fillPlaceholders();
break;
case 217: var sText = String.fromCharCode(8943);
this.AddText(this,sText);
......@@ -8909,7 +8547,7 @@ CMathContent.prototype =
case 220: var sText = String.fromCharCode(8945);
this.AddText(this,sText);
break;
case 221: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
case 221: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0);
......@@ -8921,7 +8559,7 @@ CMathContent.prototype =
oElem = oMatrix.getElement(1,1);
this.AddText(oElem, "1");
break;
case 222: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center", plcHide:1};
case 222: props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER, plcHide:1};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0);
......@@ -8929,7 +8567,7 @@ CMathContent.prototype =
oElem = oMatrix.getElement(1,1);
this.AddText(oElem, "1");
break;
case 223: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:"center"};
case 223: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0);
......@@ -8951,7 +8589,7 @@ CMathContent.prototype =
oElem = oMatrix.getElement(2,2);
this.AddText(oElem, "1");
break;
case 224: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:"center", plcHide:1};
case 224: props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER, plcHide:1};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,this);
var oElem = oMatrix.getElement(0,0);
......@@ -8966,59 +8604,51 @@ CMathContent.prototype =
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
oMatrix.fillPlaceholders();
break;
case 226: props = {ctrPrp: new CTextPr(), column:1,begChr:"[", endChr:"]"};
case 226: props = {ctrPrp: new CTextPr(), column:1,begChr:91, endChr:93};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
oMatrix.fillPlaceholders();
break;
case 227: var sChr = String.fromCharCode(124);
props = {ctrPrp: new CTextPr(), column:1,begChr:sChr, endChr:sChr};
case 227: props = {ctrPrp: new CTextPr(), column:1,begChr:124, endChr:124};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
oMatrix.fillPlaceholders();
break;
case 228: var sChr = String.fromCharCode(8214);
props = {ctrPrp: new CTextPr(), column:1,begChr:sChr, endChr:sChr};
case 228: props = {ctrPrp: new CTextPr(), column:1,begChr:8214, endChr:8214};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:2, row:2, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
oMatrix.fillPlaceholders();
break;
case 229: props = {ctrPrp: new CTextPr(), column:1};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
var oElem = oMatrix.getElement(0,0);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(0,1);
var sText = String.fromCharCode(8943);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(0,2);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(1,0);
sText = String.fromCharCode(8942);
this.AddText(oElem, sText);
......@@ -9029,30 +8659,26 @@ CMathContent.prototype =
sText = String.fromCharCode(8942);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(2,0);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(2,1);
sText = String.fromCharCode(8943);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(2,2);
oElem.fillPlaceholders();
break;
case 230: props = {ctrPrp: new CTextPr(), column:1,begChr:"[", endChr:"]"};
case 230: props = {ctrPrp: new CTextPr(), column:1,begChr:91, endChr:93};
var oDelimiter = new CDelimiter(props);
this.CreateElem(oDelimiter,this);
var delimiterBase = oDelimiter.getBase(0);
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:"center"};
props = {ctrPrp: new CTextPr(), column:3, row:3, mcJc:MCJC_CENTER};
var oMatrix = new CMathMatrix(props);
this.CreateElem(oMatrix,delimiterBase);
var oElem = oMatrix.getElement(0,0);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(0,1);
var sText = String.fromCharCode(8943);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(0,2);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(1,0);
sText = String.fromCharCode(8942);
this.AddText(oElem, sText);
......@@ -9063,12 +8689,10 @@ CMathContent.prototype =
sText = String.fromCharCode(8942);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(2,0);
oElem.fillPlaceholders();
oElem = oMatrix.getElement(2,1);
sText = String.fromCharCode(8943);
this.AddText(oElem, sText);
oElem = oMatrix.getElement(2,2);
oElem.fillPlaceholders();
break;
}
},
......@@ -9108,7 +8732,8 @@ CMathContent.prototype =
items.push(oElem);
History.Add(oParent, {Type: historyitem_Math_AddItem, Items: items, Pos: Pos, PosEnd: PosEnd});
oElem.CurPos++;
oParent.CurPos++;
oParent.SetRunEmptyToContent(true);
}
},
CreateFraction : function (oFraction,oParentElem,sNumText,sDenText)
......@@ -9144,6 +8769,12 @@ CMathContent.prototype =
this.AddText(oElem, sElemText);
var oDeg = oRad.getDegree();
if (oRad.Pr.degHide == true && sDegText == null)
{
oDeg.degHide = true;
oDeg = null;
}
else
this.AddText(oDeg, sDegText);
},
......
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