Skip to content

S
sdkjs
Commit edd64bcc authored by Sergey Luzyanin's avatar Sergey Luzyanin
Browse files
Options

fix bug with writing math props

parent bad93ce2
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 3 deletions
word/Editor/Serialize2.js
View file @ edd64bcc
...@@ -9964,6 +9964,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -9964,6 +9964,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oMathAcc, props); initMathRevisions(oMathAcc, props);
if (oParent) if (oParent)
oParent.addElementToContent(oMathAcc); oParent.addElementToContent(oMathAcc);
if(oParStruct)
oMathAcc.Paragraph = oParStruct.paragraph;
oContent.content = oMathAcc.getBase(); oContent.content = oMathAcc.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -10302,6 +10304,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10302,6 +10304,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oBar, props); initMathRevisions(oBar, props);
if (oParent) if (oParent)
oParent.addElementToContent(oBar); oParent.addElementToContent(oBar);
if(oParStruct)
oBar.Paragraph = oParStruct.paragraph;
oContent.content = oBar.getBase(); oContent.content = oBar.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -10366,6 +10371,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10366,6 +10371,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oBorderBox, props); initMathRevisions(oBorderBox, props);
if (oParent) if (oParent)
oParent.addElementToContent(oBorderBox); oParent.addElementToContent(oBorderBox);
if(oParStruct)
oBorderBox.Paragraph = oParStruct.paragraph;
oContent.content = oBorderBox.getBase(); oContent.content = oBorderBox.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -10453,6 +10460,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10453,6 +10460,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oBox, props); initMathRevisions(oBox, props);
if (oParent) if (oParent)
oParent.addElementToContent(oBox); oParent.addElementToContent(oBox);
if(oParStruct)
oBox.Paragraph = oParStruct.paragraph;
oContent.content = oBox.getBase(); oContent.content = oBox.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -10642,7 +10651,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10642,7 +10651,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
props.counter = 0; props.counter = 0;
var oDelimiter = new CDelimiter(props); var oDelimiter = new CDelimiter(props);
initMathRevisions(oDelimiter, props); initMathRevisions(oDelimiter, props);
oElem.addElementToContent(oDelimiter); oElem.addElementToContent(oDelimiter);
if(oParStruct)
oDelimiter.Paragraph = oParStruct.paragraph;
for (var i=0; i<props.column; i++) for (var i=0; i<props.column; i++)
arrContent[i] = oDelimiter.getBase(i); arrContent[i] = oDelimiter.getBase(i);
} }
...@@ -10748,7 +10759,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10748,7 +10759,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
props.counter = 0; props.counter = 0;
var oEqArr = new CEqArray(props); var oEqArr = new CEqArray(props);
initMathRevisions(oEqArr, props); initMathRevisions(oEqArr, props);
oElem.addElementToContent(oEqArr); oElem.addElementToContent(oEqArr);
if(oParStruct)
oEqArr.Paragraph = oParStruct.paragraph;
for (var i=0; i<props.row; i++) for (var i=0; i<props.row; i++)
arrContent[i] = oEqArr.getElement(i); arrContent[i] = oEqArr.getElement(i);
} }
...@@ -10833,6 +10846,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10833,6 +10846,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oFraction, props); initMathRevisions(oFraction, props);
if (oParent) if (oParent)
oParent.addElementToContent(oFraction); oParent.addElementToContent(oFraction);
if(oParStruct)
oFraction.Paragraph = oParStruct.paragraph;
oElemDen.content = oFraction.getDenominator(); oElemDen.content = oFraction.getDenominator();
oElemNum.content = oFraction.getNumerator(); oElemNum.content = oFraction.getNumerator();
} }
...@@ -10844,6 +10859,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10844,6 +10859,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oFraction, props); initMathRevisions(oFraction, props);
if (oParent) if (oParent)
oParent.addElementToContent(oFraction); oParent.addElementToContent(oFraction);
if(oParStruct)
oFraction.Paragraph = oParStruct.paragraph;
oElemDen.content = oFraction.getDenominator(); oElemDen.content = oFraction.getDenominator();
oElemNum.content = oFraction.getNumerator(); oElemNum.content = oFraction.getNumerator();
} }
...@@ -10859,6 +10877,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10859,6 +10877,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oFraction, props); initMathRevisions(oFraction, props);
if (oParent) if (oParent)
oParent.addElementToContent(oFraction); oParent.addElementToContent(oFraction);
if(oParStruct)
oFraction.Paragraph = oParStruct.paragraph;
oElemDen.content = oFraction.getDenominator(); oElemDen.content = oFraction.getDenominator();
oElemNum.content = oFraction.getNumerator(); oElemNum.content = oFraction.getNumerator();
} }
...@@ -10902,7 +10922,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10902,7 +10922,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
var oFunc = new CMathFunc(props); var oFunc = new CMathFunc(props);
initMathRevisions(oFunc, props); initMathRevisions(oFunc, props);
if (oParent) if (oParent)
oParent.addElementToContent(oFunc); oParent.addElementToContent(oFunc);
if(oParStruct)
oFunc.Paragraph = oParStruct.paragraph;
oContent.content = oFunc.getArgument(); oContent.content = oFunc.getArgument();
oName.content = oFunc.getFName(); oName.content = oFunc.getFName();
} }
...@@ -10961,6 +10983,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -10961,6 +10983,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oGroupChr, props); initMathRevisions(oGroupChr, props);
if (oParent) if (oParent)
oParent.addElementToContent(oGroupChr); oParent.addElementToContent(oGroupChr);
if(oParStruct)
oGroupChr.Paragraph = oParStruct.paragraph;
oContent.content = oGroupChr.getBase(); oContent.content = oGroupChr.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -11085,6 +11109,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11085,6 +11109,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oLimLow, props); initMathRevisions(oLimLow, props);
if (oParent) if (oParent)
oParent.addElementToContent(oLimLow); oParent.addElementToContent(oLimLow);
if(oParStruct)
oLimLow.Paragraph = oParStruct.paragraph;
oContent.content = oLimLow.getFName(); oContent.content = oLimLow.getFName();
oLim.content = oLimLow.getIterator(); oLim.content = oLimLow.getIterator();
} }
...@@ -11132,6 +11159,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11132,6 +11159,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oLimUpp, props); initMathRevisions(oLimUpp, props);
if (oParent) if (oParent)
oParent.addElementToContent(oLimUpp); oParent.addElementToContent(oLimUpp);
if(oParStruct)
oLimUpp.Paragraph = oParStruct.paragraph;
oContent.content = oLimUpp.getFName(); oContent.content = oLimUpp.getFName();
oLim.content = oLimUpp.getIterator(); oLim.content = oLimUpp.getIterator();
} }
...@@ -11543,6 +11572,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11543,6 +11572,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oNary, props); initMathRevisions(oNary, props);
if (oParent) if (oParent)
oParent.addElementToContent(oNary); oParent.addElementToContent(oNary);
if(oParStruct)
oNary.Paragraph = oParStruct.paragraph;
oSub.content = oNary.getLowerIterator(); oSub.content = oNary.getLowerIterator();
oSup.content = oNary.getUpperIterator(); oSup.content = oNary.getUpperIterator();
oContent.content = oNary.getBase(); oContent.content = oNary.getBase();
...@@ -11731,6 +11762,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11731,6 +11762,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oPhant, props); initMathRevisions(oPhant, props);
if (oParent) if (oParent)
oParent.addElementToContent(oPhant); oParent.addElementToContent(oPhant);
if(oParStruct)
oPhant.Paragraph = oParStruct.paragraph;
oContent.content = oPhant.getBase(); oContent.content = oPhant.getBase();
} }
else if (c_oSer_OMathContentType.Element === type) else if (c_oSer_OMathContentType.Element === type)
...@@ -11830,6 +11863,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11830,6 +11863,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oRad.content, props); initMathRevisions(oRad.content, props);
if (oParent) if (oParent)
oParent.addElementToContent(oRad.content); oParent.addElementToContent(oRad.content);
if(oParStruct)
oRad.Paragraph = oParStruct.paragraph;
oDeg.content = oRad.content.getDegree(); oDeg.content = oRad.content.getDegree();
oContent.content = oRad.content.getBase(); oContent.content = oRad.content.getBase();
} }
...@@ -11963,6 +11998,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -11963,6 +11998,9 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oSPre, props); initMathRevisions(oSPre, props);
if (oParent) if (oParent)
oParent.addElementToContent(oSPre); oParent.addElementToContent(oSPre);
if(oParStruct)
oSPre.Paragraph = oParStruct.paragraph;
oSub.content = oSPre.getLowerIterator(); oSub.content = oSPre.getLowerIterator();
oSup.content = oSPre.getUpperIterator(); oSup.content = oSPre.getUpperIterator();
oContent.content = oSPre.getBase(); oContent.content = oSPre.getBase();
...@@ -12017,6 +12055,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12017,6 +12055,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oSSub, props); initMathRevisions(oSSub, props);
if (oParent) if (oParent)
oParent.addElementToContent(oSSub); oParent.addElementToContent(oSSub);
if(oParStruct)
oSSub.Paragraph = oParStruct.paragraph;
oSub.content = oSSub.getLowerIterator(); oSub.content = oSSub.getLowerIterator();
oContent.content = oSSub.getBase(); oContent.content = oSSub.getBase();
} }
...@@ -12064,6 +12104,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12064,6 +12104,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oSSubSup, props); initMathRevisions(oSSubSup, props);
if (oParent) if (oParent)
oParent.addElementToContent(oSSubSup); oParent.addElementToContent(oSSubSup);
if(oParStruct)
oSSubSup.Paragraph = oParStruct.paragraph;
oSub.content = oSSubSup.getLowerIterator(); oSub.content = oSSubSup.getLowerIterator();
oSup.content = oSSubSup.getUpperIterator(); oSup.content = oSSubSup.getUpperIterator();
oContent.content = oSSubSup.getBase(); oContent.content = oSSubSup.getBase();
...@@ -12157,6 +12199,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote) ...@@ -12157,6 +12199,8 @@ function Binary_oMathReader(stream, oReadResult, curFootnote)
initMathRevisions(oSSup, props); initMathRevisions(oSSup, props);
if (oParent) if (oParent)
oParent.addElementToContent(oSSup); oParent.addElementToContent(oSSup);
if(oParStruct)
oSSup.Paragraph = oParStruct.paragraph;
oSup.content = oSSup.getUpperIterator(); oSup.content = oSSup.getUpperIterator();
oContent.content = oSSup.getBase(); oContent.content = oSSup.getBase();
} }
......
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