From 65aa5d46b240da7b91e57fc74890d8544aa479c3 Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Wed, 23 Jul 2008 21:30:49 +0000 Subject: [PATCH] 0.5.3 --- helm/software/configure.ac | 2 +- helm/software/matita/dist/ChangeLog | 3 ++- helm/software/matita/matita.glade | 32 +++++++++++++++----------- helm/software/matita/matitaMathView.ml | 14 ++++++++++- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/helm/software/configure.ac b/helm/software/configure.ac index ef4bb5da2..333761076 100644 --- a/helm/software/configure.ac +++ b/helm/software/configure.ac @@ -5,7 +5,7 @@ AC_INIT(matita/matitaTypes.ml) DEBUG_DEFAULT="true" DEFAULT_DBHOST="mysql://mowgli.cs.unibo.it" RT_BASE_DIR_DEFAULT="`pwd`/matita" -MATITA_VERSION="0.5.2" +MATITA_VERSION="0.5.3" DISTRIBUTED="no" # "yes" for distributed tarballs # End of distribution settings diff --git a/helm/software/matita/dist/ChangeLog b/helm/software/matita/dist/ChangeLog index 63b4e785b..2ff51705c 100644 --- a/helm/software/matita/dist/ChangeLog +++ b/helm/software/matita/dist/ChangeLog @@ -1,4 +1,4 @@ -0.5.3 - ?/7/2008 - bugfix release +0.5.3 - 23/7/2008 - bugfix release * many fixes concerning the CProp hiearchy * coercion database simplified * coercion hiding now works properly for coercions to funclass @@ -8,6 +8,7 @@ * \infrule layout added, allows to display readable fractions * better window for terms grammar and TeX/Unicode * fixed a bug in the positivity check not considering some subterms + * fixed some GUI glitches thanks to glade-3 0.5.2 - 2/7/2008 - better-usability-for-the-working-constructivist release * refinement of match fixed to prevent useless unfolding, diff --git a/helm/software/matita/matita.glade b/helm/software/matita/matita.glade index 14bfea0dc..34121dd9f 100644 --- a/helm/software/matita/matita.glade +++ b/helm/software/matita/matita.glade @@ -3,12 +3,12 @@ - 640 + 500 480 True Cic browser GTK_WIN_POS_CENTER_ON_PARENT - 640 + 500 480 True MainWin @@ -1289,13 +1289,27 @@ - + True - Displays the term grammar - Show term's grammar + Displays the terms grammar as extended by the user + Terms grammar True + + + True + Show the conversion table from TeX to UTF8 + Tex/UTF8 table + True + + + True + gtk-select-font + + + + @@ -1338,14 +1352,6 @@ - - - True - Displays the Tex/Unicode table - Show Tex/Unicode table - True - - True diff --git a/helm/software/matita/matitaMathView.ml b/helm/software/matita/matitaMathView.ml index 1f5b2a22c..e6c261791 100644 --- a/helm/software/matita/matitaMathView.ml +++ b/helm/software/matita/matitaMathView.ml @@ -949,6 +949,10 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) match self#currentCicUri with | Some uri -> self#load (`Metadata (`Deps (`Back, uri))) | None -> ()); + connect_menu_item win#browserCloseMenuItem (fun () -> + let my_id = Oo.id self in + cicBrowsers := List.filter (fun b -> Oo.id b <> my_id) !cicBrowsers; + win#toplevel#misc#hide(); win#toplevel#destroy ()); (* remove hbugs *) (* connect_menu_item win#hBugsTutorsMenuItem (fun () -> @@ -1124,7 +1128,15 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) method private tex () = let text = String.concat "\n" - (List.map (fun (k,vs) -> k ^ "\t" ^ String.concat ", " vs) + (List.map (fun (k,vs) -> + let vs = + List.sort (fun a b -> String.length a - String.length b) vs + in + let vs = + if List.length vs < 4 then vs else + let vs, _ = HExtlib.split_nth 4 vs in vs + in + k ^ "\t" ^ String.concat ", " vs) (Utf8Macro.pp_table ())) in self#_loadText text -- 2.39.2