800c549 · typeable/pandoc

git.iko.soy/typeable/pandoc

LaTeX reader: Don't add spurious ", " to citation suffixes.

This is added when needed in Text.Pandoc.Biblio anyway.

commit800c5490ec080520268c9c3348f2b4199a21e6db authorJohn MacFarlane <fiddlosopher@gmail.com> dateSun 21 Jul 2013, 11:44 (13 years ago) parentbd1979f

3 files changed+22−26

compare with master

unifiedsplit

src/Text/Pandoc/Readers/LaTeX.hs+3−7 tests/Tests/Readers/LaTeX.hs+18−18 tests/latex-reader.native+1−1

src/Text/Pandoc/Readers/LaTeX.hs+3−7

@@ -44,7 +44,7 @@ import qualified Text.Pandoc.UTF8 as UTF8

4444import Data.Char ( chr, ord )

4545import Control.Monad

4646import Text.Pandoc.Builder

47−import Data.Char (isLetter, isPunctuation, isSpace)

47+import Data.Char (isLetter)

4848import Control.Applicative

4949import Data.Monoid

5050import System.Environment (getEnv)

@@ -986,12 +986,8 @@ addPrefix _ _ = []

986986

987987addSuffix :: [Inline] -> [Citation] -> [Citation]

988988addSuffix s ks@(_:_) =

989− let k = last ks

990− s' = case s of

991− (Str (c:_):_)

992− | not (isPunctuation c || isSpace c) -> Str "," : Space : s

993− _ -> s

994− in init ks ++ [k {citationSuffix = citationSuffix k ++ s'}]

989+ let k = last ks

990+ in init ks ++ [k {citationSuffix = citationSuffix k ++ s}]

995991addSuffix _ _ = []

996992

997993simpleCiteArgs :: LP [Citation]

tests/Tests/Readers/LaTeX.hs+18−18

@@ -79,14 +79,14 @@ natbibCitations = testGroup "natbib"

7979 =?> para (cite [baseCitation] (rt "\\citet{item1}"))

8080 , "suffix" =: "\\citet[p.~30]{item1}"

8181 =?> para

82− (cite [baseCitation{ citationSuffix = toList $ text ", p.\160\&30" }] (rt "\\citet[p.~30]{item1}"))

82+ (cite [baseCitation{ citationSuffix = toList $ text "p.\160\&30" }] (rt "\\citet[p.~30]{item1}"))

8383 , "suffix long" =: "\\citet[p.~30, with suffix]{item1}"

8484 =?> para (cite [baseCitation{ citationSuffix =

85− toList $ text ", p.\160\&30, with suffix" }] (rt "\\citet[p.~30, with suffix]{item1}"))

85+ toList $ text "p.\160\&30, with suffix" }] (rt "\\citet[p.~30, with suffix]{item1}"))

8686 , "multiple" =: "\\citeauthor{item1} \\citetext{\\citeyear{item1}; \\citeyear[p.~30]{item2}; \\citealp[see also][]{item3}}"

