c06ed6e · typeable/pandoc

git.iko.soy/typeable/pandoc

Biblio: Add comma to beginning of bare suffix, e.g. @item1 [50].

Motivation: @item1 [50] should be as close as possible to [@item1, 50].

commitc06ed6e3b148910a89b7c9a9acb1dd41f818b351 authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 5 Jun 2012, 11:54 (14 years ago) parent337735a

1 file changed+10−2

unifiedsplit

src/Text/Pandoc/Biblio.hs+10−2

@@ -31,7 +31,7 @@ module Text.Pandoc.Biblio ( processBiblio ) where

3131

3232import Data.List

3333import Data.Unique

34−import Data.Char ( isDigit )

34+import Data.Char ( isDigit, isPunctuation )

3535import qualified Data.Map as M

3636import Text.CSL hiding ( Cite(..), Citation(..) )

3737import qualified Text.CSL as CSL ( Cite(..) )

@@ -124,13 +124,21 @@ toCslCite :: Citation -> CSL.Cite

124124toCslCite c

125125 = let (l, s) = locatorWords $ citationSuffix c

126126 (la,lo) = parseLocator l

127+ s' = case (l,s,citationMode c) of

128+ -- treat a bare locator as if it begins with comma

129+ -- so @item1 [blah] is like [@item1, blah]

130+ ("",(x:_),AuthorInText) | not (isPunct x)

131+ -> [Str ",",Space] ++ s

132+ _ -> s

133+ isPunct (Str (c:_)) = isPunctuation c

134+ isPunct _ = False

127135 citMode = case citationMode c of

128136 AuthorInText -> (True, False)

129137 SuppressAuthor -> (False,True )

130138 NormalCitation -> (False,False)

131139 in emptyCite { CSL.citeId = citationId c

132140 , CSL.citePrefix = PandocText $ citationPrefix c

133− , CSL.citeSuffix = PandocText $ s

141+ , CSL.citeSuffix = PandocText s'

134142 , CSL.citeLabel = la

135143 , CSL.citeLocator = lo

136144 , CSL.citeNoteNumber = show $ citationNoteNum c