From 7bb28cb61ee12edf77aa0c368eaf747fb162bad9 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 8 Feb 2020 13:40:47 +0100 Subject: Problem with links from search index files The format of the tag file has been slightly changed in the past so that the original HTML_FILE_EXTENSION was preserved by adding the HTML_FILE_EXTENSION to the items in the tag file. This change has not been reflected in the search files like `files_0.js` resulting in lines like ``` ['core_5fbigfloat_2eh_8971',['CORE_BigFloat.h',['../../Number_types/CORE__BigFloat_8h.html.html',1,'']]], ``` this has been corrected. (Found in the CGAL code). --- src/searchindex.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- cgit v0.12 From 4281a6cb105c3b57bb8f866ec55e8ef13060c401 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 8 Feb 2020 15:07:32 +0100 Subject: More indicative warning for wrong nesting of sections In case we have a "*section" outside the hierarchy it is useful also have the id of the misbehaving "*section" even though line numbers are given , they might be misleading. --- src/docparser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 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) { -- cgit v0.12