X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbin%2Frecomm%2FrecommOutput.ml;h=e0f3f1d70397327d87a3dd60e1181a238e44cdb7;hb=4d232392091ee233afc26ecf3120dd5f5c6a33c8;hp=fe8bebe945148fdd03ce6450c4b8b3f1bdbc56ec;hpb=dbc57c92512c04b3fd88f8289bb8dbe99b2f90e0;p=helm.git diff --git a/matita/matita/contribs/lambdadelta/bin/recomm/recommOutput.ml b/matita/matita/contribs/lambdadelta/bin/recomm/recommOutput.ml index fe8bebe94..e0f3f1d70 100644 --- a/matita/matita/contribs/lambdadelta/bin/recomm/recommOutput.ml +++ b/matita/matita/contribs/lambdadelta/bin/recomm/recommOutput.ml @@ -4,8 +4,17 @@ let width = ref 78 let replace = ref false +let string_length_utf8 s = + let l = String.length s in + let rec aux r i = + if i >= l then r else + if '\x80' <= s.[i] && s.[i] <= '\xBF' + then aux (succ r) (succ i) else aux r (succ i) + in + l - aux 0 0 + let complete s = - let l = !width - String.length s - 6 in + let l = !width - string_length_utf8 s - 6 in if l < 0 then begin Printf.eprintf "overfull: %S\n" s; "" @@ -19,7 +28,7 @@ let out_src och = function | ET.Text s -> Printf.fprintf och "%s" s | ET.Mark s -> - Printf.fprintf och "(* %s**)" s + Printf.fprintf och "(* *%s*)" s | ET.Key (s1, s2) -> Printf.fprintf och "(* %s%s*)" s1 s2 | ET.Title ss ->