more fixes

Author: lubegasimon

src/markdown/generator.ml

@@ -18,7 +18,7 @@ type args = { generate_links : bool }
 let rec source_contains_text (s : Source.t) =
   let inline_contains_text (i : Inline.t) =
     let check_inline_desc (i : Inline.desc) =
-      match i with Text "" -> false | Text _ | _ -> true
+      match i with Text "" | Text " " -> false | Text _ | _ -> true
     in
     List.exists (fun { Inline.desc = d; _ } -> check_inline_desc d) i
   in
@@ -71,10 +71,7 @@ and inline (l : Inline.t) args =
                 ++ continue rest)
             (continue content ++ continue rest)
       | InternalLink (Unresolved content) -> continue content ++ continue rest
-      | Source content ->
-          cond
-            (source_code content args ++ continue rest)
-            (source_code content args ++ continue rest)
+      | Source content -> source_code content args ++ continue rest
       | Raw_markup _ -> noop
       (* TODO: handle this well! *))
 

test/integration/markdown.t/run.t

@@ -1,6 +1,6 @@
   $ ocamlc -c -bin-annot test.mli
   $ odoc compile test.cmti
-  File "test.mli", line 39, characters 13-22:
+  File "test.mli", line 41, characters 13-22:
   Warning: '{foo_bar}': bad markup.
   Suggestion: did you mean '{!foo_bar}' or '[foo_bar]'?
   $ odoc link test.odoc
@@ -22,15 +22,15 @@
 
   ######     type y'
 
-  ######     module  Bar : sig ... end
+  ######     module Bar : sig ... end
 
-  ######     module type  Foo = sig
+  ######     module type Foo = sig
 
   ######         type foo
 
   docs for x
 
-  ######         module type  Foo' = sig
+  ######         module type Foo' = sig
 
   ######             type foo'
 
@@ -117,7 +117,7 @@
 
   David Sheets
 
-  ######     module  Foo : sig ... end
+  ######     module Foo : sig ... end
 
   The end foo end keyword in doc comment.