summaryrefslogtreecommitdiff
path: root/src/rtfdocvisitor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/rtfdocvisitor.cpp')
-rw-r--r--src/rtfdocvisitor.cpp85
1 files changed, 46 insertions, 39 deletions
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index 1e2afaa..f080139 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -1,9 +1,6 @@
/******************************************************************************
*
- *
- *
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
+ * Copyright (C) 1997-2022 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
@@ -27,6 +24,7 @@
#include "msc.h"
#include "util.h"
#include "rtfstyle.h"
+#include "rtfgen.h"
#include "message.h"
#include "parserintf.h"
#include "msc.h"
@@ -37,6 +35,7 @@
#include "emoji.h"
#include "plantuml.h"
#include "fileinfo.h"
+#include "portable.h"
//#define DBG_RTF(x) m_t << x
#define DBG_RTF(x) do {} while(0)
@@ -55,9 +54,9 @@ static QCString align(const DocHtmlCell &cell)
return "";
}
-RTFDocVisitor::RTFDocVisitor(TextStream &t,CodeOutputInterface &ci,
- const QCString &langExt)
- : m_t(t), m_ci(ci), m_langExt(langExt)
+RTFDocVisitor::RTFDocVisitor(TextStream &t,OutputCodeList &ci,
+ const QCString &langExt, int hierarchyLevel)
+ : m_t(t), m_ci(ci), m_langExt(langExt), m_hierarchyLevel(hierarchyLevel)
{
}
@@ -128,14 +127,14 @@ void RTFDocVisitor::operator()(const DocSymbol &s)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visit(DocSymbol)}\n");
- const char *res = HtmlEntityMapper::instance()->rtf(s.symbol());
+ const char *res = HtmlEntityMapper::instance().rtf(s.symbol());
if (res)
{
m_t << res;
}
else
{
- err("RTF: non supported HTML-entity found: %s\n",HtmlEntityMapper::instance()->html(s.symbol(),TRUE));
+ err("RTF: non supported HTML-entity found: %s\n",HtmlEntityMapper::instance().html(s.symbol(),TRUE));
}
m_lastIsPara=FALSE;
}
@@ -144,7 +143,7 @@ void RTFDocVisitor::operator()(const DocEmoji &s)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visit(DocEmoji)}\n");
- const char *res = EmojiEntityMapper::instance()->unicode(s.index());
+ const char *res = EmojiEntityMapper::instance().unicode(s.index());
if (res)
{
const char *p = res;
@@ -286,9 +285,6 @@ void RTFDocVisitor::operator()(const DocStyleChange &s)
break;
case DocStyleChange::Div: /* HTML only */ break;
case DocStyleChange::Span: /* HTML only */ break;
- case DocStyleChange::Summary: /* emulation of the <summary> tag inside a <details> tag */
- if (s.enable()) m_t << "{\\b "; else m_t << "}\\par ";
- break;
}
}
@@ -351,7 +347,7 @@ void RTFDocVisitor::operator()(const DocVerbatim &s)
dotindex++,
".dot"
);
- std::ofstream file(fileName.str(),std::ofstream::out | std::ofstream::binary);
+ std::ofstream file = Portable::openOutputStream(fileName);
if (!file.is_open())
{
err("Could not open file %s for writing\n",qPrint(fileName));
@@ -380,7 +376,7 @@ void RTFDocVisitor::operator()(const DocVerbatim &s)
mscindex++,
".msc"
);
- std::ofstream file(baseName.str(),std::ofstream::out | std::ofstream::binary);
+ std::ofstream file = Portable::openOutputStream(baseName);
if (!file.is_open())
{
err("Could not open file %s for writing\n",qPrint(baseName));
@@ -449,20 +445,19 @@ void RTFDocVisitor::operator()(const DocInclude &inc)
m_t << "\\par\n";
m_t << rtf_Style_Reset << getStyle("CodeExample");
FileInfo cfi( inc.file().str() );
- FileDef *fd = createFileDef( cfi.dirPath(), cfi.fileName() );
+ auto fd = createFileDef( cfi.dirPath(), cfi.fileName() );
getCodeParser(inc.extension()).parseCode(m_ci,inc.context(),
inc.text(),
langExt,
inc.isExample(),
inc.exampleFile(),
- fd, // fileDef,
+ fd.get(), // fileDef,
-1, // start line
-1, // end line
FALSE, // inline fragment
0, // memberDef
TRUE // show line numbers
);
- delete fd;
m_t << "\\par";
m_t << "}\n";
}
@@ -504,12 +499,13 @@ void RTFDocVisitor::operator()(const DocInclude &inc)
m_t << "}\n";
break;
case DocInclude::Snippet:
+ case DocInclude::SnippetTrimLeft:
m_t << "{\n";
if (!m_lastIsPara) m_t << "\\par\n";
m_t << rtf_Style_Reset << getStyle("CodeExample");
getCodeParser(inc.extension()).parseCode(m_ci,
inc.context(),
- extractBlock(inc.text(),inc.blockId()),
+ extractBlock(inc.text(),inc.blockId(),inc.type()==DocInclude::SnippetTrimLeft),
langExt,
inc.isExample(),
inc.exampleFile()
@@ -519,7 +515,7 @@ void RTFDocVisitor::operator()(const DocInclude &inc)
case DocInclude::SnipWithLines:
{
FileInfo cfi( inc.file().str() );
- FileDef *fd = createFileDef( cfi.dirPath(), cfi.fileName() );
+ auto fd = createFileDef( cfi.dirPath(), cfi.fileName() );
m_t << "{\n";
if (!m_lastIsPara) m_t << "\\par\n";
m_t << rtf_Style_Reset << getStyle("CodeExample");
@@ -529,14 +525,13 @@ void RTFDocVisitor::operator()(const DocInclude &inc)
langExt,
inc.isExample(),
inc.exampleFile(),
- fd,
+ fd.get(),
lineBlock(inc.text(),inc.blockId()),
-1, // endLine
FALSE, // inlineFragment
0, // memberDef
TRUE // show line number
);
- delete fd;
m_t << "}";
}
break;
@@ -573,7 +568,7 @@ void RTFDocVisitor::operator()(const DocIncOperator &op)
m_hide = popHidden();
if (!m_hide)
{
- FileDef *fd = 0;
+ std::unique_ptr<FileDef> fd = 0;
if (!op.includeFileName().isEmpty())
{
FileInfo cfi( op.includeFileName().str() );
@@ -582,14 +577,13 @@ void RTFDocVisitor::operator()(const DocIncOperator &op)
getCodeParser(locLangExt).parseCode(m_ci,op.context(),op.text(),langExt,
op.isExample(),op.exampleFile(),
- fd, // fileDef
+ fd.get(), // fileDef
op.line(), // startLine
-1, // endLine
FALSE, // inline fragment
0, // memberDef
op.showLineNo() // show line numbers
);
- if (fd) delete fd;
}
pushHidden(m_hide);
m_hide=TRUE;
@@ -862,7 +856,9 @@ void RTFDocVisitor::operator()(const DocSection &s)
m_t << "{{" // start section
<< rtf_Style_Reset;
QCString heading;
- int level = std::min(s.level()+1,4);
+ int level = std::min(s.level()+2+m_hierarchyLevel,4);
+ if (level <= 0)
+ level = 1;
heading.sprintf("Heading%d",level);
// set style
m_t << rtf_Style[heading.str()].reference() << "\n";
@@ -1131,25 +1127,34 @@ void RTFDocVisitor::operator()(const DocHRef &href)
m_lastIsPara=FALSE;
}
+void RTFDocVisitor::operator()(const DocHtmlSummary &s)
+{
+ if (m_hide) return;
+ m_t << "{\\b ";
+ visitChildren(s);
+ m_t << "}\\par ";
+}
+
void RTFDocVisitor::operator()(const DocHtmlDetails &d)
{
if (m_hide) return;
- //m_lastIsPara=TRUE;
- //m_t << "{\n";
- //m_t << "\\par\n";
- //visitChildren(d);
- //m_t << "\\par";
- //m_t << "}\n";
- //m_lastIsPara=TRUE;
DBG_RTF("{\\comment RTFDocVisitor::operator()(const DocHtmlDetails &)}\n");
if (!m_lastIsPara) m_t << "\\par\n";
- m_t << "{"; // start desc
- incIndentLevel();
- m_t << rtf_Style_Reset << getStyle("DescContinue");
+ auto summary = d.summary();
+ if (summary)
+ {
+ std::visit(*this,*summary);
+ m_t << "{"; // start desc
+ incIndentLevel();
+ m_t << rtf_Style_Reset << getStyle("DescContinue");
+ }
visitChildren(d);
if (!m_lastIsPara) m_t << "\\par\n";
- decIndentLevel();
- m_t << "}"; // end desc
+ if (summary)
+ {
+ decIndentLevel();
+ m_t << "}"; // end desc
+ }
m_lastIsPara=TRUE;
}
@@ -1160,7 +1165,9 @@ void RTFDocVisitor::operator()(const DocHtmlHeader &header)
m_t << "{" // start section
<< rtf_Style_Reset;
QCString heading;
- int level = std::min(header.level(),5);
+ int level = std::min(header.level()+m_hierarchyLevel,5);
+ if (level <= 0)
+ level = 1;
heading.sprintf("Heading%d",level);
// set style
m_t << rtf_Style[heading.str()].reference();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 16:02:02 +0000