diff --git a/ePublishing/Books.xba b/ePublishing/Books.xba index 256f00a..f721195 100644 --- a/ePublishing/Books.xba +++ b/ePublishing/Books.xba @@ -1,6 +1,6 @@ -Sub markBooks6 +Sub markBooks7 End Sub Sub setUniqPageStyles diff --git a/ePublishing/journals.xba b/ePublishing/journals.xba index 298052b..16b168a 100644 --- a/ePublishing/journals.xba +++ b/ePublishing/journals.xba @@ -1286,6 +1286,12 @@ Function shrinkPageContent() As Boolean oViewCursor.jumpToStartOfPage() startPosition = oViewCursor.Text.createTextCursorByRange(oViewCursor) targetContent = selectContentToShrink(initPosition,startPosition) + For i = LBound(targetContent) To Ubound(targetContent) + shrinkContentSpacing(targetContent(i)) + If isShrinkPageSucceded(initPosition, initPageNum) Then + Exit Function + EndIf + Next i 'TODO: Уменьшая отступы каждого параграфа от и до следующего ' а также уменьшая кернинг, межстрочное расстояние и кегль For j = 0 To rounds @@ -1301,12 +1307,6 @@ Function shrinkPageContent() As Boolean EndIf Next i Next j - For i = LBound(targetContent) To Ubound(targetContent) - shrinkContentSpacing(targetContent(i)) - If isShrinkPageSucceded(initPosition, initPageNum) Then - Exit Function - EndIf - Next i For i = LBound(targetContent) To Ubound(targetContent) increaseContentCharHeight(targetContent(i), delta * rounds ) Next i