From 1fcafc3adc0b61866fbc5dcdcbb3c9d845121fc5 Mon Sep 17 00:00:00 2001
From: Joel Pitt <joel@joelpitt.com>
Date: Wed, 30 Oct 2013 11:06:17 +1300
Subject: [PATCH 1/2] pin pandoc version, and modify to fit pandoc api change

---
 Bibproc/Init.hs | 2 +-
 bibproc.cabal   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bibproc/Init.hs b/Bibproc/Init.hs
index e735b80..dc99594 100644
--- a/Bibproc/Init.hs
+++ b/Bibproc/Init.hs
@@ -32,7 +32,7 @@ myinit = do
     return (style, refs)
 
 wrapPandoc :: Block -> Pandoc
-wrapPandoc blk = Pandoc (Meta [] [] []) [blk]
+wrapPandoc blk = Pandoc nullMeta [blk]
 
 toHtml :: Block -> String
 toHtml = writeHtmlString def . wrapPandoc
diff --git a/bibproc.cabal b/bibproc.cabal
index e54a29f..4a2fd5e 100644
--- a/bibproc.cabal
+++ b/bibproc.cabal
@@ -17,7 +17,7 @@ Executable bib2html
   Build-depends:
     base >= 4 && < 5,
     citeproc-hs > 0.3,
-    pandoc,
+    pandoc == 1.12.*,
     directory,
     filepath,
     parsec,
@@ -31,7 +31,7 @@ Executable bib2sort
   Build-depends:
     base >= 4 && < 5,
     citeproc-hs > 0.3,
-    pandoc,
+    pandoc == 1.12.*,
     directory,
     filepath,
     split,
@@ -46,7 +46,7 @@ Executable bib2html_test
   Build-depends:
     base >= 4 && < 5,
     citeproc-hs > 0.3,
-    pandoc,
+    pandoc == 1.12.*,
     directory,
     filepath,
     parsec,

From 3abdd6372054b7dbb648f1a099217c6738990d65 Mon Sep 17 00:00:00 2001
From: Joel Pitt <joel@joelpitt.com>
Date: Wed, 30 Oct 2013 11:18:48 +1300
Subject: [PATCH 2/2] Remove weird genre tag from csl

---
 test/apa-dragonfly.csl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/apa-dragonfly.csl b/test/apa-dragonfly.csl
index 9bffca6..c380cdc 100644
--- a/test/apa-dragonfly.csl
+++ b/test/apa-dragonfly.csl
@@ -179,11 +179,6 @@
 	</group>
       </else-if>
       <else>
-	<choose>
-	  <if variable="event" match="none">
-	    <text variable="genre" suffix=", "/>
-	  </if>
-	</choose>
 	<group delimiter=": ">
 	  <text variable="publisher-place"/>
 	  <text variable="publisher"/>
@@ -340,4 +335,4 @@
       <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>