Permalink
Browse files

Bug 722711 - [PATCH] Link refs with no title swallow an extra newline

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Jan 26, 2014
1 parent 0e9da9f commit 60ea06a68f2e355e34b61bf45babc6405bfbfe84
Showing with 39 additions and 3 deletions.
  1. +3 −3 src/markdown.cpp
  2. +20 −0 testing/055/md_055_markdown.xml
  3. +16 −0 testing/055_markdown.md
@@ -1133,8 +1133,8 @@ static int isLinkRef(const char *data,int size,
while (i<size && data[i]==' ') i++;
if (i<size && data[i]=='\n')
{
i++;
eol=i;
i++;
while (i<size && data[i]==' ') i++;
}
if (i>=size)
@@ -1152,6 +1152,7 @@ static int isLinkRef(const char *data,int size,
int titleStart=i;
// search for end of the line
while (i<size && data[i]!='\n') i++;
eol = i;
// search back to matching character
int end=i-1;
@@ -1166,8 +1167,7 @@ static int isLinkRef(const char *data,int size,
//printf("end of isLinkRef: i=%d size=%d data[i]='%c' eol=%d\n",
// i,size,data[i],eol);
if (i>=size) return i; // end of buffer while ref id was found
else if (data[i]=='\n') return i+1; // end of line while ref id was found
else if (eol) return eol; // no optional title found
else if (eol) return eol; // end of line while ref id was found
return 0; // invalid link ref
}
@@ -0,0 +1,20 @@
<?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>
<detaileddescription>
<para>
<heading level="1">Foo</heading>
</para>
<para>
<heading level="2">Bar</heading>
</para>
<para>Some text with a <ulink url="http://www.example.com/">link</ulink>.</para>
<para>
<heading level="2">Baz</heading>
</para>
<para>More text </para>
</detaileddescription>
</compounddef>
</doxygen>
@@ -0,0 +1,16 @@
<!--
// objective: test markdown
// check: md_055_markdown.xml
-->
# Foo
## Bar
Some text with a [link][1].
[1]: http://www.example.com/
## Baz
More text

0 comments on commit 60ea06a

Please sign in to comment.