Merge branch 'raphlinus:master' into zig-release

specs/regression.txt

@@ -2116,3 +2116,41 @@ baz`</li>
 baz](https://example.com)</li>
 </ul>
 ````````````````````````````````
+
+ISSUE 808
+
+```````````````````````````````` example
+[mylink]
+
+[mylink]: https://example.com
+'
+part of the title'
+.
+<p><a href="https://example.com" title="
+part of the title">mylink</a></p>
+````````````````````````````````
+
+ISSUE 810
+
+```````````````````````````````` example
+1.
+      pulldown-cmark used to think this was code, but commonmark.js and commonmark-hs didn't.
+      The dot in the list marker is at column two, so the child paragraph actually
+      starts in column *three*.
+.
+<ol>
+<li>pulldown-cmark used to think this was code, but commonmark.js and commonmark-hs didn't.
+The dot in the list marker is at column two, so the child paragraph actually
+starts in column <em>three</em>.</li>
+</ol>
+````````````````````````````````
+
+```````````````````````````````` example
+1.
+  This is not in the list at all. It's a paragraph after it.
+.
+<ol>
+<li></li>
+</ol>
+<p>This is not in the list at all. It's a paragraph after it.</p>
+````````````````````````````````

src/firstpass.rs

@@ -1520,7 +1520,12 @@ impl<'a, 'b> FirstPass<'a, 'b> {
                     }
                 }
                 c if c == closing_delim => {
-                    let cow = linebuf.map(CowStr::from).unwrap_or(CowStr::from(&text[linestart..bytecount]));
+                    let cow = if let Some(mut linebuf) = linebuf {
+                        linebuf.push_str(&text[linestart..bytecount]);
+                        CowStr::from(linebuf)
+                    } else {
+                        CowStr::from(&text[linestart..bytecount])
+                    };
                     return Some((bytecount + 1, cow));
                 }
                 _ => {

src/scanners.rs

@@ -236,7 +236,7 @@ impl<'a> LineStart<'a> {
                     } else if c == b')' || c == b'.' {
                         self.ix = ix;
                         if self.scan_space(1) || self.is_at_eol() {
-                            return self.finish_list_marker(c, val, indent + self.ix - start_ix);
+                            return self.finish_list_marker(c, val, indent + 1 + ix - start_ix);
                         } else {
                             break;
                         }

tests/suite/regression.rs

@@ -2492,3 +2492,51 @@ baz](https://example.com)</li>
 
     test_markdown_html(original, expected, false, false, false);
 }
+
+
+#[test]
+fn regression_test_154() {
+    let original = r##"[mylink]
+
+[mylink]: https://example.com
+'
+part of the title'
+"##;
+    let expected = r##"<p><a href="https://example.com" title="
+part of the title">mylink</a></p>
+"##;
+
+    test_markdown_html(original, expected, false, false, false);
+}
+
+#[test]
+fn regression_test_155() {
+    let original = r##"1.
+      pulldown-cmark used to think this was code, but commonmark.js and commonmark-hs didn't.
+      The dot in the list marker is at column two, so the child paragraph actually
+      starts in column *three*.
+"##;
+    let expected = r##"<ol>
+<li>pulldown-cmark used to think this was code, but commonmark.js and commonmark-hs didn't.
+The dot in the list marker is at column two, so the child paragraph actually
+starts in column <em>three</em>.</li>
+</ol>
+"##;
+
+    test_markdown_html(original, expected, false, false, false);
+}
+
+#[test]
+fn regression_test_156() {
+    let original = r##"1.
+  This is not in the list at all. It's a paragraph after it.
+"##;
+    let expected = r##"<ol>
+<li></li>
+</ol>
+<p>This is not in the list at all. It's a paragraph after it.</p>
+
+"##;
+
+    test_markdown_html(original, expected, false, false, false);
+}