diff options
| author | Stef Walter <stef@memberwebs.com> | 2004-07-11 22:07:43 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2004-07-11 22:07:43 +0000 |
| commit | 5eb52056cf799bd0f55b642a513e024c0304c604 (patch) | |
| tree | a74754e3fdff365df1e481ddf2c4fefdd3014b19 /src/xmlcomposer.cpp | |
| parent | 6469807b6ca403cb585616fe3b9c0607ba391529 (diff) | |
Fixed grouping issues
Consolidate footnotes to end
Proper ref format
Fixed 'removeDuplicate' bugs
Diffstat (limited to 'src/xmlcomposer.cpp')
| -rw-r--r-- | src/xmlcomposer.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/xmlcomposer.cpp b/src/xmlcomposer.cpp index 4091adb..5c29e65 100644 --- a/src/xmlcomposer.cpp +++ b/src/xmlcomposer.cpp @@ -104,6 +104,7 @@ void RtfParser::endDocument() // Cleanup the tree RtfFixups::removeDuplicates(m_document); + RtfFixups::consolidateEndTags(m_document); RtfFixups::breakTables(m_document); RtfFixups::breakTags(m_document, kElTable, kElRow); RtfFixups::breakTags(m_document, kElRow, kElCell); @@ -504,7 +505,8 @@ bool RtfParser::ParseAnalyser::processTextAutoContent(const string& cw, int flag int ac = m_parser->getAutoCount(AUTOCOUNT_FOOTNOTE); AN_ELEMENT(kElRef); - AN_ATTRIBUTE(kAtFootNote, ac); + AN_ATTRIBUTE(kAtType, kValFootNote); + AN_ATTRIBUTE(kAtTo, ac); dest->charData(formatInt(ac)); AN_POP_ELEMENT(); return true; @@ -953,18 +955,7 @@ ON_DONE(FootNote) m_parser->incrementAutoCount(AUTOCOUNT_FOOTNOTE); } -// TODO: Remove these (for debugging) -ON_GROUPSTART(FootNote) -{ - int ac = m_parser->getAutoCount(AUTOCOUNT_FOOTNOTE); - fprintf(stderr, "%d start\n", ac); -} -ON_GROUPEND(FootNote) -{ - int ac = m_parser->getAutoCount(AUTOCOUNT_FOOTNOTE); - fprintf(stderr, "%d end\n", ac); -} ON_CHARDATA(Raw) |