markdown generator

src/document/codefmt.ml

@@ -28,11 +28,12 @@ module State = struct
       ())
 
   let leave state =
-    if state.ignore_all = 0 then (
+    if state.ignore_all = 0 then
       let current_elt = List.rev state.current in
       let previous_elt, tag = Stack.pop state.context in
-      state.current <- Tag (tag, current_elt) :: previous_elt;
-      ())
+      match current_elt with
+      | [] -> state.current <- previous_elt
+      | _ -> state.current <- Tag (tag, current_elt) :: previous_elt
 
   let rec flush state =
     if Stack.is_empty state.context then List.rev state.current
@@ -151,7 +152,9 @@ let make () =
   let open Inline in
   let state0 = State.create () in
   let push elt = State.push state0 (Elt elt) in
-  let push_text s = if state0.ignore_all = 0 then push [ inline @@ Text s ] in
+  let push_text s =
+    if state0.ignore_all = 0 && s <> "" then push [ inline @@ Text s ]
+  in
 
   let formatter =
     let out_string s i j = push_text (String.sub s i j) in

src/document/generator.ml

@@ -1014,7 +1014,11 @@ module Make (Syntax : SYNTAX) = struct
 
     let class_ (t : Odoc_model.Lang.Class.t) =
       let name = Paths.Identifier.name t.id in
-      let params = format_params ~delim:`brackets t.params in
+      let params =
+        match t.params with
+        | [] -> O.noop
+        | params -> format_params ~delim:`brackets params ++ O.txt " "
+      in
       let virtual_ =
         if t.virtual_ then O.keyword "virtual" ++ O.txt " " else O.noop
       in
@@ -1041,8 +1045,7 @@ module Make (Syntax : SYNTAX) = struct
           expansion summary
       in
       let content =
-        O.documentedSrc
-          (O.keyword "class" ++ O.txt " " ++ virtual_ ++ params ++ O.txt " ")
+        O.documentedSrc (O.keyword "class" ++ O.txt " " ++ virtual_ ++ params)
         @ cname @ cd
       in
       let attr = [ "class" ] in
@@ -1052,7 +1055,11 @@ module Make (Syntax : SYNTAX) = struct
 
     let class_type (t : Odoc_model.Lang.ClassType.t) =
       let name = Paths.Identifier.name t.id in
-      let params = format_params ~delim:`brackets t.params in
+      let params =
+        match t.params with
+        | [] -> O.noop
+        | params -> format_params ~delim:`brackets params ++ O.txt " "
+      in
       let virtual_ =
         if t.virtual_ then O.keyword "virtual" ++ O.txt " " else O.noop
       in
@@ -1074,7 +1081,7 @@ module Make (Syntax : SYNTAX) = struct
       let content =
         O.documentedSrc
           (O.keyword "class" ++ O.txt " " ++ O.keyword "type" ++ O.txt " "
-         ++ virtual_ ++ params ++ O.txt " ")
+         ++ virtual_ ++ params)
         @ cname @ expr
       in
       let attr = [ "class-type" ] in

src/markdown/dune

@@ -0,0 +1,6 @@
+(library
+ (name odoc_markdown)
+ (public_name odoc.markdown)
+ (instrumentation
+  (backend bisect_ppx))
+ (libraries odoc_model odoc_document))