8787 =?> para (cite [baseCitation{ citationMode = AuthorInText }

8888 ,baseCitation{ citationMode = SuppressAuthor

89− , citationSuffix = [Str ",",Space,Str "p.\160\&30"]

89+ , citationSuffix = [Str "p.\160\&30"]

9090 , citationId = "item2" }

9191 ,baseCitation{ citationId = "item3"

9292 , citationPrefix = [Str "see",Space,Str "also"]

@@ -95,28 +95,28 @@ natbibCitations = testGroup "natbib"

9595 , "group" =: "\\citetext{\\citealp[see][p.~34--35]{item1}; \\citealp[also][chap. 3]{item3}}"

9696 =?> para (cite [baseCitation{ citationMode = NormalCitation

9797 , citationPrefix = [Str "see"]

98− , citationSuffix = [Str ",",Space,Str "p.\160\&34\8211\&35"] }

98+ , citationSuffix = [Str "p.\160\&34\8211\&35"] }

9999 ,baseCitation{ citationMode = NormalCitation

100100 , citationId = "item3"

101101 , citationPrefix = [Str "also"]

102− , citationSuffix = [Str ",",Space,Str "chap.",Space,Str "3"] }

102+ , citationSuffix = [Str "chap.",Space,Str "3"] }

103103 ] (rt "\\citetext{\\citealp[see][p.~34--35]{item1}; \\citealp[also][chap. 3]{item3}}"))

104104 , "suffix and locator" =: "\\citep[pp.~33, 35--37, and nowhere else]{item1}"

105105 =?> para (cite [baseCitation{ citationMode = NormalCitation

106− , citationSuffix = [Str ",",Space,Str "pp.\160\&33,",Space,Str "35\8211\&37,",Space,Str "and",Space,Str "nowhere",Space, Str "else"] }] (rt "\\citep[pp.~33, 35--37, and nowhere else]{item1}"))

106+ , citationSuffix = [Str "pp.\160\&33,",Space,Str "35\8211\&37,",Space,Str "and",Space,Str "nowhere",Space, Str "else"] }] (rt "\\citep[pp.~33, 35--37, and nowhere else]{item1}"))

107107 , "suffix only" =: "\\citep[and nowhere else]{item1}"

108108 =?> para (cite [baseCitation{ citationMode = NormalCitation

109− , citationSuffix = toList $ text ", and nowhere else" }] (rt "\\citep[and nowhere else]{item1}"))

109+ , citationSuffix = toList $ text "and nowhere else" }] (rt "\\citep[and nowhere else]{item1}"))

110110 , "no author" =: "\\citeyearpar{item1}, and now Doe with a locator \\citeyearpar[p.~44]{item2}"

111111 =?> para (cite [baseCitation{ citationMode = SuppressAuthor }] (rt "\\citeyearpar{item1}") <>

112112 text ", and now Doe with a locator " <>

113113 cite [baseCitation{ citationMode = SuppressAuthor

114− , citationSuffix = [Str ",",Space,Str "p.\160\&44"]

114+ , citationSuffix = [Str "p.\160\&44"]

115115 , citationId = "item2" }] (rt "\\citeyearpar[p.~44]{item2}"))

116116 , "markup" =: "\\citep[\\emph{see}][p. \\textbf{32}]{item1}"

117117 =?> para (cite [baseCitation{ citationMode = NormalCitation

118118 , citationPrefix = [Emph [Str "see"]]

119− , citationSuffix = [Str ",",Space,Str "p.",Space,

119+ , citationSuffix = [Str "p.",Space,

120120 Strong [Str "32"]] }] (rt "\\citep[\\emph{see}][p. \\textbf{32}]{item1}"))

121121 ]

122122

@@ -126,14 +126,14 @@ biblatexCitations = testGroup "biblatex"

126126 =?> para (cite [baseCitation] (rt "\\textcite{item1}"))

127127 , "suffix" =: "\\textcite[p.~30]{item1}"

128128 =?> para

129− (cite [baseCitation{ citationSuffix = toList $ text ", p.\160\&30" }] (rt "\\textcite[p.~30]{item1}"))

129+ (cite [baseCitation{ citationSuffix = toList $ text "p.\160\&30" }] (rt "\\textcite[p.~30]{item1}"))

130130 , "suffix long" =: "\\textcite[p.~30, with suffix]{item1}"

131131 =?> para (cite [baseCitation{ citationSuffix =

132− toList $ text ", p.\160\&30, with suffix" }] (rt "\\textcite[p.~30, with suffix]{item1}"))

132+ toList $ text "p.\160\&30, with suffix" }] (rt "\\textcite[p.~30, with suffix]{item1}"))

133133 , "multiple" =: "\\textcites{item1}[p.~30]{item2}[see also][]{item3}"

