diff options
Diffstat (limited to 'src/xmlcomposer.cpp')
| -rw-r--r-- | src/xmlcomposer.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/xmlcomposer.cpp b/src/xmlcomposer.cpp index cb1bf16..dcd4c34 100644 --- a/src/xmlcomposer.cpp +++ b/src/xmlcomposer.cpp @@ -124,29 +124,33 @@ void XmlComposer::endDocument() { LevelHandler::endDocument(); - // Pass 0: Cleanup the tree - XmlFixups::combineDuplicates(m_document); - XmlFixups::consolidateStartTags(m_document); - XmlFixups::consolidateEndTags(m_document); + XmlFixups fix; + + // Pass 0: Cleanup the tree + // XmlFixups::combineDuplicates(m_document); + // XmlFixups::consolidateStartTags(m_document); + // XmlFixups::consolidateEndTags(m_document); // Pass 1: Block breakout - XmlFixups::breakTables(m_document); - XmlFixups::breakTags(m_document, kElTable, kElRow); - XmlFixups::breakTags(m_document, kElRow, kElCell); - XmlFixups::wrapTags(m_document, kElCell, kElDest); - XmlFixups::breakBlocks(m_document); - XmlFixups::breakLists(m_document); + fix.breakTables(m_document); + fix.breakTags(m_document, kElTable, kElRow); + fix.breakTags(m_document, kElRow, kElCell); + fix.wrapTags(m_document, kElCell, kElDest); + fix.breakBlocks(m_document); + fix.breakLists(m_document); // Pass 2: Fixups - XmlFixups::fixLists(m_document); - XmlFixups::fixStyles(m_document); - XmlFixups::fixBlocks(m_document); - XmlFixups::removeTags(m_document); - XmlFixups::breakBreak(m_document, kElDoc, kElPage); - XmlFixups::breakBreak(m_document, kElDoc, kElSect); + fix.runPassTwo(m_document); + + // XmlFixups::fixLists(m_document); + // XmlFixups::fixStyles(m_document); + // XmlFixups::fixBlocks(m_document); + // XmlFixups::removeTags(m_document); + // XmlFixups::breakBreak(m_document, kElDoc, kElPage); + // XmlFixups::breakBreak(m_document, kElDoc, kElSect); // Pass 3: Final cleanup - XmlFixups::combineDuplicates(m_document); + // XmlFixups::combineDuplicates(m_document); return; } @@ -330,7 +334,7 @@ void XmlComposer::incrementAutoCount(int type) #define DEFAULT_CONTROLWORD processDefault(cw, flags, param) #define DUMMY 1 == 1 #define NUM_ATTR(x) formatInt(x) -#define DO_EXTRAS() (m_composer->GetOptions().extras) +#define DO_EXTRAS() (m_composer->getOptions().extras) /* ---------------------------------------------------------------------------------- * BASE ANALYSER @@ -1049,7 +1053,7 @@ ON_CHARDATA(Content) AN_ELEMENT(kElFont); if(font != -1) - AN_ATTRIBUTE(kAtId, font); + AN_ATTRIBUTE(kAtName, font); if(fontsize != -1) AN_ATTRIBUTE(kAtSize, fontsize); |