diff --git a/lib/canvas.mli b/lib/canvas.mli index 7192d1c..a402467 100644 --- a/lib/canvas.mli +++ b/lib/canvas.mli @@ -8,5 +8,4 @@ val doc : Html.document Js_of_ocaml.Js.t val _window : Html.window Js_of_ocaml.Js.t module C : Modules.Impl - -module Backend : Modules.Backend \ No newline at end of file +module Backend : Modules.Backend diff --git a/lib/modules.ml b/lib/modules.ml index 9069737..442f22c 100644 --- a/lib/modules.ml +++ b/lib/modules.ml @@ -23,6 +23,7 @@ end module type Backend = sig type context + val context : context option ref type 'a point = 'a Shape.point @@ -45,12 +46,11 @@ module type Backend = sig val with_fill : color -> shape -> shape val map_stroke : (color -> color) -> shape -> shape val map_fill : (color -> color) -> shape -> shape - - val white : color - val black : color - val red : color - val blue : color - val green : color + val white : color + val black : color + val red : color + val blue : color + val green : color val yellow : color val compose : @@ -76,11 +76,12 @@ end module Make (B : Impl) : Backend with type context = B.context = struct type context = B.context + let context = B.context - include Shape - include Transform - include Color + include Shape + include Transform + include Color let set_line_width = B.set_line_width let resolution = B.resolution diff --git a/lib/modules.mli b/lib/modules.mli index 4b310e6..a060285 100644 --- a/lib/modules.mli +++ b/lib/modules.mli @@ -19,6 +19,7 @@ end module type Backend = sig type context + val context : context option ref type 'a point = 'a Shape.point @@ -41,12 +42,11 @@ module type Backend = sig val with_fill : color -> shape -> shape val map_stroke : (color -> color) -> shape -> shape val map_fill : (color -> color) -> shape -> shape - - val white : color - val black : color - val red : color - val blue : color - val green : color + val white : color + val black : color + val red : color + val blue : color + val green : color val yellow : color val compose : diff --git a/lib/svg.mli b/lib/svg.mli index 4f0b9d1..b13a2fd 100644 --- a/lib/svg.mli +++ b/lib/svg.mli @@ -1,3 +1,2 @@ module S : Modules.Impl - module Backend : Modules.Backend