diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-20 14:22:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-20 14:22:13 (GMT) |
| commit | 8eb8e0b77cc50b02a7cb17abb1e4c9b7c1b0d60a (patch) | |
| tree | 9785abea0bac8bab6e947141983d1efbf690bf76 | |
| parent | f5cb240a30552a0a4070f9381f5ba600b6d1dc76 (diff) | |
| parent | f29fcff2647803f23b4852a5c4eb69cebda79a3e (diff) | |
| download | Doxygen-8eb8e0b77cc50b02a7cb17abb1e4c9b7c1b0d60a.zip Doxygen-8eb8e0b77cc50b02a7cb17abb1e4c9b7c1b0d60a.tar.gz Doxygen-8eb8e0b77cc50b02a7cb17abb1e4c9b7c1b0d60a.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | doc/markdown.doc | 5 | ||||
| -rw-r--r-- | src/markdown.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/markdown.doc b/doc/markdown.doc index 883e831..eba9431 100644 --- a/doc/markdown.doc +++ b/doc/markdown.doc @@ -155,7 +155,10 @@ Examples: ______ Note that using asterisks in comment blocks does not work. See -\ref mddox_stars for details. +\ref mddox_stars for details.<br> +Note that when using hyphens and the previous line is not empty you have to +use at least one whitespace in the sequence of hyphens otherwise it might be +seen as a level 2 header (see \ref md_headers). \subsection md_emphasis Emphasis diff --git a/src/markdown.cpp b/src/markdown.cpp index 930efd6..e395fd9 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -784,7 +784,7 @@ void Markdown::writeMarkdownImage(const char *fmt, bool explicitTitle, m_out.addStr(title); m_out.addStr("\""); } - m_out.addStr("\n"); + m_out.addStr("\\ilinebr"); } int Markdown::processLink(const char *data,int,int size) @@ -2033,7 +2033,7 @@ void Markdown::writeOneLineHeaderOrRuler(const char *data,int size) QCString id; if (isHRuler(data,size)) { - m_out.addStr("\n<hr>\n"); + m_out.addStr("<hr>\n"); } else if ((level=isAtxHeader(data,size,header,id,TRUE))) { |