diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-09 14:34:17 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-03-09 14:34:17 (GMT) |
commit | 0c8bc0e1bae616cab770884864d72d66db953235 (patch) | |
tree | 2780521957182f56829861ac3105317002d41f1a /src/htmldocvisitor.cpp | |
parent | 169a67186780c191749b958de0f71a17fa090248 (diff) | |
parent | 8d13a1a9d0e6a5e4f50563b6d1b6840176e4a5cc (diff) | |
download | Doxygen-0c8bc0e1bae616cab770884864d72d66db953235.zip Doxygen-0c8bc0e1bae616cab770884864d72d66db953235.tar.gz Doxygen-0c8bc0e1bae616cab770884864d72d66db953235.tar.bz2 |
Merge branch 'feature/bug_lineno_split_examples' of https://github.com/albert-github/doxygen into albert-github-feature/bug_lineno_split_examples
Diffstat (limited to 'src/htmldocvisitor.cpp')
-rw-r--r-- | src/htmldocvisitor.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index c0c22b8..f405591 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -670,7 +670,9 @@ void HtmlDocVisitor::visit(DocInclude *inc) forceStartParagraph(inc); } break; - case DocInclude::DontInclude: + case DocInclude::DontInclude: + case DocInclude::LatexInclude: + case DocInclude::DontIncWithLines: break; case DocInclude::HtmlInclude: { @@ -679,8 +681,6 @@ void HtmlDocVisitor::visit(DocInclude *inc) if (inc->isBlock()) forceStartParagraph(inc); } break; - case DocInclude::LatexInclude: - break; case DocInclude::VerbInclude: forceEndParagraph(inc); m_t << /*PREFRAG_START <<*/ "<pre class=\"fragment\">"; @@ -762,6 +762,12 @@ void HtmlDocVisitor::visit(DocIncOperator *op) popEnabled(); if (!m_hide) { + FileDef *fd; + if (!op->includeFileName().isEmpty()) + { + QFileInfo cfi( op->includeFileName() ); + fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() ); + } Doxygen::parserManager->getParser(m_langExt) ->parseCode( m_ci, @@ -770,14 +776,15 @@ void HtmlDocVisitor::visit(DocIncOperator *op) langExt, op->isExample(), op->exampleFile(), - 0, // fileDef - -1, // startLine + fd, // fileDef + op->line(), // startLine -1, // endLine FALSE, // inline fragment 0, // memberDef - TRUE, // show line numbers + op->showLineNo(), // show line numbers m_ctx // search context ); + if (fd) delete fd; } pushEnabled(); m_hide=TRUE; |