draft

Author: lubegasimon

src/markdown/generator.ml

@@ -15,11 +15,29 @@ let make_hashes n = String.make n '#'
 
 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 | _ -> true
+    in
+    List.exists (fun { Inline.desc = d; _ } -> check_inline_desc d) i
+  in
+  let check_source (s : Source.token) =
+    match s with
+    | Source.Elt i -> inline_contains_text i
+    | Tag (_, s) -> source_contains_text s
+  in
+  List.exists check_source s
+
 let rec source_code (s : Source.t) args =
   match s with
   | [] -> noop
   | h :: t -> (
-      let continue s = if s = [] then noop else source_code s args in
+      let continue s =
+        if s = [] then noop
+        else if source_contains_text s then source_code s args
+        else noop
+      in
       match h with
       | Source.Elt i -> inline i args ++ continue t
       | Tag (_, s) -> continue s ++ continue t
@@ -130,20 +148,6 @@ let take_code l =
   in
   (c, rest)
 
-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 | _ -> true
-    in
-    List.exists (fun { Inline.desc = d; _ } -> check_inline_desc d) i
-  in
-  let check_source (s : Source.token) =
-    match s with
-    | Source.Elt i -> inline_contains_text i
-    | Tag (_, s) -> source_contains_text s
-  in
-  List.exists check_source s
-
 let rec documented_src (l : DocumentedSrc.t) args nbsps =
   let nbsps' = nbsps ++ (nbsp ++ nbsp) in
   let noop = paragraph noop in

test/integration/markdown.t/run.t

@@ -8,57 +8,57 @@
   $ cat markdown/Test.md
   Test
 
-  Module Test 
+  Module Test
 
   # This is a heading
 
   ## This has a label
 
   ---
 
-  ######     type t    
+  ######     type t
 
   Doc for type t .
 
-  ######     type y'    
+  ######     type y'
 
-  ######     module  Bar  : sig ... end   
+  ######     module  Bar : sig ... end
 
-  ######     module type  Foo  = sig  
+  ######     module type  Foo = sig
 
-  ######         type foo    
+  ######         type foo
 
   docs for x
 
-  ######         module type  Foo'  = sig  
+  ######         module type  Foo' = sig
 
-  ######             type foo'    
+  ######             type foo'
 
-  ######             type days  = 
+  ######             type days =
 
-  ######               | Mon  
+  ######               | Mon
 
   first day of the week.
 
-  ######             type num = [ 
+  ######             type num = [
 
-  ######               |  `One 
+  ######               | `One
 
-  ######             ]   
+  ######             ]
 
-  ######         end   
+  ######         end
 
-  ######     end   
+  ######     end
 
-  ######     type name  = { 
+  ######     type name = {
 
-  ######       fname : string ; 
+  ######       fname : string ;
 
   first name
 
-  ######       lname : string ; 
+  ######       lname : string ;
 
-  ######     }   
+  ######     }
 
   ## Label
 
@@ -117,7 +117,7 @@
 
   David Sheets
 
-  ######     module  Foo  : sig ... end   
+  ######     module  Foo : sig ... end
 
   The end foo end keyword in doc comment.