diff options
| author | Maxence Guesdon <maxence.guesdon@inria.fr> | 2009-12-18 11:52:23 +0000 |
|---|---|---|
| committer | Maxence Guesdon <maxence.guesdon@inria.fr> | 2009-12-18 11:52:23 +0000 |
| commit | e904577b6b0e68911c9169eb7c1629f6f3b9534c (patch) | |
| tree | fb7538d389604e899974c0d4b2004d09a76fa7d5 /ocamldoc/odoc_cross.ml | |
| parent | 758e4cd86078a89af5790872f9704c5ea019b4e7 (diff) | |
PR#4914: ability to specify a text for links to elements
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'ocamldoc/odoc_cross.ml')
| -rw-r--r-- | ocamldoc/odoc_cross.ml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ocamldoc/odoc_cross.ml b/ocamldoc/odoc_cross.ml index c5686338a..a310d4569 100644 --- a/ocamldoc/odoc_cross.ml +++ b/ocamldoc/odoc_cross.ml @@ -611,7 +611,7 @@ let rec assoc_comments_text_elements parent_name module_list t_ele = | Subscript t -> Subscript (assoc_comments_text parent_name module_list t) | Title (n, l_opt, t) -> Title (n, l_opt, (assoc_comments_text parent_name module_list t)) | Link (s, t) -> Link (s, (assoc_comments_text parent_name module_list t)) - | Ref (initial_name, None) -> + | Ref (initial_name, None, text_option) -> ( let rec iter_parent ?parent_name name = let res = @@ -647,12 +647,12 @@ let rec assoc_comments_text_elements parent_name module_list t_ele = (name, Some kind) in match res with - | (name, Some k) -> Ref (name, Some k) + | (name, Some k) -> Ref (name, Some k, text_option) | (_, None) -> match parent_name with None -> Odoc_messages.pwarning (Odoc_messages.cross_element_not_found initial_name); - Ref (initial_name, None) + Ref (initial_name, None, text_option) | Some p -> let parent_name = match Name.father p with @@ -663,12 +663,12 @@ let rec assoc_comments_text_elements parent_name module_list t_ele = in iter_parent ~parent_name initial_name ) - | Ref (initial_name, Some kind) -> + | Ref (initial_name, Some kind, text_option) -> ( let rec iter_parent ?parent_name name = let v = (name, Some kind) in if was_verified v then - Ref (name, Some kind) + Ref (name, Some kind, text_option) else let res = match kind with @@ -708,12 +708,12 @@ let rec assoc_comments_text_elements parent_name module_list t_ele = (name, None) in match res with - | (name, Some k) -> Ref (name, Some k) + | (name, Some k) -> Ref (name, Some k, text_option) | (_, None) -> match parent_name with None -> Odoc_messages.pwarning (not_found_of_kind kind initial_name); - Ref (initial_name, None) + Ref (initial_name, None, text_option) | Some p -> let parent_name = match Name.father p with |