Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Org writer: remove blank line after figure caption

Browse source 
Org-mode only treats an image as a figure if it is directly preceded by
a caption.
This commit is contained in:
Albert Krewinkel 2016-08-18 14:32:59 +02:00
parent 3a44ee62c0
commit 91afa513ad
No known key found for this signature in database
GPG key ID: 388DC0B21F631124
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Text/Pandoc/Writers/Org.hs
View file

@ -158,10 +158,9 @@ blockToOrg (Plain inlines) = inlineListToOrg inlines
blockToOrg (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do blockToOrg (Para [Image attr txt (src,'f':'i':'g':':':tit)]) = do
capt <- if null txt capt <- if null txt
then return empty then return empty
else (\c -> "#+CAPTION: " <> c <> blankline) `fmap` else ("#+CAPTION: " <>) `fmap` inlineListToOrg txt
inlineListToOrg txt
img <- inlineToOrg (Image attr txt (src,tit)) img <- inlineToOrg (Image attr txt (src,tit))
return $ capt <> img return $ capt $$ img
blockToOrg (Para inlines) = do blockToOrg (Para inlines) = do
contents <- inlineListToOrg inlines contents <- inlineListToOrg inlines
return $ contents <> blankline return $ contents <> blankline

1
tests/writer.org
View file

@ -808,7 +808,6 @@ Auto-links should not occur here: =<http://example.com/>=
From "Voyage dans la Lune" by Georges Melies (1902): From "Voyage dans la Lune" by Georges Melies (1902):
#+CAPTION: lalune #+CAPTION: lalune
[[lalune.jpg]] [[lalune.jpg]]
Here is a movie [[movie.jpg]] icon. Here is a movie [[movie.jpg]] icon.