Formatting.

Closes #25

Author: Drup

.ocp-indent

@@ -1,3 +1,4 @@
 normal
 with=0
 syntax=lwt mll
+max_indent=2

format.sh

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02111-1307, USA.
- *)
+*)
 
 module M = Html5_f.Make(Xml)(Svg.M)
 

lib/html5.ml

@@ -15,27 +15,27 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02111-1307, USA.
- *)
+*)
 
 (** Typesafe constructors and printers for HTML5 documents.
 
     @see <http://www.w3.org/TR/html5/> W3C Recommendation *)
 
 (** Concrete implementation of HTML5 typesafe constructors *)
 module M : Html5_sigs.T with type Xml.uri = Xml.uri
-                        and type Xml.event_handler = Xml.event_handler
-                        and type Xml.attrib = Xml.attrib
-                        and type Xml.elt = Xml.elt
-                        and type 'a Xml.wrap = 'a
-                        and type 'a wrap = 'a
-			and module Svg := Svg.M
+                         and type Xml.event_handler = Xml.event_handler
+                         and type Xml.attrib = Xml.attrib
+                         and type Xml.elt = Xml.elt
+                         and type 'a Xml.wrap = 'a
+                         and type 'a wrap = 'a
+                         and module Svg := Svg.M
 
 (** Simple printer for HTML5 documents *)
 module P : Xml_sigs.Typed_simple_printer with type 'a elt := 'a M.elt
-                                         and type doc := M.doc
+                                          and type doc := M.doc
 
 (** Parametrized stream printer for HTML5 documents *)
 module Make_printer(O : Xml_sigs.Output) :
- Xml_sigs.Typed_printer with type out := O.out
-			and type 'a elt := 'a M.elt
-			and type doc := M.doc
+  Xml_sigs.Typed_printer with type out := O.out
+                          and type 'a elt := 'a M.elt
+                          and type doc := M.doc

lib/html5.mli

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02111-1307, USA.
- *)
+*)
 
 (* TODO :
    - MathML and SVG
@@ -325,7 +325,7 @@ module MakeWrapped
 
   let a_onmessage = event_attrib "onmessage"
 
-    (* Other Attributes *)
+  (* Other Attributes *)
   let a_version = string_attrib "version"
 
   let a_xmlns x =
@@ -557,10 +557,10 @@ module MakeWrapped
   let a_sandbox sb =
     let rec aux sb =
       match sb with
-        | `AllowSameOrigin :: a -> "allow-same-origin" :: (aux a)
-        | `AllowForms :: a -> "allow-forms" :: (aux a)
-        | `AllowScript :: a -> "allow-script" :: (aux a)
-        | [] -> []
+      | `AllowSameOrigin :: a -> "allow-same-origin" :: (aux a)
+      | `AllowForms :: a -> "allow-forms" :: (aux a)
+      | `AllowScript :: a -> "allow-script" :: (aux a)
+      | [] -> []
     in space_sep_attrib "sandbox" (W.fmap aux sb)
 
   let a_spellcheck sc =
@@ -957,37 +957,37 @@ module MakeWrapped
   let rp ?(a = []) elts = (a, elts)
 
   let rt ?rp ?a elts =
-      match rp with
-      | Some ((a1, e1), (a2, e2)) ->
-          `Rpt (Xml.node ~a: a1 "rp" e1, Xml.node ?a "rt" elts,
+    match rp with
+    | Some ((a1, e1), (a2, e2)) ->
+      `Rpt (Xml.node ~a: a1 "rp" e1, Xml.node ?a "rt" elts,
             Xml.node ~a: a2 "rp" e2)
-      | None -> `Rt (Xml.node ?a "rt" elts)
+    | None -> `Rt (Xml.node ?a "rt" elts)
 
   let ruby ?a elt elts =
     let rec aux =
-        function
-        | [] -> []
-        | (pel, `Rt e) :: l -> pel @ (e :: (aux l))
-        | (pel, `Rpt (e1, e2, e3)) :: l -> pel @ (e1 :: e2 :: e3 :: (aux l))
+      function
+      | [] -> []
+      | (pel, `Rt e) :: l -> pel @ (e :: (aux l))
+      | (pel, `Rpt (e1, e2, e3)) :: l -> pel @ (e1 :: e2 :: e3 :: (aux l))
     in
     let l = W.(bind elt (fun x -> bind elts (fun y -> return (x :: y))))
     in Xml.node ?a "ruby" (W.fmap aux l)
 
   let wbr = terminal "wbr"
 
-    (* VB *)
-    type shape = [ | `Rect | `Circle | `Poly | `Default ]
+  (* VB *)
+  type shape = [ | `Rect | `Circle | `Poly | `Default ]
 
   let bdo ~dir ?(a = []) elts = Xml.node ~a: ((a_dir dir) :: a) "bdo" elts
 
   let a_datetime = string_attrib "datetime"
 
   let a_shape d =
-      let f = function | `Rect -> "rect"
-         | `Circle -> "circle"
-         | `Poly -> "poly"
-         | `Default -> "default"
- in user_attrib f "shape" d
+    let f = function | `Rect -> "rect"
+                     | `Circle -> "circle"
+                     | `Poly -> "poly"
+                     | `Default -> "default"
+    in user_attrib f "shape" d
 
   let a_coords coords =
     let f c = String.concat "," (List.map string_of_int c)
@@ -1019,8 +1019,8 @@ module MakeWrapped
   let video_audio name ?src ?(srcs=W.return []) ?(a = []) elts =
     let a =
       match src with
-        | None -> a
-        | Some uri -> (a_src uri) :: a
+      | None -> a
+      | Some uri -> (a_src uri) :: a
     in
     plus_concat ~a name srcs elts
 
@@ -1031,7 +1031,7 @@ module MakeWrapped
   let canvas = star "canvas"
 
   let command ~label ?(a = []) () =
-      Xml.leaf ~a: ((a_label label) :: a) "command"
+    Xml.leaf ~a: ((a_label label) :: a) "command"
 
   let menu ?child ?a () =
     let child = opt_fmap (fun x -> li_option (Some x)) child (li_option None) in
@@ -1089,10 +1089,10 @@ module MakeWrapped
     let add_caption caption elts = match caption with
       | None -> elts
       | Some x ->
-          let f c elts = match c with
-            | `Top figc -> figc :: elts
-            | `Bottom figc -> elts @ [figc]
-          in W.fmap2 f x elts
+        let f c elts = match c with
+          | `Top figc -> figc :: elts
+          | `Bottom figc -> elts @ [figc]
+        in W.fmap2 f x elts
     in
     let content = add_caption figcaption elts in
     Xml.node ?a "figure" content
@@ -1137,7 +1137,7 @@ module MakeWrapped
 
   let img ~src ~alt ?(a = []) () =
     let a = (a_src src) :: (a_alt alt) :: a in
-      Xml.leaf ~a "img"
+    Xml.leaf ~a "img"
 
   let meta = terminal "meta"
 

lib/html5_f.ml

@@ -17,21 +17,21 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02111-1307, USA.
- *)
+*)
 
 (** Typesafe constructors for HTML5 documents (Functorial interface) *)
 
 module Make(Xml : Xml_sigs.T)(Svg : Svg_sigs.T with module Xml := Xml)
   : Html5_sigs.T with type Xml.uri = Xml.uri
