X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fcomponents%2Fcontent_pres%2FboxPp.ml;h=ff94649964812a27b0bd44b6401483b4de04f0f6;hb=48c011f52853dd106dbf9cbbd1b9da61277fba3b;hp=9bf360a637d45fd1c5d654aae2e8007c19a832ce;hpb=6f020d79dea92003151e5e588fd73452f20ffb2c;p=helm.git
diff --git a/matitaB/components/content_pres/boxPp.ml b/matitaB/components/content_pres/boxPp.ml
index 9bf360a63..ff9464996 100644
--- a/matitaB/components/content_pres/boxPp.ml
+++ b/matitaB/components/content_pres/boxPp.ml
@@ -28,11 +28,12 @@
(** {2 Pretty printing from BoxML to strings} *)
-let utf8_string_length s = Utf8.compute_len s 0 (String.length s)
+let utf8_string_length s =
+ Utf8.compute_len s 0 (String.length s)
let string_space = " "
let string_space_len = utf8_string_length string_space
-let string_indent = (* string_space *) ""
+let string_indent = (* string_space *) " "
let string_indent_len = utf8_string_length string_indent
let string_ink = "---------------------------"
let string_ink_len = utf8_string_length string_ink
@@ -40,8 +41,10 @@ let string_ink_len = utf8_string_length string_ink
let contains_attrs contained container =
List.for_all (fun attr -> List.mem attr container) contained
-let want_indent = contains_attrs (* (RenderingAttrs.indent_attributes `BoxML) *)[]
-let want_spacing = contains_attrs (* (RenderingAttrs.spacing_attributes `BoxML) *) []
+let small_skip_attributes _ = [ None, "width", "0.5em" ]
+
+let want_indent = contains_attrs [ None, "indent", "0.5em" ]
+let want_spacing = contains_attrs [ None, "spacing", "0.5em" ]
let shift off = List.map (fun (start,stop,v) -> start+off,stop+off,v);;
@@ -62,39 +65,40 @@ let merge_columns sep cols =
let sep_len = utf8_string_length sep in
let indent = ref 0 in
let res_rows = ref [] in
- let add_row ~continue row =
+ let max_len = ref 0 in
+ let add_row ~continue size row =
match !res_rows with
| last :: prev when continue ->
res_rows := (last ^ sep ^ row) :: prev;
- indent := !indent + utf8_string_length last + sep_len
+ indent := size
| _ -> res_rows := ((String.make !indent ' ') ^ row) :: !res_rows;
in
List.iter
- (fun rows ->
- match rows with
+ (fun (len,rows) ->
+ (match rows with
| hd :: tl ->
- add_row ~continue:true hd;
- List.iter (add_row ~continue:false) tl
- | [] -> ())
+ add_row ~continue:true !max_len hd;
+ List.iter (add_row ~continue:false len) tl
+ | [] -> ());
+ max_len := !max_len + len + sep_len)
cols;
- List.rev !res_rows
+ !max_len, List.rev !res_rows
-let max_len =
- List.fold_left (fun max_size s -> max (utf8_string_length s) max_size) 0
-
let render_row available_space spacing children =
let spacing_bonus = if spacing then string_space_len else 0 in
let rem_space = ref available_space in
let renderings = ref [] in
List.iter
(fun f ->
- let occupied_space, rendering = f !rem_space in
+ let (*occupied_space, rendering*) rendering = f !rem_space in
+ let occupied_space,_ = rendering in
renderings := rendering :: !renderings;
rem_space := !rem_space - (occupied_space + spacing_bonus))
children;
let sep = if spacing then string_space else "" in
- let rendering = merge_columns sep (List.rev !renderings) in
- max_len rendering, rendering
+ (*let rendering = merge_columns sep (List.rev !renderings) in
+ max_len rendering, rendering *)
+ merge_columns sep (List.rev !renderings)
let fixed_rendering s =
let s_len = utf8_string_length s in
@@ -102,10 +106,33 @@ let fixed_rendering s =
let render_to_strings ~map_unicode_to_tex choose_action size markup =
prerr_endline ("render size is " ^ string_of_int size);
+ let add_markup attr txt =
+ let txt = Netencoding.Html.encode ~in_enc:`Enc_utf8 () txt in
+ let value_of_attr (_,_,v) = v in
+ let title =
+ try Some (value_of_attr (List.find (fun (_,t,_) -> t = "title") attr))
+ with _ -> None in
+ let href =
+ try Some (value_of_attr (List.find (fun (_,t,_) -> t = "href") attr))
+ with _ -> None in
+ match title,href with
+ | None,None -> txt
+ | None,Some u -> "" ^ txt ^ ""
+ | Some t, Some u ->
+ "" ^ txt ^ ""
+ | Some t, None ->
+ let u = "cic:/fakeuri.con" in
+ "" ^ txt ^ ""
+ in
+
let max_size = max_int in
let rec aux_box =
function
- | Box.Text (_, t) -> fixed_rendering t
+ | Box.Text (attr, t) ->
+ fun x ->
+ (match fixed_rendering t x with
+ | len, [txt] -> len, [add_markup attr txt]
+ | _ -> assert false)
| Box.Space _ -> fixed_rendering string_space
| Box.Ink _ -> fixed_rendering string_ink
| Box.Action (_, []) -> assert false
@@ -133,7 +160,7 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup =
let hd_f = aux_box hd in
let tl_fs = List.map aux_box tl in
(fun size ->
- let hd_rendering = snd (hd_f size) in
+ let hd_rendering = hd_f size in
let children_size =
max 0 (if indent then size - string_indent_len else size)
in
@@ -141,11 +168,12 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup =
List.map
(fun f ->
(* let indent_header = if indent then string_indent else "" in *)
- snd (indent_children (f children_size)))
+ indent_children (f children_size))
tl_fs
in
- let rows = hd_rendering @ List.concat tl_renderings in
- max_len rows, rows)
+ List.fold_right
+ (fun (len,row) (acclen,accrows) -> max acclen len, row@accrows)
+ (hd_rendering::tl_renderings) (0,[]))
| Box.HOV (attrs, []) -> assert false
| Box.HOV (attrs, [child]) -> aux_box child
| Box.HOV (attrs, children) ->
@@ -160,19 +188,23 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup =
let renderings = ref [] in
let rem_space = ref size in
let first_row = ref true in
- let use_rendering (space, rendering) =
+ let max_len = ref 0 in
+ let use_rendering (* (space, rendering) *) rendering =
+ let space, _ = rendering in
let use_indent = !renderings = [] && not !first_row in
- let rendering' =
- if use_indent then List.map indent_string rendering
- else rendering
+ let bonus = if use_indent then indent_bonus else spacing_bonus in
+ let rendering' = (* space+bonus, *)
+ if use_indent then
+ space+indent_bonus, List.map indent_string (snd rendering)
+ else space, (snd rendering)
in
renderings := rendering' :: !renderings;
- let bonus = if use_indent then indent_bonus else spacing_bonus in
rem_space := !rem_space - (space + bonus)
in
let end_cluster () =
- let new_rows = merge_columns sep (List.rev !renderings) in
+ let new_len, new_rows = merge_columns sep (List.rev !renderings) in
rows := List.rev_append new_rows !rows;
+ max_len := max !max_len new_len;
rem_space := size - indent_bonus;
renderings := [];
first_row := false
@@ -189,7 +221,7 @@ let render_to_strings ~map_unicode_to_tex choose_action size markup =
end)
fs;
if !renderings <> [] then end_cluster ();
- max_len !rows, List.rev !rows)
+ !max_len, List.rev !rows)
in
snd (aux_box markup size)