Merge pull request #79 from panglesd/new-cmarkit

Upgrade attribute's parsing

Author: panglesd

CONTRIBUTING.md

@@ -78,3 +78,10 @@ slipshow-vscode$ vsce publish patch   # (or minor, major)
 Publish on open-vsx: connect to open-vsx, login and manually publish the new vsix.
 
 ### Update sliphub
+
+TODO
+
+## Vendoring
+
+Slipshow vendors a few modified dependencies. Currently it uses
+[git-vendor](https://github.com/brettlangdon/git-vendor).

src/compiler/lib/mappings.ml

@@ -26,8 +26,8 @@ let of_cmarkit resolve_images =
         ret
     | _ -> Mapper.default
   in
-  let inline _ = function
-    | Inline.Image (l, meta) ->
+  let inline i = function
+    | Inline.Image ((l, (attrs, meta2)), meta) ->
         let text = Inline.Link.text l in
         let reference =
           match Inline.Link.reference l with
@@ -53,7 +53,8 @@ let of_cmarkit resolve_images =
               `Inline ((ld, attrs), meta)
         in
         let l = Inline.Link.make text reference in
-        Mapper.ret (Inline.Image (l, meta))
+        let attrs = Mapper.map_attrs i attrs in
+        Mapper.ret (Inline.Image ((l, (attrs, meta2)), meta))
     | _ -> Mapper.default
   in
   let attrs = function

src/compiler/lib/renderers.ml

@@ -77,9 +77,11 @@ let custom_html_renderer =
   let default = renderer ~safe:false () in
   let custom_html =
     let inline c = function
-      | Inline.Text (t, _) ->
+      | Inline.Text ((t, (attrs, _)), _) ->
           (* Put text inside spans to be able to apply styles on them *)
-          Context.string c "<span>";
+          Context.string c "<span";
+          add_attrs c attrs;
+          Context.byte c '>';
           html_escaped_string c t;
           Context.string c "</span>";
           true