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 /src/markdown2pdf.hs | |
| parent | bea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff) | |
| parent | 38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff) | |
| download | pandoc-357b965b4455422cfdeb2676befda31d017f944f.tar.gz | |
Merge branch 'citeproc' into master.
Conflicts:
src/Text/Pandoc/Definition.hs
Diffstat (limited to 'src/markdown2pdf.hs')
| -rw-r--r-- | src/markdown2pdf.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/markdown2pdf.hs b/src/markdown2pdf.hs index cc6a034c0..768c0207d 100644 --- a/src/markdown2pdf.hs +++ b/src/markdown2pdf.hs @@ -155,7 +155,7 @@ main = bracket "--include-before-body","--include-after-body", "--custom-header","--output", "--template", "--variable", - "--csl", "--biblio", "--biblio-format"] + "--csl", "--bibliography", "--data-dir"] let isOpt ('-':_) = True isOpt _ = False let opts = filter isOpt args |