git.iko.soy/typeable/pandoc
on master help sign in
RST reader: Allow hyperlink target URIs to be split over multiple
d58dca5fiddlosopher
src/Text/Pandoc/Readers/RST.hs+14−10
compare with master
unifiedsplit
@@ -495,19 +495,27 @@ referenceKey = do
495 option "" blanklines
495 option "" blanklines
496 return result
496 return result
497
497
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+
498imageKey = try $ do
508imageKey = try $ do
499 string ".. |"
509 string ".. |"
500 ref <- manyTill inline (char '|')
510 ref <- manyTill inline (char '|')
501 skipSpaces
511 skipSpaces
502 string "image::"
512 string "image::"
503− src <- manyTill anyChar newline
513+ src <- targetURI
504 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
514 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
505
515
506anonymousKey = try $ do
516anonymousKey = try $ do
507 oneOfStrings [".. __:", "__"]
517 oneOfStrings [".. __:", "__"]
508− skipSpaces
518+ src <- targetURI
509− option ' ' newline
510− src <- manyTill anyChar newline
511 state <- getState
519 state <- getState
512 return $ KeyBlock [Str "_"] (removeLeadingTrailingSpace src, "")
520 return $ KeyBlock [Str "_"] (removeLeadingTrailingSpace src, "")
513
521
@@ -515,17 +523,13 @@ regularKeyQuoted = try $ do
515 string ".. _`"
523 string ".. _`"
516 ref <- manyTill inline (char '`')
524 ref <- manyTill inline (char '`')
517 char ':'
525 char ':'
518− skipSpaces
526+ src <- targetURI
519− option ' ' newline
520− src <- manyTill anyChar newline
521 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
527 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
522
528
523regularKey = try $ do
529regularKey = try $ do
524 string ".. _"
530 string ".. _"
525 ref <- manyTill inline (char ':')
531 ref <- manyTill inline (char ':')
526− skipSpaces
532+ src <- targetURI
527− option ' ' newline
528− src <- manyTill anyChar newline
529 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
533 return $ KeyBlock (normalizeSpaces ref) (removeLeadingTrailingSpace src, "")
530
534
531 --
535 --