diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-02-04 20:55:23 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-02-04 20:55:23 (GMT) |
| commit | 5b68436fbcc1d45eef63783faae8727e9d806096 (patch) | |
| tree | b3c8ca30b19b2cf594e25183e05329fa24574610 /testing | |
| parent | 89638fbc9961bd9a1e9cb7bc25e5f739936e8a43 (diff) | |
| parent | 3df31762585075033a04e40c3cdfb52781aa258f (diff) | |
| download | Doxygen-5b68436fbcc1d45eef63783faae8727e9d806096.zip Doxygen-5b68436fbcc1d45eef63783faae8727e9d806096.tar.gz Doxygen-5b68436fbcc1d45eef63783faae8727e9d806096.tar.bz2 | |
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
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/055/md_055_markdown.xml | 12 | ||||
| -rw-r--r-- | testing/055_markdown.md | 12 |
2 files changed, 19 insertions, 5 deletions
diff --git a/testing/055/md_055_markdown.xml b/testing/055/md_055_markdown.xml index 496685f..4006db8 100644 --- a/testing/055/md_055_markdown.xml +++ b/testing/055/md_055_markdown.xml @@ -10,11 +10,19 @@ <para> <heading level="2">Bar</heading> </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> <heading level="2">Baz</heading> </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> </compounddef> </doxygen> diff --git a/testing/055_markdown.md b/testing/055_markdown.md index 39ce574..aeb9f1a 100644 --- a/testing/055_markdown.md +++ b/testing/055_markdown.md @@ -1,5 +1,5 @@ <!-- -// objective: test markdown +// objective: test markdown parsing // check: md_055_markdown.xml --> @@ -7,10 +7,16 @@ ## 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 More text + +[Upper-cased reference link on last line][U] + +[U]: http://example.com/last-line |