diff options
58 files changed, 125 insertions, 116 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 6338a90cd..941557e0e 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -401,9 +401,12 @@ blockToMarkdown' opts (Div attrs@(_,classes,_) bs) let attrsToMd = if variant == Commonmark then attrsToMarkdown opts else classOrAttrsToMarkdown opts - in nowrap (literal ":::" <+> attrsToMd attrs) $$ + divNesting = computeDivNestingLevel bs + numcolons = 3 + divNesting + colons = literal $ T.replicate numcolons ":" + in nowrap (colons <+> attrsToMd attrs) $$ chomp contents $$ - literal ":::" <> blankline + colons <> blankline | isEnabled Ext_native_divs opts || (isEnabled Ext_raw_html opts && (variant == Commonmark || @@ -895,3 +898,9 @@ removeBlankLinesInHTML = T.pack . go False . T.unpack go !afternewline (!c:cs) | isSpace c = c : go afternewline cs | otherwise = c : go False cs + +computeDivNestingLevel :: [Block] -> Int +computeDivNestingLevel = foldr go 0 + where + go (Div _ bls') n = max (n + 1) (foldr go (n + 1) bls') + go _ n = n diff --git a/test/command/6723.md b/test/command/6723.md index 02fdfc032..4f8b78bd1 100644 --- a/test/command/6723.md +++ b/test/command/6723.md @@ -22,11 +22,11 @@ Blah.[^1] # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-doe .csl-entry} Doe, John. "An Article," 2020. <https://doi.org/10.1109/5.771073>. ::: -::: +:::: [^1]: John Doe, "An Article," 2020, <https://doi.org/10.1109/5.771073>. ``` diff --git a/test/command/citeproc-7a.md b/test/command/citeproc-7a.md index 4d14dbfc0..9ea9017e8 100644 --- a/test/command/citeproc-7a.md +++ b/test/command/citeproc-7a.md @@ -26,11 +26,11 @@ Test.[^3] Test.[^4] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-test .csl-entry} Doe, John. "Test," n.d. ::: -::: +:::: [^1]: John Doe, "Test," n.d., 12. diff --git a/test/command/pandoc-citeproc-118.md b/test/command/pandoc-citeproc-118.md index 4028a4c3d..1559bbfcc 100644 --- a/test/command/pandoc-citeproc-118.md +++ b/test/command/pandoc-citeproc-118.md @@ -19,10 +19,10 @@ references: ^D (Hitchcock 1959) is a spy thriller film. -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-nbn .csl-entry} Hitchcock, Alfred, dir. 1959. *North by Northwest*. USA: Metro-Goldwyn-Mayer. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-119.md b/test/command/pandoc-citeproc-119.md index b86a2eb95..59ed35d03 100644 --- a/test/command/pandoc-citeproc-119.md +++ b/test/command/pandoc-citeproc-119.md @@ -14,7 +14,7 @@ Averroes (1982); Averroes (1892); Averroes (1869) # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} ::: {#ref-averroes/hercz .csl-entry} Averroes. (1869). *Drei Abhandlungen über die Conjunction des separaten Intellects mit dem Menschen: Von Averroes (Vater und Sohn), aus dem @@ -34,5 +34,5 @@ the active intellect by Ibn Rushd with the commentary of Moses Narboni*. (K. P. Bland, Ed. & Trans.). New York: Jewish Theological Seminary of America. ::: -::: +:::::: ``` diff --git a/test/command/pandoc-citeproc-13.md b/test/command/pandoc-citeproc-13.md index 79e76043d..24f7375e4 100644 --- a/test/command/pandoc-citeproc-13.md +++ b/test/command/pandoc-citeproc-13.md @@ -19,11 +19,11 @@ Foo [@item1]. ^D Foo.[^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Author, Ann. "Title." *Journal*, 2011. ::: -::: +:::: [^1]: Author, "Title." ``` diff --git a/test/command/pandoc-citeproc-136.md b/test/command/pandoc-citeproc-136.md index 1ecfa22b0..86a952617 100644 --- a/test/command/pandoc-citeproc-136.md +++ b/test/command/pandoc-citeproc-136.md @@ -15,9 +15,9 @@ references: ^D *Stanze in lode della donna brutta* (1547) is an anoynymous work. -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-stanze .csl-entry} *Stanze in lode della donna brutta*. 1547. Florence. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-14.md b/test/command/pandoc-citeproc-14.md index 4ff52d84a..fd51e496d 100644 --- a/test/command/pandoc-citeproc-14.md +++ b/test/command/pandoc-citeproc-14.md @@ -56,7 +56,7 @@ Foo (Pelikan 1971b, 1:12). Bar (Pelikan 1971c, 1:12). Baz (Pelikan # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-CTv1c2 .csl-entry} Pelikan, Jaroslav. 1971a. "Chapter Two." In *The Christian Tradition: A History of the Development of Doctrine*, 1:34--56. Chicago: University @@ -73,5 +73,5 @@ of Doctrine*. Chicago: University of Chicago Press. *The Christian Tradition: A History of the Development of Doctrine*. Vol. 1. Chicago: University of Chicago Press. ::: -::: +:::::: ``` diff --git a/test/command/pandoc-citeproc-152.md b/test/command/pandoc-citeproc-152.md index 36af75b7d..c4b1a1bd9 100644 --- a/test/command/pandoc-citeproc-152.md +++ b/test/command/pandoc-citeproc-152.md @@ -49,7 +49,7 @@ I have two citations ("Communities," 2011; "Geek Feminism," 2013). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} ::: {#ref-Feminism2011ces .csl-entry} Communities. (2011, August 14). In *Geek Feminism*. Retrieved from <http://geekfeminism.wikia.com/wiki/Category:Communities> @@ -59,5 +59,5 @@ Communities. (2011, August 14). In *Geek Feminism*. Retrieved from Geek Feminism. (2013, April 10). *Geek Feminism*. Retrieved April 10, 2013, from <http://geekfeminism.wikia.com/wiki/Geek_Feminism> ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-160.md b/test/command/pandoc-citeproc-160.md index 114116289..56e2f9644 100644 --- a/test/command/pandoc-citeproc-160.md +++ b/test/command/pandoc-citeproc-160.md @@ -36,9 +36,9 @@ Foo \[Jane11\]. > > \[Jane11\] Jane Doe. A book. 2011. -::: {#refs .references .csl-bib-body} +:::: {#refs .references .csl-bib-body} ::: {#ref-item1 .csl-entry} \[Jane11\] Jane Doe. A book. 2011. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-175.md b/test/command/pandoc-citeproc-175.md index 9f9fa065d..9af990290 100644 --- a/test/command/pandoc-citeproc-175.md +++ b/test/command/pandoc-citeproc-175.md @@ -35,9 +35,9 @@ Foo (Doe 2011). > Doe, Jane. 2011. "A Title." *A Magazine*, January--February. -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Doe, Jane. 2011. "A Title." *A Magazine*, January--February 2011. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-197.md b/test/command/pandoc-citeproc-197.md index 13d589665..6461c2652 100644 --- a/test/command/pandoc-citeproc-197.md +++ b/test/command/pandoc-citeproc-197.md @@ -21,11 +21,11 @@ This is a test [@test]. ^D This is a test.[^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-test .csl-entry} Abelard, Peter, ed. *Test*. Oxford: Clarendon Press, 1989. ::: -::: +:::: [^1]: Peter Abelard, ed., *Test* (Oxford: Clarendon Press, 1989). ``` diff --git a/test/command/pandoc-citeproc-213.md b/test/command/pandoc-citeproc-213.md index d718a442f..53fd0bb9f 100644 --- a/test/command/pandoc-citeproc-213.md +++ b/test/command/pandoc-citeproc-213.md @@ -25,9 +25,9 @@ Foo (Doe 1999). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent} +:::: {#refs .references .csl-bib-body .hanging-indent} ::: {#ref-doe1 .csl-entry} Doe, A. (1999). *Title*. The collection title. The publisher. 789 pp. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-25.md b/test/command/pandoc-citeproc-25.md index 971197e26..c1971de27 100644 --- a/test/command/pandoc-citeproc-25.md +++ b/test/command/pandoc-citeproc-25.md @@ -22,9 +22,9 @@ Foo (Author 1998). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Author, Al. 1998. "Foo Bar Baz: Bazbaz Foo." ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-250.md b/test/command/pandoc-citeproc-250.md index b5f8a174e..cfbf754e3 100644 --- a/test/command/pandoc-citeproc-250.md +++ b/test/command/pandoc-citeproc-250.md @@ -13,9 +13,9 @@ references: ^D ([Doe, n.d.](#ref-doe)) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-doe .csl-entry} Doe. n.d. "Title." ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-27.md b/test/command/pandoc-citeproc-27.md index d9758d711..f7cdde048 100644 --- a/test/command/pandoc-citeproc-27.md +++ b/test/command/pandoc-citeproc-27.md @@ -29,10 +29,10 @@ Here is some text that needs a citation [@AuthorOne2014]. Here is some text that needs a citation (*1*). -::: {#refs .references .csl-bib-body} +:::: {#refs .references .csl-bib-body} ::: {#ref-AuthorOne2014 .csl-entry} [1. ]{.csl-left-margin}[J. AuthorOne, J. AuthorTwo, *Some Journal*, in press.]{.csl-right-inline} ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-292.md b/test/command/pandoc-citeproc-292.md index cffeb0539..eab63dbf6 100644 --- a/test/command/pandoc-citeproc-292.md +++ b/test/command/pandoc-citeproc-292.md @@ -27,7 +27,7 @@ references: ^D (Roe, 2007; Zoe, 2009; see for comparison Doe, 2007: 3) -::: {#refs .references .csl-bib-body .hanging-indent} +:::::: {#refs .references .csl-bib-body .hanging-indent} ::: {#ref-doe .csl-entry} Doe (2007). ::: @@ -39,5 +39,5 @@ Roe (2007). ::: {#ref-zoe .csl-entry} Zoe (2009). ::: -::: +:::::: ``` diff --git a/test/command/pandoc-citeproc-301.md b/test/command/pandoc-citeproc-301.md index afa352fd2..9eafc22fc 100644 --- a/test/command/pandoc-citeproc-301.md +++ b/test/command/pandoc-citeproc-301.md @@ -13,7 +13,7 @@ references: "Essays Presented to N.R. Ker (On Art)" (n.d.); "*Test:* An Experiment: An Abridgement" (n.d.) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-test .csl-entry} "Essays Presented to N.R. Ker (On Art)." n.d. ::: @@ -21,5 +21,5 @@ An Abridgement" (n.d.) ::: {#ref-test2 .csl-entry} "*Test:* An Experiment: An Abridgement." n.d. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-307.md b/test/command/pandoc-citeproc-307.md index 4d8129dfb..30246552d 100644 --- a/test/command/pandoc-citeproc-307.md +++ b/test/command/pandoc-citeproc-307.md @@ -22,10 +22,10 @@ Bonjour[@bazin_cybernetique_1954] ! ^D Bonjour(Bazin 1954) ! -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-bazin_cybernetique_1954 .csl-entry} Bazin, André. 1954. « La Cybernétique d'André Cayatte ». *Cahiers du cinéma*, nᵒ 36 (juin): 22‑27. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-31.md b/test/command/pandoc-citeproc-31.md index 91aaa8f0b..28ca4743a 100644 --- a/test/command/pandoc-citeproc-31.md +++ b/test/command/pandoc-citeproc-31.md @@ -27,7 +27,7 @@ Foo [@item1]. Bar [@item2]. Baz [@item1]. ^D Foo.[^1] Bar.[^2] Baz.[^3] -::: {#refs .references .csl-bib-body} +::::: {#refs .references .csl-bib-body} ::: {#ref-item1 .csl-entry} Olson HA, '[Codes, Costs, and Critiques: The Organization of Information in *Library Quarterly*, 1931--2004](https://doi.org/10.1086/504343)' @@ -37,7 +37,7 @@ in *Library Quarterly*, 1931--2004](https://doi.org/10.1086/504343)' ::: {#ref-item2 .csl-entry} 'Second Title' ::: -::: +::::: [^1]: Hope A Olson, 'Codes, Costs, and Critiques: The Organization of Information in *Library Quarterly*, 1931--2004' (2006) 76 *Library diff --git a/test/command/pandoc-citeproc-312.md b/test/command/pandoc-citeproc-312.md index e0e5680db..fdd2f20d8 100644 --- a/test/command/pandoc-citeproc-312.md +++ b/test/command/pandoc-citeproc-312.md @@ -122,7 +122,7 @@ references: --- ^D -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +:::::::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} ::: {#ref-Y .csl-entry} NN. (1950). Date: Year. ::: @@ -167,5 +167,5 @@ NN. (1964--1965, Spring--Winter). Date range: Year+season. ::: {#ref-YS/YS_same .csl-entry} NN. (1966, Summer--Winter). Date range: Year+season, same year. ::: -::: +:::::::::::::: ``` diff --git a/test/command/pandoc-citeproc-320.md b/test/command/pandoc-citeproc-320.md index b539cc2b1..66dbcea35 100644 --- a/test/command/pandoc-citeproc-320.md +++ b/test/command/pandoc-citeproc-320.md @@ -138,7 +138,7 @@ n.d.; Madison, n.d.; McAllister, n.d.; McAuley, n.d.; McMillan, n.d.). Foo (Sainte-Beuve, n.d.; Saint-Gaudens, n.d.; Saint-Saëns, n.d.; San Martin, n.d.; St. Denis, n.d.; St. Laurent, n.d.). -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +::::::::::::::::::::::::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} ::: {#ref-itemA2 .csl-entry} ben Yaakov, D. (n.d.). ::: @@ -250,5 +250,5 @@ Villafuerte, S. A. (n.d.). ::: {#ref-itemA14 .csl-entry} Villa-Lobos, J. (n.d.). ::: -::: +::::::::::::::::::::::::::::::: ``` diff --git a/test/command/pandoc-citeproc-320a.md b/test/command/pandoc-citeproc-320a.md index 1a1d2eed2..081dbfe3f 100644 --- a/test/command/pandoc-citeproc-320a.md +++ b/test/command/pandoc-citeproc-320a.md @@ -51,7 +51,7 @@ Foo [@item1; @item2; @item3; @item4; @item5; @item6; @item7; @item8]. Foo (al-ʾUdhrī, n.d.; al-ʿUdhrī, n.d.; al-\'Udhrī, n.d.; al-'Udhrī, n.d.a, n.d.b; Uch, n.d.; Uebel, n.d.; Zzz, n.d.). -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item6 .csl-entry} Uch, Ann. n.d. ::: @@ -83,5 +83,5 @@ Uebel, Joe. n.d. ::: {#ref-item8 .csl-entry} Zzz, Zoe. n.d. ::: -::: +::::::::::: ``` diff --git a/test/command/pandoc-citeproc-322.md b/test/command/pandoc-citeproc-322.md index c70eae755..8c0245001 100644 --- a/test/command/pandoc-citeproc-322.md +++ b/test/command/pandoc-citeproc-322.md @@ -23,12 +23,12 @@ Foo [@timmory__justice_1950]. ^D Foo.[^1] -::: {#refs .references .csl-bib-body} +:::: {#refs .references .csl-bib-body} ::: {#ref-timmory__justice_1950 .csl-entry} François [Timmory]{.smallcaps}, « *Justice est faite* : soyons justes », *L'Écran français*, 1950, nᵒ 272, p. 12. ::: -::: +:::: [^1]: François [Timmory]{.smallcaps}, « *Justice est faite* : soyons justes », *L'Écran français*, 1950, nᵒ 272, p. 12. diff --git a/test/command/pandoc-citeproc-325.md b/test/command/pandoc-citeproc-325.md index 4f4cc4337..0b5dbdd24 100644 --- a/test/command/pandoc-citeproc-325.md +++ b/test/command/pandoc-citeproc-325.md @@ -18,7 +18,7 @@ references: ^D (Smith, n.d.a, n.d.b) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Smith, John. n.d.a. ::: @@ -26,5 +26,5 @@ Smith, John. n.d.a. ::: {#ref-item2 .csl-entry} ---------. n.d.b. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-327.md b/test/command/pandoc-citeproc-327.md index 8fe7299bb..5918a0efa 100644 --- a/test/command/pandoc-citeproc-327.md +++ b/test/command/pandoc-citeproc-327.md @@ -41,11 +41,11 @@ I referenced something here ^D I referenced something here^\[1\]^ -::: {#refs .references .csl-bib-body entry-spacing="0"} +:::: {#refs .references .csl-bib-body entry-spacing="0"} ::: {#ref-LiLiaoDongWanHaiYuDiQiDongWuCiJiShengChanLiYanJiuJiShengJingGuaYiXingPingJie2017 .csl-entry} [\[1\] ]{.csl-left-margin}[李轶平, 于旭光, 孙明, 等. [辽东湾海域底栖动物次级生产力研究及生境适宜性评价](http://kns.cnki.net/kns/detail/detail.aspx?QueryID=4&CurRec=4&recid=&FileName=CHAN201706006&DbName=CJFDLAST2018&DbCode=CJFQ&yx=Y&pr=&URLID=21.1110.S.20171129.1725.006)\[J\]. 水产科学, 2017(6): 728--734.]{.csl-right-inline} ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-338.md b/test/command/pandoc-citeproc-338.md index c9cf0d254..e1534930b 100644 --- a/test/command/pandoc-citeproc-338.md +++ b/test/command/pandoc-citeproc-338.md @@ -24,11 +24,11 @@ references: --- ^D -::: {#refs .references .csl-bib-body .hanging-indent} +:::: {#refs .references .csl-bib-body .hanging-indent} ::: {#ref-item-1 .csl-entry} [Wolfinger, Christine]{.smallcaps}: *Keine Angst vor Linux, Unix: ein Lehrbuch für Linux- und Unix-Anwender*. 11., vollst. überarb. Aufl. Aufl. Berlin \[u.a.\] : Springer Vieweg, 2013 --- ISBN 978-3-642-32078-1 ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-351.md b/test/command/pandoc-citeproc-351.md index 0da8675c7..745827309 100644 --- a/test/command/pandoc-citeproc-351.md +++ b/test/command/pandoc-citeproc-351.md @@ -17,11 +17,11 @@ references: ^D Friedrich Nietzsche (ed.)[^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-Nie72 .csl-entry} Nietzsche, Friedrich (ed.), *Die geburt*, 1872. ::: -::: +:::: [^1]: *Die geburt*, 1872. ``` diff --git a/test/command/pandoc-citeproc-360.md b/test/command/pandoc-citeproc-360.md index 4341fba64..a16a819fb 100644 --- a/test/command/pandoc-citeproc-360.md +++ b/test/command/pandoc-citeproc-360.md @@ -23,12 +23,12 @@ references: ^D [^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-lestrange2017 .csl-entry} L'Estrange, Michael, and Stephen Merchant. "2017 Independent Intelligence Review," July 18, 2017. ::: -::: +:::: [^1]: Michael L'Estrange and Stephen Merchant, "2017 Independent Intelligence Review," July 18, 2017. diff --git a/test/command/pandoc-citeproc-365.md b/test/command/pandoc-citeproc-365.md index 8d43ab659..12c3a6022 100644 --- a/test/command/pandoc-citeproc-365.md +++ b/test/command/pandoc-citeproc-365.md @@ -27,12 +27,12 @@ Foo [@legras_michel_2010]. ^D Foo.[^1] -::: {#refs .references .csl-bib-body} +:::: {#refs .references .csl-bib-body} ::: {#ref-legras_michel_2010 .csl-entry} [Le Gras]{.smallcaps} Gwénaëlle, *Michel Simon : l'art de la disgrâce*, Paris, Scope (coll. « Jeux d'acteurs »), 2010, 128 p. ::: -::: +:::: [^1]: Gwénaëlle Le Gras, *Michel Simon : l'art de la disgrâce*, Paris, Scope, 2010, 128 p. diff --git a/test/command/pandoc-citeproc-371.md b/test/command/pandoc-citeproc-371.md index 697b30146..6d67414fe 100644 --- a/test/command/pandoc-citeproc-371.md +++ b/test/command/pandoc-citeproc-371.md @@ -28,7 +28,7 @@ Foo (Doe 2018, in press). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item2 .csl-entry} Doe, Jane. 2018. *Title Two*. ::: @@ -36,5 +36,5 @@ Doe, Jane. 2018. *Title Two*. ::: {#ref-item1 .csl-entry} ---------. In press. *Title One*. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-38.md b/test/command/pandoc-citeproc-38.md index 3013efed8..3c01bd51d 100644 --- a/test/command/pandoc-citeproc-38.md +++ b/test/command/pandoc-citeproc-38.md @@ -21,9 +21,9 @@ references: ^D Doe, Doe, and Roe (2007) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-a .csl-entry} Doe, Ann, Ben Doe, and Ron Roe. 2007. "Title." ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-386.md b/test/command/pandoc-citeproc-386.md index fcbcacf57..bac7fa662 100644 --- a/test/command/pandoc-citeproc-386.md +++ b/test/command/pandoc-citeproc-386.md @@ -26,11 +26,11 @@ references: ^D ^\[1\]^ -::: {#refs .references .csl-bib-body entry-spacing="0" line-spacing="2"} +:::: {#refs .references .csl-bib-body entry-spacing="0" line-spacing="2"} ::: {#ref-ding_metallic_2012 .csl-entry} [\[1\] ]{.csl-left-margin}[[K. Ding, C. Z. Ning, *Light Sci. Appl.* **2012**, *1*, e20](https://doi.org/10.1038/lsa.2012.20).]{.csl-right-inline} ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-392.md b/test/command/pandoc-citeproc-392.md index 5b0be6eb7..0c77e76bf 100644 --- a/test/command/pandoc-citeproc-392.md +++ b/test/command/pandoc-citeproc-392.md @@ -17,7 +17,7 @@ references: ^D (1); (2) -::: {#refs .references .csl-bib-body} +::::: {#refs .references .csl-bib-body} ::: {#ref-james .csl-entry} [1. ]{.csl-left-margin}[James MRCEL. ]{.csl-right-inline} ::: @@ -25,5 +25,5 @@ references: ::: {#ref-macfarlane .csl-entry} [2. ]{.csl-left-margin}[MacFarlane JG. ]{.csl-right-inline} ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-401.md b/test/command/pandoc-citeproc-401.md index 6a452baee..7bbcd59d1 100644 --- a/test/command/pandoc-citeproc-401.md +++ b/test/command/pandoc-citeproc-401.md @@ -43,7 +43,7 @@ Haslanger [-@haslanger2012SocialConstructionDebunking; @haslanger2012FeminismMet ^D Haslanger (\[2003\] 2012, \[2000\] 2012) says... -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-haslanger2012FeminismMetaphysicsNegotiating .csl-entry} Haslanger, Sally. (2000) 2012. "Feminism in Metaphysics: Negotiating the Natural." In *Resisting Reality: Social Construction and Social @@ -55,5 +55,5 @@ Critique*, 139--57. Oxford: Oxford University Press. In *Resisting Reality: Social Construction and Social Critique*, 113--38. Oxford: Oxford University Press. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-408.md b/test/command/pandoc-citeproc-408.md index 73ce43d61..f7e1dca46 100644 --- a/test/command/pandoc-citeproc-408.md +++ b/test/command/pandoc-citeproc-408.md @@ -27,7 +27,7 @@ references: ^D (Smith and Smith 2019; Smith 2019) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-smith1 .csl-entry} Smith, Mary. 2019. "Foo." ::: @@ -35,5 +35,5 @@ Smith, Mary. 2019. "Foo." ::: {#ref-smithsmith .csl-entry} Smith, Mary, and John Smith. 2019. "Foo Bar." ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-416.md b/test/command/pandoc-citeproc-416.md index 758796169..9a4fb5b2b 100644 --- a/test/command/pandoc-citeproc-416.md +++ b/test/command/pandoc-citeproc-416.md @@ -44,7 +44,7 @@ Blah blah (Doe 2010, 2007, 2008). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item2 .csl-entry} Doe, J. 2007. "The Title," December 12--13, 2007. ::: @@ -56,5 +56,5 @@ Doe, J. 2007. "The Title," December 12--13, 2007. ::: {#ref-item1 .csl-entry} ---------. 2010. "The Title," December 13, 2010. ::: -::: +:::::: ``` diff --git a/test/command/pandoc-citeproc-47.md b/test/command/pandoc-citeproc-47.md index 94a6544a8..36947df80 100644 --- a/test/command/pandoc-citeproc-47.md +++ b/test/command/pandoc-citeproc-47.md @@ -92,7 +92,7 @@ chronological order is maintained, regardless of the added abbreviation. # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-doe .csl-entry} Doe, A. 2000a. *Title*. ::: @@ -108,5 +108,5 @@ Doe, A., A. Loe, and A. Toe. 2000. *Title*. ::: {#ref-doepoe .csl-entry} Doe, A., and A. Poe. 2000. *Title*. ::: -::: +::::::: ``` diff --git a/test/command/pandoc-citeproc-51.md b/test/command/pandoc-citeproc-51.md index 6bdc2a752..22cfac4b0 100644 --- a/test/command/pandoc-citeproc-51.md +++ b/test/command/pandoc-citeproc-51.md @@ -33,7 +33,7 @@ references: ^D Doe (1987--1988); Roe (1987) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Doe, John. 1987--1988. "The Title." *Journal of Something* 3: 12--34. ::: @@ -41,5 +41,5 @@ Doe, John. 1987--1988. "The Title." *Journal of Something* 3: 12--34. ::: {#ref-item2 .csl-entry} Roe, Ron. 1987. "The Title." *Journal of Something* 4: 12--34. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-53.md b/test/command/pandoc-citeproc-53.md index fb8d5c35e..41f210c30 100644 --- a/test/command/pandoc-citeproc-53.md +++ b/test/command/pandoc-citeproc-53.md @@ -26,7 +26,7 @@ references: ^D Doe[^1] Doe[^2] Roe[^3] Roe[^4] Doe[^5] Doe[^6] Roe[^7] Roe[^8] -::: {#refs .references .csl-bib-body} +::::: {#refs .references .csl-bib-body} ::: {#ref-a .csl-entry} [[Doe J.]{.smallcaps} ]{.csl-block} [2000, *Work A*,.]{.csl-left-margin} @@ -36,7 +36,7 @@ Doe[^1] Doe[^2] Roe[^3] Roe[^4] Doe[^5] Doe[^6] Roe[^7] Roe[^8] [[Roe J.]{.smallcaps} ]{.csl-block} [1990, *Work B*,.]{.csl-left-margin} ::: -::: +::::: [^1]: 2000 diff --git a/test/command/pandoc-citeproc-57.md b/test/command/pandoc-citeproc-57.md index 925032277..51cb7ff3e 100644 --- a/test/command/pandoc-citeproc-57.md +++ b/test/command/pandoc-citeproc-57.md @@ -27,11 +27,11 @@ References # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-Faraday-forthcoming .csl-entry} Faraday, Carry. Forthcoming. "Protean Photography." In *Seven Trips Beyond the Asteroid Belt*, edited by James Oring. Cape Canaveral, FL: Launch Press. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-58.md b/test/command/pandoc-citeproc-58.md index 3394cd989..f42fb7f08 100644 --- a/test/command/pandoc-citeproc-58.md +++ b/test/command/pandoc-citeproc-58.md @@ -24,9 +24,9 @@ In this item, the title replaces the (unknown) author (see 14.79) # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-stanze .csl-entry} *Stanze in lode della donna brutta*. 1547. Florence. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-61.md b/test/command/pandoc-citeproc-61.md index e99f7e5ef..da17f3171 100644 --- a/test/command/pandoc-citeproc-61.md +++ b/test/command/pandoc-citeproc-61.md @@ -55,7 +55,7 @@ Foo[^5] # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent} +::::: {#refs .references .csl-bib-body .hanging-indent} ::: {#ref-doe .csl-entry} Doe, John, *Title* (Publisher, 1985) ::: @@ -63,7 +63,7 @@ Doe, John, *Title* (Publisher, 1985) ::: {#ref-roe .csl-entry} Roe, Rob, *Title* (Publisher, 1985) ::: -::: +::::: [^1]: John Doe, *Title* (Publisher, 1985), VIII, 89. diff --git a/test/command/pandoc-citeproc-64.md b/test/command/pandoc-citeproc-64.md index a02d1c8f6..660892a9f 100644 --- a/test/command/pandoc-citeproc-64.md +++ b/test/command/pandoc-citeproc-64.md @@ -7,7 +7,7 @@ nocite: '[@*]' --- ^D -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. ::: @@ -20,5 +20,5 @@ Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. Doe, John, and Jenny Roe. 2007. "Why Water Is Wet." In *Third Book*, edited by Sam Smith. Oxford: Oxford University Press. ::: -::: +:::::: ``` diff --git a/test/command/pandoc-citeproc-65.md b/test/command/pandoc-citeproc-65.md index 6e178eff8..d0a8e7acb 100644 --- a/test/command/pandoc-citeproc-65.md +++ b/test/command/pandoc-citeproc-65.md @@ -28,11 +28,11 @@ references: ^D (Stotz 1996--2004) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-stotz:1996handbuch .csl-entry} Stotz, Peter. 1996--2004. *Handbuch zur lateinischen Sprache des Mittelalters*. 5 vols. Handbuch der Altertumswissenschaft 2.5. Munich: Beck. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-68.md b/test/command/pandoc-citeproc-68.md index 1dff8e619..d0b188ea6 100644 --- a/test/command/pandoc-citeproc-68.md +++ b/test/command/pandoc-citeproc-68.md @@ -36,13 +36,13 @@ a citation [@goering:1992william, pp. 141-42]. prose commentary[^2] \... and finally a note starting with a citation.[^3] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-goering:1992william .csl-entry} Goering, Joseph. *William de Montibus (c. 1140--1213): The Schools and the Literature of Pastoral Care*. Studies and Texts 108. Toronto: Pontifical Institute of Mediaeval Studies, 1992. ::: -::: +:::: [^1]: The text of fol. 9r is printed in Joseph Goering, *William de Montibus (c. 1140--1213): The Schools and the Literature of Pastoral diff --git a/test/command/pandoc-citeproc-7.md b/test/command/pandoc-citeproc-7.md index 8c4b091f0..8fb275d48 100644 --- a/test/command/pandoc-citeproc-7.md +++ b/test/command/pandoc-citeproc-7.md @@ -23,9 +23,9 @@ references: ^D Author (2011) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Author, Ann. 2011. "Title." *Journal*, September 24--26, 2011. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-70.md b/test/command/pandoc-citeproc-70.md index 5b933ea0e..00bb0313b 100644 --- a/test/command/pandoc-citeproc-70.md +++ b/test/command/pandoc-citeproc-70.md @@ -56,7 +56,7 @@ references: ^D (Thorndike 1955; Dinkova-Bruun 2009) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-bruun:2009samuel .csl-entry} Dinkova-Bruun, Greti. 2009. "Samuel Presbyter and the Glosses to His Versification of Psalm 1: An Anti-Church Invective?" In *Florilegium @@ -69,5 +69,5 @@ Internationale des Instituts d'Études Médiévales. ::: {#ref-thorndike:1955unde .csl-entry} Thorndike, Lynn. 1955. "Unde versus." *Traditio* 11: 163--93. ::: -::: +::::: ``` diff --git a/test/command/pandoc-citeproc-75.md b/test/command/pandoc-citeproc-75.md index 974eaa2dd..d70c6993c 100644 --- a/test/command/pandoc-citeproc-75.md +++ b/test/command/pandoc-citeproc-75.md @@ -59,9 +59,9 @@ references: (Doe, 2006, no. 6 and 7) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0" line-spacing="2"} ::: {#ref-test .csl-entry} Doe, J. (2006). Test, *81*. ::: -::: +:::: ``` diff --git a/test/command/pandoc-citeproc-76.md b/test/command/pandoc-citeproc-76.md index 2eb8a83b5..701402944 100644 --- a/test/command/pandoc-citeproc-76.md +++ b/test/command/pandoc-citeproc-76.md @@ -44,7 +44,7 @@ references: ^D Author (1998c), Author (1998d), Author (1998a), Author (1998b) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item3 .csl-entry} Author, Al. 1998a. "Foo Bar Baz: A Bazbaz Bar Foo." ::: @@ -60,5 +60,5 @@ Author, Al. 1998a. "Foo Bar Baz: A Bazbaz Bar Foo." ::: {#ref-item2 .csl-entry} ---------. 1998d. "Foo Bar Baz: The Bazbaz Bar Foo." ::: -::: +::::::: ``` diff --git a/test/command/pandoc-citeproc-77.md b/test/command/pandoc-citeproc-77.md index 51c4bd699..34c29bd58 100644 --- a/test/command/pandoc-citeproc-77.md +++ b/test/command/pandoc-citeproc-77.md @@ -39,7 +39,7 @@ references: ^D [^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item4 .csl-entry} Bennett, Frank G., Jr., n.d. ::: @@ -59,7 +59,7 @@ Gogh, Vincent van, n.d. ::: {#ref-item3 .csl-entry} Humboldt, Alexander von, n.d. ::: -::: +:::::::: [^1]: John Doe III, n.d.; Vincent van Gogh, n.d.; Alexander von Humboldt, n.d.; Frank G. Bennett, Jr., n.d.; Ezekiel Dumboldt III, diff --git a/test/command/pandoc-citeproc-82.md b/test/command/pandoc-citeproc-82.md index e44506bc2..380fe297d 100644 --- a/test/command/pandoc-citeproc-82.md +++ b/test/command/pandoc-citeproc-82.md @@ -28,12 +28,12 @@ Some text.[^1] Some text.[^1] -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-OCLC_i1099 .csl-entry} OCLC. "WorldCat." Accessed September 19, 2014. <https://www.worldcat.org/>. ::: -::: +:::: [^1]: Comment regarding text, supported by citation (OCLC, "WorldCat"). ``` diff --git a/test/command/pandoc-citeproc-87.md b/test/command/pandoc-citeproc-87.md index e3f30a131..109f4362a 100644 --- a/test/command/pandoc-citeproc-87.md +++ b/test/command/pandoc-citeproc-87.md @@ -122,7 +122,7 @@ Doe (2006b) -- article-newspaper YM # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item2a .csl-entry} Doe, John. 2006a. "Title." The Web Site. October--November 2006. <http://www.example.com>. @@ -152,5 +152,5 @@ Doe, John. 2006a. "Title." The Web Site. October--November 2006. ---------. 2006--2007. "Title." The Web Site. December 31, 2006--January 1, 2007. <http://www.example.com>. ::: -::: +::::::::: ``` diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md index b45dc8399..2614b9d97 100644 --- a/test/command/pandoc-citeproc-chicago-author-date.md +++ b/test/command/pandoc-citeproc-chicago-author-date.md @@ -83,7 +83,7 @@ With some markup (*see* [Doe 2005, 32](#ref-item1)). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. ::: @@ -96,7 +96,7 @@ Doe, John. 2005. *First Book*. Cambridge: Cambridge University Press. Doe, John, and Jenny Roe. 2007. "Why Water Is Wet." In *Third Book*, edited by Sam Smith. Oxford: Oxford University Press. ::: -::: +:::::: [^1]: Doe and Roe ([2007, 12](#ref-пункт3)) and a citation without locators ([Doe and Roe 2007](#ref-пункт3)). diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md index cca7ee2dd..c9c5d0a0d 100644 --- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md +++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md @@ -81,7 +81,7 @@ With some markup.[^14] # References {#references .unnumbered} -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item2 .csl-entry} Doe, John. "Article." *Journal of Generic Studies* 6 (2006): 33--34. ::: @@ -94,7 +94,7 @@ Doe, John. "Article." *Journal of Generic Studies* 6 (2006): 33--34. Doe, John, and Jenny Roe. "Why Water Is Wet." In *Third Book*, edited by Sam Smith. Oxford: Oxford University Press, 2007. ::: -::: +:::::: [^1]: [**Nonexistent?**](#ref-nonexistent) diff --git a/test/command/pandoc-citeproc-ieee.md b/test/command/pandoc-citeproc-ieee.md index 78f702f55..dbe5d2307 100644 --- a/test/command/pandoc-citeproc-ieee.md +++ b/test/command/pandoc-citeproc-ieee.md @@ -84,7 +84,7 @@ With some markup *see* [\[1, p. 32\]](#ref-item1). # References {#references .unnumbered} -::: {#refs .references .csl-bib-body entry-spacing="0"} +:::::: {#refs .references .csl-bib-body entry-spacing="0"} ::: {#ref-item1 .csl-entry} [\[1\] ]{.csl-left-margin}[J. Doe, *First book*. Cambridge: Cambridge University Press, 2005.]{.csl-right-inline} @@ -100,7 +100,7 @@ Studies*, vol. 6, pp. 33--34, 2006.]{.csl-right-inline} *Third book*, S. Smith, Ed. Oxford: Oxford University Press, 2007.]{.csl-right-inline} ::: -::: +:::::: [^1]: [\[3, p. 12\]](#ref-пункт3) and a citation without locators [\[3\]](#ref-пункт3). diff --git a/test/command/pandoc-citeproc-no-author.md b/test/command/pandoc-citeproc-no-author.md index 1c8efef8d..549e4a364 100644 --- a/test/command/pandoc-citeproc-no-author.md +++ b/test/command/pandoc-citeproc-no-author.md @@ -45,7 +45,7 @@ references: *Magazine* (2012a, 3), *Magazine* (2012b), *Magazine* (2012c), *Magazine* (2012d), *Newspaper* (2012a), *Newspaper* (2012b) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +::::::::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} *Magazine*. 2012a. "Title A," 2012. ::: @@ -69,5 +69,5 @@ references: ::: {#ref-item6 .csl-entry} ---------. 2012b. "Title F," 2012. ::: -::: +::::::::: ``` diff --git a/test/command/pandoc-citeproc-number-of-volumes.md b/test/command/pandoc-citeproc-number-of-volumes.md index 664ac34f2..ba83497f8 100644 --- a/test/command/pandoc-citeproc-number-of-volumes.md +++ b/test/command/pandoc-citeproc-number-of-volumes.md @@ -21,9 +21,9 @@ references: ^D Author (2013) -::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} +:::: {#refs .references .csl-bib-body .hanging-indent entry-spacing="0"} ::: {#ref-item1 .csl-entry} Author, Al. 2013. *Title*. 2 vols. Location: Publisher. ::: -::: +:::: ``` |