@@ -13,7 +13,8 @@
# links
link_says = ( C_noactions "."* " "* (mtext+ -- '":') ) >A %{ STORE(link_text); } ;
- link = ( "["? '"' link_says '":' %A uri %{ STORE_URL(href); } :> "]"? ) >X ;
+ link = ( '"' link_says '":' %A uri %{ STORE_URL(href); } ) >X ;
+ bracketed_link = ( '["' link_says '":' %A uri %{ STORE(href); } :> "]" ) >X ;
# images
image_src = ( uri ) >A %{ STORE(src) } ;
@@ -84,6 +85,7 @@
image { INLINE(block, image); };
link { PARSE_LINK_ATTR(link_text); PASS(block, name, link); };
+ bracketed_link { PARSE_LINK_ATTR(link_text); PASS(block, name, link); };
code { PARSE_ATTR(text); PASS_CODE(block, text, code, opts); };
code_tag_start { CAT(block); fgoto code_tag; };
ext/redcloth_scan/redcloth_inline.rl
@@ -199,4 +199,16 @@ html: '<p><a href="http://slashdot.org/">He said it is “very unlikely̶
---
name: linked quoted phrase
in: '""Open the pod bay doors please, HAL."":http://www.youtube.com/watch?v=npN9l2Bd06s'
-html: '<p><a href="http://www.youtube.com/watch?v=npN9l2Bd06s">“Open the pod bay doors please, <span class="caps">HAL</span>.”</a></p>'
\ No newline at end of file
+html: '<p><a href="http://www.youtube.com/watch?v=npN9l2Bd06s">“Open the pod bay doors please, <span class="caps">HAL</span>.”</a></p>'
+---
+name: links containing underscores
+in: 'This is a link to a "Wikipedia article about Barack":http://en.wikipedia.org/wiki/Barack_Obama'
+html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Barack_Obama">Wikipedia article about Barack</a></p>'
+---
+name: links containing parentheses
+in: 'This is a link to a ["Wikipedia article about Textile":http://en.wikipedia.org/wiki/Textile_(markup_language)]'
+html: '<p>This is a link to a <a href="http://en.wikipedia.org/wiki/Textile_(markup_language)">Wikipedia article about Textile</a></p>'
+---
+name: links contained in parentheses
+in: 'This is a regular link (but in parentheses: "Google":http://www.google.com)'
+html: '<p>This is a regular link (but in parentheses: <a href="http://www.google.com">Google</a>)</p>'
\ No newline at end of file
test/links.yml
dbad718a9e8436e1fdf1fb436c2a8ae238499f5c
Jason Garber
jg@jasongarber.com
http://github.com/jgarber/redcloth/commit/dc5512feced90e7f62ffc158e86ceb22441990a2
dc5512feced90e7f62ffc158e86ceb22441990a2
2008-07-21T04:31:05-07:00
2008-07-21T04:31:05-07:00
Accept links endinng with special characters when enclosed in square brackets. [#16 state:resolved]
b368b6af6d7991bbfa6e8b5513bc4077041ffb75
Jason Garber
jg@jasongarber.com