Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Removed citationSuppressParens.

Browse source 
Makefile: Use citeproc-0.3.6 release.
This commit is contained in:
John MacFarlane 2012-10-28 09:36:15 -07:00
parent 6f2347635c
commit 06300e59d5
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -9,7 +9,7 @@ all:
prof: prof:
cabal-dev configure --enable-tests --enable-library-profiling --enable-executable-profiling && cabal-dev build cabal-dev configure --enable-tests --enable-library-profiling --enable-executable-profiling && cabal-dev build
prep: pandoc-types citeproc-hs prep: pandoc-types
cabal-dev update && \ cabal-dev update && \
cabal-dev install-deps --enable-library-profiling --enable-tests --enable-benchmarks cabal-dev install-deps --enable-library-profiling --enable-tests --enable-benchmarks
@ -31,7 +31,7 @@ pandoc-types:
citeproc-hs: pandoc-types citeproc-hs: pandoc-types
darcs get --lazy http://gorgias.mine.nu/repos/citeproc-hs && \ darcs get --lazy http://gorgias.mine.nu/repos/citeproc-hs && \
cabal-dev add-source citeproc-hs cabal-dev add-source citeproc-hs
install: install:
cabal-dev install --enable-tests --enable-benchmarks cabal-dev install --enable-tests --enable-benchmarks

2
pandoc.cabal
View file

@ -218,7 +218,7 @@ Library
xml >= 1.3.12 && < 1.4, xml >= 1.3.12 && < 1.4,
random >= 1 && < 1.1, random >= 1 && < 1.1,
extensible-exceptions >= 0.1 && < 0.2, extensible-exceptions >= 0.1 && < 0.2,
citeproc-hs >= 0.3.4 && < 0.4, citeproc-hs >= 0.3.6 && < 0.4,
pandoc-types >= 1.10 && < 1.11, pandoc-types >= 1.10 && < 1.11,
json >= 0.4 && < 0.8, json >= 0.4 && < 0.8,
tagsoup >= 0.12.5 && < 0.13, tagsoup >= 0.12.5 && < 0.13,

1
src/Text/Pandoc/Readers/LaTeX.hs
View file

@ -909,7 +909,6 @@ simpleCiteArgs = try $ do
, citationMode = NormalCitation , citationMode = NormalCitation
, citationHash = 0 , citationHash = 0
, citationNoteNum = 0 , citationNoteNum = 0
, citationSuppressParens = False
} }
return $ addPrefix pre $ addSuffix suf $ map conv keys return $ addPrefix pre $ addSuffix suf $ map conv keys

2
tests/Tests/Readers/LaTeX.hs
View file

@ -68,7 +68,7 @@ baseCitation = Citation{ citationId = "item1"
, citationMode = AuthorInText , citationMode = AuthorInText
, citationNoteNum = 0 , citationNoteNum = 0
, citationHash = 0 , citationHash = 0
, citationSuppressParens = False } }
rt :: String -> Inlines rt :: String -> Inlines
rt = rawInline "latex" rt = rawInline "latex"

2
tests/latex-reader.native
View file

@ -260,7 +260,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
,HorizontalRule ,HorizontalRule
,Header 1 [Str "LaTeX"] ,Header 1 [Str "LaTeX"]
,BulletList ,BulletList
[[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str ",",Space,Str "22-23"], citationMode = AuthorInText, citationNoteNum = 0, citationSuppressParens = False, citationHash = 0}] [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 [RawInline "latex" "\\doublespacing"]]
,[Para [Math InlineMath "2+2=4"]] ,[Para [Math InlineMath "2+2=4"]]
,[Para [Math InlineMath "x \\in y"]] ,[Para [Math InlineMath "x \\in y"]]