aboutsummaryrefslogtreecommitdiff
path: root/tests/Tests
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2013-03-17 08:48:29 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2013-03-17 08:48:29 -0700
commitcae52ecc315a0635f81cb2547b4f268ec8a8befa (patch)
tree11839a2bfa2d7a34c98cc3e2a0ff85a51900bb94 /tests/Tests
parentabc3896b8e7ba75bfe49f491b860b990e49bf88a (diff)
downloadpandoc-cae52ecc315a0635f81cb2547b4f268ec8a8befa.tar.gz
Revert "LaTeX reader: citation handling changes."
This reverts commit f7229b147314042f946dfded3b441ab0fae260a0.
Diffstat (limited to 'tests/Tests')
-rw-r--r--tests/Tests/Old.hs2
-rw-r--r--tests/Tests/Readers/LaTeX.hs10
2 files changed, 3 insertions, 9 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"