Commit 5b68436f authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge branch 'wip/fix-link-id-on-last-line' of...

Merge branch 'wip/fix-link-id-on-last-line' of https://github.com/agateau/doxygen into agateau-wip/fix-link-id-on-last-line

Conflicts:
	testing/055/md_055_markdown.xml
	testing/055_markdown.md
parents 89638fbc 3df31762
...@@ -2101,7 +2101,7 @@ static QCString processBlocks(const QCString &s,int indent) ...@@ -2101,7 +2101,7 @@ static QCString processBlocks(const QCString &s,int indent)
{ {
//printf("found link ref: id='%s' link='%s' title='%s'\n", //printf("found link ref: id='%s' link='%s' title='%s'\n",
// id.data(),link.data(),title.data()); // id.data(),link.data(),title.data());
g_linkRefs.insert(id,new LinkRef(link,title)); g_linkRefs.insert(id.lower(),new LinkRef(link,title));
} }
else else
{ {
......
...@@ -10,11 +10,19 @@ ...@@ -10,11 +10,19 @@
<para> <para>
<heading level="2">Bar</heading> <heading level="2">Bar</heading>
</para> </para>
<para>Some text with a <ulink url="http://www.example.com/">link</ulink>.</para> <para>
<ulink url="http://example.com/inline">Inline link</ulink>
</para>
<para>
<ulink url="http://example.com/reference">Reference link</ulink>
</para>
<para> <para>
<heading level="2">Baz</heading> <heading level="2">Baz</heading>
</para> </para>
<para>More text </para> <para>More text</para>
<para>
<ulink url="http://example.com/last-line">Upper-cased reference link on last line</ulink>
</para>
</detaileddescription> </detaileddescription>
</compounddef> </compounddef>
</doxygen> </doxygen>
<!-- <!--
// objective: test markdown // objective: test markdown parsing
// check: md_055_markdown.xml // check: md_055_markdown.xml
--> -->
...@@ -7,10 +7,16 @@ ...@@ -7,10 +7,16 @@
## Bar ## Bar
Some text with a [link][1]. [Inline link](http://example.com/inline)
[1]: http://www.example.com/ [Reference link][1]
[1]: http://example.com/reference
## Baz ## Baz
More text More text
[Upper-cased reference link on last line][U]
[U]: http://example.com/last-line
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment