dc3ef52 · typeable/pandoc

git.iko.soy/typeable/pandoc

Markdown writer: ensure that a new csl-block begins on a new line.

This just looks better and doesn't affect the semantics. See #6921.

commitdc3ef5201f9531bc405ac07e763d9f004bb6bc91 authorJohn MacFarlane <jgm@berkeley.edu> dateFri 4 Dec 2020, 10:55 (6 years ago) parent68bcdde

2 files changed+10−3

unifiedsplit

src/Text/Pandoc/Writers/Markdown.hs+6−1

@@ -1058,7 +1058,12 @@ inlineToMarkdown opts (Span ("",["emoji"],kvs) [Str s]) =

10581058inlineToMarkdown opts (Span attrs ils) = do

10591059 variant <- asks envVariant

10601060 contents <- inlineListToMarkdown opts ils

1061− return $ case variant of

1061+ return $ case attrs of

1062+ (_,["csl-block"],_) -> (cr <>)

1063+ (_,["csl-left-margin"],_) -> (cr <>)

1064+ (_,["csl-indent"],_) -> (cr <>)

1065+ _ -> id

1066+ $ case variant of

10621067 PlainText -> contents

10631068 _ | attrs == nullAttr -> contents

10641069 | isEnabled Ext_bracketed_spans opts ->

test/command/pandoc-citeproc-53.md+4−2

@@ -28,11 +28,13 @@ Doe[^1] Doe[^2] Roe[^3] Roe[^4] Doe[^5] Doe[^6] Roe[^7] Roe[^8]

2828

2929::: {#refs .references .csl-bib-body}

3030::: {#ref-a .csl-entry}

31−[[Doe J.]{.smallcaps} ]{.csl-block}[2000, *Work A*,.]{.csl-left-margin}

31+[[Doe J.]{.smallcaps} ]{.csl-block}

32+[2000, *Work A*,.]{.csl-left-margin}

3233:::

3334

3435::: {#ref-b .csl-entry}

35−[[Roe J.]{.smallcaps} ]{.csl-block}[1990, *Work B*,.]{.csl-left-margin}

36+[[Roe J.]{.smallcaps} ]{.csl-block}

37+[1990, *Work B*,.]{.csl-left-margin}

3638:::

3739:::

3840