test/testcases/span/01_link/links_with_angle_brackets.html test/testcases/span/01_link/links_with_angle_brackets.text @@ -852,6 +852,7 @@ one space) in normal parentheses. For example: This is [a link](http://rubyforge.org) to a page. A [link](../test "local URI") can also have a title. + And [spaces](<link with spaces.html>)! Notes: @@ -860,15 +861,12 @@ Notes: to escape them. It is not possible to create nested links! * The link URL must not contain any spaces and it has to contain properly nested parentheses if no - title is specified. There must not be any spaces before the link URL, and if no title is - specified, no spaces are allowed between the link URL and the closing parenthesis. + title is specified, or the link URL must be contained in angle brackets (then spaces and + incorrectly nested parentheses are allowed). There must not be any spaces before the link URL, and + if no title is specified, no spaces are allowed between the link URL and the closing parenthesis. * The link title may not contain its delimiters and may not be empty. -> In contrast to the original Markdown syntax, the link URL may not be enclosed in angle brackets, -> neither in inline links nor in link definitions. -{: .markdown-difference} - To create a reference style link, you need to surround the link text with square brackets (as with inline links), followed by optional spaces/tabs/line breaks and then optionally followed with another set of square brackets with the link identifier in them. A link indentifier may only contain @@ -895,7 +893,8 @@ The link definition has the following structure: * The link identifier in square brackets, optionally indented up to three spaces, * then a colon and one or more spaces/tabs, -* then the link URL, +* then the link URL which must not contain any spaces or a left angle bracket, the link URL which may + contain spaces and a right angle bracket, * then optionally the title in single or double quotes, separated from the link URL by one or more spaces or on the next line by itself indented any number of spaces/tabs. doc/syntax.page @@ -468,12 +468,12 @@ module Kramdown PUNCTUATION_CHARS = "_.:,;!?-" LINK_ID_CHARS = /[a-zA-Z0-9 #{PUNCTUATION_CHARS}]/ LINK_ID_NON_CHARS = /[^a-zA-Z0-9 #{PUNCTUATION_CHARS}]/ - LINK_DEFINITION_START = /^#{OPT_SPACE}\[(#{LINK_ID_CHARS}+)\]:[ \t]*([^\s]+)[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\3[ \t]*?)?\n/ + LINK_DEFINITION_START = /^#{OPT_SPACE}\[(#{LINK_ID_CHARS}+)\]:[ \t]*(?:<(.*?)>|([^\s]+))[ \t]*?(?:\n?[ \t]*?(["'])(.+?)\4[ \t]*?)?\n/ # Parse the link definition at the current location. def parse_link_definition @src.pos += @src.matched_size - link_id, link_url, link_title = @src[1].downcase, @src[2], @src[4] + link_id, link_url, link_title = @src[1].downcase, @src[2] || @src[3], @src[5] warning("Duplicate link ID '#{link_id}' - overwriting") if @doc.parse_infos[:link_defs][link_id] @doc.parse_infos[:link_defs][link_id] = [link_url, link_title] true @@ -938,26 +938,35 @@ module Kramdown return end - link_url = '' - re = /\(|\)|\s/ - nr_of_brackets = 0 - while temp = @src.scan_until(re) - link_url += temp - case @src.matched - when /\s/ - break - when '(' - nr_of_brackets += 1 - when ')' - nr_of_brackets -= 1 - break if nr_of_brackets == 0 + # link url in parentheses + if @src.scan(/\(<(.*?)>/) + link_url = @src[1] + if @src.scan(/\)/) + add_link(el, link_url, nil, alt_text) + return end - end - link_url = link_url[1..-2] + else + link_url = '' + re = /\(|\)|\s/ + nr_of_brackets = 0 + while temp = @src.scan_until(re) + link_url += temp + case @src.matched + when /\s/ + break + when '(' + nr_of_brackets += 1 + when ')' + nr_of_brackets -= 1 + break if nr_of_brackets == 0 + end + end + link_url = link_url[1..-2] - if nr_of_brackets == 0 - add_link(el, link_url, nil, alt_text) - return + if nr_of_brackets == 0 + add_link(el, link_url, nil, alt_text) + return + end end if @src.scan(LINK_INLINE_TITLE_RE) lib/kramdown/parser.rb @@ -3,6 +3,8 @@ This is a para. [otherid1]: http://wwww.example.com/ "title 1" [otherid2]: http://wwww.example.com/ 'title 2' +[otherid3]: <some spaces.html> +[otherid4]: <some spaces.html> 'title' [break]: http://www.example.com/test/asdf.html 'Another title' test/testcases/span/01_link/link_defs.text 5b5ec9ccf3b64540a96f8e82d50cd9ff4a3e7dce Thomas Leitner t_leitner@gmx.at http://github.com/gettalong/kramdown/commit/d6f246053de97e1ced8abbeeca73cfda004393a2 d6f246053de97e1ced8abbeeca73cfda004393a2 2009-11-11T23:46:31-08:00 2009-11-11T23:46:31-08:00 Now allowing link URLs to be enclosed in angle brackets 4be64bbd20789a0e99f0802141ea4599d707efd3 Thomas Leitner t_leitner@gmx.at