diff options
author | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:31:03 -0800 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:43:47 -0800 |
commit | 357b965b4455422cfdeb2676befda31d017f944f (patch) | |
tree | 732d4ad686a0bacd2b50b60dc947aba7d84a020c /pandoc.cabal | |
parent | bea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff) | |
parent | 38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff) |
Merge branch 'citeproc' into master.
Conflicts:
src/Text/Pandoc/Definition.hs
Diffstat (limited to 'pandoc.cabal')
-rw-r--r-- | pandoc.cabal | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index c49a42ca8..d8c281b09 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.6.1 +Version: 1.7 Cabal-Version: >= 1.2 Build-Type: Custom License: GPL @@ -63,6 +63,8 @@ Data-Files: -- data for slidy writer slidy/slidy.min.css, slidy/slidy.min.js, + -- data for citeproc + default.csl, -- documentation README, INSTALL, COPYRIGHT, BUGS, changelog Extra-Source-Files: @@ -147,9 +149,6 @@ Flag library Flag wrappers Description: Build the wrappers (markdown2pdf). Default: True -Flag citeproc - Description: Compile in support for citeproc-hs bibliographic formatting. - Default: False Library -- Note: the following material must be in both Library and Executable stanzas. @@ -162,7 +161,9 @@ Library bytestring >= 0.9, zip-archive >= 0.1.1.4, utf8-string >= 0.3, old-time >= 1, HTTP >= 4000.0.5, texmath >= 0.4, xml >= 1.3.5 && < 1.4, - random, extensible-exceptions + random, extensible-exceptions, + citeproc-hs >= 0.3 && < 0.4, + pandoc-types == 1.7.* if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb else @@ -170,9 +171,6 @@ Library if flag(highlighting) Build-depends: highlighting-kate >= 0.2.7.1 cpp-options: -D_HIGHLIGHTING - if flag(citeproc) - Build-depends: citeproc-hs >= 0.2 - cpp-options: -D_CITEPROC if impl(ghc >= 6.12) Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind else @@ -184,7 +182,6 @@ Library Exposed-Modules: Text.Pandoc, Text.Pandoc.Blocks, - Text.Pandoc.Definition, Text.Pandoc.CharacterReferences, Text.Pandoc.Shared, Text.Pandoc.Parsing, @@ -212,13 +209,12 @@ Library Text.Pandoc.Writers.EPUB, Text.Pandoc.S5, Text.Pandoc.Templates + Text.Pandoc.Biblio Other-Modules: Text.Pandoc.XML, Text.Pandoc.UTF8, Text.Pandoc.UUID, Paths_pandoc - if flag(citeproc) - Exposed-Modules: Text.Pandoc.Biblio if flag(library) Buildable: True else @@ -235,7 +231,9 @@ Executable pandoc bytestring >= 0.9, zip-archive >= 0.1.1.4, utf8-string >= 0.3, old-time >= 1, HTTP >= 4000.0.5, texmath, xml >= 1.3.5 && < 1.4, - random, extensible-exceptions + random, extensible-exceptions, + citeproc-hs >= 0.3 && < 0.4, + pandoc-types == 1.7.* if impl(ghc >= 6.10) Build-depends: base >= 4 && < 5, syb else @@ -243,9 +241,6 @@ Executable pandoc if flag(highlighting) Build-depends: highlighting-kate >= 0.2.7.1 cpp-options: -D_HIGHLIGHTING - if flag(citeproc) - Build-depends: citeproc-hs >= 0.2 - cpp-options: -D_CITEPROC if impl(ghc >= 6.12) Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind else |