pandoc-citeproc 0.12.2.4 → 0.12.2.5
raw patch · 6 files changed
+52/−28 lines, 6 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- changelog +6/−0
- pandoc-citeproc.cabal +1/−1
- src/Text/CSL/Eval/Date.hs +6/−6
- src/Text/CSL/Proc/Disamb.hs +13/−10
- tests/issue312.expected.native +24/−9
- tests/issue312.in.native +2/−2
changelog view
@@ -1,3 +1,9 @@+pandoc-citeproc (0.12.2.5)++ * Fixed spurious disambiguation on some date ranges (#312).++ * Fix spurious dash after date range in certain cases (#312).+ pandoc-citeproc (0.12.2.4) * Properly fixed range delimiters. Closes #312.
pandoc-citeproc.cabal view
@@ -1,5 +1,5 @@ name: pandoc-citeproc-version: 0.12.2.4+version: 0.12.2.5 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc
src/Text/CSL/Eval/Date.hs view
@@ -134,12 +134,12 @@ | "year" <- n, o /= mempty = output fm o | otherwise = [] - withDelim _ [[]] [[]] = []- withDelim xs o1 o2 = o1 ++- (case dpRangeDelim <$> last' xs of- ["-"] -> [[OPan [Str "\x2013"]]]- [s] -> [[OPan [Str s]]]- _ -> []) ++ o2+ withDelim xs o1 o2+ | null (concat o1 ++ concat o2) = []+ | otherwise = o1 ++ (case dpRangeDelim <$> last' xs of+ ["-"] -> [[OPan [Str "\x2013"]]]+ [s] -> [[OPan [Str s]]]+ _ -> []) ++ o2 formatYear f y | "short" <- f = drop 2 y
src/Text/CSL/Proc/Disamb.hs view
@@ -22,7 +22,6 @@ module Text.CSL.Proc.Disamb where import Control.Arrow ( (&&&), (>>>), second )-import Data.Char ( chr ) import Data.List ( elemIndex, find, findIndex, sortBy, mapAccumL , nub, nubBy, groupBy, isPrefixOf ) import Data.Maybe@@ -276,11 +275,13 @@ generateYearSuffix :: [Reference] -> [(String, [Output])] -> [(String,String)] generateYearSuffix refs- = concatMap (flip zip suffs) .+ = concatMap (`zip` suffs) . -- sort clashing cites using their position in the sorted bibliography- getFst . map sort' . map (filter ((/=) 0 . snd)) . map (map getP) .+ getFst . map (sort' . (filter ((/=) 0 . snd)) . (map getP)) . -- group clashing cites- getFst . filter (\grp -> length grp >= 2) . map nub . groupBy (\a b -> snd a == snd b) . sort' . filter ((/=) [] . snd)+ getFst . filter (\grp -> length grp >= 2) . map nub .+ groupBy (\a b -> snd a == snd b) .+ sort' . filter (not . null . snd) where sort' :: (Ord a, Ord b) => [(a,b)] -> [(a,b)] sort' = sortBy (comparing snd)@@ -288,8 +289,8 @@ getP k = case findIndex ((==) k . unLiteral . refId) refs of Just x -> (k, x + 1) _ -> (k, 0)- suffs = l ++ [x ++ y | x <- l, y <- l ]- l = map (return . chr) [97..122]+ suffs = letters ++ [x ++ y | x <- letters, y <- letters ]+ letters = map (:[]) ['a'..'z'] setYearSuffCollision :: Bool -> [CiteData] -> [Output] -> [Output] setYearSuffCollision b cs = proc (setYS cs) . (map $ \x -> if hasYearSuf x then x else addYearSuffix x)@@ -315,9 +316,11 @@ getYearSuffixes (CG _ _ _ d) = map go d where go (c,x) = (citeId c, relevant False [x]) relevant :: Bool -> [Output] -> [Output] -- bool is true if has contrib- -- we're only interested in OContrib and OYear, unless there is no OContrib+ -- we're only interested in OContrib and OYear,+ -- unless there is no OContrib relevant c (Output xs _ : rest) = relevant c xs ++ relevant c rest relevant c (OYear n _ _ : rest) = OStr n emptyFormatting : relevant c rest+ relevant c (ODate xs : rest) = relevant c xs ++ relevant c rest relevant False (OStr s _ : rest) = OStr s emptyFormatting : relevant False rest relevant False (OSpace : rest) = OSpace : relevant False rest relevant False (OPan ils : rest) = OPan ils : relevant False rest@@ -377,11 +380,11 @@ -- | Add the year suffix to the year. Needed for disambiguation. addYearSuffix :: Output -> Output addYearSuffix o- | OYear y k f <- o = Output [OYear y k emptyFormatting,OYearSuf [] k [] emptyFormatting] f- | ODate (x:xs) <- o = if or $ map hasYear xs+ | OYear y k f <- o = Output [OYear y k emptyFormatting, OYearSuf [] k [] emptyFormatting] f+ | ODate (x:xs) <- o = if any hasYear xs then Output (x : [addYearSuffix $ ODate xs]) emptyFormatting else addYearSuffix (Output (x:xs) emptyFormatting)- | Output (x:xs) f <- o = if or $ map hasYearSuf (x : xs)+ | Output (x:xs) f <- o = if any hasYearSuf (x : xs) then Output (x : xs) f else if hasYear x then Output (addYearSuffix x : xs) f
tests/issue312.expected.native view
@@ -1,9 +1,24 @@-Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("references",MetaList [MetaMap (fromList [("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "-12"])]),MetaMap (fromList [("month",MetaInlines [Str "12"]),("year",MetaInlines [Str "12"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("id",MetaInlines [Str "item2"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "11"]),("year",MetaInlines [Str "2016"])]),MetaMap (fromList [("month",MetaInlines [Str "12"]),("year",MetaInlines [Str "2017"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("id",MetaInlines [Str "item3"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "1"]),("year",MetaInlines [Str "2016"])]),MetaMap (fromList [("season",MetaInlines [Str "2"]),("year",MetaInlines [Str "2017"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])])])]})-[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "(",Str "\8220Title,\8221",Space,Str "12BC\8211\&12ADa)"],Str ";",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "(",Str "\8220Title,\8221",Space,Str "2016\8211\&2017b)"],Str ";",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "(",Str "\8220Title,\8221",Space,Str "2016\8211\&2017c)"]]-,Div ("refs",["references"],[])- [Div ("ref-item1",[],[])- [Para [Str "Title.",Space,Str "(12BC\8211\&12ADa,",Space,Str "January–December)."]]- ,Div ("ref-item2",[],[])- [Para [Str "Title.",Space,Str "(2016\8211\&2017b,",Space,Str "November–December)."]]- ,Div ("ref-item3",[],[])- [Para [Str "Title.",Space,Str "(2016\8211\&2017c,",Space,Str "Spring–Summer)."]]]]+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("nocite",MetaInlines [Cite [Citation {citationId = "*", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@*"]]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "Y"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1950"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "Y/Y"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1951"])]),MetaMap (fromList [("year",MetaInlines [Str "1952"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1953"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+month"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM/YM"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1954"])]),MetaMap (fromList [("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1955"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM/YM_same"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1956"])]),MetaMap (fromList [("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1956"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month,",Space,Str "same",Space,Str "year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1958"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+month+day"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD/YMD"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1959"])]),MetaMap (fromList [("day",MetaInlines [Str "16"]),("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1960"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month+day"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD/YMD_same"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1961"])]),MetaMap (fromList [("day",MetaInlines [Str "16"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1962"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month+day,",Space,Str "same",Space,Str "month"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "3"]),("year",MetaInlines [Str "1963"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+season"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS/YS"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "1"]),("year",MetaInlines [Str "1964"])]),MetaMap (fromList [("season",MetaInlines [Str "4"]),("year",MetaInlines [Str "1965"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+season"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS/YS_same"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "2"]),("year",MetaInlines [Str "1966"])]),MetaMap (fromList [("season",MetaInlines [Str "4"]),("year",MetaInlines [Str "1966"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+season,",Space,Str "same",Space,Str "year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])])])]})+[Div ("refs",["references"],[])+ [Div ("ref-Y",[],[])+ [Para [Str "NN.",Space,Str "(1950).",Space,Str "Date:",Space,Str "Year."]]+ ,Div ("ref-Y/Y",[],[])+ [Para [Str "NN.",Space,Str "(1951\8211\&1952).",Space,Str "Date",Space,Str "range:",Space,Str "Year."]]+ ,Div ("ref-YM",[],[])+ [Para [Str "NN.",Space,Str "(1953,",Space,Str "January).",Space,Str "Date:",Space,Str "Year+month."]]+ ,Div ("ref-YM/YM",[],[])+ [Para [Str "NN.",Space,Str "(1954\8211\&1955,",Space,Str "January\8211February).",Space,Str "Date",Space,Str "range:",Space,Str "Year+month."]]+ ,Div ("ref-YM/YM_same",[],[])+ [Para [Str "NN.",Space,Str "(1956,",Space,Str "January\8211February).",Space,Str "Date",Space,Str "range:",Space,Str "Year+month,",Space,Str "same",Space,Str "year."]]+ ,Div ("ref-YMD",[],[])+ [Para [Str "NN.",Space,Str "(1958,",Space,Str "January",Space,Str "15).",Space,Str "Date:",Space,Str "Year+month+day."]]+ ,Div ("ref-YMD/YMD",[],[])+ [Para [Str "NN.",Space,Str "(1959\8211\&1960,",Space,Str "January",Space,Str "15\8211February",Space,Str "16).",Space,Str "Date",Space,Str "range:",Space,Str "Year+month+day."]]+ ,Div ("ref-YMD/YMD_same",[],[])+ [Para [Str "NN.",Space,Str "(1961\8211\&1962,",Space,Str "January",Space,Str "15\8211January",Space,Str "16).",Space,Str "Date",Space,Str "range:",Space,Str "Year+month+day,",Space,Str "same",Space,Str "month."]]+ ,Div ("ref-YS",[],[])+ [Para [Str "NN.",Space,Str "(1963,",Space,Str "Autumn).",Space,Str "Date:",Space,Str "Year+season."]]+ ,Div ("ref-YS/YS",[],[])+ [Para [Str "NN.",Space,Str "(1964\8211\&1965,",Space,Str "Spring\8211Winter).",Space,Str "Date",Space,Str "range:",Space,Str "Year+season."]]+ ,Div ("ref-YS/YS_same",[],[])+ [Para [Str "NN.",Space,Str "(1966,",Space,Str "Summer\8211Winter).",Space,Str "Date",Space,Str "range:",Space,Str "Year+season,",Space,Str "same",Space,Str "year."]]]]
tests/issue312.in.native view
@@ -1,2 +1,2 @@-Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("references",MetaList [MetaMap (fromList [("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "-12"])]),MetaMap (fromList [("month",MetaInlines [Str "12"]),("year",MetaInlines [Str "12"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("id",MetaInlines [Str "item2"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "11"]),("year",MetaInlines [Str "2016"])]),MetaMap (fromList [("month",MetaInlines [Str "12"]),("year",MetaInlines [Str "2017"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("id",MetaInlines [Str "item3"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "1"]),("year",MetaInlines [Str "2016"])]),MetaMap (fromList [("season",MetaInlines [Str "2"]),("year",MetaInlines [Str "2017"])])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "webpage"])])])]})-[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item1"],Str ";",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item2"],Str ";",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@item3"]]]+Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/apa.csl"]),("nocite",MetaInlines [Cite [Citation {citationId = "*", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@*"]]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "Y"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1950"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "Y/Y"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1951"])]),MetaMap (fromList [("year",MetaInlines [Str "1952"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1953"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+month"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM/YM"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1954"])]),MetaMap (fromList [("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1955"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YM/YM_same"]),("issued",MetaList [MetaMap (fromList [("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1956"])]),MetaMap (fromList [("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1956"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month,",Space,Str "same",Space,Str "year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1958"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+month+day"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD/YMD"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1959"])]),MetaMap (fromList [("day",MetaInlines [Str "16"]),("month",MetaInlines [Str "2"]),("year",MetaInlines [Str "1960"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month+day"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YMD/YMD_same"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "15"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1961"])]),MetaMap (fromList [("day",MetaInlines [Str "16"]),("month",MetaInlines [Str "1"]),("year",MetaInlines [Str "1962"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+month+day,",Space,Str "same",Space,Str "month"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "3"]),("year",MetaInlines [Str "1963"])])]),("title",MetaInlines [Str "Date:",Space,Str "Year+season"]),("title-short",MetaInlines [Str "Date"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS/YS"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "1"]),("year",MetaInlines [Str "1964"])]),MetaMap (fromList [("season",MetaInlines [Str "4"]),("year",MetaInlines [Str "1965"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+season"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "NN"])])]),("id",MetaInlines [Str "YS/YS_same"]),("issued",MetaList [MetaMap (fromList [("season",MetaInlines [Str "2"]),("year",MetaInlines [Str "1966"])]),MetaMap (fromList [("season",MetaInlines [Str "4"]),("year",MetaInlines [Str "1966"])])]),("title",MetaInlines [Str "Date",Space,Str "range:",Space,Str "Year+season,",Space,Str "same",Space,Str "year"]),("title-short",MetaInlines [Str "Date",Space,Str "range"]),("type",MetaInlines [Str "webpage"])])])]})+[]