X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2FmatitaMathView.ml;h=5c0bc953440814feedad53cfc395253fe35b49fc;hb=81ca7521b39937cf79056465e18b4666ce1f34ff;hp=4252014bd83115bfae8ad9927dfd88cabcef0967;hpb=b11675b6c6cdeaeabd74dfd99143ea5f87db205b;p=helm.git diff --git a/matita/matitaMathView.ml b/matita/matitaMathView.ml index 4252014bd..5c0bc9534 100644 --- a/matita/matitaMathView.ml +++ b/matita/matitaMathView.ml @@ -303,9 +303,11 @@ object (self) "\n" ^ GrafiteAstPp.pp_executable ~term_pp:(fun s -> s) ~lazy_term_pp:(fun _ -> assert false) ~obj_pp:(fun _ -> assert false) - (GrafiteAst.Tactical (loc, - GrafiteAst.Tactic (loc, GrafiteAst.Reduce (loc, kind, pat)), - Some (GrafiteAst.Semicolon loc))) in + ~map_unicode_to_tex:(Helm_registry.get_bool + "matita.paste_unicode_as_tex") + (GrafiteAst.Tactic (loc, + Some (GrafiteAst.Reduce (loc, kind, pat)), + GrafiteAst.Semicolon loc)) in (MatitaScript.current ())#advance ~statement () in connect_menu_item copy gui#copy; connect_menu_item normalize (reduction_action `Normalize); @@ -434,6 +436,8 @@ object (self) let tactic_text_pattern = self#tactic_text_pattern_of_node node in GrafiteAstPp.pp_tactic_pattern ~term_pp:(fun s -> s) ~lazy_term_pp:(fun _ -> assert false) + ~map_unicode_to_tex:(Helm_registry.get_bool + "matita.paste_unicode_as_tex") tactic_text_pattern | `Term -> self#tactic_text_of_node node else string_of_dom_node node @@ -453,8 +457,8 @@ object (self) BoxPp.render_to_string text_width markup *) let map_unicode_to_tex = - Helm_registry.get_opt Helm_registry.bool "matita.paste_unicode_as_tex" in - ApplyTransformation.txt_of_cic_sequent_conclusion ?map_unicode_to_tex + Helm_registry.get_bool "matita.paste_unicode_as_tex" in + ApplyTransformation.txt_of_cic_sequent_conclusion ~map_unicode_to_tex text_width metasenv cic_sequent method private pattern_of term context unsh_sequent = @@ -650,7 +654,9 @@ class sequentsViewer ~(notebook:GPack.notebook) ~(cicMathView:cicMathView) () = _metasenv <- []; self#script#setGoal None - method load_sequents { proof = (_,metasenv,_,_, _) as proof; stack = stack } = + method load_sequents + { proof = (_,metasenv,_subst,_,_, _) as proof; stack = stack } + = _metasenv <- metasenv; pages <- 0; let win goal_switch = @@ -1092,11 +1098,11 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) method private home () = self#_showMath; match self#script#grafite_status.proof_status with - | Proof (uri, metasenv, bo, ty, attrs) -> + | Proof (uri, metasenv, _subst, bo, ty, attrs) -> let name = UriManager.name_of_uri (HExtlib.unopt uri) in let obj = Cic.CurrentProof (name, metasenv, bo, ty, [], attrs) in self#_loadObj obj - | Incomplete_proof { proof = (uri, metasenv, bo, ty, attrs) } -> + | Incomplete_proof { proof = (uri, metasenv, _subst, bo, ty, attrs) } -> let name = UriManager.name_of_uri (HExtlib.unopt uri) in let obj = Cic.CurrentProof (name, metasenv, bo, ty, [], attrs) in self#_loadObj obj @@ -1110,7 +1116,7 @@ class cicBrowser_impl ~(history:MatitaTypes.mathViewer_entry MatitaMisc.history) self#_loadObj obj method private _loadDir dir = - let content = Http_getter.ls dir in + let content = Http_getter.ls ~local:false dir in let l = List.fast_sort Pervasives.compare