From 6c4f10c375530d1baf82527787d4887cc343d9bb Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 12 Aug 2019 15:49:28 +0200 Subject: Table caption flows in first table field for RTF output See to it that the table caption is placed on top of the table and not in the first field. (See the doxygen documentation in respect to the tables; problem with tables in tables is a a different problem.) --- src/rtfdocvisitor.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 43ac362..2b20e3d 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1005,11 +1005,14 @@ void RTFDocVisitor::visitPost(DocHtmlTable *) void RTFDocVisitor::visitPre(DocHtmlCaption *) { DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHtmlCaption)}\n"); + m_t << "\\pard \\qc \\b"; + m_t << "{Table \\field\\flddirty{\\*\\fldinst { SEQ Image \\\\*Arabic }}{\\fldrslt {\\noproof 1}} "; } void RTFDocVisitor::visitPost(DocHtmlCaption *) { DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlCaption)}\n"); + m_t << "}\n\\par" << endl; } void RTFDocVisitor::visitPre(DocHtmlRow *r) -- cgit v0.12 From 6d5ac50ae99b913a26a752fe86dfab1643b73a02 Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 13 Aug 2019 10:29:19 +0200 Subject: Table caption flows in first table field for RTF output Tables should be numbered independent of images. --- src/rtfdocvisitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 2b20e3d..8606264 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1006,7 +1006,7 @@ void RTFDocVisitor::visitPre(DocHtmlCaption *) { DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHtmlCaption)}\n"); m_t << "\\pard \\qc \\b"; - m_t << "{Table \\field\\flddirty{\\*\\fldinst { SEQ Image \\\\*Arabic }}{\\fldrslt {\\noproof 1}} "; + m_t << "{Table \\field\\flddirty{\\*\\fldinst { SEQ Table \\\\*Arabic }}{\\fldrslt {\\noproof 1}} "; } void RTFDocVisitor::visitPost(DocHtmlCaption *) -- cgit v0.12