134134 =?> para (cite [baseCitation{ citationMode = AuthorInText }

135135 ,baseCitation{ citationMode = NormalCitation

136− , citationSuffix = [Str ",",Space,Str "p.\160\&30"]

136+ , citationSuffix = [Str "p.\160\&30"]

137137 , citationId = "item2" }

138138 ,baseCitation{ citationId = "item3"

139139 , citationPrefix = [Str "see",Space,Str "also"]

@@ -142,28 +142,28 @@ biblatexCitations = testGroup "biblatex"

142142 , "group" =: "\\autocites[see][p.~34--35]{item1}[also][chap. 3]{item3}"

143143 =?> para (cite [baseCitation{ citationMode = NormalCitation

144144 , citationPrefix = [Str "see"]

145− , citationSuffix = [Str ",",Space,Str "p.\160\&34\8211\&35"] }

145+ , citationSuffix = [Str "p.\160\&34\8211\&35"] }

146146 ,baseCitation{ citationMode = NormalCitation

147147 , citationId = "item3"

148148 , citationPrefix = [Str "also"]

149− , citationSuffix = [Str ",",Space,Str "chap.",Space,Str "3"] }

149+ , citationSuffix = [Str "chap.",Space,Str "3"] }

150150 ] (rt "\\autocites[see][p.~34--35]{item1}[also][chap. 3]{item3}"))

151151 , "suffix and locator" =: "\\autocite[pp.~33, 35--37, and nowhere else]{item1}"

152152 =?> para (cite [baseCitation{ citationMode = NormalCitation

153− , citationSuffix = [Str ",",Space,Str "pp.\160\&33,",Space,Str "35\8211\&37,",Space,Str "and",Space,Str "nowhere",Space, Str "else"] }] (rt "\\autocite[pp.~33, 35--37, and nowhere else]{item1}"))

153+ , citationSuffix = [Str "pp.\160\&33,",Space,Str "35\8211\&37,",Space,Str "and",Space,Str "nowhere",Space, Str "else"] }] (rt "\\autocite[pp.~33, 35--37, and nowhere else]{item1}"))

154154 , "suffix only" =: "\\autocite[and nowhere else]{item1}"

155155 =?> para (cite [baseCitation{ citationMode = NormalCitation

156− , citationSuffix = toList $ text ", and nowhere else" }] (rt "\\autocite[and nowhere else]{item1}"))

156+ , citationSuffix = toList $ text "and nowhere else" }] (rt "\\autocite[and nowhere else]{item1}"))

157157 , "no author" =: "\\autocite*{item1}, and now Doe with a locator \\autocite*[p.~44]{item2}"

158158 =?> para (cite [baseCitation{ citationMode = SuppressAuthor }] (rt "\\autocite*{item1}") <>

159159 text ", and now Doe with a locator " <>

160160 cite [baseCitation{ citationMode = SuppressAuthor

161− , citationSuffix = [Str ",",Space,Str "p.\160\&44"]

161+ , citationSuffix = [Str "p.\160\&44"]

162162 , citationId = "item2" }] (rt "\\autocite*[p.~44]{item2}"))

163163 , "markup" =: "\\autocite[\\emph{see}][p. \\textbf{32}]{item1}"

164164 =?> para (cite [baseCitation{ citationMode = NormalCitation

165165 , citationPrefix = [Emph [Str "see"]]

166− , citationSuffix = [Str ",",Space,Str "p.",Space,

166+ , citationSuffix = [Str "p.",Space,

167167 Strong [Str "32"]] }] (rt "\\autocite[\\emph{see}][p. \\textbf{32}]{item1}"))

168168 , "parencite" =: "\\parencite{item1}"

169169 =?> para (cite [baseCitation{ citationMode = NormalCitation }] (rt "\\parencite{item1}"))

tests/latex-reader.native+1−1

@@ -260,7 +260,7 @@ Pandoc (Meta {unMeta = fromList [("authors",MetaList [MetaInlines [Str "John",Sp

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, citationHash = 0}] [RawInline "latex" "\\cite[22-23]{smith.1899}"]]]

263+ [[Para [Cite [Citation {citationId = "smith.1899", citationPrefix = [], citationSuffix = [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"]]