Skip to content

Commit 4696b0c

Browse files
committed
partially revert previous patch
1 parent 1792cdc commit 4696b0c

File tree

1 file changed

+31
-29
lines changed

1 file changed

+31
-29
lines changed

lib/html.ml

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,39 @@ let get_package root = Root.Package.to_string (Root.package root)
2121
let unit ~env ~output:root_dir input =
2222
let unit = Unit.load input in
2323
let root = Unit.root unit in
24-
if not (Root.unit root).hidden then
25-
let odoctree =
26-
(* See comment in compile for explanation regarding the env duplication. *)
27-
let resolve_env = Env.build env unit in
28-
let resolved = DocOck.resolve (Env.resolver resolve_env) unit in
29-
let expand_env = Env.build env resolved in
30-
DocOck.expand (Env.expander expand_env) resolved
31-
|> DocOck.resolve (Env.resolver expand_env) (* Yes, again. *)
24+
if (Root.unit root).hidden then
25+
Printf.eprintf
26+
"odoc should not generate html but will for the time being...\n%!";
27+
let odoctree =
28+
(* See comment in compile for explanation regarding the env duplication. *)
29+
let resolve_env = Env.build env unit in
30+
let resolved = DocOck.resolve (Env.resolver resolve_env) unit in
31+
let expand_env = Env.build env resolved in
32+
DocOck.expand (Env.expander expand_env) resolved
33+
|> DocOck.resolve (Env.resolver expand_env) (* Yes, again. *)
34+
in
35+
let pkg_dir =
36+
let pkg_name = get_package root in
37+
Fs.Directory.reach_from ~dir:root_dir pkg_name
38+
in
39+
let pages = To_html_tree.unit ~get_package odoctree in
40+
Html_tree.traverse pages ~f:(fun ~parents name content ->
41+
let directory =
42+
let dir =
43+
List.fold_right ~f:(fun name dir -> Fs.Directory.reach_from ~dir name)
44+
parents ~init:pkg_dir
45+
in
46+
Fs.Directory.reach_from ~dir name
3247
in
33-
let pkg_dir =
34-
let pkg_name = get_package root in
35-
Fs.Directory.reach_from ~dir:root_dir pkg_name
48+
let oc =
49+
Fs.Directory.mkdir_p directory;
50+
let file = Fs.File.create ~directory ~name:"index.html" in
51+
open_out (Fs.File.to_string file)
3652
in
37-
let pages = To_html_tree.unit ~get_package odoctree in
38-
Html_tree.traverse pages ~f:(fun ~parents name content ->
39-
let directory =
40-
let dir =
41-
List.fold_right ~f:(fun name dir -> Fs.Directory.reach_from ~dir name)
42-
parents ~init:pkg_dir
43-
in
44-
Fs.Directory.reach_from ~dir name
45-
in
46-
let oc =
47-
Fs.Directory.mkdir_p directory;
48-
let file = Fs.File.create ~directory ~name:"index.html" in
49-
open_out (Fs.File.to_string file)
50-
in
51-
let fmt = Format.formatter_of_out_channel oc in
52-
Format.fprintf fmt "%a" (Tyxml.Html.pp ()) content;
53-
close_out oc
54-
)
53+
let fmt = Format.formatter_of_out_channel oc in
54+
Format.fprintf fmt "%a" (Tyxml.Html.pp ()) content;
55+
close_out oc
56+
)
5557

5658
class from_mld_page_creator ~name page_content =
5759
object

0 commit comments

Comments
 (0)