Merge branch 'citeproc' into master.

Conflicts:
	src/Text/Pandoc/Definition.hs

1 files changed, 32 insertions, 0 deletions

diff --git a/tests/markdown-citations.ieee.txt b/tests/markdown-citations.ieee.txt
new file mode 100644
index 000000000..de5c30b33
--- /dev/null
+++ b/tests/markdown-citations.ieee.txt
@@ -0,0 +1,32 @@
+# Pandoc with citeproc-hs
+
+-   [@nonexistent]
+-   @nonexistent
+-   Reference [1] says blah.
+-   Reference [1] says blah.
+-   Reference [1] says blah.
+-   Reference [1] says blah.
+-   In a note.[^1]
+-   A citation group [1],[3].
+-   Another one [1].
+-   And another one in a note.[^2]
+-   Citation with a suffix and locator [1].
+-   Citation with suffix only [1].
+-   Now some modifiers.[^3]
+
+# References
+
+[1] J. Doe, *First Book*, Cambridge: Cambridge University Press, 2005.
+
+[2] J. Doe, “Article”, *Journal of Generic Studies*, vol. 6, 2006, pp. 33-34.
+
+[3] J. Doe and J. Roe, “Why Water Is Wet”, *Third Book*, Smith, S., Ed., Oxford: Oxford University Press, 2007.
+
+[^1]:
+    A citation without locators [3].
+
+[^2]:
+    Some citations [1]-[3].
+
+[^3]:
+    Like a citation without author: [1], and now Doe with a locator [2].