diff --git a/src/document/generator.ml b/src/document/generator.ml index 9cb6491672..4e88253f70 100644 --- a/src/document/generator.ml +++ b/src/document/generator.ml @@ -44,7 +44,7 @@ let make_name_from_path { Url.Path.name; parent; _ } = let label t ppf = match t with | Odoc_model.Lang.TypeExpr.Label s -> O.pf ppf "%s" s - | Optional s -> O.pf ppf "?%t%s" (O.entity "#8288") s + | Optional s -> O.pf ppf "?%s" s let tag tag t ppf = O.pf ppf "@{<%s>%t@}" tag t diff --git a/src/latex/generator.ml b/src/latex/generator.ml index d180775d4f..3abb962e8b 100644 --- a/src/latex/generator.ml +++ b/src/latex/generator.ml @@ -108,11 +108,7 @@ let list kind pp ppf x = | [] -> (* empty list are not supported *) () | _ -> list (Fmt.list ~sep:(fun ppf () -> Raw.break ppf Aesthetic) elt) ppf x -let escape_entity = function - | "#45" -> "-" - | "gt" -> ">" - | "#8288" -> "" - | s -> s +let escape_entity = function "#45" -> "-" | "gt" -> ">" | s -> s let filter_map f x = List.rev diff --git a/src/manpage/generator.ml b/src/manpage/generator.ml index 57730f2e63..524dd2f453 100644 --- a/src/manpage/generator.ml +++ b/src/manpage/generator.ml @@ -257,11 +257,7 @@ let strip l = (* Partial support for now *) let entity e = - match e with - | "#45" -> escaped "\\-" - | "gt" -> str ">" - | "#8288" -> noop - | s -> str "&%s;" s + match e with "#45" -> escaped "\\-" | "gt" -> str ">" | s -> str "&%s;" s (* Should hopefully make people notice and report *) diff --git a/test/html/expect/test_package+ml/Bugs/index.html b/test/html/expect/test_package+ml/Bugs/index.html index 52d4719ec5..d03c639df1 100644 --- a/test/html/expect/test_package+ml/Bugs/index.html +++ b/test/html/expect/test_package+ml/Bugs/index.html @@ -30,7 +30,7 @@

- val foo : ?⁠bar:'a -> unit -> unit + val foo : ?bar:'a -> unit -> unit

diff --git a/test/html/expect/test_package+ml/Bugs_pre_410/index.html b/test/html/expect/test_package+ml/Bugs_pre_410/index.html index 21517fa536..4c95e2bfba 100644 --- a/test/html/expect/test_package+ml/Bugs_pre_410/index.html +++ b/test/html/expect/test_package+ml/Bugs_pre_410/index.html @@ -30,7 +30,7 @@

- val foo' : ?⁠bar:'a -> unit -> unit + val foo' : ?bar:'a -> unit -> unit

diff --git a/test/html/expect/test_package+ml/Ocamlary/index.html b/test/html/expect/test_package+ml/Ocamlary/index.html index fad5db6eb5..65dd311c05 100644 --- a/test/html/expect/test_package+ml/Ocamlary/index.html +++ b/test/html/expect/test_package+ml/Ocamlary/index.html @@ -446,7 +446,7 @@

- val fun_maybe : ?⁠yes:unit -> unit -> int + val fun_maybe : ?yes:unit -> unit -> int
diff --git a/test/html/expect/test_package+ml/Type/index.html b/test/html/expect/test_package+ml/Type/index.html index fa2d46b08c..5c22ee7710 100644 --- a/test/html/expect/test_package+ml/Type/index.html +++ b/test/html/expect/test_package+ml/Type/index.html @@ -65,12 +65,12 @@

- type optional = ?⁠l:int -> int + type optional = ?l:int -> int
- type labeled_higher_order = (l:int -> int) -> (?⁠l:int -> int) -> int + type labeled_higher_order = (l:int -> int) -> (?l:int -> int) -> int
diff --git a/test/html/expect/test_package+re/Bugs/index.html b/test/html/expect/test_package+re/Bugs/index.html index 4c05bc0aa1..b6e7a85d17 100644 --- a/test/html/expect/test_package+re/Bugs/index.html +++ b/test/html/expect/test_package+re/Bugs/index.html @@ -30,7 +30,7 @@

- let foo: ?⁠bar:'a => unit => unit; + let foo: ?bar:'a => unit => unit;

diff --git a/test/html/expect/test_package+re/Bugs_pre_410/index.html b/test/html/expect/test_package+re/Bugs_pre_410/index.html index 00d18d2dd1..48e89703ec 100644 --- a/test/html/expect/test_package+re/Bugs_pre_410/index.html +++ b/test/html/expect/test_package+re/Bugs_pre_410/index.html @@ -30,7 +30,7 @@

- let foo': ?⁠bar:'a => unit => unit; + let foo': ?bar:'a => unit => unit;

diff --git a/test/html/expect/test_package+re/Ocamlary/index.html b/test/html/expect/test_package+re/Ocamlary/index.html index 026993697e..7d27c999e0 100644 --- a/test/html/expect/test_package+re/Ocamlary/index.html +++ b/test/html/expect/test_package+re/Ocamlary/index.html @@ -446,7 +446,7 @@

- let fun_maybe: ?⁠yes:unit => unit => int; + let fun_maybe: ?yes:unit => unit => int;
diff --git a/test/html/expect/test_package+re/Type/index.html b/test/html/expect/test_package+re/Type/index.html index b38d35855d..f24dd3ed12 100644 --- a/test/html/expect/test_package+re/Type/index.html +++ b/test/html/expect/test_package+re/Type/index.html @@ -65,12 +65,12 @@

- type optional = ?⁠l:int => int; + type optional = ?l:int => int;
- type labeled_higher_order = (l:int => int) => (?⁠l:int => int) => int; + type labeled_higher_order = (l:int => int) => (?l:int => int) => int;