aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-12-31 01:16:27 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-12-31 01:16:27 +0000
commit54dda0ff9e682036f3b17a28d7333d965313f9d1 (patch)
tree9a9741f9d3cf95bae976fc9519ed4ed395366d48
parent312d9337b99070dc7eae365dd0b1b3148aecc349 (diff)
downloadpandoc-54dda0ff9e682036f3b17a28d7333d965313f9d1.tar.gz
Markdown reader: use ; as separator between authors.
This allows you to use ',' within author names: e.g. "John Jones, Jr." git-svn-id: https://pandoc.googlecode.com/svn/trunk@1726 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs4
-rw-r--r--tests/testsuite.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 8a09b191c..9d31c175d 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -68,7 +68,7 @@ setextHChars = "=-"
-- treat these as potentially non-text when parsing inline:
specialChars :: [Char]
-specialChars = "\\[]*_~`<>$!^-.&'\"\8216\8217\8220\8221"
+specialChars = "\\[]*_~`<>$!^-.&'\"\8216\8217\8220\8221;"
--
-- auxiliary functions
@@ -136,7 +136,7 @@ authorsLine :: GenParser Char ParserState [[Inline]]
authorsLine = try $ do
char '%'
skipSpaces
- authors <- sepEndBy (many1 (notFollowedBy (oneOf ",;\n") >> inline)) (oneOf ",;")
+ authors <- sepEndBy (many1 (notFollowedBy (oneOf ";\n") >> inline)) (oneOf ";")
newline
return $ map normalizeSpaces authors
diff --git a/tests/testsuite.txt b/tests/testsuite.txt
index 6f24f02ed..5688e1afe 100644
--- a/tests/testsuite.txt
+++ b/tests/testsuite.txt
@@ -1,5 +1,5 @@
% Pandoc Test Suite
-% John MacFarlane, Anonymous
+% John MacFarlane; Anonymous
% July 17, 2006
This is a set of tests for pandoc. Most of them are adapted from