Commit 541601ac authored by Ilya Kirillov's avatar Ilya Kirillov

Continued to rework calculation of footnotes.

parent 746c3d02
......@@ -1665,10 +1665,8 @@ CDocument.prototype.Get_PageContentStartPos2 = function(StartPageIndex, St
var ColumnAbs = (StartColumnIndex + ElementPageIndex) - ((StartColumnIndex + ElementPageIndex) / ColumnsCount | 0) * ColumnsCount;
var PageAbs = StartPageIndex + ((StartColumnIndex + ElementPageIndex) / ColumnsCount | 0);
var FootnotesHeight = this.Footnotes.GetHeight(PageAbs, ColumnAbs);
var Y = SectPr.Get_PageMargin_Top();
var YLimit = SectPr.Get_PageHeight() - SectPr.Get_PageMargin_Bottom() - FootnotesHeight;
var YLimit = SectPr.Get_PageHeight() - SectPr.Get_PageMargin_Bottom();
var X = SectPr.Get_PageMargin_Left();
var XLimit = SectPr.Get_PageWidth() - SectPr.Get_PageMargin_Right();
......@@ -1677,7 +1675,7 @@ CDocument.prototype.Get_PageContentStartPos2 = function(StartPageIndex, St
if (this.Pages[PageAbs] && this.Pages[PageAbs].Sections[SectionIndex])
{
Y = this.Pages[PageAbs].Sections[SectionIndex].Get_Y();
YLimit = this.Pages[PageAbs].Sections[SectionIndex].Get_YLimit() - FootnotesHeight;
YLimit = this.Pages[PageAbs].Sections[SectionIndex].Get_YLimit();
}
var HdrFtrLine = this.HdrFtr.Get_HdrFtrLines(PageAbs);
......@@ -2300,7 +2298,6 @@ CDocument.prototype.Recalculate_PageColumn = function()
PageColumn.SpaceBefore = StartPos.ColumnSpaceBefore;
PageColumn.SpaceAfter = StartPos.ColumnSpaceAfter;
//var YLimitOrigin = YLimit;
this.Footnotes.ContinueElementsFromPreviousColumn(PageIndex, ColumnIndex, Y, YLimit);
var SectElement = this.SectionsInfo.Get_SectPr(StartIndex);
......
This diff is collapsed.
This diff is collapsed.
......@@ -1404,7 +1404,7 @@ ParaRun.prototype.Is_SimpleChanges = function(Changes)
// нельзя обсчитывать функцией Recalculate_Fast.
// TODO: Но на самом деле стоило бы сделать нормальную проверку на высоту строки в функции Recalculate_Fast
var ItemType = Item.Type;
if (para_Drawing === ItemType || para_NewLine === ItemType)
if (para_Drawing === ItemType || para_NewLine === ItemType || para_FootnoteRef === ItemType || para_FootnoteReference === ItemType)
return false;
// Проверяем, что все изменения произошли в одном и том же отрезке
......
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