diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,17 @@ +pandoc-citeproc (0.16.3) + + * Set `hanging-indent` class on `refs` Div if specified by the style (#410). + This depends on whether the `hanging-indent` attribute of + `` is true. + * Update chicago-author-date.csl and locales. + * Add new biblatex @dataset entry type (#413). + * Cleanup cabal file and remove old ghc 6.10 conditional. + * Replace some of the yaml use with HsYAML-aeson (vijayphoenix). + * Allow xml-conduit 1.9. + * Allow network 3.1. + * Allow pandoc 2.8. + * Use pandoc-types 1.17.6.1 + pandoc-citeproc (0.16.2) * Normalize for sorting by padding numerical strings with 0s (#399). diff --git a/chicago-author-date.csl b/chicago-author-date.csl --- a/chicago-author-date.csl +++ b/chicago-author-date.csl @@ -44,7 +44,7 @@ - + - + - + @@ -320,7 +320,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -597,7 +597,7 @@ - + diff --git a/compat/Text/CSL/Compat/Pandoc.hs b/compat/Text/CSL/Compat/Pandoc.hs --- a/compat/Text/CSL/Compat/Pandoc.hs +++ b/compat/Text/CSL/Compat/Pandoc.hs @@ -68,7 +68,7 @@ writePlain = either mempty T.unpack . runPure . Pandoc.writePlain def -writeNative = either mempty T.unpack . runPure . Pandoc.writeNative def{ writerTemplate = Just "" } +writeNative = either mempty T.unpack . runPure . Pandoc.writeNative def{ writerTemplate = Just mempty } writeHtmlString = either mempty T.unpack . runPure . Pandoc.writeHtml4String def{ writerExtensions = extensionsFromList @@ -97,7 +97,7 @@ writePlain = Pandoc.writePlain def -writeNative = Pandoc.writeNative def{ writerTemplate = Just "" } +writeNative = Pandoc.writeNative def{ writerTemplate = Just mempty } writeHtmlString = Pandoc.writeHtmlString def #endif diff --git a/locales/locales-bg-BG.xml b/locales/locales-bg-BG.xml --- a/locales/locales-bg-BG.xml +++ b/locales/locales-bg-BG.xml @@ -2,7 +2,12 @@ This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License - 2012-07-04T23:31:02+00:00 + 2018-02-15T04:14:02+00:00 + + Valeriya Simeonova + simeonova@fmi.uni-sofia.bg + http://www.mendeley.com/profiles/valeriya-simeonova/ + @@ -20,18 +25,18 @@ и и други анонимен - анон + анон. в - available at - by - circa - c. + достъпен на + от + около + ок. цитиран издание издания - изд + изд. и съавт. предстоящ от @@ -41,25 +46,25 @@ интернет интервю писмо - no date - без дата + без дата + б.д. онлайн представен на - reference - references + източник + източници - ref. - refs. + изт. + изт. изтеглен на - scale - version + скала + версия - AD - BC + сл.хр. + пр.хр. „ @@ -69,25 +74,59 @@ – - th - st - nd - rd - th - th - th + то + во + ро + то + во + ро + то + ти + ви + ри + ти + ви + ри + ти + та + ва + ра + та + ва + ра + та - first - second - third - fourth - fifth - sixth - seventh - eighth - ninth - tenth + първo + вторo + третo + четвъртo + петo + шестo + седмo + осмo + деветo + десетo + първи + втори + трети + четверти + пети + шести + седми + осми + девети + десети + първа + втора + трета + четверта + пета + шеста + седма + осма + девета + десета @@ -130,13 +169,10 @@ страница страници - - страница - страници - + брой страници - параграф - параграфи + абзац + абзаци част @@ -147,11 +183,11 @@ раздели - sub verbo - sub verbis + под раздел + под раздели - стих + стихотворение стихове @@ -160,37 +196,25 @@ - кн - гл - кол - фиг - фол - бр - l. - n. - оп - - с - с-ци - - - с - с-ци - - п - ч - разд - - s.v. - s.vv. - - - ст - ст-ове - + кн. + гл. + кол. + фиг. + фол. + бр. + р. + бел. + оп. + стр. + бр.стр. + абз. + ч. + разд. + подразд. + ст. том - т-ове + томове @@ -204,22 +228,16 @@ - - director - directors - + режисьор редактор редактори - editor - editors - - - illustrator - illustrators + главен редактор + редакторски колектив + илюстрации преводач преводачи @@ -230,50 +248,44 @@ - - dir. - dirs. - + реж. - ред - ред-ри + ред. + ред.кол. - ed. - eds. - - - ill. - ills. + гл.ред. + гл.ред.кол. + ил. прев - прев-чи + прев.кол. - ed. & tran. - eds. & trans. + ред. & прев. + ред.кол. & прев. - by - directed by + от + под общата редакция на редактиран от - edited by - illustrated by + главен редактор + илюстрации от интервюиран от до - by + рецензент преведен от - edited & translated by + редактирано & преведено от - dir. - ред - ed. - illus. - прев - ed. & trans. by + п.о.р. + ред. + гл.ред. + ил. + прев. + ред. & прев. от Януари @@ -304,9 +316,9 @@ Дек - Spring - Summer - Autumn - Winter + Пролет + Лято + Есен + Зима diff --git a/locales/locales-it-IT.xml b/locales/locales-it-IT.xml --- a/locales/locales-it-IT.xml +++ b/locales/locales-it-IT.xml @@ -72,7 +72,7 @@ – - ° + º prima diff --git a/locales/locales-la.xml b/locales/locales-la.xml new file mode 100644 --- /dev/null +++ b/locales/locales-la.xml @@ -0,0 +1,309 @@ + + + + + Andrew Dunning + + This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License + 2019-01-21T13:33:33+00:00 + + + + + + + + + + + + + + consultatus + et + et alii + anonymus + anon. + ad + praestatus ad + a + circa + c. + citatus + + editio + editiones + + ed. + et al. + futurus + ab + ibid. + in + impressorio + interrete + congressus + epistula + sine die + s.d. + in linea + praebitus ad + + relatio + relationes + + + rel. + rell. + + recuperatus + scala + uersio + + + A.D. + A.C. + + + ‘ + ’ + “ + ” + – + + + º + + + primus + secundus + tertius + quartus + quintus + sextus + septimus + octauus + nonus + decimus + + + + liber + libri + + + capitulum + capitula + + + columna + columnae + + + figura + figurae + + + folium + folii + + + numerus + numeri + + + linea + lineae + + + nota + notae + + + opus + opera + + + pagina + paginae + + + pagina + paginae + + + paragraphus + paragraphi + + + pars + partes + + + paragraphus + paragraphi + + + sub uerbo + sub uerbis + + + versus + versus + + + tomus + tomi + + + + lib. + cap. + col. + fig. + fol. + n. + l. + n. + op. + + p. + pp. + + + p. + pp. + + par. + pr. + par. + + s.u. + s.uu. + + + u. + uu. + + + t. + tt. + + + + + + ¶¶ + + + § + §§ + + + + + director + directores + + + curator + curatores + + + editor + editores + + + illustrator + illustratores + + + interpres + interpretes + + + curator et interpres + curatores et interpretes + + + + + dir. + dirs. + + + cur. + curs. + + + ed. + eds. + + + ill. + ills. + + + interp. + interps. + + + cur. et interp. + curs. et interps. + + + + a + a directione + a cura + ab editione + ab illustratione + a congressione + a + a + a interpretatione + a cura et interpretatione + + + dir. + cur. + ed. + illus. + interp. + a cur. et interp. + + + ianuarius + februarius + martius + aprilis + maius + iunius + iulius + augustus + september + october + nouember + december + + + ian. + feb. + mar. + apr. + mai. + iun. + iul. + aug. + sep. + oct. + nou. + dec. + + + uer + aestas + autumnus + hiems + + diff --git a/locales/locales-mn-MN.xml b/locales/locales-mn-MN.xml --- a/locales/locales-mn-MN.xml +++ b/locales/locales-mn-MN.xml @@ -69,38 +69,32 @@ – - th - st - nd - rd - th - th - th + -p - first - second - third - fourth - fifth - sixth - seventh - eighth - ninth - tenth + нэгдүгээр + хоёрдугаар + гуравдугаар + дөрөвдүгээр + тавдугаар + зургаадугаар + долоодугаар + наймдугаар + есдүгээр + аравдугаар - book - books + ном + номнууд chapter chapters - column - columns + багана + баганууд figure @@ -111,12 +105,12 @@ folios - number - numbers + тоо + тоонууд - line - lines + шугам + шугамнууд note @@ -127,12 +121,12 @@ opera - page - pages + хуудас + хуудаснууд - page - pages + хуудас + хуудаснууд paragraph @@ -209,24 +203,24 @@ directors - editor - editors + редактор + редакторууд - editor - editors + редактор + редакторууд illustrator illustrators - translator - translators + орчуулагч + орчуулагчид - editor & translator - editors & translators + редактор ба орчуулагч + редакторууд ба орчуулагчид @@ -235,24 +229,24 @@ dirs. - ed - eds + ред. + ред. - ed. - eds. + ред. + ред. ill. ills. - tran - trans + орч + орч - ed. & tran. - eds. & trans. + ред. ба орч. + ред. ба орч. @@ -276,37 +270,37 @@ ed. & trans. by - January - February - March - April - May - June - July - August - September - October - November - December + Нэгдүгээр сар + Хоёрдугаар сар + Гуравдугаар сар + Дөрөвдүгээр сар + Тавдугаар сар + Зургаадугаар сар + Долдугаар сар + Наймдугаар сар + Есдүгээр сар + Аравдугаар сар + Арван нэгдүгээр сар + Арван хоёрдугаар сар - Jan - Feb - Mar - Apr - May - Jun - Jul - Aug - Sep - Oct - Nov - Dec + 1-р сар + 2-р сар + 3-р сар + 4-р сар + 5-р сар + 6-р сар + 7-р сар + 8-р сар + 9-р сар + 10-р сар + 11-р сар + 12-р сар - Spring - Summer - Autumn - Winter + Хавар + Зун + Намар + Өвөл diff --git a/locales/locales-ro-RO.xml b/locales/locales-ro-RO.xml --- a/locales/locales-ro-RO.xml +++ b/locales/locales-ro-RO.xml @@ -26,7 +26,7 @@ anonim anon. la - valabil la + disponibil la de circa cca. @@ -70,7 +70,7 @@ ” « » - - + – -lea @@ -212,8 +212,8 @@ editori - editor - editori + coordonator + coordonatori ilustrator @@ -224,8 +224,8 @@ traducători - editor & traducător - editori & traducători + editor și traducător + editori și traducători @@ -238,8 +238,8 @@ ed. - ed. - ed. + coord. + coord. ilustr. @@ -250,29 +250,29 @@ trad. - ed. & trad. - ed. & trad. + ed. și trad. + ed. și trad. de coordonat de ediție de - ediție de + coordonator ilustrații de interviu de în de traducere de - ediție & traducere de + ediție și traducere de dir. ed. - ed. + coord. ilustr. trad. - ed. & trad. de + ed. și trad. de ianuarie diff --git a/locales/locales-sl-SI.xml b/locales/locales-sl-SI.xml --- a/locales/locales-sl-SI.xml +++ b/locales/locales-sl-SI.xml @@ -38,7 +38,7 @@ izdaje izd. - in sod. + idr. pred izidom od isto diff --git a/locales/locales-zh-CN.xml b/locales/locales-zh-CN.xml --- a/locales/locales-zh-CN.xml +++ b/locales/locales-zh-CN.xml @@ -25,17 +25,17 @@ - 见於 + 见于 和 及其他 作者不详 无名氏 - 於 - 载於 + 于 + 载于 著 介于 约 - 见引於 + 见引于 版本 本 等 @@ -50,7 +50,7 @@ 日期不详 不详 在线 - 发表於 + 发表于 参考 参 取读于 diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal --- a/pandoc-citeproc.cabal +++ b/pandoc-citeproc.cabal @@ -1,5 +1,5 @@ name: pandoc-citeproc -version: 0.16.2 +version: 0.16.3 cabal-version: 1.12 synopsis: Supports using pandoc with citeproc @@ -100,20 +100,31 @@ Text.CSL.Compat.Pandoc ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind ghc-prof-options: -fprof-auto-exported - build-depends: containers, directory, mtl, + build-depends: base >= 4 && < 5, + syb, + parsec, + old-locale, + time, + containers, + directory, + mtl, bytestring, filepath, - network < 3.1, + network < 3.2, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.8, + pandoc >= 1.16 && < 2.9, tagsoup, aeson >= 0.7 && < 1.5, text, vector, - xml-conduit >= 1.2 && < 1.9, + xml-conduit >= 1.2 && < 1.10, unordered-containers >= 0.2 && < 0.3, data-default, setenv >= 0.1 && < 0.2, - split, yaml >= 0.11 + split, + yaml >= 0.11, + HsYAML >= 0.2 && < 0.3, + HsYAML-aeson >= 0.2 && < 0.3 + if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -142,19 +153,15 @@ else build-depends: rfc5051 - if impl(ghc >= 6.10) - build-depends: base >= 4, syb, parsec, old-locale, time - else - build-depends: base >= 3 && < 4 - executable pandoc-citeproc main-is: pandoc-citeproc.hs hs-source-dirs: . ghc-options: -funbox-strict-fields -Wall ghc-prof-options: -fprof-auto-exported -rtsopts - build-depends: base >= 4, pandoc-citeproc, + build-depends: base >= 4 && < 5, + pandoc-citeproc, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.8, + pandoc >= 1.16 && < 2.9, aeson, aeson-pretty >= 0.8, yaml >= 0.11, @@ -188,12 +195,21 @@ Buildable: True else Buildable: False - build-depends: base >= 4, aeson, directory, text, mtl, + build-depends: base >= 4 && < 5, + pandoc-citeproc, + aeson, + directory, + text, + mtl, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.8, - filepath, containers, - bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.11, containers >= 0.4, vector >= 0.10 + pandoc >= 1.16 && < 2.9, + filepath, + bytestring, + process, + temporary >= 1.1, + yaml >= 0.11, + containers >= 0.4, + vector >= 0.10 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -211,10 +227,19 @@ Main-Is: test-pandoc-citeproc.hs Other-Modules: JSON Hs-Source-Dirs: tests, compat - build-depends: base >= 4, aeson, directory, text, - pandoc-types >= 1.17.3 && < 1.18, mtl, - pandoc >= 1.16 && < 2.8, filepath, containers, - bytestring, pandoc-citeproc, process, temporary >= 1.1, + build-depends: base >= 4 && < 5, + aeson, + directory, + text, + pandoc-types >= 1.17.3 && < 1.18, + mtl, + pandoc >= 1.16 && < 2.9, + filepath, + containers, + bytestring, + pandoc-citeproc, + process, + temporary >= 1.1, yaml >= 0.11 ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -threaded if impl(ghc < 8.0) diff --git a/src/Text/CSL/Input/Bibtex.hs b/src/Text/CSL/Input/Bibtex.hs --- a/src/Text/CSL/Input/Bibtex.hs +++ b/src/Text/CSL/Input/Bibtex.hs @@ -109,7 +109,7 @@ -- | Parse a BibTeX or BibLaTeX file into a list of 'Reference's. -- The first parameter is a predicate to filter identifiers. -- If the second parameter is true, the file will be treated as --- BibTeX; otherwse as BibLaTeX. If the third parameter is +-- BibTeX; otherwise as BibLaTeX. If the third parameter is -- true, an "untitlecase" transformation will be performed. readBibtex :: (String -> Bool) -> Bool -> Bool -> FilePath -> IO [Reference] readBibtex idpred isBibtex caseTransform f = do @@ -1269,6 +1269,7 @@ "booklet" -> (Pamphlet,mempty) "bookinbook" -> (Chapter,mempty) "collection" -> (Book,mempty) + "dataset" -> (Dataset,mempty) "electronic" -> (Webpage,mempty) "inbook" -> (Chapter,mempty) "incollection" -> (Chapter,mempty) @@ -1295,6 +1296,7 @@ "proceedings" -> (Book,mempty) "reference" -> (Book,mempty) "report" -> (Report,mempty) + "software" -> (Book,mempty) -- no "software" type in CSL "suppbook" -> (Chapter,mempty) "suppcollection" -> (Chapter,mempty) "suppperiodical" @@ -1318,7 +1320,6 @@ "music" -> (Song,mempty) -- for musical *recordings* "performance" -> (Speech,mempty) "review" -> (Review,mempty) -- or "review-book" ? - "software" -> (Book,mempty) -- for lack of any better match "standard" -> (Legislation,mempty) "video" -> (MotionPicture,mempty) -- biblatex-apa: diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs --- a/src/Text/CSL/Input/Bibutils.hs +++ b/src/Text/CSL/Input/Bibutils.hs @@ -24,11 +24,13 @@ import Prelude import qualified Control.Exception as E import Data.Aeson +import Data.Aeson.Types (parseMaybe) import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString as BS import qualified Data.HashMap.Strict as HM import qualified Data.Text as T -import qualified Data.Yaml as Yaml +import qualified Data.YAML.Aeson as YA +import qualified Data.YAML as Y import qualified Data.Vector as V import Data.Char import qualified Data.Map as M @@ -182,23 +184,25 @@ selectEntries :: (String -> Bool) -> BS.ByteString -> BS.ByteString selectEntries idpred bs = - case Yaml.decodeEither' bs of - Right (Array vs) -> Yaml.encode (filterObjects $ V.toList vs) + case YA.decode1Strict bs of + Right (Array vs) -> YA.encode1Strict (filterObjects $ V.toList vs) Right (Object o) -> case HM.lookup (T.pack "references") o of Just (Array vs) -> - Yaml.encode (HM.insert (T.pack "references") + YA.encode1Strict (HM.insert (T.pack "references") (filterObjects $ V.toList vs) mempty) _ -> BS.empty Right _ -> BS.empty - Left e -> E.throw $ ErrorParsingReferences - (Yaml.prettyPrintParseException e) + Left (pos,e) -> E.throw $ ErrorParsingReferences + $ e ++ " (line " ++ show (Y.posLine pos) ++ + " column " ++ show (Y.posColumn pos) ++ + ")" where filterObjects = filter (\x -> case x of Object o -> case HM.lookup (T.pack "id") o of Just i -> - case Yaml.parseMaybe parseString i of + case parseMaybe parseString i of Just s -> idpred s Nothing -> False _ -> False diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs --- a/src/Text/CSL/Pandoc.hs +++ b/src/Text/CSL/Pandoc.hs @@ -41,7 +41,7 @@ import Text.HTML.TagSoup.Entity (lookupEntity) import Text.Pandoc import Text.Pandoc.Builder (deleteMeta, setMeta) -import Text.Pandoc.Shared (stringify) +import Text.Pandoc.Shared (stringify, ordNub) import Text.Pandoc.Walk import Text.Parsec hiding (State, (<|>)) @@ -68,9 +68,12 @@ Nothing -> m3 Just x -> setMeta "nocite" x m3 notemap = mkNoteMap (Pandoc m3 bs) + hanging = maybe False (== "true") + (biblio style >>= + lookup "hanging-indent" . bibOptions) in Pandoc m $ walk (addFirstNoteNumber notemap) $ walk (concatMap removeNocaseSpans) - $ insertRefs m biblioList bs + $ insertRefs hanging m biblioList bs addFirstNoteNumber :: M.Map String Int -> Inline -> Inline addFirstNoteNumber notemap @@ -95,9 +98,9 @@ -- if document contains a Div with id="refs", insert -- references as its contents. Otherwise, insert references -- at the end of the document in a Div with id="refs" -insertRefs :: Meta -> [Block] -> [Block] -> [Block] -insertRefs _ [] bs = bs -insertRefs meta refs bs = +insertRefs :: Bool -> Meta -> [Block] -> [Block] -> [Block] +insertRefs _ _ [] bs = bs +insertRefs hanging meta refs bs = if isRefRemove meta then bs else case runState (walkM go bs) False of @@ -107,20 +110,23 @@ Header lev (id',classes,kvs) ys : xs -> reverse xs ++ [Header lev (id',addUnNumbered classes,kvs) ys, - Div ("refs",["references"],[]) refs] + Div ("refs",refclasses,[]) refs] _ -> bs ++ refHeader ++ - [Div ("refs",["references"],[]) refs] - where go :: Block -> State Bool Block - go (Div attr@("refs",_,_) xs) = do - put True - -- refHeader isn't used if you have an explicit references div - return $ Div attr (xs ++ refs) - go x = return x - addUnNumbered cs = "unnumbered" : [c | c <- cs, c /= "unnumbered"] - refHeader = case refTitle meta of - Just ils -> - [Header 1 ("bibliography", ["unnumbered"], []) ils] - _ -> [] + [Div ("refs",refclasses,[]) refs] + where + refclasses = "references" : if hanging then ["hanging-indent"] else [] + go :: Block -> State Bool Block + go (Div ("refs",cs,kvs) xs) = do + put True + -- refHeader isn't used if you have an explicit references div + let cs' = ordNub $ cs ++ refclasses + return $ Div ("refs",cs',kvs) (xs ++ refs) + go x = return x + addUnNumbered cs = "unnumbered" : [c | c <- cs, c /= "unnumbered"] + refHeader = case refTitle meta of + Just ils -> + [Header 1 ("bibliography", ["unnumbered"], []) ils] + _ -> [] refTitle :: Meta -> Maybe [Inline] refTitle meta = diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -9,12 +9,14 @@ packages: - '.' extra-deps: -- pandoc-2.7.2 -- texmath-0.11.2.2 -- skylighting-core-0.7.7 -- skylighting-0.7.7 -- ipynb-0.1 -- cmark-gfm-0.2.0 +- pandoc-types-1.17.6.1 +- HsYAML-0.2.0.0 +- HsYAML-aeson-0.2.0.0 +- doctemplates-0.6.1 +- doclayout-0.1 +- git: https://github.com/jgm/pandoc.git + commit: b64410ff9ce64d6a2c7e09b43694b6f4245f9129 + ghc-options: "$locals": -fhide-source-paths -resolver: lts-13.9 +resolver: lts-14.6 diff --git a/tests/chicago-author-date.expected.native b/tests/chicago-author-date.expected.native --- a/tests/chicago-author-date.expected.native +++ b/tests/chicago-author-date.expected.native @@ -15,7 +15,7 @@ ,Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 19}] [Str "(",Link ("",[],[]) [Str "2005"] ("#ref-item1",""),Str ")"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 20}] [Str "(",Link ("",[],[]) [Str "2006"] ("#ref-item2",""),Str ",",Space,Str "44)"],Str "."]]] ,Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21}] [Str "(",Emph [Str "see"],Space,Str "Doe",Space,Link ("",[],[]) [Str "2005"] ("#ref-item1",""),Str ",",Space,Str "32)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]] ,Div ("ref-item2",[],[]) diff --git a/tests/issue118.expected.native b/tests/issue118.expected.native --- a/tests/issue118.expected.native +++ b/tests/issue118.expected.native @@ -1,3 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("director",MetaMap (fromList [("family",MetaInlines [Str "Hitchcock"]),("given",MetaInlines [Str "Alfred"])])),("id",MetaInlines [Str "nbn"]),("issued",MetaMap (fromList [("year",MetaString "1959")])),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "Metro-Goldwyn-Mayer"]),("publisher-place",MetaInlines [Str "USA"]),("title",MetaInlines [Str "North",Space,Str "by",Space,Str "Northwest"]),("type",MetaInlines [Str "motion_picture"])])])]}) [Para [Cite [Citation {citationId = "nbn", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Hitchcock",Space,Str "1959)"],Space,Str "is",Space,Str "a",Space,Str "spy",Space,Str "thriller",Space,Str "film."] -,Div ("refs",["references"],[]) [Div ("ref-nbn",[],[]) [Para [Str "Hitchcock,",Space,Str "Alfred,",Space,Str "dir.",Space,Str "1959.",Space,Emph [Str "North",Space,Str "by",Space,Str "Northwest"],Str ".",Space,Str "USA:",Space,Str "Metro-Goldwyn-Mayer."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-nbn",[],[]) + [Para [Str "Hitchcock,",Space,Str "Alfred,",Space,Str "dir.",Space,Str "1959.",Space,Emph [Str "North",Space,Str "by",Space,Str "Northwest"],Str ".",Space,Str "USA:",Space,Str "Metro-Goldwyn-Mayer."]]]] diff --git a/tests/issue119.expected.native b/tests/issue119.expected.native --- a/tests/issue119.expected.native +++ b/tests/issue119.expected.native @@ -1,7 +1,7 @@ Pandoc (Meta {unMeta = fromList [("bibliography",MetaInlines [Str "tests/biblatex-examples.bib"]),("csl",MetaInlines [Str "tests/apa.csl"])]}) [Para [Cite [Citation {citationId = "averroes/bland", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Averroes",Space,Str "(1982)"],Str ";",Space,Cite [Citation {citationId = "averroes/hannes", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Averroes",Space,Str "(1892)"],Str ";",Space,Cite [Citation {citationId = "averroes/hercz", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "Averroes",Space,Str "(1869)"]] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-averroes/hercz",[],[]) [Para [Str "Averroes.",Space,Str "(1869).",Space,Emph [Str "Drei",Space,Str "Abhandlungen",Space,Str "\252ber",Space,Str "die",Space,Str "Conjunction",Space,Str "des",Space,Str "separaten",Space,Str "Intellects",Space,Str "mit",Space,Str "dem",Space,Str "Menschen:",Space,Str "Von",Space,Str "Averroes",Space,Str "(Vater",Space,Str "und",Space,Str "Sohn),",Space,Str "aus",Space,Str "dem",Space,Str "Arabischen",Space,Str "\252bersetzt",Space,Str "von",Space,Str "Samuel",Space,Str "Ibn",Space,Str "Tibbon"],Str ".",Space,Str "(J.",Space,Str "Hercz,",Space,Str "Trans.,",Space,Str "J.",Space,Str "Hercz,",Space,Str "Ed.).",Space,Str "Berlin:",Space,Str "S.\160Hermann."]] ,Div ("ref-averroes/hannes",[],[]) diff --git a/tests/issue13.expected.native b/tests/issue13.expected.native --- a/tests/issue13.expected.native +++ b/tests/issue13.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-note-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Ann"]])])),("container-title",MetaInlines [Str "Journal"]),("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "2011")])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "article-newspaper"])])])]}) [Para [Str "Foo",Str ".",Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Author,",Space,Str "\8220Title.\8221"]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Ann.",Space,Str "\8220Title.\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "2011."]]]] diff --git a/tests/issue14.expected.native b/tests/issue14.expected.native --- a/tests/issue14.expected.native +++ b/tests/issue14.expected.native @@ -1,4 +1,10 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "chicago-author-date.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("container-title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("id",MetaInlines [Str "CTv1c2"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("page",MetaInlines [Str "34-56"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "Chapter",Space,Str "two"]),("type",MetaInlines [Str "chapter"]),("volume",MetaString "1"),("volume-title",MetaInlines [Str "The",Space,Str "emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "tradition",Space,Str "(100\8211\&600)"])]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("container-title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("id",MetaInlines [Str "CTv1"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "The",Space,Str "emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "tradition",Space,Str "(100\8211\&600)"]),("type",MetaInlines [Str "book"]),("volume",MetaString "1")]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("id",MetaInlines [Str "CT"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "CT", citationPrefix = [], citationSuffix = [Str ",",Space,Str "1:12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Pelikan",Space,Str "1971b,",Space,Str "1:12)"],Str ".",Space,Str "Bar",Space,Cite [Citation {citationId = "CTv1", citationPrefix = [], citationSuffix = [Str ",",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Pelikan",Space,Str "1971c,",Space,Str "1:12)"],Str ".",Space,Str "Baz",Space,Cite [Citation {citationId = "CTv1c2", citationPrefix = [], citationSuffix = [Str ",",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Str "(Pelikan",Space,Str "1971a,",Space,Str "12)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) [Div ("ref-CTv1c2",[],[]) [Para [Str "Pelikan,",Space,Str "Jaroslav.",Space,Str "1971a.",Space,Str "\8220Chapter",Space,Str "Two.\8221",Space,Str "In",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ",",Space,Str "1:34\8211\&56.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CT",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971b.",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CTv1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971c.",Space,Emph [Str "The",Space,Str "Emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "Tradition",Space,Str "(100\8211\&600)"],Str ".",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Vol.",Space,Str "1.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-CTv1c2",[],[]) + [Para [Str "Pelikan,",Space,Str "Jaroslav.",Space,Str "1971a.",Space,Str "\8220Chapter",Space,Str "Two.\8221",Space,Str "In",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ",",Space,Str "1:34\8211\&56.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]] + ,Div ("ref-CT",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "1971b.",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]] + ,Div ("ref-CTv1",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "1971c.",Space,Emph [Str "The",Space,Str "Emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "Tradition",Space,Str "(100\8211\&600)"],Str ".",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Vol.",Space,Str "1.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]]]] diff --git a/tests/issue152.expected.native b/tests/issue152.expected.native --- a/tests/issue152.expected.native +++ b/tests/issue152.expected.native @@ -2,7 +2,7 @@ [Header 1 ("test",[],[]) [Str "Test"] ,Para [Str "I",Space,Str "have",Space,Str "two",Space,Str "citations",Space,Cite [Citation {citationId = "Feminism2013gf", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "Feminism2011ces", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(",Str "\8220Communities,\8221",Space,Str "2011;",Space,Str "\8220Geek",Space,Str "Feminism,\8221",Space,Str "2013)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-Feminism2011ces",[],[]) [Para [Str "Communities.",Space,Str "(2011,",Space,Str "August",Space,Str "14).",Space,Str "In",Space,Emph [Str "Geek",Space,Str "Feminism"],Str ".",Space,Str "Retrieved",Space,Str "from",Space,Link ("",[],[]) [Str "http://geekfeminism.wikia.com/wiki/Category:Communities"] ("http://geekfeminism.wikia.com/wiki/Category:Communities","")]] ,Div ("ref-Feminism2013gf",[],[]) diff --git a/tests/issue175.expected.native b/tests/issue175.expected.native --- a/tests/issue175.expected.native +++ b/tests/issue175.expected.native @@ -4,6 +4,6 @@ ,Header 2 ("expected",[],[]) [Str "Expected"] ,BlockQuote [Para [Str "Doe,",Space,Str "Jane.",Space,Str "2011.",Space,Str "\8220A",Space,Str "Title.\8221",Space,Emph [Str "A",Space,Str "Magazine"],Str ",",Space,Str "January\8211February."]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "Jane.",Space,Str "2011.",Space,Str "\8220A",Space,Str "Title.\8221",Space,Emph [Str "A",Space,Str "Magazine"],Str ",",Space,Str "January\8211February",Space,Str "2011."]]]] diff --git a/tests/issue197.expected.native b/tests/issue197.expected.native --- a/tests/issue197.expected.native +++ b/tests/issue197.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("nocite",MetaInlines [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@test"]]),("references",MetaList [MetaMap (fromList [("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Abelard"]),("given",MetaInlines [Str "Peter"])])]),("id",MetaInlines [Str "test"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1989"]])])),("publisher",MetaInlines [Str "Clarendon",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Oxford"]),("title",MetaInlines [Str "Test"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "test",Str ".",Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Peter",Space,Str "Abelard,",Space,Str "ed.,",Space,Emph [Str "Test"],Space,Str "(Oxford:",Space,Str "Clarendon",Space,Str "Press,",Space,Str "1989)."]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-test",[],[]) [Para [Str "Abelard,",Space,Str "Peter,",Space,Str "ed.",Space,Emph [Str "Test"],Str ".",Space,Str "Oxford:",Space,Str "Clarendon",Space,Str "Press,",Space,Str "1989."]]]] diff --git a/tests/issue213.expected.native b/tests/issue213.expected.native --- a/tests/issue213.expected.native +++ b/tests/issue213.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/harvard-university-of-kent.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Ann"])])]),("collection-title",MetaInlines [Str "The",Space,Str "collection",Space,Str "title"]),("dimensions",MetaInlines [Str "789",Space,Str "pp."]),("id",MetaInlines [Str "doe1"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1999"])])]),("publisher",MetaInlines [Str "The",Space,Str "publisher"]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "doe1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Doe",Space,Str "1999)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-doe1",[],[]) [Para [Str "Doe,",Space,Str "A.",Space,Str "(1999).",Space,Emph [Str "Title"],Str ".",Space,Str "The",Space,Str "collection",Space,Str "title.",Space,Str "The",Space,Str "publisher.",Space,Str "789",Space,Str "pp."]]]] diff --git a/tests/issue25.expected.native b/tests/issue25.expected.native --- a/tests/issue25.expected.native +++ b/tests/issue25.expected.native @@ -1,4 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "bazbaz",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Author",Space,Str "1998)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Foo.\8221"]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-item1",[],[]) + [Para [Str "Author,",Space,Str "Al.",Space,Str "1998.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Foo.\8221"]]]] diff --git a/tests/issue250.expected.native b/tests/issue250.expected.native --- a/tests/issue250.expected.native +++ b/tests/issue250.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("link-citations",MetaBool True),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Doe"])])),("id",MetaInlines [Str "doe"]),("title",MetaInlines [Str "Title"])])])]}) [Para [Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Doe,",Space,Link ("",[],[]) [Str "n.d."] ("#ref-doe",""),Str ")"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-doe",[],[]) [Para [Str "Doe.",Space,Str "n.d.",Space,Str "\8220Title.\8221"]]]] diff --git a/tests/issue292.expected.native b/tests/issue292.expected.native --- a/tests/issue292.expected.native +++ b/tests/issue292.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/sage-harvard.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Doe"])])),("id",MetaInlines [Str "doe"]),("issued",MetaMap (fromList [("year",MetaString "2007")])),("type",MetaInlines [Str "article"])]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Zoe"])])),("id",MetaInlines [Str "zoe"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "2009")])]),("type",MetaInlines [Str "article"])]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Roe"])])),("id",MetaInlines [Str "roe"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "2007")])]),("type",MetaInlines [Str "article"])])])]}) [Para [Cite [Citation {citationId = "zoe", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "roe", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "doe", citationPrefix = [Str "see",Space,Str "for",Space,Str "comparison"], citationSuffix = [Str ",",Space,Str "p.\160\&3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Str "(Roe,",Space,Str "2007;",Space,Str "Zoe,",Space,Str "2009;",Space,Str "see",Space,Str "for",Space,Str "comparison",Space,Str "Doe,",Space,Str "2007:",Space,Str "3)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-doe",[],[]) [Para [Str "Doe",Space,Str "(2007)."]] ,Div ("ref-roe",[],[]) diff --git a/tests/issue301.expected.native b/tests/issue301.expected.native --- a/tests/issue301.expected.native +++ b/tests/issue301.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("id",MetaInlines [Str "test"]),("title",MetaInlines [Str "Essays",Space,Str "presented",Space,Str "to",Space,Str "N.R.",Space,Str "Ker",Space,Str "(On",Space,Str "Art)"])]),MetaMap (fromList [("id",MetaInlines [Str "test2"]),("title",MetaInlines [Emph [Str "Test:"],Space,Str "An",Space,Str "experiment:",Space,Str "An",Space,Str "abridgement"])])])]}) [Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "(",Str "\8220Essays",Space,Str "Presented",Space,Str "to",Space,Str "N.R.",Space,Str "Ker",Space,Str "(on",Space,Str "Art),\8221",Space,Str "n.d.)"],Str ";",Space,Cite [Citation {citationId = "test2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "(",Str "\8220",Emph [Str "Test:"],Space,Str "An",Space,Str "Experiment:",Space,Str "An",Space,Str "Abridgement,\8221",Space,Str "n.d.)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-test",[],[]) [Para [Str "\8220",Str "Essays",Space,Str "Presented",Space,Str "to",Space,Str "N.R.",Space,Str "Ker",Space,Str "(on",Space,Str "Art).\8221",Space,Str "n.d."]] ,Div ("ref-test2",[],[]) diff --git a/tests/issue307.expected.native b/tests/issue307.expected.native --- a/tests/issue307.expected.native +++ b/tests/issue307.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("lang",MetaInlines [Str "fr-FR"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bazin"]),("given",MetaInlines [Str "Andr\233"])])]),("container-title",MetaInlines [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"]),("id",MetaInlines [Str "bazin_cybernetique_1954"]),("issue",MetaInlines [Str "36"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1954",MetaString "6"]])])),("page",MetaInlines [Str "22-27"]),("title",MetaInlines [Str "La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Str "Bonjour",Cite [Citation {citationId = "bazin_cybernetique_1954", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Bazin",Space,Str "1954)"],Space,Str "!"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-bazin_cybernetique_1954",[],[]) [Para [Str "Bazin,",Space,Str "Andr\233.",Space,Str "1954.",Space,Str "\171\160La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte\160\187.",Space,Emph [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"],Str ",",Space,Str "n\7506",Space,Str "36",Space,Str "(juin):",Space,Str "22\8209\&27."]]]] diff --git a/tests/issue312.expected.native b/tests/issue312.expected.native --- a/tests/issue312.expected.native +++ b/tests/issue312.expected.native @@ -1,5 +1,5 @@ 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 ("refs",["references","hanging-indent"],[]) [Div ("ref-Y",[],[]) [Para [Str "NN.",Space,Str "(1950).",Space,Str "Date:",Space,Str "Year."]] ,Div ("ref-Y/Y",[],[]) diff --git a/tests/issue320.expected.native b/tests/issue320.expected.native --- a/tests/issue320.expected.native +++ b/tests/issue320.expected.native @@ -2,7 +2,7 @@ [Para [Str "Foo",Space,Cite [Citation {citationId = "itemA1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "itemA2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "itemA3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3},Citation {citationId = "itemA4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4},Citation {citationId = "itemA5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5},Citation {citationId = "itemA6", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 6},Citation {citationId = "itemA7", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 7},Citation {citationId = "itemA8", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 8},Citation {citationId = "itemA9", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 9},Citation {citationId = "itemA10", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 10},Citation {citationId = "itemA11", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 11},Citation {citationId = "itemA12", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 12},Citation {citationId = "itemA13", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 13},Citation {citationId = "itemA14", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 14}] [Str "(Benjamin,",Space,Str "n.d.;",Space,Str "ben",Space,Str "Yaakov,",Space,Str "n.d.;",Space,Str "Brown,",Space,Str "n.d.;",Space,Str "Browning,",Space,Str "n.d.;",Space,Str "Girard,",Space,Str "n.d.;",Space,Str "Girard-Perregaux,",Space,Str "n.d.;",Space,Str "Ibn",Space,Str "Abdulaziz,",Space,Str "n.d.;",Space,Str "Ibn",Space,Str "Nidal,",Space,Str "n.d.;",Space,Str "Lo\769pez,",Space,Str "n.d.;",Space,Str "Lo\769pez",Space,Str "de",Space,Str "Molina,",Space,Str "n.d.;",Space,Str "Singh,",Space,Str "n.d.;",Space,Str "Singh",Space,Str "Siddhu,",Space,Str "n.d.;",Space,Str "Villafuerte,",Space,Str "n.d.;",Space,Str "Villa-Lobos,",Space,Str "n.d.)"],Str "."] ,Para [Str "Foo",Space,Cite [Citation {citationId = "itemB1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 15},Citation {citationId = "itemB2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 16},Citation {citationId = "itemB3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 17},Citation {citationId = "itemB4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 18},Citation {citationId = "itemB5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 19},Citation {citationId = "itemB6", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 20},Citation {citationId = "itemB7", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21},Citation {citationId = "itemB8", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 22}] [Str "(Macalister,",Space,Str "n.d.;",Space,Str "MacAlister,",Space,Str "n.d.;",Space,Str "Macauley,",Space,Str "n.d.;",Space,Str "Macmillan,",Space,Str "n.d.;",Space,Str "Madison,",Space,Str "n.d.;",Space,Str "McAllister,",Space,Str "n.d.;",Space,Str "McAuley,",Space,Str "n.d.;",Space,Str "McMillan,",Space,Str "n.d.)"],Str "."] ,Para [Str "Foo",Space,Cite [Citation {citationId = "itemC1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 23},Citation {citationId = "itemC2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 24},Citation {citationId = "itemC3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 25},Citation {citationId = "itemC4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 26},Citation {citationId = "itemC5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 27},Citation {citationId = "itemC6", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 28}] [Str "(Sainte-Beuve,",Space,Str "n.d.;",Space,Str "Saint-Gaudens,",Space,Str "n.d.;",Space,Str "Saint-Sa\235ns,",Space,Str "n.d.;",Space,Str "San",Space,Str "Martin,",Space,Str "n.d.;",Space,Str "St.\160Denis,",Space,Str "n.d.;",Space,Str "St.\160Laurent,",Space,Str "n.d.)"],Str "."] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-itemA1",[],[]) [Para [Str "Benjamin,",Space,Str "A.",Space,Str "S.",Space,Str "(n.d.)."]] ,Div ("ref-itemA2",[],[]) diff --git a/tests/issue320a.expected.native b/tests/issue320a.expected.native --- a/tests/issue320a.expected.native +++ b/tests/issue320a.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "\702Udhr\299"]),("given",MetaInlines [Str "Jam\299l"]),("non-dropping-particle",MetaInlines [Str "al-"]),("note",MetaInlines [Str "ayn"])])]),("id",MetaInlines [Str "item1"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "\703Udhr\299"]),("given",MetaInlines [Str "Jam\299l"]),("non-dropping-particle",MetaInlines [Str "al-"]),("note",MetaInlines [Str "hamza"])])]),("id",MetaInlines [Str "item2"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "'Udhr\299"]),("given",MetaInlines [Str "Jam\299l"]),("non-dropping-particle",MetaInlines [Str "al-"]),("note",MetaInlines [Str "straight",Space,Str "apostrophe"])])]),("id",MetaInlines [Str "item3"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "\8216Udhr\299"]),("given",MetaInlines [Str "Jam\299l"]),("non-dropping-particle",MetaInlines [Str "al-"]),("note",MetaInlines [Str "inverted",Space,Str "apostrophe",Space,Str "=",Space,Str "opening",Space,Str "single",Space,Str "curly",Space,Str "quote",Space,Str "(for",Space,Str "ayn)"])])]),("id",MetaInlines [Str "item4"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "\8217Udhr\299"]),("given",MetaInlines [Str "Jam\299l"]),("non-dropping-particle",MetaInlines [Str "al-"]),("note",MetaInlines [Str "apostrophe",Space,Str "=",Space,Str "closing",Space,Str "single",Space,Str "curly",Space,Str "quote",Space,Str "(for",Space,Str "hamza)"])])]),("id",MetaInlines [Str "item5"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Uch"]),("given",MetaInlines [Str "Ann"])])]),("id",MetaInlines [Str "item6"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Uebel"]),("given",MetaInlines [Str "Joe"])])]),("id",MetaInlines [Str "item7"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Zzz"]),("given",MetaInlines [Str "Zoe"])])]),("id",MetaInlines [Str "item8"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3},Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4},Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5},Citation {citationId = "item6", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 6},Citation {citationId = "item7", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 7},Citation {citationId = "item8", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 8}] [Str "(al-\702Udhr\299,",Space,Str "n.d.;",Space,Str "al-\703Udhr\299,",Space,Str "n.d.;",Space,Str "al-'Udhr\299,",Space,Str "n.d.;",Space,Str "al-\8216Udhr\299,",Space,Str "n.d.;",Space,Str "al-\8217Udhr\299,",Space,Str "n.d.;",Space,Str "Uch,",Space,Str "n.d.;",Space,Str "Uebel,",Space,Str "n.d.;",Space,Str "Zzz,",Space,Str "n.d.)"],Str "."] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item6",[],[]) [Para [Str "Uch,",Space,Str "Ann.",Space,Str "n.d."]] ,Div ("ref-item1",[],[]) diff --git a/tests/issue325.expected.native b/tests/issue325.expected.native --- a/tests/issue325.expected.native +++ b/tests/issue325.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Smith"]),("given",MetaInlines [Str "John"])])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Smith"]),("given",MetaInlines [Str "John"])])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Smith,",Space,Str "n.d.a,",Space,Str "n.d.b)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Smith,",Space,Str "John.",Space,Str "n.d.a."]] ,Div ("ref-item2",[],[]) diff --git a/tests/issue338.expected.native b/tests/issue338.expected.native --- a/tests/issue338.expected.native +++ b/tests/issue338.expected.native @@ -1,4 +1,4 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/din-1505-2.csl"]),("lang",MetaInlines [Str "de"]),("nocite",MetaInlines [Cite [Citation {citationId = "*", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@*"]]),("pagetitle",MetaInlines [Str "Citation"]),("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "978-3-642-32078-1"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Wolfinger"]),("given",MetaInlines [Str "Christine"])])]),("edition",MetaInlines [Str "11.,",Space,Str "vollst.",Space,Str "\252berarb.",Space,Str "Aufl."]),("id",MetaInlines [Str "item-1"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2013"])])]),("keyword",MetaInlines [Str "UNIX;",Space,Str "LINUX"]),("number-of-pages",MetaInlines [Str "XVIII,",Space,Str "529",Space,Str "S.",Space,Str ":",Space,Str "Ill.,",Space,Str "graph.",Space,Str "Darst."]),("publisher",MetaInlines [Str "Springer",Space,Str "Vieweg"]),("publisher-place",MetaInlines [Str "Berlin",Space,Str "[u.a.]"]),("title",MetaInlines [Str "Keine",Space,Str "Angst",Space,Str "vor",Space,Str "Linux,",Space,Str "Unix:",Space,Str "ein",Space,Str "Lehrbuch",Space,Str "f\252r",Space,Str "Linux-",Space,Str "und",Space,Str "Unix-Anwender"]),("type",MetaInlines [Str "book"])])])]}) -[Div ("refs",["references"],[]) +[Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item-1",[],[]) [Para [SmallCaps [Str "Wolfinger,",Space,Str "Christine"],Str ":",Space,Emph [Str "Keine",Space,Str "Angst",Space,Str "vor",Space,Str "Linux,",Space,Str "Unix:",Space,Str "ein",Space,Str "Lehrbuch",Space,Str "f\252r",Space,Str "Linux-",Space,Str "und",Space,Str "Unix-Anwender"],Str ".",Space,Str "11.,",Space,Str "vollst.",Space,Str "\252berarb.",Space,Str "Aufl.",Space,Str "Aufl.",Space,Str "Berlin",Space,Str "[u.a.]\160:",Space,Str "Springer",Space,Str "Vieweg,",Space,Str "2013",Space,Str "\8212\160ISBN\160",Link ("",[],[]) [Str "978-3-642-32078-1"] ("https://worldcat.org/isbn/978-3-642-32078-1","")]]]] diff --git a/tests/issue351.expected.native b/tests/issue351.expected.native --- a/tests/issue351.expected.native +++ b/tests/issue351.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/zeitschrift-fur-kunstgeschichte.csl"]),("references",MetaList [MetaMap (fromList [("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Nietzsche"]),("given",MetaInlines [Str "Friedrich"])])]),("id",MetaInlines [Str "Nie72"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1872"])])]),("title",MetaInlines [Str "Die",Space,Str "geburt"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Friedrich",Space,Str "Nietzsche",Space,Str "(ed.)",Note [Para [Emph [Str "Die",Space,Str "geburt"],Str ",",Space,Str "1872."]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-Nie72",[],[]) [Para [Str "Nietzsche,",Space,Str "Friedrich",Space,Str "(ed.),",Space,Emph [Str "Die",Space,Str "geburt"],Str ",",Space,Str "1872."]]]] diff --git a/tests/issue356.expected.native b/tests/issue356.expected.native --- a/tests/issue356.expected.native +++ b/tests/issue356.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Alice"])])]),("id",MetaInlines [Str "foo"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2042"])])]),("other-ids",MetaList [MetaInlines [Str "bar"],MetaInlines [Str "doz"]]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "bar", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Alice",Space,Str "2042)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-foo",[],[]) [Para [Str "Alice.",Space,Str "2042."]]]] diff --git a/tests/issue360.expected.native b/tests/issue360.expected.native --- a/tests/issue360.expected.native +++ b/tests/issue360.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "L\8217Estrange"]),("given",MetaInlines [Str "Michael"])]),MetaMap (fromList [("family",MetaInlines [Str "Merchant"]),("given",MetaInlines [Str "Stephen"])])]),("id",MetaInlines [Str "lestrange2017"]),("issued",MetaList [MetaMap (fromList [("day",MetaInlines [Str "18"]),("month",MetaInlines [Str "7"]),("year",MetaInlines [Str "2017"])])]),("language",MetaInlines [Str "en-US"]),("title",MetaInlines [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("title-short",MetaInlines [Str "Independent",Space,Str "Intelligence",Space,Str "Review"]),("type",MetaInlines [Str "report"])])])]}) [Para [Cite [Citation {citationId = "lestrange2017", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Michael",Space,Str "L\8217Estrange",Space,Str "and",Space,Str "Stephen",Space,Str "Merchant,",Space,Emph [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"],Str ",",Space,Str "July",Space,Str "18,",Space,Str "2017."]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-lestrange2017",[],[]) [Para [Str "L\8217Estrange,",Space,Str "Michael,",Space,Str "and",Space,Str "Stephen",Space,Str "Merchant.",Space,Emph [Str "2017",Space,Str "Independent",Space,Str "Intelligence",Space,Str "Review"],Str ",",Space,Str "July",Space,Str "18,",Space,Str "2017."]]]] diff --git a/tests/issue371.expected.native b/tests/issue371.expected.native --- a/tests/issue371.expected.native +++ b/tests/issue371.expected.native @@ -1,7 +1,7 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item1"]),("status",MetaInlines [Str "in",Space,Str "press"]),("title",MetaInlines [Str "Title",Space,Str "one"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item2"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2018"])])]),("title",MetaInlines [Str "Title",Space,Str "two"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Doe",Space,Str "2018,",Space,Str "in",Space,Str "press)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item2",[],[]) [Para [Str "Doe,",Space,Str "Jane.",Space,Str "2018.",Space,Emph [Str "Title",Space,Str "Two"],Str "."]] ,Div ("ref-item1",[],[]) diff --git a/tests/issue38.expected.native b/tests/issue38.expected.native --- a/tests/issue38.expected.native +++ b/tests/issue38.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Ann"])]),MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Ben"])]),MetaMap (fromList [("family",MetaInlines [Str "Roe"]),("given",MetaInlines [Str "Ron"])])]),("id",MetaInlines [Str "a"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2007"]])])),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Cite [Citation {citationId = "a", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Doe,",Space,Str "Doe,",Space,Str "and",Space,Str "Roe",Space,Str "(2007)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-a",[],[]) [Para [Str "Doe,",Space,Str "Ann,",Space,Str "Ben",Space,Str "Doe,",Space,Str "and",Space,Str "Ron",Space,Str "Roe.",Space,Str "2007.",Space,Str "\8220Title.\8221"]]]] diff --git a/tests/issue47.expected.native b/tests/issue47.expected.native --- a/tests/issue47.expected.native +++ b/tests/issue47.expected.native @@ -8,7 +8,7 @@ ,Para [Str "Doe,",Space,Str "A.,",Space,Str "and",Space,Str "A.",Space,Str "Poe.",Space,Str "2000.",Space,Str "Title."]] ,Para [Str "(See",Space,Str "CMoS,",Space,Str "16e,",Space,Str "15.16,",Space,Quoted DoubleQuote [Str "Single",Space,Str "author",Space,Str "versus",Space,Str "several",Space,Str "authors\8212reference",Space,Str "list",Space,Str "order"],Str ":",Space,Quoted DoubleQuote [Str "Successive",Space,Str "entries",Space,Str "by",Space,Str "two",Space,Str "or",Space,Str "more",Space,Str "authors",Space,Str "in",Space,Str "which",Space,Str "only",Space,Str "the",Space,Str "first",Space,Str "author\8217s",Space,Str "name",Space,Str "is",Space,Str "the",Space,Str "same",Space,Str "are",Space,Str "alphabetized",Space,Str "according",Space,Str "to",Space,Str "the",Space,Str "coauthors\8217",Space,Str "last",Space,Str "names",Space,Str "(regardless",Space,Str "of",Space,Str "how",Space,Str "many",Space,Str "coauthors",Space,Str "there",Space,Str "are)."],Space,Str "and",Space,Str "15.18,",Space,Quoted DoubleQuote [Str "The",Space,Str "3-em",Space,Str "dash",Space,Str "with",Space,Str "edited,",Space,Str "translated,",Space,Str "or",Space,Str "compiled",Space,Str "works"],Str ":",Space,Quoted DoubleQuote [Str "The",Space,Str "chronological",Space,Str "order",Space,Str "is",Space,Str "maintained,",Space,Str "regardless",Space,Str "of",Space,Str "the",Space,Str "added",Space,Str "abbreviation.",Space,Str "[ed.,",Space,Str "trans.,",Space,Str "comp.,",Space,Str "or",Space,Str "whatever]"]] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-doe",[],[]) [Para [Str "Doe,",Space,Str "A.",Space,Str "2000a.",Space,Emph [Str "Title"],Str "."]] ,Div ("ref-doe-ed",[],[]) diff --git a/tests/issue51.expected.native b/tests/issue51.expected.native --- a/tests/issue51.expected.native +++ b/tests/issue51.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John"])])]),("container-title",MetaInlines [Str "Journal",Space,Str "of",Space,Str "Something"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1987"],MetaList [MetaString "1988"]])])),("page",MetaInlines [Str "12-34"]),("title",MetaInlines [Str "The",Space,Str "title"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "3")]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Roe"]),("given",MetaInlines [Str "Ron"])])]),("container-title",MetaInlines [Str "Journal",Space,Str "of",Space,Str "Something"]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1987"]])])),("page",MetaInlines [Str "12-34"]),("title",MetaInlines [Str "The",Space,Str "title"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "4")])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Doe",Space,Str "(1987\8211\&1988)"],Str ";",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Roe",Space,Str "(1987)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "1987\8211\&1988.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "3:",Space,Str "12\8211\&34."]] ,Div ("ref-item2",[],[]) diff --git a/tests/issue57.expected.native b/tests/issue57.expected.native --- a/tests/issue57.expected.native +++ b/tests/issue57.expected.native @@ -1,4 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-author-date-with-original-date-and-status.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Faraday"]),("given",MetaInlines [Str "Carry"])])]),("container-title",MetaInlines [Str "Seven",Space,Str "Trips",Space,Str "beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"]),("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Oring"]),("given",MetaInlines [Str "James"])])]),("id",MetaInlines [Str "Faraday-forthcoming"]),("publisher",MetaInlines [Str "Launch",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Cape",Space,Str "Canaveral,",Space,Str "FL"]),("status",MetaInlines [Str "forthcoming"]),("title",MetaInlines [Str "Protean",Space,Str "photography"]),("type",MetaInlines [Str "chapter"])])])]}) [Para [Cite [Citation {citationId = "Faraday-forthcoming", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Faraday,",Space,Str "forthcoming)"]] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) [Div ("ref-Faraday-forthcoming",[],[]) [Para [Str "Faraday,",Space,Str "Carry.",Space,Str "Forthcoming.",Space,Str "\8220Protean",Space,Str "Photography.\8221",Space,Str "In",Space,Emph [Str "Seven",Space,Str "Trips",Space,Str "Beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "James",Space,Str "Oring.",Space,Str "Cape",Space,Str "Canaveral,",Space,Str "FL:",Space,Str "Launch",Space,Str "Press."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-Faraday-forthcoming",[],[]) + [Para [Str "Faraday,",Space,Str "Carry.",Space,Str "Forthcoming.",Space,Str "\8220Protean",Space,Str "Photography.\8221",Space,Str "In",Space,Emph [Str "Seven",Space,Str "Trips",Space,Str "Beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "James",Space,Str "Oring.",Space,Str "Cape",Space,Str "Canaveral,",Space,Str "FL:",Space,Str "Launch",Space,Str "Press."]]]] diff --git a/tests/issue58.expected.native b/tests/issue58.expected.native --- a/tests/issue58.expected.native +++ b/tests/issue58.expected.native @@ -1,4 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue58.csl"]),("references",MetaList [MetaMap (fromList [("id",MetaInlines [Str "stanze"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1547"]])])),("language",MetaInlines [Str "it-IT"]),("publisher-place",MetaInlines [Str "Florence"]),("title",MetaInlines [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "In",Space,Str "this",Space,Str "item,",Space,Str "the",Space,Str "title",Space,Str "replaces",Space,Str "the",Space,Str "(unknown)",Space,Str "author",Space,Str "(see",Space,Str "14.79)",Space,Cite [Citation {citationId = "stanze", citationPrefix = [], citationSuffix = [Str ",",Space,Str "p.",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Space,Str "1547,",Space,Str "12)"],Str "."] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) [Div ("ref-stanze",[],[]) [Para [Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Str ".",Space,Str "1547.",Space,Str "Florence."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-stanze",[],[]) + [Para [Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Str ".",Space,Str "1547.",Space,Str "Florence."]]]] diff --git a/tests/issue61.expected.native b/tests/issue61.expected.native --- a/tests/issue61.expected.native +++ b/tests/issue61.expected.native @@ -6,7 +6,7 @@ ,Para [Str "Foo",Cite [Citation {citationId = "roe", citationPrefix = [], citationSuffix = [Str ",",Space,Str "MVIII,",Space,Str "89"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4}] [Note [Para [Str "Roe,",Space,Str "MVIII,",Space,Str "89."]]]] ,Para [Str "Foo",Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [Str ",",Space,Str "CL,",Space,Str "89"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5}] [Note [Para [Str "Doe,",Space,Str "CL,",Space,Str "89."]]]] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-doe",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Emph [Str "Title"],Space,Str "(Publisher,",Space,Str "1985)"]] ,Div ("ref-roe",[],[]) diff --git a/tests/issue64.expected.native b/tests/issue64.expected.native --- a/tests/issue64.expected.native +++ b/tests/issue64.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("bibliography",MetaList [MetaInlines [Str "tests/biblio.bib"]]),("nocite",MetaInlines [Cite [Citation {citationId = "*", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\nocite{*}"]])]}) -[Div ("refs",["references"],[]) +[Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]] ,Div ("ref-item2",[],[]) diff --git a/tests/issue65.expected.native b/tests/issue65.expected.native --- a/tests/issue65.expected.native +++ b/tests/issue65.expected.native @@ -1,3 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "3406493556"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Stotz"]),("given",MetaInlines [Str "Peter"])])]),("call-number",MetaInlines [Str "PA25",Space,Str "PA2616",Space,Str ".H24",Space,Str "Abt.",Space,Str "2,",Space,Str "T.",Space,Str "5,",Space,Str "Bd.",Space,Str "2,",Space,Str "etc"]),("collection-number",MetaInlines [Str "2.5"]),("collection-title",MetaInlines [Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft"]),("event-place",MetaInlines [Str "Munich"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "stotz:1996handbuch"]),("issued",MetaMap (fromList [("literal",MetaInlines [Str "1996_2004"])])),("language",MetaInlines [Str "German"]),("number-of-volumes",MetaInlines [Str "5"]),("publisher",MetaInlines [Str "Beck"]),("publisher-place",MetaInlines [Str "Munich"]),("source",MetaInlines [Str "Library",Space,Str "of",Space,Str "Congress",Space,Str "ISBN"]),("title",MetaInlines [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"]),("title-short",MetaInlines [Str "Handbuch"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "stotz:1996handbuch", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Stotz",Space,Str "1996\8211\&2004)"]] -,Div ("refs",["references"],[]) [Div ("ref-stotz:1996handbuch",[],[]) [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-stotz:1996handbuch",[],[]) + [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]] diff --git a/tests/issue68.expected.native b/tests/issue68.expected.native --- a/tests/issue68.expected.native +++ b/tests/issue68.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "0888441088"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Goering"]),("given",MetaInlines [Str "Joseph"])])]),("call-number",MetaInlines [Str "BV4009",Space,Str ".W55",Space,Str "1992"]),("collection-number",MetaInlines [Str "108"]),("collection-title",MetaInlines [Str "Studies",Space,Str "and",Space,Str "Texts"]),("event-place",MetaInlines [Str "Toronto"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "goering:1992william"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1992"]])])),("publisher",MetaInlines [Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies"]),("publisher-place",MetaInlines [Str "Toronto"]),("source",MetaInlines [Str "toroprod.library.utoronto.ca",Space,Str "Library",Space,Str "Catalog"]),("title",MetaInlines [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(c.",Space,Str "1140\8211\&1213):",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"]),("title-short",MetaInlines [Str "William",Space,Str "de",Space,Str "Montibus"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "...",Space,Str "a",Space,Str "prose",Space,Str "commentary",Str ".",Cite [Citation {citationId = "goering:1992william", citationPrefix = [Str "the",Space,Str "text",Space,Str "of",Space,Str "fol.",Space,Str "9r",Space,Str "is",Space,Str "printed",Space,Str "in"], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "501\8211\&3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "The",Space,Str "text",Space,Str "of",Space,Str "fol.",Space,Str "9r",Space,Str "is",Space,Str "printed",Space,Str "in",Space,Str "Joseph",Space,Str "Goering,",Space,Emph [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(c.",Space,Str "1140\8211\&1213):",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"],Str ",",Space,Str "Studies",Space,Str "and",Space,Str "Texts",Space,Str "108",Space,Str "(Toronto:",Space,Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies,",Space,Str "1992),",Space,Str "501\8211\&3."]]],Space,Str "...",Space,Str "a",Space,Str "collection",Space,Str "of",Space,Str "verses",Space,Str "with",Space,Str "a",Space,Str "formal",Space,Str "prose",Space,Str "commentary",Cite [Citation {citationId = "goering:1992william", citationPrefix = [Str "excerpts",Space,Str "from",Space,Str "this",Space,Str "text",Space,Str "were",Space,Str "previously",Space,Str "printed",Space,Str "in"], citationSuffix = [Str ",",Space,Str "p.",Space,Str "508\8211\&14"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "goering:1992william", citationPrefix = [Str "it",Space,Str "was",Space,Str "also",Space,Str "briefly",Space,Str "described",Space,Str "in"], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "141\8211\&42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Note [Para [Str "Excerpts",Space,Str "from",Space,Str "this",Space,Str "text",Space,Str "were",Space,Str "previously",Space,Str "printed",Space,Str "in",Space,Str "ibid.,",Space,Str "508\8211\&14;",Space,Str "it",Space,Str "was",Space,Str "also",Space,Str "briefly",Space,Str "described",Space,Str "in",Space,Str "ibid.,",Space,Str "141\8211\&42."]]],Space,Str "...",Space,Str "and",Space,Str "finally",Space,Str "a",Space,Str "note",Space,Str "starting",Space,Str "with",Space,Str "a",Space,Str "citation",Str ".",Cite [Citation {citationId = "goering:1992william", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "141-42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4}] [Note [Para [Str "Ibid.,",Space,Str "141\8211\&42."]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-goering:1992william",[],[]) [Para [Str "Goering,",Space,Str "Joseph.",Space,Emph [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(c.",Space,Str "1140\8211\&1213):",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"],Str ".",Space,Str "Studies",Space,Str "and",Space,Str "Texts",Space,Str "108.",Space,Str "Toronto:",Space,Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies,",Space,Str "1992."]]]] diff --git a/tests/issue7.expected.native b/tests/issue7.expected.native --- a/tests/issue7.expected.native +++ b/tests/issue7.expected.native @@ -1,5 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Ann"]])])),("container-title",MetaInlines [Str "Journal"]),("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("day",MetaString "24"),("month",MetaString "9"),("year",MetaString "2011")]),MetaMap (fromList [("day",MetaString "26"),("month",MetaString "9"),("year",MetaString "2011")])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "article-magazine"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(2011)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Ann.",Space,Str "2011.",Space,Str "\8220Title.\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "September",Space,Str "24\8211\&26,",Space,Str "2011."]]]] diff --git a/tests/issue70.expected.native b/tests/issue70.expected.native --- a/tests/issue70.expected.native +++ b/tests/issue70.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "9782503531465"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dinkova-Bruun"]),("given",MetaInlines [Str "Greti"])])]),("call-number",MetaInlines [Str "CB351",Space,Str ".F564",Space,Str "2009"]),("collection-number",MetaInlines [Str "50"]),("collection-title",MetaInlines [Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge"]),("container-title",MetaInlines [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"]),("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Meirinhos"]),("given",MetaInlines [Str "Jos\233",Space,Str "Francisco"])]),MetaMap (fromList [("family",MetaInlines [Str "Weijers"]),("given",MetaInlines [Str "Olga"])])]),("event-place",MetaInlines [Str "Louvain-la-Neuve"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "bruun:2009samuel"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2009"]])])),("language",MetaInlines [Str "French"]),("page",MetaInlines [Str "155\8211\&174"]),("publisher",MetaInlines [Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales"]),("publisher-place",MetaInlines [Str "Louvain-la-Neuve"]),("source",MetaInlines [Str "Library",Space,Str "of",Space,Str "Congress",Space,Str "ISBN"]),("title",MetaInlines [Str "Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?"]),("title-short",MetaInlines [Str "Samuel",Space,Str "Presbyter"]),("type",MetaInlines [Str "chapter"])]),MetaMap (fromList [("ISSN",MetaInlines [Str "0362-1529"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Thorndike"]),("given",MetaInlines [Str "Lynn"])])]),("container-title",MetaInlines [Str "Traditio"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "thorndike:1955unde"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1955"]])])),("language",MetaInlines [Str "Latin"]),("note",MetaInlines [Str "ArticleType:",Space,Str "research-article",Space,Str "/",Space,Str "Full",Space,Str "publication",Space,Str "date:",Space,Str "1955",Space,Str "/",Space,Str "Copyright",Space,Str "\169",Space,Str "1955",Space,Str "Fordham",Space,Str "University"]),("page",MetaInlines [Str "163\8211\&193"]),("source",MetaInlines [Str "JSTOR"]),("title",MetaInlines [Str "Unde",Space,Str "versus"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaInlines [Str "11"])])])]}) [Para [Cite [Citation {citationId = "thorndike:1955unde", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "bruun:2009samuel", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Thorndike",Space,Str "1955;",Space,Str "Dinkova-Bruun",Space,Str "2009)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-bruun:2009samuel",[],[]) [Para [Str "Dinkova-Bruun,",Space,Str "Greti.",Space,Str "2009.",Space,Str "\8220Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?\8221",Space,Str "In",Space,Emph [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Jos\233",Space,Str "Francisco",Space,Str "Meirinhos",Space,Str "and",Space,Str "Olga",Space,Str "Weijers,",Space,Str "155\8211\&74.",Space,Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge",Space,Str "50.",Space,Str "Louvain-la-Neuve:",Space,Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales."]] ,Div ("ref-thorndike:1955unde",[],[]) diff --git a/tests/issue75.expected.native b/tests/issue75.expected.native --- a/tests/issue75.expected.native +++ b/tests/issue75.expected.native @@ -10,4 +10,6 @@ ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Space,Str "bk.",Space,Str "VI"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 9}] [Str "(Doe,",Space,Str "2006,",Space,Str "bk.",Space,Str "VI)"]] ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Str ",",Space,Str "no.",Space,Str "6"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 10}] [Str "(Doe,",Space,Str "2006,",Space,Str "no.",Space,Str "6)"]] ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Str ",",Space,Str "nos.",Space,Str "6",Space,Str "and",Space,Str "7"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 11}] [Str "(Doe,",Space,Str "2006,",Space,Str "no.",Space,Str "6",Space,Str "and",Space,Str "7)"]] -,Div ("refs",["references"],[]) [Div ("ref-test",[],[]) [Para [Str "Doe,",Space,Str "J.",Space,Str "(2006).",Space,Str "Test,",Space,Emph [Str "81"],Str "."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-test",[],[]) + [Para [Str "Doe,",Space,Str "J.",Space,Str "(2006).",Space,Str "Test,",Space,Emph [Str "81"],Str "."]]]] diff --git a/tests/issue76.expected.native b/tests/issue76.expected.native --- a/tests/issue76.expected.native +++ b/tests/issue76.expected.native @@ -1,3 +1,11 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "the",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item3"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "a",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "an",Space,Str "abazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(1998c)"],Str ",",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Author",Space,Str "(1998d)"],Str ",",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "Author",Space,Str "(1998a)"],Str ",",Space,Cite [Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 4}] [Str "Author",Space,Str "(1998b)"]] -,Div ("refs",["references"],[]) [Div ("ref-item3",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998a.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "A",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item4",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998b.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "An",Space,Str "Abazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998c.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998d.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "The",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-item3",[],[]) + [Para [Str "Author,",Space,Str "Al.",Space,Str "1998a.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "A",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]] + ,Div ("ref-item4",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "1998b.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "An",Space,Str "Abazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]] + ,Div ("ref-item1",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "1998c.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]] + ,Div ("ref-item2",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "1998d.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "The",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]]]] diff --git a/tests/issue77.expected.native b/tests/issue77.expected.native --- a/tests/issue77.expected.native +++ b/tests/issue77.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "van",Space,Str "Gogh"]),("given",MetaInlines [Str "Vincent"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Humboldt"]),("given",MetaInlines [Str "Alexander",Space,Str "von"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item3"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bennett"]),("given",MetaInlines [Str "Frank",Space,Str "G.,!",Space,Str "Jr."]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item4"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dumboldt"]),("given",MetaInlines [Str "Ezekiel,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item5"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3},Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4},Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5}] [Note [Para [Str "John",Space,Str "Doe",Space,Str "III,",Space,Str "n.d.;",Space,Str "Vincent",Space,Str "van",Space,Str "Gogh,",Space,Str "n.d.;",Space,Str "Alexander",Space,Str "von",Space,Str "Humboldt,",Space,Str "n.d.;",Space,Str "Frank",Space,Str "G.",Space,Str "Bennett,",Space,Str "Jr.,",Space,Str "n.d.;",Space,Str "Ezekiel",Space,Str "Dumboldt",Space,Str "III,",Space,Str "n.d."]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item4",[],[]) [Para [Str "Bennett,",Space,Str "Frank",Space,Str "G.,",Space,Str "Jr.,",Space,Str "n.d."]] ,Div ("ref-item1",[],[]) diff --git a/tests/issue82.expected.native b/tests/issue82.expected.native --- a/tests/issue82.expected.native +++ b/tests/issue82.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-annotated-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "https://www.worldcat.org/"]),("accessed",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2014",MetaString "9",MetaString "19"]])])),("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "OCLC"])])]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "OCLC_i1099"]),("title",MetaInlines [Str "WorldCat"]),("type",MetaInlines [Str "webpage"])])])]}) [Header 1 ("title",[],[]) [Str "Title"] ,Para [Str "Some",Space,Str "text.",Note [Para [Str "Comment",Space,Str "regarding",Space,Str "text,",Space,Str "supported",Space,Str "by",Space,Str "citation",Space,Cite [Citation {citationId = "OCLC_i1099", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "OCLC,",Space,Str "\8220WorldCat.\8221"]]]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-OCLC_i1099",[],[]) [Para [Str "OCLC.",Space,Str "\8220WorldCat.\8221",Space,Str "Accessed",Space,Str "September",Space,Str "19,",Space,Str "2014.",Space,Link ("",[],[]) [Str "https://www.worldcat.org/"] ("https://www.worldcat.org/",""),Str "."]]]] diff --git a/tests/issue87.expected.native b/tests/issue87.expected.native --- a/tests/issue87.expected.native +++ b/tests/issue87.expected.native @@ -6,7 +6,7 @@ ,Para [Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 5}] [Str "Doe",Space,Str "(2006e)"],Space,Str "\8211",Space,Str "article-newspaper"] ,Para [Cite [Citation {citationId = "item3b", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 6}] [Str "Doe",Space,Str "(2006b)"],Space,Str "\8211",Space,Str "article-newspaper",Space,Str "YM"] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item2a",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2006a.",Space,Str "\8220Title.\8221",Space,Str "The",Space,Str "Web",Space,Str "Site.",Space,Str "October\8211November",Space,Str "2006.",Space,Link ("",[],[]) [Str "http://www.example.com"] ("http://www.example.com",""),Str "."]] ,Div ("ref-item3b",[],[]) diff --git a/tests/jats.csl b/tests/jats.csl deleted file mode 100644 --- a/tests/jats.csl +++ /dev/null @@ -1,208 +0,0 @@ - - - diff --git a/tests/mhra.expected.native b/tests/mhra.expected.native --- a/tests/mhra.expected.native +++ b/tests/mhra.expected.native @@ -15,7 +15,7 @@ ,Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 19}] [Emph [Str "First",Space,Str "Book"],Str ""],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 20}] [Str "\8216Article\8217,",Space,Str "33\8211\&34",Space,Str "(p.",Space,Str "44)"],Str "."]]] ,Para [Str "With",Space,Str "some",Space,Str "markup",Str ".",Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21}] [Note [Para [Emph [Str "See"],Space,Str "Doe,",Space,Emph [Str "First",Space,Str "Book"],Str ",",Space,Str "p.",Space,Str "32."]]]] ,Header 1 ("references",["unnumbered"],[]) [Str "References"] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item2",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Str "\8216Article\8217,",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Str ",",Space,Str "6",Space,Str "(2006),",Space,Str "33\8211\&34."]] ,Div ("ref-item1",[],[]) diff --git a/tests/no-author.expected.native b/tests/no-author.expected.native --- a/tests/no-author.expected.native +++ b/tests/no-author.expected.native @@ -1,6 +1,6 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "A"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "B"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item3"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "C"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "D"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item5"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "E"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "D"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Newspaper"]),("id",MetaInlines [Str "item5"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "E"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Newspaper"]),("id",MetaInlines [Str "item6"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "F"]),("type",MetaInlines [Str "article-magazine"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.",Space,Str "3"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "Magazine"],Space,Str "2012a,",Space,Str "3)"],Str ",",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "(",Emph [Str "Magazine"],Space,Str "2012b)"],Str ",",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "(",Emph [Str "Magazine"],Space,Str "2012c)"],Str ",",Space,Cite [Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 4}] [Str "(",Emph [Str "Magazine"],Space,Str "2012d)"],Str ",",Space,Cite [Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 5}] [Str "(",Emph [Str "Magazine"],Space,Str "2012e)"],Str ",",Space,Cite [Citation {citationId = "item6", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 6}] [Str "(",Emph [Str "Newspaper"],Space,Str "2012)"]] -,Div ("refs",["references"],[]) +,Div ("refs",["references","hanging-indent"],[]) [Div ("ref-item1",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012a.",Space,Str "\8220Title",Space,Str "A,\8221",Space,Str "2012."]] ,Div ("ref-item2",[],[]) diff --git a/tests/number-of-volumes.expected.native b/tests/number-of-volumes.expected.native --- a/tests/number-of-volumes.expected.native +++ b/tests/number-of-volumes.expected.native @@ -1,3 +1,5 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Al"]])])),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2013")])),("language",MetaInlines [Str "en-US"]),("number-of-volumes",MetaString "2"),("publisher",MetaInlines [Str "Publisher"]),("publisher-place",MetaInlines [Str "Location"]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(2013)"]] -,Div ("refs",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "2013.",Space,Emph [Str "Title"],Str ".",Space,Str "2",Space,Str "vols.",Space,Str "Location:",Space,Str "Publisher."]]]] +,Div ("refs",["references","hanging-indent"],[]) + [Div ("ref-item1",[],[]) + [Para [Str "Author,",Space,Str "Al.",Space,Str "2013.",Space,Emph [Str "Title"],Str ".",Space,Str "2",Space,Str "vols.",Space,Str "Location:",Space,Str "Publisher."]]]]