From 83bb1de3f592b21ba2af01c321a4ec74d1264530 Mon Sep 17 00:00:00 2001 From: John MacFarlane <fiddlosopher@gmail.com> Date: Fri, 13 Jan 2012 00:02:38 -0800 Subject: [PATCH] Improved citation tests. --- ...markdown-citations.chicago-author-date.txt | 8 +++---- tests/markdown-citations.ieee.txt | 18 +++++++------- tests/markdown-citations.mhra.txt | 24 +++++++++---------- tests/markdown-citations.txt | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/markdown-citations.chicago-author-date.txt b/tests/markdown-citations.chicago-author-date.txt index f9bc6894d..8e207e956 100644 --- a/tests/markdown-citations.chicago-author-date.txt +++ b/tests/markdown-citations.chicago-author-date.txt @@ -15,7 +15,7 @@ Pandoc with citeproc-hs - In a note.[^1] -- A citation group (see Doe 2005, 34–35; also Doe and Roe 2007, chap. 3). +- A citation group (see Doe 2005, chap. 3; also Doe and Roe 2007, 34–35). - Another one (see Doe 2005, 34–35). @@ -34,12 +34,12 @@ References Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. ----. 2006. Article. *Journal of Generic Studies* 6: 33–34. +———. 2006. “Article.” *Journal of Generic Studies* 6: 33–34. -Doe, John, and Jenny Roe. 2007. Why Water Is Wet. In *Third Book*, ed. Sam Smith. Oxford: Oxford University Press. +Doe, John, and Jenny Roe. 2007. “Why Water Is Wet.” In *Third Book*, ed. Sam Smith. Oxford: Oxford University Press. [^1]: A citation without locators (Doe and Roe 2007). -[^2]: Some citations (see Doe 2006, chap. 3; Doe and Roe 2007; Doe 2005). +[^2]: Some citations (see Doe 2005, chap. 3; Doe and Roe 2007; Doe 2006). [^3]: Like a citation without author: (2005), and now Doe with a locator (2006, 44). diff --git a/tests/markdown-citations.ieee.txt b/tests/markdown-citations.ieee.txt index 69da9efbf..3cb71469b 100644 --- a/tests/markdown-citations.ieee.txt +++ b/tests/markdown-citations.ieee.txt @@ -5,17 +5,17 @@ Pandoc with citeproc-hs - @nonexistent -- Reference [1] says blah. +- Reference 1 says blah. -- Reference [1] says blah. +- Reference 1 says blah. -- 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]. +- A citation group [1], [3]. - Another one [1]. @@ -32,14 +32,14 @@ Pandoc with citeproc-hs References ========== -[1] J. Doe, *First Book*, Cambridge: Cambridge University Press, 2005. +[1] J. Doe, *First Book*. Cambridge: Cambridge University Press, 2005. -[2] J. Doe, “Article,” *Journal of Generic Studies*, vol. 6, 2006, pp. 33-34. +[2] J. Doe, “Article,” *Journal of Generic Studies*, vol. 6, pp. 33-34, 2006. -[3] J. Doe and J. Roe, “Why Water Is Wet,” *Third Book*, Smith, S., Ed., Oxford: Oxford University Press, 2007. +[3] J. Doe and J. Roe, “Why Water Is Wet,” in *Third Book*, S. Smith, Ed. Oxford: Oxford University Press, 2007. [^1]: A citation without locators [3]. -[^2]: Some citations [1]–[3]. +[^2]: Some citations [1–3]. [^3]: Like a citation without author: [1], and now Doe with a locator [2]. diff --git a/tests/markdown-citations.mhra.txt b/tests/markdown-citations.mhra.txt index 370f906eb..17b8f1a40 100644 --- a/tests/markdown-citations.mhra.txt +++ b/tests/markdown-citations.mhra.txt @@ -32,32 +32,32 @@ Pandoc with citeproc-hs References ========== -Doe, John, ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34. +Doe, John, ‘Article’, *Journal of Generic Studies*, 6 (2006), 33–34. ---, *First Book* (Cambridge: Cambridge University Press, 2005). -Doe, John, and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed by Sam Smith (Oxford: Oxford University Press, 2007). +Doe, John, and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed. by Sam Smith (Oxford: Oxford University Press, 2007). [^1]: *First Book* (Cambridge: Cambridge University Press, 2005). -[^2]: First Book, p. 30. +[^2]: *First Book*, p. 30. -[^3]: First Book, p. 30, with suffix. +[^3]: *First Book*, p. 30, with suffix. -[^4]: First Book; ‘Article’, *Journal of Generic Studies*, 6 (2006), 33-34 (p. 30); see also John Doe and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed by Sam Smith (Oxford: Oxford University Press, 2007). +[^4]: *First Book*; ‘Article’, *Journal of Generic Studies*, 6 (2006), 33–34 (p. 30); see also John Doe and Jenny Roe, ‘Why Water Is Wet’, in *Third Book*, ed. by Sam Smith (Oxford: Oxford University Press, 2007). [^5]: A citation without locators Doe and Roe. -[^6]: See Doe, First Book, pp. 34-35; also Doe and Roe, chap. 3. +[^6]: See Doe, *First Book*, chap. 3; also Doe and Roe, pp. 34–35. -[^7]: See Doe, First Book, pp. 34-35. +[^7]: See Doe, *First Book*, pp. 34–35. -[^8]: Some citations see Doe, Article, 33-34 (chap. 3); Doe and Roe; Doe, First Book. +[^8]: Some citations see Doe, *First Book*, chap. 3; Doe and Roe; Doe, ‘Article’, 33–34. -[^9]: Doe, First Book, pp. 33, 35-37, and nowhere else. +[^9]: Doe, *First Book*, pp. 33, 35–37, and nowhere else. -[^10]: Doe, First Book and nowhere else. +[^10]: Doe, *First Book* and nowhere else. -[^11]: Like a citation without author: First Book, and now Doe with a locator Article, 33-34 (p. 44). +[^11]: Like a citation without author: *First Book*, and now Doe with a locator ‘Article’, 33–34 (p. 44). -[^12]: *See* Doe, First Book, p. 32. +[^12]: *See* Doe, *First Book*, p. 32. diff --git a/tests/markdown-citations.txt b/tests/markdown-citations.txt index 83050a61d..1207c0133 100644 --- a/tests/markdown-citations.txt +++ b/tests/markdown-citations.txt @@ -15,7 +15,7 @@ Pandoc with citeproc-hs - In a note.[^1] -- A citation group [see @item1 p. 34-35; also @пункт3 chap. 3]. +- A citation group [see @item1 chap. 3; also @пункт3 p. 34-35]. - Another one [see @item1 p. 34-35]. @@ -34,6 +34,6 @@ References [^1]: A citation without locators [@пункт3]. -[^2]: Some citations [see @item2 chap. 3; @пункт3; @item1]. +[^2]: Some citations [see @item1 chap. 3; @пункт3; @item2]. [^3]: Like a citation without author: [-@item1], and now Doe with a locator [-@item2 p. 44].