summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config.xml2
-rw-r--r--src/markdown.cpp22
-rwxr-xr-x[-rw-r--r--]testing/055/md_055_markdown.xml62
3 files changed, 32 insertions, 54 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
{
diff --git a/testing/055/md_055_markdown.xml b/testing/055/md_055_markdown.xml
index 4bdd2e2..307eb26 100644..100755
--- a/testing/055/md_055_markdown.xml
+++ b/testing/055/md_055_markdown.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
- <compounddef id="md_055_markdown" kind="page">
- <compoundname>md_055_markdown</compoundname>
- <title>055_markdown</title>
- <briefdescription>
- </briefdescription>
- <detaileddescription>
- <para>
- <heading level="1">Foo</heading>
- </para>
- <para>
- <heading level="2">Bar</heading>
- </para>
- <para>
- <ulink url="http://example.com/inline">Inline link</ulink>
- </para>
- <para>
- <ulink url="http://example.com/reference">Reference link</ulink>
- </para>
- <para>
- <heading level="2">Baz</heading>
- </para>
- <para>More text</para>
- <para>
- <ulink url="http://example.com/last-line">Upper-cased reference link on last line</ulink>
- </para>
- <para>Dash - NDash <ndash/> MDash <mdash/> EDash - ENDash -- EMDash --- E3Dash --- </para>
- </detaileddescription>
- </compounddef>
-</doxygen>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="md_055_markdown" kind="page">
+ <compoundname>md_055_markdown</compoundname>
+ <title>055_markdown</title>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <sect1 id="md_055_markdown_1autotoc_md0">
+ <title>Foo</title>
+ <sect2 id="md_055_markdown_1autotoc_md1">
+ <title>Bar</title>
+ <para>
+ <ulink url="http://example.com/inline">Inline link</ulink>
+ </para>
+ <para>
+ <ulink url="http://example.com/reference">Reference link</ulink>
+ </para>
+ </sect2>
+ <sect2 id="md_055_markdown_1autotoc_md2">
+ <title>Baz</title>
+ <para>More text</para>
+ <para>
+ <ulink url="http://example.com/last-line">Upper-cased reference link on last line</ulink>
+ </para>
+ <para>Dash - NDash <ndash/> MDash <mdash/> EDash - ENDash -- EMDash --- E3Dash --- </para>
+ </sect2>
+ </sect1>
+ </detaileddescription>
+ </compounddef>
+</doxygen>