Fixed markedjs/marked#465

git-svn-id: https://github.com/chjj/marked.git@708 de94abd1-4c94-9ff3-2ac9-ce57b7db7bff

trunk/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,11 @@
+## Expectation
+
+<!-- Describe the output you are expecting from marked -->
+
+## Result
+
+<!-- Describe the output you received from marked -->
+
+## What was attempted
+
+<!-- Describe what code combination got you there -->

trunk/README.md

@@ -265,7 +265,7 @@ default with the old behavior moved into `pedantic`.
 Type: `boolean`
 Default: `false`
 
-Use "smart" typograhic punctuation for things like quotes and dashes.
+Use "smart" typographic punctuation for things like quotes and dashes.
 
 ## Access to lexer and parser
 
@@ -297,7 +297,7 @@ $ cat hello.html
 
 The point of marked was to create a markdown compiler where it was possible to
 frequently parse huge chunks of markdown without having to worry about
-caching the compiled output somehow...or blocking for an unnecesarily long time.
+caching the compiled output somehow...or blocking for an unnecessarily long time.
 
 marked is very concise and still implements all markdown features. It is also
 now fully compatible with the client-side.

trunk/bower.json

@@ -1,5 +1,6 @@
 {
   "name": "marked",
+  "version": "0.3.4",
   "homepage": "https://github.com/chjj/marked",
   "authors": [
     "Christopher Jeffrey <chjjeffrey@gmail.com>"

trunk/lib/marked.js

@@ -39,10 +39,6 @@ block.list = replace(block.list)
   ('def', '\\n+(?=' + block.def.source + ')')
   ();
 
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
-
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
@@ -457,7 +453,7 @@ var inline = {
   nolink: /^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,
   strong: /^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,
   em: /^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,
-  code: /^(`+)([\s\S]*?[^`])\1(?!`)/,
+  code: /^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,
   br: /^ {2,}\n(?!\s*$)/,
   del: noop,
   text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
@@ -661,7 +657,7 @@ InlineLexer.prototype.output = function(src) {
     // code
     if (cap = this.rules.code.exec(src)) {
       src = src.substring(cap[0].length);
-      out += this.renderer.codespan(escape(cap[2].trim(), true));
+      out += this.renderer.codespan(escape(cap[2], true));
       continue;
     }
 
@@ -879,9 +875,6 @@ Renderer.prototype.link = function(href, title, text) {
       return '';
     }
   }
-  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
-    href = resolveUrl(this.options.baseUrl, href);
-  }
   var out = '<a href="' + href + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -891,9 +884,6 @@ Renderer.prototype.link = function(href, title, text) {
 };
 
 Renderer.prototype.image = function(href, title, text) {
-  if (this.options.baseUrl && !originIndependentUrl.test(href)) {
-    href = resolveUrl(this.options.baseUrl, href);
-  }
   var out = '<img src="' + href + '" alt="' + text + '"';
   if (title) {
     out += ' title="' + title + '"';
@@ -1125,30 +1115,6 @@ function replace(regex, opt) {
   };
 }
 
-function resolveUrl(base, href) {
-  if (!baseUrls[' ' + base]) {
-    // we can ignore everything in base after the last slash of its path component,
-    // but we might need to add _that_
-    // https://tools.ietf.org/html/rfc3986#section-3
-    if (/^[^:]+:\/*[^/]*$/.test(base)) {
-      baseUrls[' ' + base] = base + '/';
-    } else {
-      baseUrls[' ' + base] = base.replace(/[^/]*$/, '');
-    }
-  }
-  base = baseUrls[' ' + base];
-
-  if (href.slice(0, 2) === '//') {
-    return base.replace(/:[^]*/, ':') + href;
-  } else if (href.charAt(0) === '/') {
-    return base.replace(/(:\/*[^/]*)[^]*/, '$1') + href;
-  } else {
-    return base + href;
-  }
-}
-baseUrls = {};
-originIndependentUrl = /^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;
-
 function noop() {}
 noop.exec = noop;
 
@@ -1283,8 +1249,7 @@ marked.defaults = {
   smartypants: false,
   headerPrefix: '',
   renderer: new Renderer,
-  xhtml: false,
-  baseUrl: null
+  xhtml: false
 };
 
 /**

trunk/package.json

@@ -2,7 +2,7 @@
   "name": "marked",
   "description": "A markdown parser built for speed",
   "author": "Christopher Jeffrey",
-  "version": "0.3.9",
+  "version": "0.3.7",
   "main": "./lib/marked.js",
   "bin": "./bin/marked",
   "man": "./man/marked.1",

trunk/test/tests/def_blocks.html

@@ -6,7 +6,8 @@
 <hr>
 
 <blockquote>
-  <p>hello</p>
+  <p>hello
+[2]: hello</p>
 </blockquote>
 
 
@@ -24,5 +25,6 @@
 <blockquote>
   <p>foo
 bar
+[1]: foo
 bar</p>
 </blockquote>

trunk/test/tests/toplevel_paragraphs.gfm.text

@@ -30,6 +30,7 @@ hello world
 <span>how are you</span>
 
 hello [world][how]
+
 [how]: /are/you
 
 <div>hello</div>