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

LaTeX reader: fixed \cite so it is a NormalCitation not AuthorInText.

Browse source
This commit is contained in:
John MacFarlane 2016-06-29 07:58:33 -07:00
parent a349814665
commit 3429fa6438
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -559,8 +559,8 @@ inlineCommands = M.fromList $
src <- unescapeURL <$> braced src <- unescapeURL <$> braced
mkImage options src) mkImage options src)
, ("enquote", enquote) , ("enquote", enquote)
, ("cite", citation "cite" AuthorInText False) , ("cite", citation "cite" NormalCitation False)
, ("Cite", citation "cite" AuthorInText False) , ("Cite", citation "Cite" NormalCitation False)
, ("citep", citation "citep" NormalCitation False) , ("citep", citation "citep" NormalCitation False)
, ("citep*", citation "citep*" NormalCitation False) , ("citep*", citation "citep*" NormalCitation False)
, ("citeal", citation "citeal" NormalCitation False) , ("citeal", citation "citeal" NormalCitation False)

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

@ -431,7 +431,7 @@ tests =
{ citationId = "Coffee" { citationId = "Coffee"
, citationPrefix = [] , citationPrefix = []
, citationSuffix = [] , citationSuffix = []
, citationMode = AuthorInText , citationMode = NormalCitation
, citationNoteNum = 0 , citationNoteNum = 0
, citationHash = 0} , citationHash = 0}
in (para . cite [citation] $ rawInline "latex" "\\cite{Coffee}") in (para . cite [citation] $ rawInline "latex" "\\cite{Coffee}")

2
tests/latex-reader.native
View file

@ -260,7 +260,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa
,HorizontalRule ,HorizontalRule
,Header 1 ("latex",[],[]) [Str "LaTeX"] ,Header 1 ("latex",[],[]) [Str "LaTeX"]
,BulletList ,BulletList
[[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str "22-23"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite[22-23]{smith.1899}"]]] [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [Str "22-23"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite[22-23]{smith.1899}"]]]
,[Para [RawInline (Format "latex") "\\doublespacing"]] ,[Para [RawInline (Format "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"]]