diff --git a/INSTALL.txt b/INSTALL.txt deleted file mode 100644 index edacd82..0000000 --- a/INSTALL.txt +++ /dev/null @@ -1,40 +0,0 @@ -(* OASIS_START *) -(* DO NOT EDIT (digest: 0285bf40fba5c66740b69a483c4c7639) *) -This is the INSTALL file for the ocaml-markdown distribution. - -This package uses OASIS to generate its build system. See section OASIS for -full information. - -Dependencies -============ - -In order to compile this package, you will need: -* ocaml for all, test main -* findlib -* extlib for library markdown -* sexplib for library markdown -* tyxml for library html -* oUnit for executable test - -Installing -========== - -1. Uncompress the source archive and go to the root of the package -2. Run 'ocaml setup.ml -configure' -3. Run 'ocaml setup.ml -build' -4. Run 'ocaml setup.ml -install' - -Uninstalling -============ - -1. Go to the root of the package -2. Run 'ocaml setup.ml -uninstall' - -OASIS -===== - -OASIS is a program that generates a setup.ml file using a simple '_oasis' -configuration file. The generated setup only depends on the standard OCaml -installation: no additional library is required. - -(* OASIS_STOP *) diff --git a/_oasis b/_oasis index f03eb3f..5d29e76 100644 --- a/_oasis +++ b/_oasis @@ -19,7 +19,7 @@ BuildTools: ocamlbuild Library markdown Path: src Modules: Markdown - BuildDepends: extlib, str, sexplib + BuildDepends: extlib, str Library html FindlibParent: markdown diff --git a/_tags b/_tags deleted file mode 100644 index 5255ce3..0000000 --- a/_tags +++ /dev/null @@ -1,4 +0,0 @@ -# OASIS_START -# OASIS_STOP - -"src/Markdown.ml": syntax_camlp4o, pkg_sexplib.syntax diff --git a/src/Markdown.ml b/src/Markdown.ml index 1a9e29a..4043e36 100644 --- a/src/Markdown.ml +++ b/src/Markdown.ml @@ -2,9 +2,6 @@ open Printf open ExtString open ExtList -open Sexplib.Conv - -TYPE_CONV_PATH "Simple_markup" type ref = { src : string; desc : string } @@ -32,13 +29,10 @@ and href = { href_target : string; href_desc : string; } and img_ref = { img_src : string; img_alt : string; } -and par_list = paragraph list with sexp +and par_list = paragraph list type parse_state = { max : int; current : Buffer.t; fragments : text list; } -let string_of_paragraph p = Sexplib.Sexp.to_string_hum (sexp_of_paragraph p) -let string_of_paragraphs ps = Sexplib.Sexp.to_string_hum (sexp_of_par_list ps) - let indentation ?(ts=8) s = let rec loop n indent max = if n >= max then indent diff --git a/test/TestMarkdown.ml b/test/TestMarkdown.ml index fd284c9..3fb4c2d 100644 --- a/test/TestMarkdown.ml +++ b/test/TestMarkdown.ml @@ -4,11 +4,8 @@ open Markdown open Printf open ExtString -let wrap f x = - "\n" ^ f x ^ "\n" - let aeq_pars ?msg expected actual = - assert_equal ?msg ~printer:(wrap string_of_paragraphs) expected actual + assert_equal ?msg expected actual let check expected input = aeq_pars ~msg:(sprintf "With input:\n%s\n" (String.strip input))