diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-12-13 10:45:03 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-12-13 15:25:46 -0800 |
| commit | c43e2dc0f4ce639c8d0bd156afea2fd07ffc91ff (patch) | |
| tree | 8310833f7c0ed4676ace291528b5ecaf97539235 /test/command | |
| parent | 32902d0fad22af823fa765603d22437580b4b5e2 (diff) | |
| download | pandoc-c43e2dc0f4ce639c8d0bd156afea2fd07ffc91ff.tar.gz | |
RST writer: better image handling.
- An image alone in its paragraph (but not a figure) is now
rendered as an independent image, with an `alt` attribute
if a description is supplied.
- An inline image that is not alone in its paragraph will
be rendered, as before, using a substitution.
Such an image cannot have a "center", "left", or
"right" alignment, so the classes `align-center`,
`align-left`, or `align-right` are ignored.
However, `align-top`, `align-middle`, `align-bottom`
will generate a corresponding `align` attribute.
Closes #6948.
Diffstat (limited to 'test/command')
| -rw-r--r-- | test/command/4420.md | 11 | ||||
| -rw-r--r-- | test/command/6948.md | 31 |
2 files changed, 31 insertions, 11 deletions
diff --git a/test/command/4420.md b/test/command/4420.md index 3e7008935..36d697234 100644 --- a/test/command/4420.md +++ b/test/command/4420.md @@ -1,16 +1,5 @@ ``` % pandoc -f native -t rst -[Image ("",["align-right"],[("width","100px")]) [Str "image"] ("foo.png","")] -^D -|image| - -.. |image| image:: foo.png - :align: right - :width: 100px -``` - -``` -% pandoc -f native -t rst [Para [Image ("",["align-right"],[("width","100px")]) [Str "image"] ("foo.png","fig:test")]] ^D .. figure:: foo.png diff --git a/test/command/6948.md b/test/command/6948.md new file mode 100644 index 000000000..8803aebe9 --- /dev/null +++ b/test/command/6948.md @@ -0,0 +1,31 @@ +Treat an image alone in its paragraph (but not a figure) +as an independent image: +``` +% pandoc -f native -t rst +[Para [Image ("",["align-center"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +.. image:: https://pandoc.org/diagram.jpg + :alt: https://pandoc.org/diagram.jpg + :align: center +``` + +Here we just omit the center attribute as it's not valid: +``` +% pandoc -f native -t rst +[Para [Str "hi",Space,Image ("",["align-center"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +hi |https://pandoc.org/diagram.jpg| + +.. |https://pandoc.org/diagram.jpg| image:: https://pandoc.org/diagram.jpg +``` + +But we can use top, middle, or bottom alignment: +``` +% pandoc -f native -t rst +[Para [Str "hi",Space,Image ("",["align-top"],[]) [Str "https://pandoc.org/diagram.jpg"] ("https://pandoc.org/diagram.jpg","")]] +^D +hi |https://pandoc.org/diagram.jpg| + +.. |https://pandoc.org/diagram.jpg| image:: https://pandoc.org/diagram.jpg + :align: top +``` |