git.iko.soy/typeable/pandoc
on master help sign in
Removed citationSuppressParens.

Makefile: Use citeproc-0.3.6 release.

commit06300e59d51d1040a95e961c7419794b422cbdee authorJohn MacFarlane <fiddlosopher@gmail.com> dateSun 28 Oct 2012, 09:36 (14 years ago) parent6f23476
5 files changed+5−6
compare with master
unifiedsplit
Makefile+2−2 pandoc.cabal+1−1 src/Text/Pandoc/Readers/LaTeX.hs−1 tests/Tests/Readers/LaTeX.hs+1−1 tests/latex-reader.native+1−1
Makefile+2−2
@@ -9,7 +9,7 @@ all:
99prof:
1010 cabal-dev configure --enable-tests --enable-library-profiling --enable-executable-profiling && cabal-dev build
1111
12−prep: pandoc-types citeproc-hs
12+prep: pandoc-types
1313 cabal-dev update && \
1414 cabal-dev install-deps --enable-library-profiling --enable-tests --enable-benchmarks
1515
@@ -31,7 +31,7 @@ pandoc-types:
3131
3232citeproc-hs: pandoc-types
3333 darcs get --lazy http://gorgias.mine.nu/repos/citeproc-hs && \
34− cabal-dev add-source citeproc-hs
34+ cabal-dev add-source citeproc-hs
3535
3636install:
3737 cabal-dev install --enable-tests --enable-benchmarks
pandoc.cabal+1−1
@@ -218,7 +218,7 @@ Library
218218 xml >= 1.3.12 && < 1.4,
219219 random >= 1 && < 1.1,
220220 extensible-exceptions >= 0.1 && < 0.2,
221− citeproc-hs >= 0.3.4 && < 0.4,
221+ citeproc-hs >= 0.3.6 && < 0.4,
222222 pandoc-types >= 1.10 && < 1.11,
223223 json >= 0.4 && < 0.8,
224224 tagsoup >= 0.12.5 && < 0.13,
src/Text/Pandoc/Readers/LaTeX.hs−1
@@ -909,7 +909,6 @@ simpleCiteArgs = try $ do
909909 , citationMode = NormalCitation
910910 , citationHash = 0
911911 , citationNoteNum = 0
912− , citationSuppressParens = False
913912 }
914913 return $ addPrefix pre $ addSuffix suf $ map conv keys
915914
tests/Tests/Readers/LaTeX.hs+1−1
@@ -68,7 +68,7 @@ baseCitation = Citation{ citationId = "item1"
6868 , citationMode = AuthorInText
6969 , citationNoteNum = 0
7070 , citationHash = 0
71− , citationSuppressParens = False }
71+ }
7272
7373rt :: String -> Inlines
7474rt = rawInline "latex"
tests/latex-reader.native+1−1
@@ -260,7 +260,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA
260260,HorizontalRule
261261,Header 1 [Str "LaTeX"]
262262,BulletList
263− [[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}"]]]
263+ [[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}"]]]
264264 ,[Para [RawInline "latex" "\\doublespacing"]]
265265 ,[Para [Math InlineMath "2+2=4"]]
266266 ,[Para [Math InlineMath "x \\in y"]]