diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-02-09 09:46:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-02-09 09:46:13 (GMT) |
| commit | ecd6ab38db2333b0e4a69a81e027e9d420b65965 (patch) | |
| tree | 7381eb18a87bdcf6a271fe02f4e5b24e30607088 | |
| parent | 3cbb8b8b56cb56f9cca84740baa065cb07997f90 (diff) | |
| parent | 3b9624bf5b3e167a825309feeaaedc927a8e5552 (diff) | |
| download | Doxygen-ecd6ab38db2333b0e4a69a81e027e9d420b65965.zip Doxygen-ecd6ab38db2333b0e4a69a81e027e9d420b65965.tar.gz Doxygen-ecd6ab38db2333b0e4a69a81e027e9d420b65965.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/docparser.cpp | 6 | ||||
| -rw-r--r-- | src/searchindex.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 889a014..9348810 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -7133,7 +7133,7 @@ void DocRoot::parse() { if (!g_token->sectionId.startsWith("autotoc_md")) { - warn_doc_error(g_fileName,doctokenizerYYlineno,"found paragraph command outside of subsubsection context!"); + warn_doc_error(g_fileName,doctokenizerYYlineno,"found paragraph command (id: '%s') outside of subsubsection context!",qPrint(g_token->sectionId)); } while (retval==RetVal_Paragraph) { @@ -7163,7 +7163,7 @@ void DocRoot::parse() if (retval==RetVal_Subsubsection) { if (!(g_token->sectionId.startsWith("autotoc_md"))) - warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsubsection command outside of subsection context!"); + warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsubsection command (id: '%s') outside of subsection context!",qPrint(g_token->sectionId)); while (retval==RetVal_Subsubsection) { if (!g_token->sectionId.isEmpty()) @@ -7193,7 +7193,7 @@ void DocRoot::parse() { if (!g_token->sectionId.startsWith("autotoc_md")) { - warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsection command outside of section context!"); + warn_doc_error(g_fileName,doctokenizerYYlineno,"found subsection command (id: '%s') outside of section context!",qPrint(g_token->sectionId)); } while (retval==RetVal_Subsection) { diff --git a/src/searchindex.cpp b/src/searchindex.cpp index eee1aa1..329b123 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -1052,7 +1052,7 @@ void writeJavaScriptSearchIndex() QCString anchor = d->anchor(); ti << "'" << externalRef("../",d->getReference(),TRUE) - << d->getOutputFileBase() << Doxygen::htmlFileExtension; + << addHtmlExtensionIfMissing(d->getOutputFileBase()); if (!anchor.isEmpty()) { ti << "#" << anchor; @@ -1109,7 +1109,7 @@ void writeJavaScriptSearchIndex() ti << "],["; } ti << "'" << externalRef("../",d->getReference(),TRUE) - << d->getOutputFileBase() << Doxygen::htmlFileExtension; + << addHtmlExtensionIfMissing(d->getOutputFileBase()); if (!anchor.isEmpty()) { ti << "#" << anchor; |