aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Text/Pandoc')
-rw-r--r--src/Text/Pandoc/Citeproc.hs40
-rw-r--r--src/Text/Pandoc/Citeproc/Locator.hs5
-rw-r--r--src/Text/Pandoc/Readers/Markdown.hs19
-rw-r--r--src/Text/Pandoc/Readers/Org/Inlines.hs13
4 files changed, 54 insertions, 23 deletions
diff --git a/src/Text/Pandoc/Citeproc.hs b/src/Text/Pandoc/Citeproc.hs
index 5ab245e16..954953fdb 100644
--- a/src/Text/Pandoc/Citeproc.hs
+++ b/src/Text/Pandoc/Citeproc.hs
@@ -299,17 +299,49 @@ getCitations locale otherIdsMap = Foldable.toList . query getCitation
where
getCitation (Cite cs _fallback) = Seq.singleton $
Citeproc.Citation { Citeproc.citationId = Nothing
- , Citeproc.citationPrefix = Nothing
- , Citeproc.citationSuffix = Nothing
+ , Citeproc.citationPrefix = pref
+ , Citeproc.citationSuffix = suff
, Citeproc.citationNoteNumber =
case cs of
[] -> Nothing
(Pandoc.Citation{ Pandoc.citationNoteNum = n }:
_) | n > 0 -> Just n
| otherwise -> Nothing
- , Citeproc.citationItems =
- fromPandocCitations locale otherIdsMap cs
+ , Citeproc.citationItems = items
}
+ where
+ (pref, suff, items) =
+ case fromPandocCitations locale otherIdsMap cs of
+ [] -> (Nothing, Nothing, [])
+ (i:is) ->
+ let (pref', i') = case citationItemPrefix i of
+ Nothing -> (Nothing, i)
+ Just p ->
+ case splitInlinesOnPipe (B.toList p) of
+ (_,[]) -> (Nothing, i)
+ (as,bs) -> (Just (B.fromList as),
+ i{ citationItemPrefix = Just (B.fromList bs) })
+ (suff', is') = case reverse is of
+ [] -> (Nothing, [])
+ (i'':is'') ->
+ case Citeproc.citationItemSuffix i'' of
+ Nothing -> (Nothing, is)
+ Just s ->
+ case splitInlinesOnPipe (B.toList s) of
+ (_,[]) -> (Nothing, is)
+ (as,bs) -> (Just (B.fromList bs), reverse
+ (i''{ citationItemSuffix = Just (B.fromList as) }:is''))
+ in (pref', suff', i':is')
+ splitInlinesOnPipe ils =
+ case break isStrWithPipe ils of
+ (xs,Str s : ys) ->
+ let (as,bs) = T.break (=='|') s
+ bs' = T.drop 1 bs
+ in (xs ++ [Str as | not (T.null as)],
+ [Str bs' | not (T.null bs')] ++ ys)
+ _ -> (ils,[])
+ isStrWithPipe (Str s) = T.any (=='|') s
+ isStrWithPipe _ = False
getCitation _ = mempty
fromPandocCitations :: Locale
diff --git a/src/Text/Pandoc/Citeproc/Locator.hs b/src/Text/Pandoc/Citeproc/Locator.hs
index ee5459e3d..9ee58506b 100644
--- a/src/Text/Pandoc/Citeproc/Locator.hs
+++ b/src/Text/Pandoc/Citeproc/Locator.hs
@@ -19,7 +19,6 @@ import Control.Monad (mzero)
import qualified Data.Map as M
import Data.Char (isSpace, isPunctuation, isDigit)
-
data LocatorInfo =
LocatorInfo{ locatorRaw :: Text
, locatorLabel :: Text
@@ -57,9 +56,11 @@ pLocatorWords locMap = do
maybeAddComma :: [Inline] -> [Inline]
maybeAddComma [] = []
maybeAddComma ils@(Space : _) = ils
+maybeAddComma ils@(SoftBreak : _) = ils
+maybeAddComma ils@(LineBreak : _) = ils
maybeAddComma ils@(Str t : _)
| Just (c, _) <- T.uncons t
- , isPunctuation c = ils
+ , isPunctuation c || c == '|' = ils
maybeAddComma ils = Str "," : Space : ils
pLocatorDelimited :: LocatorMap -> LocatorParser LocatorInfo
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index d81c4e3c1..248bf0146 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -55,7 +55,6 @@ import Text.Pandoc.Shared
import Text.Pandoc.URI (escapeURI, isURI, pBase64DataURI)
import Text.Pandoc.XML (fromEntities)
import Text.Pandoc.Readers.Metadata (yamlBsToMeta, yamlBsToRefs, yamlMetaBlock)
--- import Debug.Trace (traceShowId)
type MarkdownParser m = ParsecT Sources ParserState m
@@ -2247,14 +2246,8 @@ normalCite = try $ do
return citations
suffix :: PandocMonad m => MarkdownParser m (F Inlines)
-suffix = try $ do
- hasSpace <- option False (notFollowedBy nonspaceChar >> return True)
- spnl
- ils <- many (notFollowedBy (oneOf ";]") >> inline)
- let rest = trimInlinesF (mconcat ils)
- return $ if hasSpace && not (null ils)
- then (B.space <>) <$> rest
- else rest
+suffix = try $
+ mconcat <$> many (notFollowedBy (oneOf ";]") >> inline)
prefix :: PandocMonad m => MarkdownParser m (F Inlines)
prefix = trimInlinesF . mconcat <$>
@@ -2274,11 +2267,11 @@ citation = try $ do
suff <- suffix
noteNum <- stateNoteNumber <$> getState
return $ do
- x <- pref
- y <- suff
+ pref' <- B.toList <$> pref
+ suff' <- B.toList <$> suff
return Citation{ citationId = key
- , citationPrefix = B.toList x
- , citationSuffix = B.toList y
+ , citationPrefix = pref'
+ , citationSuffix = suff'
, citationMode = if suppress_author
then SuppressAuthor
else NormalCitation
diff --git a/src/Text/Pandoc/Readers/Org/Inlines.hs b/src/Text/Pandoc/Readers/Org/Inlines.hs
index 4d901ffc4..99f71f306 100644
--- a/src/Text/Pandoc/Readers/Org/Inlines.hs
+++ b/src/Text/Pandoc/Readers/Org/Inlines.hs
@@ -182,21 +182,26 @@ adjustCiteStyle sty cs = do
addPrefixToFirstItem :: (F Inlines) -> (F [Citation]) -> (F [Citation])
addPrefixToFirstItem aff cs = do
cs' <- cs
- aff' <- aff
+ aff' <- B.toList <$> aff
case cs' of
[] -> return []
(d:ds) -> return (d{ citationPrefix =
- B.toList aff' <> citationPrefix d }:ds)
+ if null aff'
+ then citationPrefix d
+ else aff' ++ (Str "|" : citationPrefix d) }:ds)
addSuffixToLastItem :: (F Inlines) -> (F [Citation]) -> (F [Citation])
addSuffixToLastItem aff cs = do
cs' <- cs
- aff' <- aff
+ aff' <- B.toList <$> aff
case lastMay cs' of
Nothing -> return cs'
Just d ->
return (init cs' ++ [d{ citationSuffix =
- citationSuffix d <> B.toList aff' }])
+ citationSuffix d <>
+ if null aff'
+ then []
+ else Str "|" : aff' }])
citeItems :: PandocMonad m => OrgParser m (F [Citation])
citeItems = sequence <$> sepBy1' citeItem (char ';' <* void (many spaceChar))
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-27 00:58:08 +0000