From 4efcf87882b0a92a0fb764d8bb2bcb4d33cf78ee Mon Sep 17 00:00:00 2001 From: Nikolay Yakimov Date: Tue, 5 Mar 2024 09:13:52 +0300 Subject: [PATCH] Change in output fenced div messes with tests; update --- test/m2m/emptyChapterLabels/expect.md | 4 +- test/m2m/label-precedence/expect.md | 12 ++-- .../listOfTemplates-buillet-list/expect.md | 36 +++++------ test/m2m/listOfTemplates-ord-list/expect.md | 36 +++++------ test/m2m/listOfTemplates/expect.md | 36 +++++------ test/m2m/loxItemTitle/expect.md | 36 +++++------ test/m2m/numberOverride/expect.md | 28 ++++----- test/m2m/secLabels/expect.md | 4 +- test/m2m/setLabelAttribute/expect.md | 4 +- test/m2m/subfigures-ccsDelim/expect.md | 44 ++++++------- test/m2m/subfigures-grid/expect.md | 62 +++++++++---------- test/m2m/subfigures-one-row/expect.md | 4 +- test/m2m/subfigures/expect.md | 44 ++++++------- test/m2m/titlesInRefs/expect.md | 4 +- 14 files changed, 177 insertions(+), 177 deletions(-) diff --git a/test/m2m/emptyChapterLabels/expect.md b/test/m2m/emptyChapterLabels/expect.md index 95dec8a3..c82e49b2 100644 --- a/test/m2m/emptyChapterLabels/expect.md +++ b/test/m2m/emptyChapterLabels/expect.md @@ -2,13 +2,13 @@ ## 1 Subsection {#sec:subsection label=""} -::: {#fig:figure1 .figure} +:::: {#fig:figure1 .figure} ![Figure1](./image.png) ::: caption Figure 1: Figure1 ::: -::: +:::: ### 1.1 Subsubsection {#sec:subsubsection} diff --git a/test/m2m/label-precedence/expect.md b/test/m2m/label-precedence/expect.md index 6664a6bf..4a342b60 100644 --- a/test/m2m/label-precedence/expect.md +++ b/test/m2m/label-precedence/expect.md @@ -2,25 +2,25 @@ text -::: {#fig:fig1 .figure} +:::: {#fig:fig1 .figure} ![A figure](image.png) ::: caption Figure α: A figure ::: -::: +:::: ## \*.A Subsection {#subsection} other text -::: {#fig:fig2 .figure} +:::: {#fig:fig2 .figure} ![A figure with custom label](image.png){label="+"} ::: caption Figure +: A figure with custom label ::: -::: +:::: ### \*.A.A Subsubsection {#subsubsection} @@ -28,13 +28,13 @@ text text text # B Custom on other elements {#custom-on-other-elements} -::: {#fig:fig3 .figure} +:::: {#fig:fig3 .figure} ![Figure](fig.png){label="F"} ::: caption Figure F: Figure ::: -::: +:::: ::: {#tbl:table label="T"} a b c diff --git a/test/m2m/listOfTemplates-buillet-list/expect.md b/test/m2m/listOfTemplates-buillet-list/expect.md index 8fa8f94f..5ea5f770 100644 --- a/test/m2m/listOfTemplates-buillet-list/expect.md +++ b/test/m2m/listOfTemplates-buillet-list/expect.md @@ -1,74 +1,74 @@ -::: {#fig:1 .figure} +:::: {#fig:1 .figure} ![1](fig1.png) ::: caption Figure 1: 1 ::: -::: +:::: -::: {#fig:2 .figure} +:::: {#fig:2 .figure} ![2](fig2.png) ::: caption Figure 2: 2 ::: -::: +:::: -::: {#fig:3 .figure} +:::: {#fig:3 .figure} ![3](fig3.png) ::: caption Figure 3: 3 ::: -::: +:::: -::: {#fig:4 .figure} +:::: {#fig:4 .figure} ![4](fig4.png) ::: caption Figure 4: 4 ::: -::: +:::: -::: {#fig:5 .figure} +:::: {#fig:5 .figure} ![5](fig5.png) ::: caption Figure 5: 5 ::: -::: +:::: -::: {#fig:6 .figure} +:::: {#fig:6 .figure} ![6](fig6.png) ::: caption Figure 6: 6 ::: -::: +:::: -::: {#fig:7 .figure} +:::: {#fig:7 .figure} ![7](fig7.png) ::: caption Figure 7: 7 ::: -::: +:::: -::: {#fig:8 .figure} +:::: {#fig:8 .figure} ![8](fig8.png) ::: caption Figure 8: 8 ::: -::: +:::: -::: {#fig:9 .figure} +:::: {#fig:9 .figure} ![9](fig9.png) ::: caption Figure 9: 9 ::: -::: +:::: # List of Figures diff --git a/test/m2m/listOfTemplates-ord-list/expect.md b/test/m2m/listOfTemplates-ord-list/expect.md index 237aaf11..44cb2f5d 100644 --- a/test/m2m/listOfTemplates-ord-list/expect.md +++ b/test/m2m/listOfTemplates-ord-list/expect.md @@ -1,74 +1,74 @@ -::: {#fig:1 .figure} +:::: {#fig:1 .figure} ![1](fig1.png) ::: caption Figure 1: 1 ::: -::: +:::: -::: {#fig:2 .figure} +:::: {#fig:2 .figure} ![2](fig2.png) ::: caption Figure 2: 2 ::: -::: +:::: -::: {#fig:3 .figure} +:::: {#fig:3 .figure} ![3](fig3.png) ::: caption Figure 3: 3 ::: -::: +:::: -::: {#fig:4 .figure} +:::: {#fig:4 .figure} ![4](fig4.png) ::: caption Figure 4: 4 ::: -::: +:::: -::: {#fig:5 .figure} +:::: {#fig:5 .figure} ![5](fig5.png) ::: caption Figure 5: 5 ::: -::: +:::: -::: {#fig:6 .figure} +:::: {#fig:6 .figure} ![6](fig6.png) ::: caption Figure 6: 6 ::: -::: +:::: -::: {#fig:7 .figure} +:::: {#fig:7 .figure} ![7](fig7.png) ::: caption Figure 7: 7 ::: -::: +:::: -::: {#fig:8 .figure} +:::: {#fig:8 .figure} ![8](fig8.png) ::: caption Figure 8: 8 ::: -::: +:::: -::: {#fig:9 .figure} +:::: {#fig:9 .figure} ![9](fig9.png) ::: caption Figure 9: 9 ::: -::: +:::: # List of Figures diff --git a/test/m2m/listOfTemplates/expect.md b/test/m2m/listOfTemplates/expect.md index 21ea8b2e..76047d2a 100644 --- a/test/m2m/listOfTemplates/expect.md +++ b/test/m2m/listOfTemplates/expect.md @@ -1,74 +1,74 @@ -::: {#fig:1 .figure} +:::: {#fig:1 .figure} ![1](fig1.png) ::: caption Figure 1: 1 ::: -::: +:::: -::: {#fig:2 .figure} +:::: {#fig:2 .figure} ![2](fig2.png) ::: caption Figure 2: 2 ::: -::: +:::: -::: {#fig:3 .figure} +:::: {#fig:3 .figure} ![3](fig3.png) ::: caption Figure 3: 3 ::: -::: +:::: -::: {#fig:4 .figure} +:::: {#fig:4 .figure} ![4](fig4.png) ::: caption Figure 4: 4 ::: -::: +:::: -::: {#fig:5 .figure} +:::: {#fig:5 .figure} ![5](fig5.png) ::: caption Figure 5: 5 ::: -::: +:::: -::: {#fig:6 .figure} +:::: {#fig:6 .figure} ![6](fig6.png) ::: caption Figure 6: 6 ::: -::: +:::: -::: {#fig:7 .figure} +:::: {#fig:7 .figure} ![7](fig7.png) ::: caption Figure 7: 7 ::: -::: +:::: -::: {#fig:8 .figure} +:::: {#fig:8 .figure} ![8](fig8.png) ::: caption Figure 8: 8 ::: -::: +:::: -::: {#fig:9 .figure} +:::: {#fig:9 .figure} ![9](fig9.png) ::: caption Figure 9: 9 ::: -::: +:::: ::: {#lst:code1 .listing .haskell} Listing 1: Listing caption 1 diff --git a/test/m2m/loxItemTitle/expect.md b/test/m2m/loxItemTitle/expect.md index 05e889c2..69aa4d76 100644 --- a/test/m2m/loxItemTitle/expect.md +++ b/test/m2m/loxItemTitle/expect.md @@ -1,74 +1,74 @@ -::: {#fig:1 .figure} +:::: {#fig:1 .figure} ![1](fig1.png) ::: caption Figure 1: 1 ::: -::: +:::: -::: {#fig:2 .figure} +:::: {#fig:2 .figure} ![2](fig2.png) ::: caption Figure 2: 2 ::: -::: +:::: -::: {#fig:3 .figure} +:::: {#fig:3 .figure} ![3](fig3.png) ::: caption Figure 3: 3 ::: -::: +:::: -::: {#fig:4 .figure} +:::: {#fig:4 .figure} ![4](fig4.png) ::: caption Figure 4: 4 ::: -::: +:::: -::: {#fig:5 .figure} +:::: {#fig:5 .figure} ![5](fig5.png) ::: caption Figure 5: 5 ::: -::: +:::: -::: {#fig:6 .figure} +:::: {#fig:6 .figure} ![6](fig6.png) ::: caption Figure 6: 6 ::: -::: +:::: -::: {#fig:7 .figure} +:::: {#fig:7 .figure} ![7](fig7.png) ::: caption Figure 7: 7 ::: -::: +:::: -::: {#fig:8 .figure} +:::: {#fig:8 .figure} ![8](fig8.png) ::: caption Figure 8: 8 ::: -::: +:::: -::: {#fig:9 .figure} +:::: {#fig:9 .figure} ![9](fig9.png) ::: caption Figure 9: 9 ::: -::: +:::: ::: {#lst:code1 .listing .haskell} Listing 1: Listing caption 1 diff --git a/test/m2m/numberOverride/expect.md b/test/m2m/numberOverride/expect.md index 11bfb4eb..30857771 100644 --- a/test/m2m/numberOverride/expect.md +++ b/test/m2m/numberOverride/expect.md @@ -2,62 +2,62 @@ ## 1.1 Earlier Subsection -::: {#fig:img1 .figure} +:::: {#fig:img1 .figure} ![Image 1](img2.png) ::: caption Figure 1.1.1: Image 1 ::: -::: +:::: ## 1.6 Title of Subsection {#title-of-subsection number="6"} -::: {#fig:img2 .figure} +:::: {#fig:img2 .figure} ![Image 1.6.2](img2.png) ::: caption Figure 1.6.1: Image 1.6.2 ::: -::: +:::: -::: {#fig:img3 .figure} +:::: {#fig:img3 .figure} ![Image 1.6.100500](img2.png){number="100500"} ::: caption Figure 1.6.100500: Image 1.6.100500 ::: -::: +:::: -::: {#fig:img4 .figure} +:::: {#fig:img4 .figure} ![Image 1.6.100501](img2.png) ::: caption Figure 1.6.100501: Image 1.6.100501 ::: -::: +:::: ## 1.7 Title of Subsection -::: {#fig:img21 .figure} +:::: {#fig:img21 .figure} ![Image 1.7.1](img2.png) ::: caption Figure 1.7.1: Image 1.7.1 ::: -::: +:::: -::: {#fig:img31 .figure} +:::: {#fig:img31 .figure} ![Image 1.7.100500](img2.png){number="100500"} ::: caption Figure 1.7.100500: Image 1.7.100500 ::: -::: +:::: -::: {#fig:img41 .figure} +:::: {#fig:img41 .figure} ![Image 1.7.100501](img2.png) ::: caption Figure 1.7.100501: Image 1.7.100501 ::: -::: +:::: diff --git a/test/m2m/secLabels/expect.md b/test/m2m/secLabels/expect.md index bb5e16f9..1d52fb20 100644 --- a/test/m2m/secLabels/expect.md +++ b/test/m2m/secLabels/expect.md @@ -2,13 +2,13 @@ ## a.a Second Level Section {#second-level-section} -::: {#fig:myfig .figure} +:::: {#fig:myfig .figure} ![my figure](myfig.png) ::: caption Figure a: my figure ::: -::: +:::: ## a.b Other Second Level Section {#other-second-level-section} diff --git a/test/m2m/setLabelAttribute/expect.md b/test/m2m/setLabelAttribute/expect.md index dafe336a..cbcf289f 100644 --- a/test/m2m/setLabelAttribute/expect.md +++ b/test/m2m/setLabelAttribute/expect.md @@ -1,12 +1,12 @@ # Section {#section label="1"} -::: {#fig:1 .figure label="1.1"} +:::: {#fig:1 .figure label="1.1"} ![Figure](./image.png) ::: caption Figure 1.1: Figure ::: -::: +:::: [$$equation\qquad{(1.1)}$$]{#eq:1 label="(1.1)"} diff --git a/test/m2m/subfigures-ccsDelim/expect.md b/test/m2m/subfigures-ccsDelim/expect.md index b2b05790..f75b5f71 100644 --- a/test/m2m/subfigures-ccsDelim/expect.md +++ b/test/m2m/subfigures-ccsDelim/expect.md @@ -1,6 +1,6 @@ You can define subfigures: -::: {#fig:subfigures .figure .subfigures} +:::: {#fig:subfigures .figure .subfigures} ![a](fig1.png){#fig:subfig1} ![b](fig2.png){#fig:subfig2} ![c](fig3.png) ![d](fig4.png){#fig:subfig4} ![e](fig5.png) ![f](fig6.png){#fig:subfig6} @@ -11,86 +11,86 @@ You can define subfigures: Figure 1: Caption. a --- 1; b --- 2; c --- 3; d --- 4; e --- 5; f --- 6; g --- 7; h --- 8; i --- 9 ::: -::: +:::: -::: {#fig:subfigures2 .figure .subfigures} -::: {#fig:subfig21 .figure} +:::: {#fig:subfigures2 .figure .subfigures} +:::: {#fig:subfig21 .figure} ![1](fig1.png) ::: caption a ::: -::: +:::: -::: {#fig:subfig22 .figure} +:::: {#fig:subfig22 .figure} ![2](fig2.png) ::: caption b ::: -::: +:::: -::: figure +:::: figure ![3](fig3.png) ::: caption c ::: -::: +:::: -::: {#fig:subfig24 .figure} +:::: {#fig:subfig24 .figure} ![4](fig4.png) ::: caption d ::: -::: +:::: -::: figure +:::: figure ![5](fig5.png) ::: caption e ::: -::: +:::: -::: {#fig:subfig26 .figure} +:::: {#fig:subfig26 .figure} ![6](fig6.png) ::: caption f ::: -::: +:::: -::: {#fig:subfig27 .figure} +:::: {#fig:subfig27 .figure} ![7](fig7.png) ::: caption g ::: -::: +:::: -::: figure +:::: figure ![8](fig8.png) ::: caption h ::: -::: +:::: -::: {#fig:subfig29 .figure} +:::: {#fig:subfig29 .figure} ![9](fig9.png) ::: caption i ::: -::: +:::: ::: caption Figure 2: Caption. a --- 1; b --- 2; c --- 3; d --- 4; e --- 5; f --- 6; g --- 7; h --- 8; i --- 9 ::: -::: +:::: Figures themselves can be referenced fig. 2, as well as individual subfigures: figs. 1 (a), 1 (b), 2 (i) diff --git a/test/m2m/subfigures-grid/expect.md b/test/m2m/subfigures-grid/expect.md index d70574ae..3aba5eb7 100644 --- a/test/m2m/subfigures-grid/expect.md +++ b/test/m2m/subfigures-grid/expect.md @@ -1,124 +1,124 @@ You can define subfigures: -::: {#fig:subfigures .figure .subfigures} +:::: {#fig:subfigures .figure .subfigures} +:------------------:+:------------------:+:------------------:+ -| ::: {#fi | ::: {#fi | ::: figure | +| :::: {#fi | :::: {#fi | :::: figure | | g:subfig1 .figure} | g:subfig2 .figure} | ![c](fig3. | | ![a](fig1. | ![b](fig2. | png){width="100%"} | | png){width="100%"} | png){width="100%"} | | | | | ::: caption | | ::: caption | ::: caption | c | | a | b | ::: | -| ::: | ::: | ::: | -| ::: | ::: | | +| ::: | ::: | :::: | +| :::: | :::: | | +--------------------+--------------------+--------------------+ -| ::: {#fi | ::: figure | ::: {#fi | +| :::: {#fi | :::: figure | :::: {#fi | | g:subfig4 .figure} | ![e](fig5. | g:subfig6 .figure} | | ![d](fig4. | png){width="100%"} | ![f](fig6. | | png){width="100%"} | | png){width="100%"} | | | ::: caption | | | ::: caption | e | ::: caption | | d | ::: | f | -| ::: | ::: | ::: | -| ::: | | ::: | +| ::: | :::: | ::: | +| :::: | | :::: | +--------------------+--------------------+--------------------+ -| ::: {#fi | ::: figure | ::: {#fi | +| :::: {#fi | :::: figure | :::: {#fi | | g:subfig7 .figure} | ![h](fig8. | g:subfig9 .figure} | | ![g](fig7. | png){width="100%"} | ![i](fig9. | | png){width="100%"} | | png){width="100%"} | | | ::: caption | | | ::: caption | h | ::: caption | | g | ::: | i | -| ::: | ::: | ::: | -| ::: | | ::: | +| ::: | :::: | ::: | +| :::: | | :::: | +--------------------+--------------------+--------------------+ ::: caption Figure 1: Caption. a --- 1, b --- 2, c --- 3, d --- 4, e --- 5, f --- 6, g --- 7, h --- 8, i --- 9 ::: -::: +:::: -::: {#fig:subfigures2 .figure .subfigures} +:::: {#fig:subfigures2 .figure .subfigures} +:--------------------------------------------------------------------:+ -| ::: {#fig:subfig21 .figure} | +| :::: {#fig:subfig21 .figure} | | ![1](fig1.png) | | | | ::: caption | | a | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: {#fig:subfig22 .figure} | +| :::: {#fig:subfig22 .figure} | | ![2](fig2.png) | | | | ::: caption | | b | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: figure | +| :::: figure | | ![3](fig3.png) | | | | ::: caption | | c | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: {#fig:subfig24 .figure} | +| :::: {#fig:subfig24 .figure} | | ![4](fig4.png) | | | | ::: caption | | d | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: figure | +| :::: figure | | ![5](fig5.png) | | | | ::: caption | | e | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: {#fig:subfig26 .figure} | +| :::: {#fig:subfig26 .figure} | | ![6](fig6.png) | | | | ::: caption | | f | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: {#fig:subfig27 .figure} | +| :::: {#fig:subfig27 .figure} | | ![7](fig7.png) | | | | ::: caption | | g | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: figure | +| :::: figure | | ![8](fig8.png) | | | | ::: caption | | h | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ -| ::: {#fig:subfig29 .figure} | +| :::: {#fig:subfig29 .figure} | | ![9](fig9.png) | | | | ::: caption | | i | | ::: | -| ::: | +| :::: | +----------------------------------------------------------------------+ ::: caption Figure 2: Caption. a --- 1, b --- 2, c --- 3, d --- 4, e --- 5, f --- 6, g --- 7, h --- 8, i --- 9 ::: -::: +:::: Figures themselves can be referenced fig. 2, as well as individual subfigures: figs. 1 (a), 1 (b), 2 (i) diff --git a/test/m2m/subfigures-one-row/expect.md b/test/m2m/subfigures-one-row/expect.md index a768d566..80bc940f 100644 --- a/test/m2m/subfigures-one-row/expect.md +++ b/test/m2m/subfigures-one-row/expect.md @@ -3,7 +3,7 @@ Regression test for [#381](https://github.com/lierdakil/pandoc-crossref/issues/381) -::: {#fig:latex .figure .subfigures} +:::: {#fig:latex .figure .subfigures} ![a](/tmp/LaTeX_logo.svg.png){#fig:logo1 width="40%"} ![b](/tmp/LaTeX_logo.svg.png){#fig:logo2 width="40%"} @@ -11,6 +11,6 @@ Regression test for Figure 1: Copies of the LaTeX logo. a --- cool caption, b --- cooler caption ::: -::: +:::: Those logos are different I swear. Especially fig. 1 (a) and fig. 1 (b). diff --git a/test/m2m/subfigures/expect.md b/test/m2m/subfigures/expect.md index ac2ac993..46b8a1cb 100644 --- a/test/m2m/subfigures/expect.md +++ b/test/m2m/subfigures/expect.md @@ -1,6 +1,6 @@ You can define subfigures: -::: {#fig:subfigures .figure .subfigures} +:::: {#fig:subfigures .figure .subfigures} ![a](fig1.png){#fig:subfig1} ![b](fig2.png){#fig:subfig2} ![c](fig3.png) ![d](fig4.png){#fig:subfig4} ![e](fig5.png) ![f](fig6.png){#fig:subfig6} @@ -11,86 +11,86 @@ You can define subfigures: Figure 1: Caption. a --- 1, b --- 2, c --- 3, d --- 4, e --- 5, f --- 6, g --- 7, h --- 8, i --- 9 ::: -::: +:::: -::: {#fig:subfigures2 .figure .subfigures} -::: {#fig:subfig21 .figure} +:::: {#fig:subfigures2 .figure .subfigures} +:::: {#fig:subfig21 .figure} ![1](fig1.png) ::: caption a ::: -::: +:::: -::: {#fig:subfig22 .figure} +:::: {#fig:subfig22 .figure} ![2](fig2.png) ::: caption b ::: -::: +:::: -::: figure +:::: figure ![3](fig3.png) ::: caption c ::: -::: +:::: -::: {#fig:subfig24 .figure} +:::: {#fig:subfig24 .figure} ![4](fig4.png) ::: caption d ::: -::: +:::: -::: figure +:::: figure ![5](fig5.png) ::: caption e ::: -::: +:::: -::: {#fig:subfig26 .figure} +:::: {#fig:subfig26 .figure} ![6](fig6.png) ::: caption f ::: -::: +:::: -::: {#fig:subfig27 .figure} +:::: {#fig:subfig27 .figure} ![7](fig7.png) ::: caption g ::: -::: +:::: -::: figure +:::: figure ![8](fig8.png) ::: caption h ::: -::: +:::: -::: {#fig:subfig29 .figure} +:::: {#fig:subfig29 .figure} ![9](fig9.png) ::: caption i ::: -::: +:::: ::: caption Figure 2: Caption. a --- 1, b --- 2, c --- 3, d --- 4, e --- 5, f --- 6, g --- 7, h --- 8, i --- 9 ::: -::: +:::: Figures themselves can be referenced fig. 2, as well as individual subfigures: figs. 1 (a), 1 (b), 2 (i) diff --git a/test/m2m/titlesInRefs/expect.md b/test/m2m/titlesInRefs/expect.md index 1bbf917a..058b4b53 100644 --- a/test/m2m/titlesInRefs/expect.md +++ b/test/m2m/titlesInRefs/expect.md @@ -1,12 +1,12 @@ # Section {#sec:section} -::: {#fig:figure .figure} +:::: {#fig:figure .figure} ![A Figure](figure.png) ::: caption Figure 1: A Figure ::: -::: +:::: sec. 1 (Section)