Add Paragraph_Sep

bin/main.ml

@@ -1,6 +1,6 @@
 open Mldoc_org
 open Mldoc_org.Parser
-open Mldoc_org.Config
+open Mldoc_org.Conf
 open Lwt
 open Cmdliner
 

js/lib.ml

@@ -1,6 +1,6 @@
 open Mldoc_org
 open Mldoc_org.Parser
-open Mldoc_org.Config
+open Mldoc_org.Conf
 
 let ast_to_json ast =
   Type.blocks_to_yojson ast |> Yojson.Safe.to_string
@@ -16,7 +16,7 @@ let _ =
       method parseJson input config_json =
         let config_json = Js.to_string config_json in
         let config_json = Yojson.Safe.from_string config_json in
-        match Config.of_yojson config_json with
+        match Conf.of_yojson config_json with
         | Ok config -> begin
             let str = Js.to_string input in
             parse config str |> ast_to_json |> Js.string

lib/export/exporter.ml

@@ -4,7 +4,7 @@ module type Exporter = sig
 
   val default_filename : string -> string
 
-  val export: Config.t -> Document.t -> out_channel -> unit
+  val export: Conf.t -> Document.t -> out_channel -> unit
 end
 
 type exporter = (module Exporter)

lib/export/html.ml

@@ -3,7 +3,7 @@ open Type
 open Inline
 open Document
 open Timestamp
-open Config
+open Conf
 
 (* taken from mlorg *)
 
@@ -425,7 +425,7 @@ module HtmlExporter = struct
      *                 [Xml.data s; Xml.raw "<br />"; subtitle] in *)
 
     let blocks = blocks config doc.blocks in
-    let blocks = if Config.(config.toc) then ((toc config doc.toc) :: blocks) else blocks in
+    let blocks = if Conf.(config.toc) then ((toc config doc.toc) :: blocks) else blocks in
     let body = [Xml.raw ("<!-- directives: " ^ (directives_to_string doc.directives) ^ " -->\n");
                 Xml.block "div" ~attr:[("id", "content")] blocks] in
     Xml.output_xhtml output body

lib/mldoc_org.ml

@@ -4,7 +4,7 @@ module Document = Document
 module Block = Block
 module Inline = Inline
 module Exporters = Exporter.Exporters
-module Config = Config
+module Conf = Conf
 module Exporter = Exporter
 module Timestamp = Timestamp
 module Parser = Org_parser

lib/org_parser.ml

@@ -8,7 +8,8 @@ let list_content_parsers config =
     ; Hr.parse
     ; Block.results
     ; Comment.parse
-    ; Paragraph.parse config [ Table.parse
+    ; Paragraph.parse config [ Paragraph.sep
+                             ; Table.parse
                              ; Block.parse config
                              ; Block.results
                              ; Latex_env.parse
@@ -18,7 +19,8 @@ let list_content_parsers config =
 
 (* Orders care *)
 let interrupt_parsers config =
-  [ Heading.parse
+  [ Paragraph.sep
+  ; Heading.parse
   ; Table.parse
   ; Lists.parse (list_content_parsers config)
   ; Block.parse config

lib/syntax/inline.ml

@@ -62,6 +62,7 @@ and t =
     Emphasis of emphasis
   | Break_Line
   | Hard_Break_Line
+  | Paragraph_Sep
   | Verbatim of string
   | Code of string
   | Spaces of string
@@ -156,7 +157,8 @@ let verbatim =
 let code = between '~' >>= fun s -> return (Code s) <?> "Inline code"
 
 (* TODO: optimization *)
-let plain_delims = ['*'; '_'; '/'; '\\'; '+'; '~'; '='; '['; '<'; '{'; '$'; '^';]
+let plain_delims = ['*'; '_'; '/'; '\\'; '+'; '~'; '='; '['; '<'; '{'; '$'; '^'; '\n'; '\r'; '(']
+(* replace list with a  *)
 let in_plain_delims c =
   List.exists (fun d -> c = d) plain_delims
 

lib/syntax/paragraph.ml

@@ -1,10 +1,18 @@
 open Angstrom
 open Parsers
 open Type
-open Config
+open Conf
 
 (* inline and footnotes *)
 
+let sep =
+  eols >>= fun s ->
+  print_int (String.length s);
+  if String.length s >= 2 then
+    return [Paragraph_Sep]
+  else
+    fail "only 1 eol"
+
 let parse_paragraph config interrupt_parsers lines =
   let open List in
   let inline_parse () =

lib/syntax/type.ml

@@ -43,6 +43,7 @@ and code_block =
 
 and t =
     Paragraph of Inline.t list  (** A paragraph containing only inline text *)
+  | Paragraph_Sep
   | Heading of heading  (** A heading *)
   | List of list_item list  (** A list [item] *)
   | Directive of string * string  (** A directive [name, value] *)