From cf3ae36b3479a563f98780352e9fd9cf1c1cff81 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 23 Jun 2016 09:56:27 -0700
Subject: Revert "Better parsing of shortcut references."

This reverts commit c069cb55bcadfd0f45890d846ff412b3c892eb87.
---
 src/inlines.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/inlines.c')

diff --git a/src/inlines.c b/src/inlines.c
index 02e6a9a..8f18e6c 100644
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -751,11 +751,11 @@ noMatch:
 
 // Return a link, an image, or a literal close bracket.
 static cmark_node *handle_close_bracket(subject *subj) {
-  bufsize_t initial_pos, save_pos;
+  bufsize_t initial_pos;
   bufsize_t starturl, endurl, starttitle, endtitle, endall;
   bufsize_t n;
   bufsize_t sps;
-  cmark_reference *ref = NULL;
+  cmark_reference *ref;
   bool is_image = false;
   cmark_chunk url_chunk, title_chunk;
   cmark_chunk url, title;
@@ -830,6 +830,11 @@ static cmark_node *handle_close_bracket(subject *subj) {
   // skip spaces
   raw_label = cmark_chunk_literal("");
   found_label = link_label(subj, &raw_label);
+  if (!found_label || raw_label.len == 0) {
+    cmark_chunk_free(subj->mem, &raw_label);
+    raw_label = cmark_chunk_dup(&subj->input, opener->position,
+                                initial_pos - opener->position - 1);
+  }
 
   if (!found_label) {
     // If we have a shortcut reference link, back up
@@ -837,22 +842,12 @@ static cmark_node *handle_close_bracket(subject *subj) {
     subj->pos = initial_pos;
   }
 
-  if (!found_label || raw_label.len == 0) {
-    save_pos = subj->pos;
-    subj->pos = opener->position - 1;
-    cmark_chunk_free(subj->mem, &raw_label);
-    found_label = link_label(subj, &raw_label);
-    subj->pos = save_pos;
-  }
-
-  if (found_label) {
-    ref = cmark_reference_lookup(subj->refmap, &raw_label);
-  }
+  ref = cmark_reference_lookup(subj->refmap, &raw_label);
+  cmark_chunk_free(subj->mem, &raw_label);
 
-  if (ref) {
+  if (ref != NULL) { // found
     url = chunk_clone(subj->mem, &ref->url);
     title = chunk_clone(subj->mem, &ref->title);
-    cmark_chunk_free(subj->mem, &raw_label);
     goto match;
   } else {
     goto noMatch;
-- 
cgit v1.2.3