Commit 1fc80ab5 authored by Martin Tobias Holmedahl Sandsmark's avatar Martin Tobias Holmedahl Sandsmark
Browse files

Revert "Improve page breaks and batch up cursor edits in epub generator"

This broke the layouting.

This reverts commit c110c654.
parent dd8fa351
......@@ -175,7 +175,6 @@ QTextDocument* Converter::convert( const QString &fileName )
mTextDocument = newDocument;
QTextCursor *_cursor = new QTextCursor( mTextDocument );
_cursor->beginEditBlock();
mLocalLinks.clear();
mSectionMap.clear();
......@@ -347,21 +346,19 @@ QTextDocument* Converter::convert( const QString &fileName )
_handle_anchors(before, link);
// Force a page break.
// The new format will also clear the previous one,
const int page = mTextDocument->pageCount();
// it will clear the previous format
// useful when the last line had a bullet
QTextBlockFormat pageBreak;
pageBreak.setPageBreakPolicy(QTextFormat::PageBreak_AlwaysAfter);
_cursor->insertBlock(pageBreak);
_cursor->insertBlock(QTextBlockFormat());
while(mTextDocument->pageCount() == page)
_cursor->insertText(QStringLiteral("\n"));
}
} while (epub_it_get_next(it));
epub_free_iterator(it);
// Clear the previous format
// In particular, clear the last page break.
_cursor->insertBlock(QTextBlockFormat());
// handle toc
struct titerator *tit;
......@@ -400,8 +397,10 @@ QTextDocument* Converter::convert( const QString &fileName )
_handle_anchors(block, link);
}
// start a new page.
_cursor->block().blockFormat().setPageBreakPolicy(QTextFormat::PageBreak_AlwaysAfter);
// Start new file in a new page
int page = mTextDocument->pageCount();
while(mTextDocument->pageCount() == page)
_cursor->insertText(QStringLiteral("\n"));
}
free(data);
......@@ -448,8 +447,6 @@ QTextDocument* Converter::convert( const QString &fileName )
}
}
_cursor->endEditBlock();
delete _cursor;
return mTextDocument;
......
Supports Markdown
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