@@ -495,19 +495,27 @@ referenceKey = do
495495 option "" blanklines
496496 return result
497497
498+targetURI = try $ do
499+ skipSpaces
500+ option ' ' newline
501+ contents <- many1 (try (do many spaceChar
502+ newline
503+ many1 spaceChar
504+ noneOf " \t\n") <|> noneOf "\n")
505+ blanklines
506+ return contents
507+
498508imageKey = try $ do
499509 string ".. |"
500510 ref <- manyTill inline (char '|')
501511 skipSpaces
502512 string "image::"
503− src <- manyTill anyChar newline
513+ src <- targetURI
504514 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
505515
506516anonymousKey = try $ do
507517 oneOfStrings [".. __:", "__"]
508− skipSpaces
509− option ' ' newline
510− src <- manyTill anyChar newline
518+ src <- targetURI
511519 state <- getState
512520 return $ KeyBlock [Str "_"] (removeLeadingTrailingSpace src, "")
513521
@@ -515,17 +523,13 @@ regularKeyQuoted = try $ do
515523 string ".. _`"
516524 ref <- manyTill inline (char '`')
517525 char ':'
518− skipSpaces
519− option ' ' newline
520− src <- manyTill anyChar newline
526+ src <- targetURI
521527 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
522528
523529regularKey = try $ do
524530 string ".. _"
525531 ref <- manyTill inline (char ':')
526− skipSpaces
527− option ' ' newline
528− src <- manyTill anyChar newline
532+ src <- targetURI
529533 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
530534
531535 --