Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
541601ac
Commit
541601ac
authored
Sep 09, 2016
by
Ilya Kirillov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Continued to rework calculation of footnotes.
parent
746c3d02
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
158 additions
and
243 deletions
+158
-243
word/Editor/Document.js
word/Editor/Document.js
+2
-5
word/Editor/Footnotes.js
word/Editor/Footnotes.js
+26
-179
word/Editor/Paragraph_Recalculate.js
word/Editor/Paragraph_Recalculate.js
+129
-58
word/Editor/Run.js
word/Editor/Run.js
+1
-1
No files found.
word/Editor/Document.js
View file @
541601ac
...
...
@@ -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
);
...
...
word/Editor/Footnotes.js
View file @
541601ac
This diff is collapsed.
Click to expand it.
word/Editor/Paragraph_Recalculate.js
View file @
541601ac
This diff is collapsed.
Click to expand it.
word/Editor/Run.js
View file @
541601ac
...
...
@@ -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
;
// Проверяем, что все изменения произошли в одном и том же отрезке
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment