Markdown citation parser improvements and test updates.

Now we handle a suffix after a bare locator, e.g.
@item1 [p. 30, suffix]
The suffix now includes any punctuation that introduces it.
A few tests fail because of problems with citeproc (extra space
before the suffix, missing space after comma separating multiple
page ranges in the locator).

2 files changed, 9 insertions, 3 deletions

diff --git a/tests/markdown-citations.plain b/tests/markdown-citations.plain
index b809842be..dd5d23efc 100644
--- a/tests/markdown-citations.plain
+++ b/tests/markdown-citations.plain
@@ -5,12 +5,14 @@ Pandoc with citeproc-hs
 
 @nonexistent
 
-Doe (2005) says blah. Doe (2005, 30) says blah. Doe
-(2005; 2006, 30; see also Doe and Roe 2007) says blah.
+Doe (2005) says blah. Doe (2005, 30) says blah. Doe (2005, 30, suffix)
+says blah. Doe (2005; 2006, 30; see also Doe and Roe 2007) says blah.
 
 In a note.[^1] A citation group
 (see Doe 2005, 34-35; also Doe and Roe 2007, chap. 3). Another one
-(see Doe 2005, 34-35). And another one in a note.[^2]
+(see Doe 2005, 34-35). And another one in a note.[^2] Citation with
+a suffix and locator (Doe 2005, 33, 35-37, and nowhere else).
+Citation with suffix only (Doe 2005, and nowhere else).
 
 Now some modifiers.[^3]
 
diff --git a/tests/markdown-citations.txt b/tests/markdown-citations.txt
index 9840832ce..c54a41304 100644
--- a/tests/markdown-citations.txt
+++ b/tests/markdown-citations.txt
@@ -6,11 +6,15 @@
 
 @item1 says blah.
 @item1 [p. 30] says blah.
+@item1 [p. 30, with suffix] says blah.
 @item1 [-@item2 p. 30; see also @item3] says blah.
 
 In a note.[^1] A citation group [see
 @item1 p. 34-35; also @item3 chap. 3]. Another one [see
 @item1 p. 34-35]. And another one in a note.[^2]
+Citation with a suffix and locator [@item1 pp. 33, 35-37,
+and nowhere else].  Citation with suffix only
+[@item1, and nowhere else].
 
 Now some modifiers.[^3]