diff options
author | John MacFarlane <fiddlosopher@gmail.com> | 2013-03-17 08:48:29 -0700 |
---|---|---|
committer | John MacFarlane <fiddlosopher@gmail.com> | 2013-03-17 08:48:29 -0700 |
commit | cae52ecc315a0635f81cb2547b4f268ec8a8befa (patch) | |
tree | 11839a2bfa2d7a34c98cc3e2a0ff85a51900bb94 /tests | |
parent | abc3896b8e7ba75bfe49f491b860b990e49bf88a (diff) |
Revert "LaTeX reader: citation handling changes."
This reverts commit f7229b147314042f946dfded3b441ab0fae260a0.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Tests/Old.hs | 2 | ||||
-rw-r--r-- | tests/Tests/Readers/LaTeX.hs | 10 | ||||
-rw-r--r-- | tests/biblio.mods | 106 | ||||
-rw-r--r-- | tests/latex-reader.native | 2 |
4 files changed, 4 insertions, 116 deletions
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs index 9e7493504..b6d95ca89 100644 --- a/tests/Tests/Old.hs +++ b/tests/Tests/Old.hs @@ -186,7 +186,7 @@ markdownCitationTests ++ [test "natbib" wopts "markdown-citations.txt" "markdown-citations.txt"] where - ropts = ["-r", "markdown", "-w", "markdown", "--bibliography", + ropts = ["-r", "markdown", "-w", "markdown-citations", "--bibliography", "biblio.bib", "--no-wrap"] wopts = ["-r", "markdown", "-w", "markdown", "--no-wrap", "--natbib"] styleToTest style = test style (ropts ++ ["--csl", style ++ ".csl"]) diff --git a/tests/Tests/Readers/LaTeX.hs b/tests/Tests/Readers/LaTeX.hs index 016281ccb..271b32689 100644 --- a/tests/Tests/Readers/LaTeX.hs +++ b/tests/Tests/Readers/LaTeX.hs @@ -2,20 +2,14 @@ module Tests.Readers.LaTeX (tests) where import Text.Pandoc.Definition -import Data.Monoid (mempty) -import Text.CSL (Reference, readBiblioFile) import Test.Framework import Tests.Helpers import Tests.Arbitrary() import Text.Pandoc.Builder import Text.Pandoc -import System.IO.Unsafe (unsafePerformIO) - -refs :: [Reference] -refs = unsafePerformIO $ readBiblioFile "biblio.mods" latex :: String -> Pandoc -latex = readLaTeX def{ readerReferences = refs } +latex = readLaTeX def infix 4 =: (=:) :: ToString c @@ -77,7 +71,7 @@ baseCitation = Citation{ citationId = "item1" } rt :: String -> Inlines -rt = const mempty -- rawInline "latex" +rt = rawInline "latex" natbibCitations :: Test natbibCitations = testGroup "natbib" diff --git a/tests/biblio.mods b/tests/biblio.mods deleted file mode 100644 index 478439419..000000000 --- a/tests/biblio.mods +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<modsCollection xmlns="http://www.loc.gov/mods/v3"> -<mods ID="item1"> - <titleInfo> - <title>First Book</title> - </titleInfo> - <name type="personal"> - <namePart type="given">John</namePart> - <namePart type="family">Doe</namePart> - <role> - <roleTerm authority="marcrelator" type="text">author</roleTerm> - </role> - </name> - <originInfo> - <issuance>monographic</issuance> - <dateIssued>2005</dateIssued> - <publisher>Cambridge University Press</publisher> - <place> - <placeTerm type="text">Cambridge</placeTerm> - </place> - </originInfo> - <typeOfResource>text</typeOfResource> - <genre authority="marcgt">book</genre> - <identifier type="citekey">item1</identifier> -</mods> -<mods ID="item2"> - <titleInfo> - <title>Article</title> - </titleInfo> - <name type="personal"> - <namePart type="given">John</namePart> - <namePart type="family">Doe</namePart> - <role> - <roleTerm authority="marcrelator" type="text">author</roleTerm> - </role> - </name> - <originInfo> - <dateIssued>2006</dateIssued> - </originInfo> - <typeOfResource>text</typeOfResource> - <relatedItem type="host"> - <titleInfo> - <title>Journal of Generic Studies</title> - </titleInfo> - <originInfo> - <issuance>continuing</issuance> - </originInfo> - <genre authority="marcgt">periodical</genre> - <genre>academic journal</genre> - </relatedItem> - <identifier type="citekey">item2</identifier> - <part> - <date>2006</date> - <detail type="volume"><number>6</number></detail> - <extent unit="page"> - <start>33</start> - <end>34</end> - </extent> - </part> -</mods> -<mods ID="пункт3"> - <titleInfo> - <title>Why Water Is Wet</title> - </titleInfo> - <name type="personal"> - <namePart type="given">John</namePart> - <namePart type="family">Doe</namePart> - <role> - <roleTerm authority="marcrelator" type="text">author</roleTerm> - </role> - </name> - <name type="personal"> - <namePart type="given">Jenny</namePart> - <namePart type="family">Roe</namePart> - <role> - <roleTerm authority="marcrelator" type="text">author</roleTerm> - </role> - </name> - <originInfo> - <issuance>monographic</issuance> - <dateIssued>2007</dateIssued> - </originInfo> - <typeOfResource>text</typeOfResource> - <relatedItem type="host"> - <titleInfo> - <title>Third Book</title> - </titleInfo> - <name type="personal"> - <namePart type="given">Sam</namePart> - <namePart type="family">Smith</namePart> - <role> - <roleTerm authority="marcrelator" type="text">editor</roleTerm> - </role> - </name> - <originInfo> - <dateIssued>2007</dateIssued> - <publisher>Oxford University Press</publisher> - <place> - <placeTerm type="text">Oxford</placeTerm> - </place> - </originInfo> - <genre>collection</genre> - </relatedItem> - <identifier type="citekey">пункт3</identifier> -</mods> -</modsCollection> diff --git a/tests/latex-reader.native b/tests/latex-reader.native index f225e0969..28bbad89c 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -260,7 +260,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,HorizontalRule ,Header 1 ("",[],[]) [Str "LaTeX"] ,BulletList - [[Para [RawInline "latex" "\\cite[22-23]{smith.1899}"]] + [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str ",",Space,Str "22-23"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [RawInline "latex" "\\cite[22-23]{smith.1899}"]]] ,[Para [RawInline "latex" "\\doublespacing"]] ,[Para [Math InlineMath "2+2=4"]] ,[Para [Math InlineMath "x \\in y"]] |