Commit ad739d39 authored by Sergey Luzyanin's avatar Sergey Luzyanin

set paragraph at reading math ParaRun

parent d47c652c
...@@ -9115,7 +9115,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, curFoo ...@@ -9115,7 +9115,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, curFoo
oDrawing.ParaMath = oMathPara; oDrawing.ParaMath = oMathPara;
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.boMathr.ReadMathArg(t,l,oMathPara.Root); return oThis.boMathr.ReadMathArg(t,l,oMathPara.Root, oParStruct);
}); });
oMathPara.Root.Correct_Content(true); oMathPara.Root.Correct_Content(true);
} }
...@@ -9951,7 +9951,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -9951,7 +9951,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
return res; return res;
}; };
this.ReadMathAcc = function(type, length, props, oParent, oContent) this.ReadMathAcc = function(type, length, props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -9969,7 +9969,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -9969,7 +9969,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -10032,7 +10032,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10032,7 +10032,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathAcc(t,l,props,oElem,oContent); return oThis.ReadMathAcc(t,l,props,oElem,oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.ArgPr === type) else if (c_oSer_OMathContentType.ArgPr === type)
...@@ -10046,21 +10046,21 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10046,21 +10046,21 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathBar(t,l,props,oElem, oContent); return oThis.ReadMathBar(t,l,props,oElem, oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.BorderBox === type) else if (c_oSer_OMathContentType.BorderBox === type)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathBorderBox(t,l,props,oElem, oContent); return oThis.ReadMathBorderBox(t,l,props,oElem, oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Box === type) else if (c_oSer_OMathContentType.Box === type)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathBox(t,l,props,oElem,oContent); return oThis.ReadMathBox(t,l,props,oElem,oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.CtrlPr === type) else if (c_oSer_OMathContentType.CtrlPr === type)
...@@ -10074,14 +10074,14 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10074,14 +10074,14 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
{ {
var arrContent = []; var arrContent = [];
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathDelimiter(t,l,props,oElem,arrContent); return oThis.ReadMathDelimiter(t,l,props,oElem,arrContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.EqArr === type) else if (c_oSer_OMathContentType.EqArr === type)
{ {
var arrContent = []; var arrContent = [];
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathEqArr(t,l,props,oElem,arrContent); return oThis.ReadMathEqArr(t,l,props,oElem,arrContent, oParStruct);
}); });
if (props.mcJc) if (props.mcJc)
{ {
...@@ -10100,7 +10100,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10100,7 +10100,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oElemDen = {}; var oElemDen = {};
var oElemNum = {}; var oElemNum = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathFraction(t,l,props,oElem,oElemDen,oElemNum); return oThis.ReadMathFraction(t,l,props,oElem,oElemDen,oElemNum, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Func === type) else if (c_oSer_OMathContentType.Func === type)
...@@ -10108,14 +10108,14 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10108,14 +10108,14 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oContent = {}; var oContent = {};
var oName = {}; var oName = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathFunc(t,l,props,oElem,oContent,oName); return oThis.ReadMathFunc(t,l,props,oElem,oContent,oName, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.GroupChr === type) else if (c_oSer_OMathContentType.GroupChr === type)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathGroupChr(t,l,props,oElem,oContent); return oThis.ReadMathGroupChr(t,l,props,oElem,oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.LimLow === type) else if (c_oSer_OMathContentType.LimLow === type)
...@@ -10123,7 +10123,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10123,7 +10123,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oContent = {}; var oContent = {};
var oLim = {}; var oLim = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathLimLow(t,l,props,oElem,oContent,oLim); return oThis.ReadMathLimLow(t,l,props,oElem,oContent,oLim, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.LimUpp === type) else if (c_oSer_OMathContentType.LimUpp === type)
...@@ -10131,7 +10131,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10131,7 +10131,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oContent = {}; var oContent = {};
var oLim = {}; var oLim = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathLimUpp(t,l,props,oElem,oContent,oLim); return oThis.ReadMathLimUpp(t,l,props,oElem,oContent,oLim, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Matrix === type) else if (c_oSer_OMathContentType.Matrix === type)
...@@ -10139,7 +10139,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10139,7 +10139,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var arrContent = []; var arrContent = [];
props.mcs = []; props.mcs = [];
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathMatrix(t, l, props, arrContent); return oThis.ReadMathMatrix(t, l, props, arrContent, oParStruct);
}); });
if (oElem) { if (oElem) {
//create props by content, important before creation matrix //create props by content, important before creation matrix
...@@ -10171,7 +10171,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10171,7 +10171,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var cell = row[j]; var cell = row[j];
this.stream.Seek2(cell.pos); this.stream.Seek2(cell.pos);
res = this.bcr.Read1(cell.length, function(t, l){ res = this.bcr.Read1(cell.length, function(t, l){
return oThis.ReadMathArg(t, l, oMatrix.getElement(i, j)); return oThis.ReadMathArg(t, l, oMatrix.getElement(i, j), oParStruct);
}); });
} }
} }
...@@ -10184,25 +10184,26 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10184,25 +10184,26 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oSub = {}; var oSub = {};
var oSup = {}; var oSup = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathNary(t,l,props,oElem,oContent,oSub,oSup); return oThis.ReadMathNary(t,l,props,oElem,oContent,oSub,oSup, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.OMath === type) else if (c_oSer_OMathContentType.OMath === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oElem); return oThis.ReadMathArg(t,l,oElem, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Phant === type) else if (c_oSer_OMathContentType.Phant === type)
{ {
var oContent = {}; var oContent = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathPhant(t,l,props,oElem,oContent); return oThis.ReadMathPhant(t,l,props,oElem,oContent, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.MRun === type) else if (c_oSer_OMathContentType.MRun === type)
{ {
var oMRun = new ParaRun(null, true); var oParagraph = oParStruct ? oParStruct.paragraph : null;
var oMRun = new ParaRun(oParagraph, true);
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathMRun(t,l,oMRun,props,oElem,oParStruct); return oThis.ReadMathMRun(t,l,oMRun,props,oElem,oParStruct);
}); });
...@@ -10215,7 +10216,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10215,7 +10216,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oDeg = {}; var oDeg = {};
var oRad = {}; var oRad = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathRad(t,l,props,oElem,oRad,oContent,oDeg); return oThis.ReadMathRad(t,l,props,oElem,oRad,oContent,oDeg, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.SPre === type) else if (c_oSer_OMathContentType.SPre === type)
...@@ -10224,7 +10225,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10224,7 +10225,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oSub = {}; var oSub = {};
var oSup = {}; var oSup = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathSPre(t,l,props,oElem,oContent,oSub,oSup); return oThis.ReadMathSPre(t,l,props,oElem,oContent,oSub,oSup, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.SSub === type) else if (c_oSer_OMathContentType.SSub === type)
...@@ -10232,7 +10233,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10232,7 +10233,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oContent = {}; var oContent = {};
var oSub = {}; var oSub = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathSSub(t,l,props,oElem,oContent,oSub); return oThis.ReadMathSSub(t,l,props,oElem,oContent,oSub, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.SSubSup === type) else if (c_oSer_OMathContentType.SSubSup === type)
...@@ -10241,7 +10242,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10241,7 +10242,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oSub = {}; var oSub = {};
var oSup = {}; var oSup = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathSSubSup(t,l,props,oElem,oContent,oSub,oSup); return oThis.ReadMathSSubSup(t,l,props,oElem,oContent,oSub,oSup, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.SSup === type) else if (c_oSer_OMathContentType.SSup === type)
...@@ -10249,7 +10250,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10249,7 +10250,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oContent = {}; var oContent = {};
var oSup = {}; var oSup = {};
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathSSup(t,l,props,oElem,oContent,oSup); return oThis.ReadMathSSup(t,l,props,oElem,oContent,oSup, oParStruct);
}); });
} }
else else
...@@ -10288,7 +10289,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10288,7 +10289,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathBar = function(type, length,props, oParent, oContent) this.ReadMathBar = function(type, length,props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10306,7 +10307,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10306,7 +10307,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -10352,7 +10353,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10352,7 +10353,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathBorderBox = function(type, length, props, oParent, oContent) this.ReadMathBorderBox = function(type, length, props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10370,7 +10371,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10370,7 +10371,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -10439,7 +10440,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10439,7 +10440,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathBox = function(type, length, props, oParent, oContent) this.ReadMathBox = function(type, length, props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10457,7 +10458,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10457,7 +10458,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -10628,7 +10629,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10628,7 +10629,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathDelimiter = function(type, length, props, oElem, arrContent) this.ReadMathDelimiter = function(type, length, props, oElem, arrContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10649,7 +10650,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10649,7 +10650,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
{ {
var lColumn = props.counter; var lColumn = props.counter;
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,arrContent[lColumn]); return oThis.ReadMathArg(t,l,arrContent[lColumn], oParStruct);
}); });
props.counter++; props.counter++;
} }
...@@ -10731,7 +10732,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10731,7 +10732,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathEqArr = function(type, length, props, oElem, arrContent) this.ReadMathEqArr = function(type, length, props, oElem, arrContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10755,7 +10756,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10755,7 +10756,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
{ {
var lRow = props.counter; var lRow = props.counter;
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,arrContent[lRow]); return oThis.ReadMathArg(t,l,arrContent[lRow], oParStruct);
}); });
props.counter++; props.counter++;
} }
...@@ -10819,7 +10820,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10819,7 +10820,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathFraction = function(type, length, props, oParent, oElemDen, oElemNum) this.ReadMathFraction = function(type, length, props, oParent, oElemDen, oElemNum, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10847,7 +10848,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10847,7 +10848,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
oElemNum.content = oFraction.getNumerator(); oElemNum.content = oFraction.getNumerator();
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oElemDen.content); return oThis.ReadMathArg(t,l,oElemDen.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Num === type) else if (c_oSer_OMathContentType.Num === type)
...@@ -10862,7 +10863,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10862,7 +10863,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
oElemNum.content = oFraction.getNumerator(); oElemNum.content = oFraction.getNumerator();
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oElemNum.content); return oThis.ReadMathArg(t,l,oElemNum.content, oParStruct);
}); });
} }
else else
...@@ -10889,7 +10890,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10889,7 +10890,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathFunc = function(type, length, props, oParent, oContent, oName) this.ReadMathFunc = function(type, length, props, oParent, oContent, oName, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10908,13 +10909,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10908,13 +10909,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.FName === type) else if (c_oSer_OMathContentType.FName === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oName.content); return oThis.ReadMathArg(t,l,oName.content, oParStruct);
}); });
} }
else else
...@@ -10947,7 +10948,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10947,7 +10948,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathGroupChr = function(type, length, props, oParent, oContent) this.ReadMathGroupChr = function(type, length, props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -10965,7 +10966,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10965,7 +10966,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -11070,7 +11071,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11070,7 +11071,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathLimLow = function(type, length, props, oParent, oContent, oLim) this.ReadMathLimLow = function(type, length, props, oParent, oContent, oLim, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11090,13 +11091,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11090,13 +11091,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Lim === type) else if (c_oSer_OMathContentType.Lim === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oLim.content); return oThis.ReadMathArg(t,l,oLim.content, oParStruct);
}); });
} }
else else
...@@ -11117,7 +11118,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11117,7 +11118,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathLimUpp = function(type, length, props, oParent, oContent, oLim) this.ReadMathLimUpp = function(type, length, props, oParent, oContent, oLim, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11137,13 +11138,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11137,13 +11138,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content ); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Lim === type) else if (c_oSer_OMathContentType.Lim === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oLim.content); return oThis.ReadMathArg(t,l,oLim.content, oParStruct);
}); });
} }
else else
...@@ -11527,7 +11528,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11527,7 +11528,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathNary = function(type, length, props, oParent, oContent, oSub, oSup) this.ReadMathNary = function(type, length, props, oParent, oContent, oSub, oSup, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11549,19 +11550,19 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11549,19 +11550,19 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Sub === type) else if (c_oSer_OMathContentType.Sub === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSub.content); return oThis.ReadMathArg(t,l,oSub.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Sup === type) else if (c_oSer_OMathContentType.Sup === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSup.content); return oThis.ReadMathArg(t,l,oSup.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.CtrlPr) else if (c_oSer_OMathContentType.CtrlPr)
...@@ -11717,7 +11718,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11717,7 +11718,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathPhant = function(type, length, props, oParent, oContent) this.ReadMathPhant = function(type, length, props, oParent, oContent, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11735,7 +11736,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11735,7 +11736,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -11816,7 +11817,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11816,7 +11817,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathRad = function(type, length, props, oParent, oRad, oContent, oDeg) this.ReadMathRad = function(type, length, props, oParent, oRad, oContent, oDeg, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11835,13 +11836,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11835,13 +11836,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Deg === type) else if (c_oSer_OMathContentType.Deg === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oDeg.content); return oThis.ReadMathArg(t,l,oDeg.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -11948,7 +11949,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11948,7 +11949,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathSPre = function(type, length, props, oParent, oContent, oSub, oSup) this.ReadMathSPre = function(type, length, props, oParent, oContent, oSub, oSup, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -11969,19 +11970,19 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11969,19 +11970,19 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Sub === type) else if (c_oSer_OMathContentType.Sub === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSub.content); return oThis.ReadMathArg(t,l,oSub.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Sup === type) else if (c_oSer_OMathContentType.Sup === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSup.content); return oThis.ReadMathArg(t,l,oSup.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -12002,7 +12003,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12002,7 +12003,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathSSub = function(type, length, props, oParent, oContent, oSub) this.ReadMathSSub = function(type, length, props, oParent, oContent, oSub, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -12022,13 +12023,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12022,13 +12023,13 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
else if (c_oSer_OMathContentType.Sub === type) else if (c_oSer_OMathContentType.Sub === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSub.content); return oThis.ReadMathArg(t,l,oSub.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
{ {
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -12049,7 +12050,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12049,7 +12050,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathSSubSup = function(type, length, props, oParent, oContent, oSub, oSup) this.ReadMathSSubSup = function(type, length, props, oParent, oContent, oSub, oSup, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -12081,7 +12082,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12081,7 +12082,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSub.content); return oThis.ReadMathArg(t,l,oSub.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Sup === type) else if (c_oSer_OMathContentType.Sup === type)
...@@ -12098,7 +12099,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12098,7 +12099,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSup.content); return oThis.ReadMathArg(t,l,oSup.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -12115,7 +12116,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12115,7 +12116,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
...@@ -12142,7 +12143,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12142,7 +12143,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
return res; return res;
}; };
this.ReadMathSSup = function(type, length, props, oParent, oContent, oSup) this.ReadMathSSup = function(type, length, props, oParent, oContent, oSup, oParStruct)
{ {
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
...@@ -12173,7 +12174,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12173,7 +12174,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oSup.content); return oThis.ReadMathArg(t,l,oSup.content, oParStruct);
}); });
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -12190,7 +12191,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12190,7 +12191,7 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
} }
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathArg(t,l,oContent.content); return oThis.ReadMathArg(t,l,oContent.content, oParStruct);
}); });
} }
else else
......
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