updating the structures for sorts

[helm.git] / helm / software / matita / matitaGtkMisc.ml

diff --git a/helm/software/matita/matitaGtkMisc.ml b/helm/software/matita/matitaGtkMisc.ml
index 9c00dfddef4aa1b7879026c85e12fa1df0c3700d..772f17a41643f14250daf5f4c7f60e57d8a99066 100644 (file)
--- a/helm/software/matita/matitaGtkMisc.ml
+++ b/helm/software/matita/matitaGtkMisc.ml
@@ -398,17 +398,26 @@ let utf8_parsed_text s floc =
   let start, stop = HExtlib.loc_of_floc floc in
   let start_bytes = Glib.Utf8.offset_to_pos s ~pos:0 ~off:start in
   let stop_bytes = Glib.Utf8.offset_to_pos s ~pos:0 ~off:stop in
-  assert(stop_bytes >= start_bytes);
+  if (stop_bytes < start_bytes) then
+    Printf.sprintf "ERROR (%d > %d)" start_bytes stop_bytes, 0
+  else
   let bytes = stop_bytes - start_bytes in
   try
     String.sub s start_bytes bytes, bytes
   with Invalid_argument _ -> 
-    Printf.eprintf "%s/%d/%d\n" s start_bytes bytes;
-    assert false
-    
+    Printf.sprintf "ERROR (%s/%d/%d)" s start_bytes bytes, 0
   
 let utf8_string_length s = 
   if BuildTimeConf.debug then
     assert(Glib.Utf8.validate s);
   Glib.Utf8.length s
+
+let escape_pango_markup text =
+   let text = Pcre.replace ~pat:"&" ~templ:"&amp;" text in
+   let text = Pcre.replace ~pat:"<" ~templ:"&lt;" text in
+   let text = Pcre.replace ~pat:"'" ~templ:"&apos;" text in
+   let text = Pcre.replace ~pat:"\"" ~templ:"&quot;" text in
+   text
+;;
+