-                 and type Xml.event_handler = Xml.event_handler
-                 and type Xml.attrib = Xml.attrib
-                 and type Xml.elt = Xml.elt
-		 and module Svg := Svg
-		 and type +'a elt = Xml.elt
-                 and type 'a Xml.wrap = 'a
-                 and type 'a wrap = 'a
-		 and type 'a attrib = Xml.attrib
-		 and type uri = Xml.uri
+                  and type Xml.event_handler = Xml.event_handler
+                  and type Xml.attrib = Xml.attrib
+                  and type Xml.elt = Xml.elt
+                  and module Svg := Svg
+                  and type +'a elt = Xml.elt
+                  and type 'a Xml.wrap = 'a
+                  and type 'a wrap = 'a
+                  and type 'a attrib = Xml.attrib
+                  and type uri = Xml.uri
 
 (** Like the {! Html5_f.Make } functor, but allows to wrap elements inside a monad described by {! Xml_wrap.T}.
     See the functorial interface documentation for more details. *)
@@ -40,12 +40,12 @@ module MakeWrapped
     (Xml : Xml_sigs.Wrapped with type 'a wrap = 'a W.t)
     (Svg : Svg_sigs.T with module Xml := Xml)
   : Html5_sigs.T with type Xml.uri = Xml.uri
-                 and type Xml.event_handler = Xml.event_handler
-                 and type Xml.attrib = Xml.attrib
-                 and type Xml.elt = Xml.elt
-		 and module Svg := Svg
-		 and type +'a elt = Xml.elt
-                 and type 'a Xml.wrap = 'a W.t
-                 and type 'a wrap = 'a W.t
-		 and type 'a attrib = Xml.attrib
-		 and type uri = Xml.uri
+                  and type Xml.event_handler = Xml.event_handler
+                  and type Xml.attrib = Xml.attrib
+                  and type Xml.elt = Xml.elt
+                  and module Svg := Svg
+                  and type +'a elt = Xml.elt
+                  and type 'a Xml.wrap = 'a W.t
+                  and type 'a wrap = 'a W.t
+                  and type 'a attrib = Xml.attrib
+                  and type uri = Xml.uri