1d9ff85 · typeable/pandoc

git.iko.soy/typeable/pandoc

RST reader: keep `name` property in `imgAttr`. (#5637)

Closes #5619.

commit1d9ff85b451f976b1d140f06e9eee56bc3fadf33 authorBrian Leung <29217594+leungbk@users.noreply.github.com> dateWed 10 Jul 2019, 18:35 (7 years ago) parent95d7d1b

2 files changed+11−1

compare with master

unifiedsplit

src/Text/Pandoc/Readers/RST.hs+1−1 test/command/5619.md+10

src/Text/Pandoc/Readers/RST.hs+1−1

@@ -645,7 +645,7 @@ directive' = do

645645 name = trim $ fromMaybe "" (lookup "name" fields)

646646 classes = words $ maybe "" trim (lookup "class" fields)

647647 keyvals = [(k, trim v) | (k, v) <- fields, k /= "name", k /= "class"]

648− imgAttr cl = ("", classes ++ alignClasses, widthAttr ++ heightAttr)

648+ imgAttr cl = (name, classes ++ alignClasses, widthAttr ++ heightAttr)

649649 where

650650 alignClasses = words $ maybe "" trim (lookup cl fields) ++

651651 maybe "" (\x -> "align-" ++ trim x)

test/command/5619.mdnew file+10

@@ -0,0 +1,10 @@

1+```

2+% pandoc -f rst -t native

3+.. figure:: img1.jpg

4+ :width: 1in

5+ :name: test

7+ The caption. Here's what piggybacking on caption would look like {#fig:1}

8+^D

9+[Para [Image ("test",[],[("width","1in")]) [Str "The",Space,Str "caption.",Space,Str "Here's",Space,Str "what",Space,Str "piggybacking",Space,Str "on",Space,Str "caption",Space,Str "would",Space,Str "look",Space,Str "like",Space,Str "{#fig:1}"] ("img1.jpg","fig:")]]

10+```