Fix lists generation

Signed-off-by: Marcello Seri <[email protected]>

CHANGES.md

@@ -1,4 +1,5 @@
 ## 0.5.0 (2021-06-25)
+- improve generation of (un)ordered lists
 - port to omd 2.0.0~alpha2
 
 ## 0.4.0 (2021-06-25)

src/backend.ml

@@ -167,8 +167,8 @@ let rec block ctx (bl : 'attr Omd.block) =
   | List (_attr, ty, sp, bl) ->
     let sign =
       match ty with
-      | Ordered _ -> "+ "
-      | Bullet _ -> "- "
+      | Ordered _ -> "{+ "
+      | Bullet _ -> "{- "
     in
     let li t =
       let block' (t : 'attr Omd.block) =
@@ -177,9 +177,14 @@ let rec block ctx (bl : 'attr Omd.block) =
         | _ -> block ctx t
       in
       let nl = if sp = Tight then Null else nl in
-      Surround (sign, concat nl (concat_map block' t), "")
+      Surround (sign, concat nl (concat_map block' t), "}")
     in
-    concat nl (concat_map li bl)
+    let list_type =
+      match ty with
+      | Ordered _ -> "{ol "
+      | Bullet _ -> "{ul "
+    in
+    concat (Surround (list_type, concat_map li bl, "}")) nl
   | Code_block (_attr, _label, code) -> BlockSurround ("{[\n", text code, "]}")
   | Thematic_break _attr -> GeneralBlock (text "***")
   | Html_block (_attr, body) -> raw body

tests/readme-min-header-3.expected

@@ -19,12 +19,12 @@ In [dune] you can use it to generate an mld file with
 You can see the documentation generated from the latest tagged version of this README at {{: http://mseri.github.io/md2mld/md2mld/index.html} mseri.github.io/md2mld/md2mld/index.html}.
 
 {4 Known issues}
-
-- 
+{ul {- 
 
 Until the new odoc {{: https://github.com/ocaml/odoc/issues/141} fixing #141} is released, the minimal header allowed in the [md] file will be the level 3 one [###].
 You can work around this by using the [-min-header 3] flag during the invocation of [md2mld].
-- 
+}{- 
 
 If you see an error like ['{0': heading level should be lower than top heading level '0'], this is because in [ocamldoc] the first header must have a level higher than all other headings in the page.
 You can safely ignore it or increase the level of the subsequent headings to get rid of it.
+}}

tests/readme.expected

@@ -19,12 +19,12 @@ In [dune] you can use it to generate an mld file with
 You can see the documentation generated from the latest tagged version of this README at {{: http://mseri.github.io/md2mld/md2mld/index.html} mseri.github.io/md2mld/md2mld/index.html}.
 
 {1 Known issues}
-
-- 
+{ul {- 
 
 Until the new odoc {{: https://github.com/ocaml/odoc/issues/141} fixing #141} is released, the minimal header allowed in the [md] file will be the level 3 one [###].
 You can work around this by using the [-min-header 3] flag during the invocation of [md2mld].
-- 
+}{- 
 
 If you see an error like ['{0': heading level should be lower than top heading level '0'], this is because in [ocamldoc] the first header must have a level higher than all other headings in the page.
 You can safely ignore it or increase the level of the subsequent headings to get rid of it.
+}}

tests/test.expected

@@ -7,16 +7,16 @@ let x = "bla"
 ]}
 
 Hello this is a ordered list
-
-+ One
-+ Two
-+ Three
+{ol {+ One
+}{+ Two
+}{+ Three
+}}
 
 And this is a unordered list
-
-- One
-- Two
-- Three
+{ul {- One
+}{- Two
+}{- Three
+}}
 
 {1 Another header}