diff options
| -rw-r--r-- | src/Text/Pandoc/Readers/Org/Inlines.hs | 6 | ||||
| -rw-r--r-- | test/Tests/Readers/Org.hs | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Inlines.hs b/src/Text/Pandoc/Readers/Org/Inlines.hs index 42fdfd4dd..c5b1ccc52 100644 --- a/src/Text/Pandoc/Readers/Org/Inlines.hs +++ b/src/Text/Pandoc/Readers/Org/Inlines.hs @@ -735,15 +735,15 @@ many1TillNOrLessNewlines n p end = try $ -- | Chars allowed to occur before emphasis (spaces and newlines are ok, too) emphasisPreChars :: [Char] -emphasisPreChars = "\t \"'({" +emphasisPreChars = "-\t ('\"{" -- | Chars allowed at after emphasis emphasisPostChars :: [Char] -emphasisPostChars = "\t\n !\"'),-.:;?\\}[" +emphasisPostChars = "-\t\n .,:!?;'\")}[" -- | Chars not allowed at the (inner) border of emphasis emphasisForbiddenBorderChars :: [Char] -emphasisForbiddenBorderChars = "\t\n\r \"'," +emphasisForbiddenBorderChars = "\t\n\r " -- | The maximum number of newlines within emphasisAllowedNewlines :: Int diff --git a/test/Tests/Readers/Org.hs b/test/Tests/Readers/Org.hs index a9097f993..0a91d9357 100644 --- a/test/Tests/Readers/Org.hs +++ b/test/Tests/Readers/Org.hs @@ -131,18 +131,18 @@ tests = para (spcSep [ emph $ "t/&" <> space <> "a" , "/" , "./r/" - , "(" <> (strong "l") <> ")" - , (emph "e") <> "!" - , (emph "b") <> "." + , "(" <> strong "l" <> ")" + , emph "e" <> "!" + , emph "b" <> "." ]) - , "Quotes are forbidden border chars" =: - "/'nope/ *nope\"*" =?> - para ("/'nope/" <> space <> "*nope\"*") + , "Quotes are allowed border chars" =: + "/'yep/ *sure\"*" =?> + para (emph "'yep" <> space <> strong "sure\"") - , "Commata are forbidden border chars" =: - "/nada,/" =?> - para "/nada,/" + , "Spaces are forbidden border chars" =: + "/nada /" =?> + para "/nada /" , "Markup should work properly after a blank line" =: T.unlines ["foo", "", "/bar/"] =?> |