docs/demo/initial.md

@@ -9,7 +9,7 @@ How To Use The Demo
 1. Type in stuff on the left.
 2. See the live updates on the right.
 
-That's it.  Pretty simple.  There's also a drop-down option in the upper right to switch between various views:
+That's it.  Pretty simple.  There's also a drop-down option above to switch between various views:
 
 - **Preview:**  A live display of the generated HTML as it would render in a browser.
 - **HTML Source:**  The generated HTML before your browser makes it pretty.

lib/marked.cjs

@@ -540,7 +540,9 @@ var Tokenizer = /*#__PURE__*/function () {
         }
         raw = cap[0];
         src = src.substring(raw.length);
-        line = cap[2].split('\n', 1)[0];
+        line = cap[2].split('\n', 1)[0].replace(/^\t+/, function (t) {
+          return ' '.repeat(3 * t.length);
+        });
         nextLine = src.split('\n', 1)[0];
         if (this.options.pedantic) {
           indent = 2;
@@ -559,56 +561,72 @@ var Tokenizer = /*#__PURE__*/function () {
           endEarly = true;
         }
         if (!endEarly) {
-          var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
+          var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))");
           var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)");
           var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)");
           var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#");
 
           // Check if following lines should be included in List Item
           while (src) {
             rawLine = src.split('\n', 1)[0];
-            line = rawLine;
+            nextLine = rawLine;
 
             // Re-align to follow commonmark nesting rules
             if (this.options.pedantic) {
-              line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+              nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
             }
 
             // End list item if found code fences
-            if (fencesBeginRegex.test(line)) {
+            if (fencesBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new heading
-            if (headingBeginRegex.test(line)) {
+            if (headingBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new bullet
-            if (nextBulletRegex.test(line)) {
+            if (nextBulletRegex.test(nextLine)) {
               break;
             }
 
             // Horizontal rule found
             if (hrRegex.test(src)) {
               break;
             }
-            if (line.search(/[^ ]/) >= indent || !line.trim()) {
+            if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) {
               // Dedent if possible
-              itemContents += '\n' + line.slice(indent);
-            } else if (!blankLine) {
-              // Until blank line, item doesn't need indentation
-              itemContents += '\n' + line;
+              itemContents += '\n' + nextLine.slice(indent);
             } else {
-              // Otherwise, improper indentation ends this item
-              break;
+              // not enough indentation
+              if (blankLine) {
+                break;
+              }
+
+              // paragraph continuation unless last line was a different block level element
+              if (line.search(/[^ ]/) >= 4) {
+                // indented code block
+                break;
+              }
+              if (fencesBeginRegex.test(line)) {
+                break;
+              }
+              if (headingBeginRegex.test(line)) {
+                break;
+              }
+              if (hrRegex.test(line)) {
+                break;
+              }
+              itemContents += '\n' + nextLine;
             }
-            if (!blankLine && !line.trim()) {
+            if (!blankLine && !nextLine.trim()) {
               // Check if current line is blank
               blankLine = true;
             }
             raw += rawLine + '\n';
             src = src.substring(rawLine.length + 1);
+            line = nextLine.slice(indent);
           }
         }
         if (!list.loose) {

lib/marked.esm.js

@@ -513,7 +513,7 @@ class Tokenizer {
         raw = cap[0];
         src = src.substring(raw.length);
 
-        line = cap[2].split('\n', 1)[0];
+        line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
         nextLine = src.split('\n', 1)[0];
 
         if (this.options.pedantic) {
@@ -535,33 +535,33 @@ class Tokenizer {
         }
 
         if (!endEarly) {
-          const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`);
+          const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`);
           const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
           const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`);
           const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
 
           // Check if following lines should be included in List Item
           while (src) {
             rawLine = src.split('\n', 1)[0];
-            line = rawLine;
+            nextLine = rawLine;
 
             // Re-align to follow commonmark nesting rules
             if (this.options.pedantic) {
-              line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+              nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
             }
 
             // End list item if found code fences
-            if (fencesBeginRegex.test(line)) {
+            if (fencesBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new heading
-            if (headingBeginRegex.test(line)) {
+            if (headingBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new bullet
-            if (nextBulletRegex.test(line)) {
+            if (nextBulletRegex.test(nextLine)) {
               break;
             }
 
@@ -570,20 +570,38 @@ class Tokenizer {
               break;
             }
 
-            if (line.search(/[^ ]/) >= indent || !line.trim()) { // Dedent if possible
-              itemContents += '\n' + line.slice(indent);
-            } else if (!blankLine) { // Until blank line, item doesn't need indentation
-              itemContents += '\n' + line;
-            } else { // Otherwise, improper indentation ends this item
-              break;
+            if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible
+              itemContents += '\n' + nextLine.slice(indent);
+            } else {
+              // not enough indentation
+              if (blankLine) {
+                break;
+              }
+
+              // paragraph continuation unless last line was a different block level element
+              if (line.search(/[^ ]/) >= 4) { // indented code block
+                break;
+              }
+              if (fencesBeginRegex.test(line)) {
+                break;
+              }
+              if (headingBeginRegex.test(line)) {
+                break;
+              }
+              if (hrRegex.test(line)) {
+                break;
+              }
+
+              itemContents += '\n' + nextLine;
             }
 
-            if (!blankLine && !line.trim()) { // Check if current line is blank
+            if (!blankLine && !nextLine.trim()) { // Check if current line is blank
               blankLine = true;
             }
 
             raw += rawLine + '\n';
             src = src.substring(rawLine.length + 1);
+            line = nextLine.slice(indent);
           }
         }
 

lib/marked.umd.js

@@ -544,7 +544,9 @@
           }
           raw = cap[0];
           src = src.substring(raw.length);
-          line = cap[2].split('\n', 1)[0];
+          line = cap[2].split('\n', 1)[0].replace(/^\t+/, function (t) {
+            return ' '.repeat(3 * t.length);
+          });
           nextLine = src.split('\n', 1)[0];
           if (this.options.pedantic) {
             indent = 2;
@@ -563,56 +565,72 @@
             endEarly = true;
           }
           if (!endEarly) {
-            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))");
+            var nextBulletRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))");
             var hrRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)");
             var fencesBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}(?:```|~~~)");
             var headingBeginRegex = new RegExp("^ {0," + Math.min(3, indent - 1) + "}#");
 
             // Check if following lines should be included in List Item
             while (src) {
               rawLine = src.split('\n', 1)[0];
-              line = rawLine;
+              nextLine = rawLine;
 
               // Re-align to follow commonmark nesting rules
               if (this.options.pedantic) {
-                line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+                nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
               }
 
               // End list item if found code fences
-              if (fencesBeginRegex.test(line)) {
+              if (fencesBeginRegex.test(nextLine)) {
                 break;
               }
 
               // End list item if found start of new heading
-              if (headingBeginRegex.test(line)) {
+              if (headingBeginRegex.test(nextLine)) {
                 break;
               }
 
               // End list item if found start of new bullet
-              if (nextBulletRegex.test(line)) {
+              if (nextBulletRegex.test(nextLine)) {
                 break;
               }
 
               // Horizontal rule found
               if (hrRegex.test(src)) {
                 break;
               }
-              if (line.search(/[^ ]/) >= indent || !line.trim()) {
+              if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) {
                 // Dedent if possible
-                itemContents += '\n' + line.slice(indent);
-              } else if (!blankLine) {
-                // Until blank line, item doesn't need indentation
-                itemContents += '\n' + line;
+                itemContents += '\n' + nextLine.slice(indent);
               } else {
-                // Otherwise, improper indentation ends this item
-                break;
+                // not enough indentation
+                if (blankLine) {
+                  break;
+                }
+
+                // paragraph continuation unless last line was a different block level element
+                if (line.search(/[^ ]/) >= 4) {
+                  // indented code block
+                  break;
+                }
+                if (fencesBeginRegex.test(line)) {
+                  break;
+                }
+                if (headingBeginRegex.test(line)) {
+                  break;
+                }
+                if (hrRegex.test(line)) {
+                  break;
+                }
+                itemContents += '\n' + nextLine;
               }
-              if (!blankLine && !line.trim()) {
+              if (!blankLine && !nextLine.trim()) {
                 // Check if current line is blank
                 blankLine = true;
               }
               raw += rawLine + '\n';
               src = src.substring(rawLine.length + 1);
+              line = nextLine.slice(indent);
             }
           }
           if (!list.loose) {

package.json

@@ -2,7 +2,7 @@
   "name": "marked",
   "description": "A markdown parser built for speed",
   "author": "Christopher Jeffrey",
-  "version": "4.2.4",
+  "version": "4.2.5",
   "type": "module",
   "main": "./lib/marked.cjs",
   "module": "./lib/marked.esm.js",
@@ -54,7 +54,7 @@
     "@semantic-release/release-notes-generator": "^10.0.3",
     "cheerio": "^1.0.0-rc.12",
     "commonmark": "0.30.0",
-    "eslint": "^8.29.0",
+    "eslint": "^8.30.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-n": "^15.6.0",
@@ -64,7 +64,7 @@
     "jasmine": "^4.5.0",
     "markdown-it": "13.0.1",
     "node-fetch": "^3.3.0",
-    "rollup": "^3.6.0",
+    "rollup": "^3.7.5",
     "semantic-release": "^19.0.5",
     "titleize": "^3.0.0",
     "uglify-js": "^3.17.4",

src/Tokenizer.js

@@ -203,7 +203,7 @@ export class Tokenizer {
         raw = cap[0];
         src = src.substring(raw.length);
 
-        line = cap[2].split('\n', 1)[0];
+        line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
         nextLine = src.split('\n', 1)[0];
 
         if (this.options.pedantic) {
@@ -225,33 +225,33 @@ export class Tokenizer {
         }
 
         if (!endEarly) {
-          const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?: [^\\n]*)?(?:\\n|$))`);
+          const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`);
           const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
           const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`);
           const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
 
           // Check if following lines should be included in List Item
           while (src) {
             rawLine = src.split('\n', 1)[0];
-            line = rawLine;
+            nextLine = rawLine;
 
             // Re-align to follow commonmark nesting rules
             if (this.options.pedantic) {
-              line = line.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+              nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
             }
 
             // End list item if found code fences
-            if (fencesBeginRegex.test(line)) {
+            if (fencesBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new heading
-            if (headingBeginRegex.test(line)) {
+            if (headingBeginRegex.test(nextLine)) {
               break;
             }
 
             // End list item if found start of new bullet
-            if (nextBulletRegex.test(line)) {
+            if (nextBulletRegex.test(nextLine)) {
               break;
             }
 
@@ -260,20 +260,38 @@ export class Tokenizer {
               break;
             }
 
-            if (line.search(/[^ ]/) >= indent || !line.trim()) { // Dedent if possible
-              itemContents += '\n' + line.slice(indent);
-            } else if (!blankLine) { // Until blank line, item doesn't need indentation
-              itemContents += '\n' + line;
-            } else { // Otherwise, improper indentation ends this item
-              break;
+            if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible
+              itemContents += '\n' + nextLine.slice(indent);
+            } else {
+              // not enough indentation
+              if (blankLine) {
+                break;
+              }
+
+              // paragraph continuation unless last line was a different block level element
+              if (line.search(/[^ ]/) >= 4) { // indented code block
+                break;
+              }
+              if (fencesBeginRegex.test(line)) {
+                break;
+              }
+              if (headingBeginRegex.test(line)) {
+                break;
+              }
+              if (hrRegex.test(line)) {
+                break;
+              }
+
+              itemContents += '\n' + nextLine;
             }
 
-            if (!blankLine && !line.trim()) { // Check if current line is blank
+            if (!blankLine && !nextLine.trim()) { // Check if current line is blank
               blankLine = true;
             }
 
             raw += rawLine + '\n';
             src = src.substring(rawLine.length + 1);
+            line = nextLine.slice(indent);
           }
         }
 

test/specs/new/list_item_tabs.html

@@ -0,0 +1,17 @@
+<ul>
+  <li>A</li>
+  <li>B</li>
+  <li>C</li>
+  <li>D</li>
+  <li>E</li>
+  <li>F</li>
+</ul>
+
+<ol>
+  <li>A</li>
+  <li>B</li>
+  <li>C</li>
+  <li>D</li>
+  <li>E</li>
+  <li>F</li>
+</ol>

test/specs/new/list_item_tabs.md

@@ -0,0 +1,13 @@
+- A
+-   B
+-	C
+-	D
+-	E
+-	F
+
+1. A
+2.   B
+3.	C
+4.	D
+5.	E
+6.	F

test/specs/new/paragraph-after-list-item.html

@@ -0,0 +1,24 @@
+<ul>
+  <li>
+    <hr />
+  </li>
+</ul>
+<p>paragraph</p>
+<ul>
+  <li>
+    <h1 id="heading">heading</h1>
+  </li>
+</ul>
+<p>paragraph</p>
+<ul>
+  <li>
+  <pre><code>indented code</code></pre>
+  </li>
+</ul>
+<p>paragraph</p>
+<ul>
+  <li>
+    <pre><code>fenced code</code></pre>
+  </li>
+</ul>
+<p>paragraph</p>

test/specs/new/paragraph-after-list-item.md

@@ -0,0 +1,10 @@
+- ***
+paragraph
+- # heading
+paragraph
+-     indented code
+paragraph
+- ```
+  fenced code
+  ```
+paragraph