diff --git a/packages/remark-parse/lib/tokenize/definition.js b/packages/remark-parse/lib/tokenize/definition.js
index 9c7dcbb67..ec56f0c41 100644
--- a/packages/remark-parse/lib/tokenize/definition.js
+++ b/packages/remark-parse/lib/tokenize/definition.js
@@ -4,8 +4,6 @@ var whitespace = require('is-whitespace-character')
 var normalize = require('../util/normalize')
 
 module.exports = definition
-definition.notInList = true
-definition.notInBlock = true
 
 var quotationMark = '"'
 var apostrophe = "'"
diff --git a/test/fixtures/input/definition-in-list-and-blockquote.text b/test/fixtures/input/definition-in-list-and-blockquote.text
new file mode 100644
index 000000000..73157dc47
--- /dev/null
+++ b/test/fixtures/input/definition-in-list-and-blockquote.text
@@ -0,0 +1,9 @@
+[alpha][1], [bravo][2].
+
+* Definition in list:
+
+  [1]: alpha
+
+> Definition in blockquote:
+>
+> [2]: bravo
diff --git a/test/fixtures/tree/def-blocks.commonmark.json b/test/fixtures/tree/def-blocks.commonmark.json
index 83ff0ec01..f25549f55 100644
--- a/test/fixtures/tree/def-blocks.commonmark.json
+++ b/test/fixtures/tree/def-blocks.commonmark.json
@@ -312,64 +312,11 @@
           "checked": null,
           "children": [
             {
-              "type": "paragraph",
-              "children": [
-                {
-                  "type": "linkReference",
-                  "identifier": "3",
-                  "label": "3",
-                  "referenceType": "shortcut",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "3",
-                      "position": {
-                        "start": {
-                          "line": 11,
-                          "column": 4,
-                          "offset": 61
-                        },
-                        "end": {
-                          "line": 11,
-                          "column": 5,
-                          "offset": 62
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 11,
-                      "column": 3,
-                      "offset": 60
-                    },
-                    "end": {
-                      "line": 11,
-                      "column": 6,
-                      "offset": 63
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": ": hello",
-                  "position": {
-                    "start": {
-                      "line": 11,
-                      "column": 6,
-                      "offset": 63
-                    },
-                    "end": {
-                      "line": 11,
-                      "column": 13,
-                      "offset": 70
-                    },
-                    "indent": []
-                  }
-                }
-              ],
+              "type": "definition",
+              "identifier": "3",
+              "label": "3",
+              "title": null,
+              "url": "hello",
               "position": {
                 "start": {
                   "line": 11,
diff --git a/test/fixtures/tree/def-blocks.json b/test/fixtures/tree/def-blocks.json
index 129080312..d88570a63 100644
--- a/test/fixtures/tree/def-blocks.json
+++ b/test/fixtures/tree/def-blocks.json
@@ -40,64 +40,11 @@
           }
         },
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 2,
-                      "column": 4,
-                      "offset": 11
-                    },
-                    "end": {
-                      "line": 2,
-                      "column": 5,
-                      "offset": 12
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 2,
-                  "column": 3,
-                  "offset": 10
-                },
-                "end": {
-                  "line": 2,
-                  "column": 6,
-                  "offset": 13
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": hello",
-              "position": {
-                "start": {
-                  "line": 2,
-                  "column": 6,
-                  "offset": 13
-                },
-                "end": {
-                  "line": 2,
-                  "column": 13,
-                  "offset": 20
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": null,
+          "url": "hello",
           "position": {
             "start": {
               "line": 2,
@@ -285,64 +232,11 @@
           "checked": null,
           "children": [
             {
-              "type": "paragraph",
-              "children": [
-                {
-                  "type": "linkReference",
-                  "identifier": "3",
-                  "label": "3",
-                  "referenceType": "shortcut",
-                  "children": [
-                    {
-                      "type": "text",
-                      "value": "3",
-                      "position": {
-                        "start": {
-                          "line": 11,
-                          "column": 4,
-                          "offset": 61
-                        },
-                        "end": {
-                          "line": 11,
-                          "column": 5,
-                          "offset": 62
-                        },
-                        "indent": []
-                      }
-                    }
-                  ],
-                  "position": {
-                    "start": {
-                      "line": 11,
-                      "column": 3,
-                      "offset": 60
-                    },
-                    "end": {
-                      "line": 11,
-                      "column": 6,
-                      "offset": 63
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": ": hello",
-                  "position": {
-                    "start": {
-                      "line": 11,
-                      "column": 6,
-                      "offset": 63
-                    },
-                    "end": {
-                      "line": 11,
-                      "column": 13,
-                      "offset": 70
-                    },
-                    "indent": []
-                  }
-                }
-              ],
+              "type": "definition",
+              "identifier": "3",
+              "label": "3",
+              "title": null,
+              "url": "hello",
               "position": {
                 "start": {
                   "line": 11,
diff --git a/test/fixtures/tree/definition-in-list-and-blockquote.json b/test/fixtures/tree/definition-in-list-and-blockquote.json
new file mode 100644
index 000000000..382377c7a
--- /dev/null
+++ b/test/fixtures/tree/definition-in-list-and-blockquote.json
@@ -0,0 +1,323 @@
+{
+  "type": "root",
+  "children": [
+    {
+      "type": "paragraph",
+      "children": [
+        {
+          "type": "linkReference",
+          "identifier": "1",
+          "label": "1",
+          "referenceType": "full",
+          "children": [
+            {
+              "type": "text",
+              "value": "alpha",
+              "position": {
+                "start": {
+                  "line": 1,
+                  "column": 2,
+                  "offset": 1
+                },
+                "end": {
+                  "line": 1,
+                  "column": 7,
+                  "offset": 6
+                },
+                "indent": []
+              }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 1,
+              "column": 1,
+              "offset": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 11,
+              "offset": 10
+            },
+            "indent": []
+          }
+        },
+        {
+          "type": "text",
+          "value": ", ",
+          "position": {
+            "start": {
+              "line": 1,
+              "column": 11,
+              "offset": 10
+            },
+            "end": {
+              "line": 1,
+              "column": 13,
+              "offset": 12
+            },
+            "indent": []
+          }
+        },
+        {
+          "type": "linkReference",
+          "identifier": "2",
+          "label": "2",
+          "referenceType": "full",
+          "children": [
+            {
+              "type": "text",
+              "value": "bravo",
+              "position": {
+                "start": {
+                  "line": 1,
+                  "column": 14,
+                  "offset": 13
+                },
+                "end": {
+                  "line": 1,
+                  "column": 19,
+                  "offset": 18
+                },
+                "indent": []
+              }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 1,
+              "column": 13,
+              "offset": 12
+            },
+            "end": {
+              "line": 1,
+              "column": 23,
+              "offset": 22
+            },
+            "indent": []
+          }
+        },
+        {
+          "type": "text",
+          "value": ".",
+          "position": {
+            "start": {
+              "line": 1,
+              "column": 23,
+              "offset": 22
+            },
+            "end": {
+              "line": 1,
+              "column": 24,
+              "offset": 23
+            },
+            "indent": []
+          }
+        }
+      ],
+      "position": {
+        "start": {
+          "line": 1,
+          "column": 1,
+          "offset": 0
+        },
+        "end": {
+          "line": 1,
+          "column": 24,
+          "offset": 23
+        },
+        "indent": []
+      }
+    },
+    {
+      "type": "list",
+      "ordered": false,
+      "start": null,
+      "spread": false,
+      "children": [
+        {
+          "type": "listItem",
+          "spread": true,
+          "checked": null,
+          "children": [
+            {
+              "type": "paragraph",
+              "children": [
+                {
+                  "type": "text",
+                  "value": "Definition in list:",
+                  "position": {
+                    "start": {
+                      "line": 3,
+                      "column": 3,
+                      "offset": 27
+                    },
+                    "end": {
+                      "line": 3,
+                      "column": 22,
+                      "offset": 46
+                    },
+                    "indent": []
+                  }
+                }
+              ],
+              "position": {
+                "start": {
+                  "line": 3,
+                  "column": 3,
+                  "offset": 27
+                },
+                "end": {
+                  "line": 3,
+                  "column": 22,
+                  "offset": 46
+                },
+                "indent": []
+              }
+            },
+            {
+              "type": "definition",
+              "identifier": "1",
+              "label": "1",
+              "title": null,
+              "url": "alpha",
+              "position": {
+                "start": {
+                  "line": 5,
+                  "column": 3,
+                  "offset": 50
+                },
+                "end": {
+                  "line": 5,
+                  "column": 13,
+                  "offset": 60
+                },
+                "indent": []
+              }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 3,
+              "column": 1,
+              "offset": 25
+            },
+            "end": {
+              "line": 5,
+              "column": 13,
+              "offset": 60
+            },
+            "indent": [
+              1,
+              1
+            ]
+          }
+        }
+      ],
+      "position": {
+        "start": {
+          "line": 3,
+          "column": 1,
+          "offset": 25
+        },
+        "end": {
+          "line": 5,
+          "column": 13,
+          "offset": 60
+        },
+        "indent": [
+          1,
+          1
+        ]
+      }
+    },
+    {
+      "type": "blockquote",
+      "children": [
+        {
+          "type": "paragraph",
+          "children": [
+            {
+              "type": "text",
+              "value": "Definition in blockquote:",
+              "position": {
+                "start": {
+                  "line": 7,
+                  "column": 3,
+                  "offset": 64
+                },
+                "end": {
+                  "line": 7,
+                  "column": 28,
+                  "offset": 89
+                },
+                "indent": []
+              }
+            }
+          ],
+          "position": {
+            "start": {
+              "line": 7,
+              "column": 3,
+              "offset": 64
+            },
+            "end": {
+              "line": 7,
+              "column": 28,
+              "offset": 89
+            },
+            "indent": []
+          }
+        },
+        {
+          "type": "definition",
+          "identifier": "2",
+          "label": "2",
+          "title": null,
+          "url": "bravo",
+          "position": {
+            "start": {
+              "line": 9,
+              "column": 3,
+              "offset": 94
+            },
+            "end": {
+              "line": 9,
+              "column": 13,
+              "offset": 104
+            },
+            "indent": []
+          }
+        }
+      ],
+      "position": {
+        "start": {
+          "line": 7,
+          "column": 1,
+          "offset": 62
+        },
+        "end": {
+          "line": 9,
+          "column": 13,
+          "offset": 104
+        },
+        "indent": [
+          1,
+          1
+        ]
+      }
+    }
+  ],
+  "position": {
+    "start": {
+      "line": 1,
+      "column": 1,
+      "offset": 0
+    },
+    "end": {
+      "line": 10,
+      "column": 1,
+      "offset": 105
+    }
+  }
+}
diff --git a/test/fixtures/tree/entities-advanced.commonmark.json b/test/fixtures/tree/entities-advanced.commonmark.json
index 229c4ef3f..b0d55e508 100644
--- a/test/fixtures/tree/entities-advanced.commonmark.json
+++ b/test/fixtures/tree/entities-advanced.commonmark.json
@@ -945,188 +945,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 8,
-                      "offset": 605
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 37,
-                      "offset": 634
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "end": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1164,194 +987,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 6,
-                      "offset": 673
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 35,
-                      "offset": 702
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "end": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.commonmark.pedantic.json b/test/fixtures/tree/entities-advanced.commonmark.pedantic.json
index 229c4ef3f..b0d55e508 100644
--- a/test/fixtures/tree/entities-advanced.commonmark.pedantic.json
+++ b/test/fixtures/tree/entities-advanced.commonmark.pedantic.json
@@ -945,188 +945,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 8,
-                      "offset": 605
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 37,
-                      "offset": 634
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "end": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1164,194 +987,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 6,
-                      "offset": 673
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 35,
-                      "offset": 702
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "end": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.json b/test/fixtures/tree/entities-advanced.json
index 229c4ef3f..b0d55e508 100644
--- a/test/fixtures/tree/entities-advanced.json
+++ b/test/fixtures/tree/entities-advanced.json
@@ -945,188 +945,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 8,
-                      "offset": 605
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 37,
-                      "offset": 634
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "end": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1164,194 +987,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 6,
-                      "offset": 673
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 35,
-                      "offset": 702
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "end": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.nogfm.commonmark.json b/test/fixtures/tree/entities-advanced.nogfm.commonmark.json
index 2a5c515d5..eae59f2a6 100644
--- a/test/fixtures/tree/entities-advanced.nogfm.commonmark.json
+++ b/test/fixtures/tree/entities-advanced.nogfm.commonmark.json
@@ -910,134 +910,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "end": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1075,140 +952,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "end": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.nogfm.commonmark.pedantic.json b/test/fixtures/tree/entities-advanced.nogfm.commonmark.pedantic.json
index 2a5c515d5..eae59f2a6 100644
--- a/test/fixtures/tree/entities-advanced.nogfm.commonmark.pedantic.json
+++ b/test/fixtures/tree/entities-advanced.nogfm.commonmark.pedantic.json
@@ -910,134 +910,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "end": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1075,140 +952,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "end": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.nogfm.json b/test/fixtures/tree/entities-advanced.nogfm.json
index 7bfc493bd..bf442a36b 100644
--- a/test/fixtures/tree/entities-advanced.nogfm.json
+++ b/test/fixtures/tree/entities-advanced.nogfm.json
@@ -753,134 +753,11 @@
           }
         },
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "end": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -898,140 +775,11 @@
           }
         },
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "end": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.nogfm.pedantic.json b/test/fixtures/tree/entities-advanced.nogfm.pedantic.json
index 7bfc493bd..bf442a36b 100644
--- a/test/fixtures/tree/entities-advanced.nogfm.pedantic.json
+++ b/test/fixtures/tree/entities-advanced.nogfm.pedantic.json
@@ -753,134 +753,11 @@
           }
         },
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 22,
-                  "offset": 619
-                },
-                "end": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 27,
-                  "offset": 624
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -898,140 +775,11 @@
           }
         },
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": http://example",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 20,
-                  "offset": 687
-                },
-                "end": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "xample.com \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 25,
-                  "offset": 692
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,
diff --git a/test/fixtures/tree/entities-advanced.pedantic.json b/test/fixtures/tree/entities-advanced.pedantic.json
index 229c4ef3f..b0d55e508 100644
--- a/test/fixtures/tree/entities-advanced.pedantic.json
+++ b/test/fixtures/tree/entities-advanced.pedantic.json
@@ -945,188 +945,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": "1",
-              "label": "1",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "1",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 4,
-                      "offset": 601
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 5,
-                      "offset": 602
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 3,
-                  "offset": 600
-                },
-                "end": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 6,
-                  "offset": 603
-                },
-                "end": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 8,
-                      "offset": 605
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 22,
-                      "offset": 619
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 35,
-                      "column": 27,
-                      "offset": 624
-                    },
-                    "end": {
-                      "line": 35,
-                      "column": 37,
-                      "offset": 634
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 8,
-                  "offset": 605
-                },
-                "end": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 35,
-                  "column": 37,
-                  "offset": 634
-                },
-                "end": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 5,
-                  "offset": 648
-                },
-                "end": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 36,
-                  "column": 10,
-                  "offset": 653
-                },
-                "end": {
-                  "line": 36,
-                  "column": 13,
-                  "offset": 656
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": "1",
+          "label": "1",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 35,
@@ -1164,194 +987,11 @@
       "type": "blockquote",
       "children": [
         {
-          "type": "paragraph",
-          "children": [
-            {
-              "type": "linkReference",
-              "identifier": " 1 ",
-              "label": "\n  1\n",
-              "referenceType": "shortcut",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "\n  1\n",
-                  "position": {
-                    "start": {
-                      "line": 38,
-                      "column": 4,
-                      "offset": 661
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 3,
-                      "offset": 670
-                    },
-                    "indent": [
-                      3,
-                      3
-                    ]
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 38,
-                  "column": 3,
-                  "offset": 660
-                },
-                "end": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "indent": [
-                  3,
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": ": ",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 4,
-                  "offset": 671
-                },
-                "end": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "link",
-              "title": null,
-              "url": "http://example&copyxample.com",
-              "children": [
-                {
-                  "type": "text",
-                  "value": "http://example",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 6,
-                      "offset": 673
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "©",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 20,
-                      "offset": 687
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "indent": []
-                  }
-                },
-                {
-                  "type": "text",
-                  "value": "xample.com",
-                  "position": {
-                    "start": {
-                      "line": 40,
-                      "column": 25,
-                      "offset": 692
-                    },
-                    "end": {
-                      "line": 40,
-                      "column": 35,
-                      "offset": 702
-                    },
-                    "indent": []
-                  }
-                }
-              ],
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 6,
-                  "offset": 673
-                },
-                "end": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": " \"in some\npl",
-              "position": {
-                "start": {
-                  "line": 40,
-                  "column": 35,
-                  "offset": 702
-                },
-                "end": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "indent": [
-                  3
-                ]
-              }
-            },
-            {
-              "type": "text",
-              "value": "©",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 5,
-                  "offset": 716
-                },
-                "end": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "indent": []
-              }
-            },
-            {
-              "type": "text",
-              "value": "ce\"",
-              "position": {
-                "start": {
-                  "line": 41,
-                  "column": 10,
-                  "offset": 721
-                },
-                "end": {
-                  "line": 41,
-                  "column": 13,
-                  "offset": 724
-                },
-                "indent": []
-              }
-            }
-          ],
+          "type": "definition",
+          "identifier": " 1 ",
+          "label": "\n  1\n",
+          "title": "in some\npl©ce",
+          "url": "http://example&copyxample.com",
           "position": {
             "start": {
               "line": 38,