summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-01-26 11:07:12 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-01-26 11:07:12 (GMT)
commitafc77213ab3662f3a7377af94d77ebee1f972bb7 (patch)
treeb9e9e8ed31bd6ee0f863c8ff70c6bfe9e11e5ea4 /src
parentb073c0a41a2575d8be4cbd17482d605d6d930e19 (diff)
parent5b1b37bc6b84da6d9641356c6a53741355150c08 (diff)
downloadDoxygen-afc77213ab3662f3a7377af94d77ebee1f972bb7.zip
Doxygen-afc77213ab3662f3a7377af94d77ebee1f972bb7.tar.gz
Doxygen-afc77213ab3662f3a7377af94d77ebee1f972bb7.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r--src/config.xml2
-rw-r--r--src/markdown.cpp22
2 files changed, 1 insertions, 23 deletions
diff --git a/src/config.xml b/src/config.xml
index a62040b..8820fe7 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -667,7 +667,7 @@ Go to the <a href="commands.html">next</a> section or return to the
]]>
</docs>
</option>
- <option type='int' id='TOC_INCLUDE_HEADINGS' minval='0' maxval='99' defval='0' depends='MARKDOWN_SUPPORT'>
+ <option type='int' id='TOC_INCLUDE_HEADINGS' minval='0' maxval='99' defval='5' depends='MARKDOWN_SUPPORT'>
<docs>
<![CDATA[
When the \c TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings
diff --git a/src/markdown.cpp b/src/markdown.cpp
index 74492ea..fcad7e9 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2282,28 +2282,6 @@ static QCString processBlocks(const QCString &s,int indent)
out.addStr(" ");
out.addStr(header);
out.addStr("\n\n");
- SectionInfo *si = Doxygen::sectionDict->find(id);
- if (si)
- {
- if (si->lineNr != -1)
- {
- warn(g_fileName,g_lineNr,"multiple use of section label '%s', (first occurrence: %s, line %d)",header.data(),si->fileName.data(),si->lineNr);
- }
- else
- {
- warn(g_fileName,g_lineNr,"multiple use of section label '%s', (first occurrence: %s)",header.data(),si->fileName.data());
- }
- }
- else
- {
- si = new SectionInfo(g_fileName,g_lineNr,id,header,
- level==1 ? SectionInfo::Section : SectionInfo::Subsection,level);
- if (g_current)
- {
- g_current->anchors->append(si);
- }
- Doxygen::sectionDict->append(id,si);
- }
}
else
{