X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=e335c1b63c559d16a93ee7bf047ff8ecdbb59ad2;hb=11b2157bacf59cfc561c2ef6f92ee41ee2c1a006;hp=d064ef619fc6918452ebbc5ce935caeb36a1c027;hpb=80110e17ef1d38d71473e9471ce15beddde663bb;p=helm.git diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml index d064ef619..e335c1b63 100644 --- a/helm/software/components/grafite/grafiteAstPp.ml +++ b/helm/software/components/grafite/grafiteAstPp.ml @@ -25,15 +25,16 @@ (* $Id$ *) -open Printf - open GrafiteAst let tactical_terminator = "" let tactic_terminator = tactical_terminator let command_terminator = tactical_terminator -let pp_idents idents = "[" ^ String.concat "; " idents ^ "]" +let pp_idents idents = + let map = function Some s -> s | None -> "_" in + "(" ^ String.concat " " (List.map map idents) ^ ")" +let pp_hyps idents = String.concat " " idents let pp_reduction_kind ~term_pp = function | `Normalize -> "normalize" @@ -43,138 +44,212 @@ let pp_reduction_kind ~term_pp = function | `Unfold None -> "unfold" | `Whd -> "whd" -let pp_tactic_pattern ~term_pp ~lazy_term_pp (what, hyp, goal) = +let pp_tactic_pattern ~map_unicode_to_tex ~term_pp ~lazy_term_pp (what, hyp, goal) = + if what = None && hyp = [] && goal = None then "" else let what_text = match what with | None -> "" - | Some t -> sprintf "in match (%s) " (lazy_term_pp t) in + | Some t -> Printf.sprintf "in match (%s) " (lazy_term_pp t) in let hyp_text = String.concat " " - (List.map (fun (name, p) -> sprintf "%s:(%s)" name (term_pp p)) hyp) in + (List.map (fun (name, p) -> Printf.sprintf "%s:(%s)" name (term_pp p)) hyp) in let goal_text = match goal with | None -> "" - | Some t -> sprintf "\\vdash (%s)" (term_pp t) in - sprintf "%sin %s%s" what_text hyp_text goal_text + | Some t -> + let vdash = if map_unicode_to_tex then "\\vdash" else "⊢" in + Printf.sprintf "%s (%s)" vdash (term_pp t) + in + Printf.sprintf "%sin %s%s" what_text hyp_text goal_text -let pp_intros_specs = function +let pp_intros_specs s = function | None, [] -> "" - | Some num, [] -> Printf.sprintf " names %i" num - | None, idents -> Printf.sprintf " names %s" (pp_idents idents) - | Some num, idents -> Printf.sprintf " names %i %s" num (pp_idents idents) + | Some num, [] -> Printf.sprintf " %s%i" s num + | None, idents -> Printf.sprintf " %s%s" s (pp_idents idents) + | Some num, idents -> Printf.sprintf " %s%i %s" s num (pp_idents idents) -let terms_pp ~term_pp terms = String.concat ", " (List.map term_pp terms) +let pp_terms ~term_pp terms = String.concat ", " (List.map term_pp terms) let opt_string_pp = function | None -> "" | Some what -> what ^ " " + +let pp_auto_params ~term_pp (univ, params) = + String.concat " " + (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) ^ + if univ <> [] then + (if params <> [] then " " else "") ^ "by " ^ + String.concat " " (List.map term_pp univ) + else "" +;; + +let pp_just ~term_pp = + function + `Term term -> "exact " ^ term_pp term + | `Auto params -> pp_auto_params ~term_pp params +;; + +let pp_ntactic ~map_unicode_to_tex = function + | NApply (_,t) -> "napply " ^ CicNotationPp.pp_term t + | NCases (_,what,where) -> "ncases " ^ CicNotationPp.pp_term what ^ + assert false ^ " " ^ assert false + | NCase1 (_,n) -> "*" ^ n ^ ":" + | NChange (_,what,wwhat) -> "nchange " ^ assert false ^ + " with " ^ CicNotationPp.pp_term wwhat + | NElim (_,what,where) -> "nelim " ^ CicNotationPp.pp_term what ^ + assert false ^ " " ^ assert false + | NId _ -> "nid" + | NIntro (_,n) -> "#" ^ n + | NRewrite (_,dir,n,where) -> "nrewrite" ^ assert false + | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> assert false +;; -let rec pp_tactic ~term_pp ~lazy_term_pp = - let pp_reduction_kind = pp_reduction_kind ~term_pp in - let pp_tactic_pattern = pp_tactic_pattern ~lazy_term_pp ~term_pp in +let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp = + let pp_terms = pp_terms ~term_pp in + let pp_tactics = pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp in + let pp_reduction_kind = pp_reduction_kind ~term_pp in + let pp_tactic_pattern = + pp_tactic_pattern ~map_unicode_to_tex ~lazy_term_pp ~term_pp in + let rec pp_tactic = function + (* Higher order tactics *) + | Do (_, count, tac) -> + Printf.sprintf "do %d %s" count (pp_tactic tac) + | Repeat (_, tac) -> "repeat " ^ pp_tactic tac + | Seq (_, tacs) -> pp_tactics ~sep:"; " tacs + | Then (_, tac, tacs) -> + Printf.sprintf "%s; [%s]" (pp_tactic tac) + (pp_tactics ~sep:" | " tacs) + | First (_, tacs) -> + Printf.sprintf "tries [%s]" (pp_tactics ~sep:" | " tacs) + | Try (_, tac) -> "try " ^ pp_tactic tac + | Solve (_, tac) -> + Printf.sprintf "solve [%s]" (pp_tactics ~sep:" | " tac) + | Progress (_, tac) -> "progress " ^ pp_tactic tac + (* First order tactics *) | Absurd (_, term) -> "absurd" ^ term_pp term | Apply (_, term) -> "apply " ^ term_pp term + | ApplyRule (_, term) -> "apply rule " ^ term_pp term + | ApplyP (_, term) -> "applyP " ^ term_pp term | ApplyS (_, term, params) -> - "applyS " ^ term_pp term ^ - String.concat " " - (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) - | Auto (_,params) -> "auto " ^ - String.concat " " - (List.map (fun (k,v) -> if v <> "" then k ^ "=" ^ v else k) params) + "applyS " ^ term_pp term ^ pp_auto_params ~term_pp params + | AutoBatch (_,params) -> "autobatch " ^ + pp_auto_params ~term_pp params | Assumption _ -> "assumption" + | Cases (_, term, pattern, specs) -> + Printf.sprintf "cases %s %s%s" + (term_pp term) + (pp_tactic_pattern pattern) + (pp_intros_specs "names " specs) | Change (_, where, with_what) -> - sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what) - | Clear (_,ids) -> sprintf "clear %s" (pp_idents ids) - | ClearBody (_,id) -> sprintf "clearbody %s" id + Printf.sprintf "change %s with %s" (pp_tactic_pattern where) (lazy_term_pp with_what) + | Clear (_,ids) -> Printf.sprintf "clear %s" (pp_hyps ids) + | ClearBody (_,id) -> Printf.sprintf "clearbody %s" (pp_hyps [id]) | Constructor (_,n) -> "constructor " ^ string_of_int n + | Compose (_,t1, t2, times, intro_specs) -> + Printf.sprintf "compose %s%s %s%s" + (if times > 0 then string_of_int times ^ " " else "") + (term_pp t1) (match t2 with None -> "" | Some t2 -> "with "^term_pp t2) + (pp_intros_specs " as " intro_specs) | Contradiction _ -> "contradiction" | Cut (_, ident, term) -> "cut " ^ term_pp term ^ (match ident with None -> "" | Some id -> " as " ^ id) - | Decompose (_, [], what, names) -> - sprintf "decompose %s%s" (opt_string_pp what) (pp_intros_specs (None, names)) - | Decompose (_, types, what, names) -> - let to_ident = function - | Ident id -> id - | Type _ -> assert false - in - let types = List.rev_map to_ident types in - sprintf "decompose %s %s%s" (pp_idents types) (opt_string_pp what) (pp_intros_specs (None, names)) - | Demodulate _ -> "demodulate" - | Destruct (_, term) -> "destruct " ^ term_pp term - | Elim (_, term, using, num, idents) -> - sprintf "elim " ^ term_pp term ^ + | Decompose (_, names) -> + Printf.sprintf "decompose%s" + (pp_intros_specs "names " (None, names)) + | Demodulate (_, params) -> "demodulate " ^ pp_auto_params ~term_pp params + | Destruct (_, None) -> "destruct" + | Destruct (_, Some terms) -> "destruct " ^ pp_terms terms + | Elim (_, what, using, pattern, specs) -> + Printf.sprintf "elim %s%s %s%s" + (term_pp what) (match using with None -> "" | Some term -> " using " ^ term_pp term) - ^ pp_intros_specs (num, idents) - | ElimType (_, term, using, num, idents) -> - sprintf "elim type " ^ term_pp term ^ + (pp_tactic_pattern pattern) + (pp_intros_specs "names " specs) + | ElimType (_, term, using, specs) -> + Printf.sprintf "elim type %s%s%s" + (term_pp term) (match using with None -> "" | Some term -> " using " ^ term_pp term) - ^ pp_intros_specs (num, idents) + (pp_intros_specs "names " specs) | Exact (_, term) -> "exact " ^ term_pp term | Exists _ -> "exists" | Fold (_, kind, term, pattern) -> - sprintf "fold %s %s %s" (pp_reduction_kind kind) + Printf.sprintf "fold %s %s %s" (pp_reduction_kind kind) (lazy_term_pp term) (pp_tactic_pattern pattern) - | FwdSimpl (_, hyp, idents) -> - sprintf "fwd %s%s" hyp - (match idents with [] -> "" | idents -> " as " ^ pp_idents idents) + | FwdSimpl (_, hyp, names) -> + Printf.sprintf "fwd %s%s" hyp (pp_intros_specs "names " (None, names)) | Generalize (_, pattern, ident) -> - sprintf "generalize %s%s" (pp_tactic_pattern pattern) + Printf.sprintf "generalize %s%s" (pp_tactic_pattern pattern) (match ident with None -> "" | Some id -> " as " ^ id) - | Goal (_, n) -> "goal " ^ string_of_int n | Fail _ -> "fail" | Fourier _ -> "fourier" | IdTac _ -> "id" - | Intros (_, None, []) -> "intros" + | Intros (_, specs) -> Printf.sprintf "intros%s" (pp_intros_specs "" specs) | Inversion (_, term) -> "inversion " ^ term_pp term - | Intros (_, num, idents) -> - sprintf "intros%s%s" - (match num with None -> "" | Some num -> " " ^ string_of_int num) - (match idents with [] -> "" | idents -> " " ^ pp_idents idents) | LApply (_, linear, level_opt, terms, term, ident_opt) -> - sprintf "lapply %s%s%s%s%s" + Printf.sprintf "lapply %s%s%s%s%s" (if linear then " linear " else "") (match level_opt with None -> "" | Some i -> " depth = " ^ string_of_int i ^ " ") (term_pp term) - (match terms with [] -> "" | _ -> " to " ^ terms_pp ~term_pp terms) + (match terms with [] -> "" | _ -> " to " ^ pp_terms terms) (match ident_opt with None -> "" | Some ident -> " as " ^ ident) | Left _ -> "left" - | LetIn (_, term, ident) -> sprintf "let %s in %s" (term_pp term) ident + | LetIn (_, term, ident) -> + Printf.sprintf "letin %s \\def %s" ident (term_pp term) | Reduce (_, kind, pat) -> - sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat) + Printf.sprintf "%s %s" (pp_reduction_kind kind) (pp_tactic_pattern pat) | Reflexivity _ -> "reflexivity" | Replace (_, pattern, t) -> - sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t) - | Rewrite (_, pos, t, pattern) -> - sprintf "rewrite %s %s %s" + Printf.sprintf "replace %s with %s" (pp_tactic_pattern pattern) (lazy_term_pp t) + | Rewrite (_, pos, t, pattern, names) -> + Printf.sprintf "rewrite %s %s %s%s" (if pos = `LeftToRight then ">" else "<") (term_pp t) (pp_tactic_pattern pattern) + (if names = [] then "" else " as " ^ pp_idents names) | Right _ -> "right" | Ring _ -> "ring" | Split _ -> "split" - | Subst _ -> "subst" | Symmetry _ -> "symmetry" | Transitivity (_, term) -> "transitivity " ^ term_pp term (* Tattiche Aggiunte *) | Assume (_, ident , term) -> "assume" ^ ident ^ ":" ^ term_pp term | Suppose (_, term, ident,term1) -> "suppose" ^ term_pp term ^ "(" ^ ident ^ ")" ^ (match term1 with None -> " " | Some term1 -> term_pp term1) - | Bydone (_, term) -> "by" ^ (match term with None -> "_" | Some term -> term_pp term) ^ "done" - | By_term_we_proved (_, term, term1, ident, term2) -> "by" ^ (match term with None -> "_" | Some term -> term_pp term) ^ "we proved" ^ term_pp term1 ^ (match ident with None -> "" | Some ident -> "(" ^ident^ ")") ^ + | Bydone (_, just) -> pp_just ~term_pp just ^ "done" + | By_just_we_proved (_, just, term1, ident, term2) -> pp_just ~term_pp just ^ "we proved" ^ term_pp term1 ^ (match ident with None -> "" | Some ident -> "(" ^ident^ ")") ^ (match term2 with None -> " " | Some term2 -> term_pp term2) | We_need_to_prove (_, term, ident, term1) -> "we need to prove" ^ term_pp term ^ (match ident with None -> "" | Some ident -> "(" ^ ident ^ ")") ^ (match term1 with None -> " " | Some term1 -> term_pp term1) + | We_proceed_by_cases_on (_, term, term1) -> "we proceed by cases on" ^ term_pp term ^ "to prove" ^ term_pp term1 | We_proceed_by_induction_on (_, term, term1) -> "we proceed by induction on" ^ term_pp term ^ "to prove" ^ term_pp term1 | Byinduction (_, term, ident) -> "by induction hypothesis we know" ^ term_pp term ^ "(" ^ ident ^ ")" | Thesisbecomes (_, term) -> "the thesis becomes " ^ term_pp term - | ExistsElim (_, term0, ident, term, ident1, term1) -> "by " ^ term_pp term0 ^ "let " ^ ident ^ ":" ^ term_pp term ^ "such that " ^ term_pp term1 ^ "(" ^ ident1 ^ ")" - | AndElim (_, term, ident1, term1, ident2, term2) -> "by " ^ term_pp term ^ "we have " ^ term_pp term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ term_pp term2 ^ " (" ^ ident2 ^ ")" - | RewritingStep (_, term, term1, term2, cont) -> (match term with None -> " " | Some term -> "obtain " ^ term_pp term) ^ "=" ^ term_pp term1 ^ (match term2 with None -> "_" | Some term2 -> term_pp term2) ^ (match cont with None -> " done" | Some Cic.Anonymous -> "" | Some (Cic.Name id) -> " we proved " ^ id) + | ExistsElim (_, just, ident, term, ident1, term1) -> pp_just ~term_pp just ^ "let " ^ ident ^ ":" ^ term_pp term ^ "such that " ^ lazy_term_pp term1 ^ "(" ^ ident1 ^ ")" + | AndElim (_, just, ident1, term1, ident2, term2) -> pp_just ~term_pp just ^ "we have " ^ term_pp term1 ^ " (" ^ ident1 ^ ") " ^ "and " ^ term_pp term2 ^ " (" ^ ident2 ^ ")" + | RewritingStep (_, term, term1, term2, cont) -> + (match term with + | None -> " " + | Some (None,term) -> "conclude " ^ term_pp term + | Some (Some name,term) -> + "obtain (" ^ name ^ ") " ^ term_pp term) + ^ "=" ^ + term_pp term1 ^ + (match term2 with + | `Auto params -> pp_auto_params ~term_pp params + | `Term term2 -> " exact " ^ term_pp term2 + | `Proof -> " proof" + | `SolveWith term -> " using " ^ term_pp term) + ^ (if cont then " done" else "") | Case (_, id, args) -> "case" ^ id ^ String.concat " " (List.map (function (id,term) -> "(" ^ id ^ ": " ^ term_pp term ^ ")") args) + in pp_tactic + +and pp_tactics ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~sep tacs = + String.concat sep + (List.map (pp_tactic ~map_unicode_to_tex ~lazy_term_pp ~term_pp) tacs) let pp_search_kind = function | `Locate -> "locate" @@ -191,8 +266,31 @@ let pp_arg ~term_pp arg = else "(" ^ s ^ ")" -let pp_macro ~term_pp = +let pp_macro ~term_pp ~lazy_term_pp = let term_pp = pp_arg ~term_pp in + let flavour_pp = function + | `Definition -> "definition" + | `Fact -> "fact" + | `Lemma -> "lemma" + | `Remark -> "remark" + | `Theorem -> "theorem" + | `Variant -> "variant" + | `Axiom -> "axiom" + | `MutualDefinition -> assert false + in + let pp_inline_params l = + let pp_param = function + | IPPrefix prefix -> "prefix = \"" ^ prefix ^ "\"" + | IPAs flavour -> flavour_pp flavour + | IPProcedural -> "procedural" + | IPNoDefaults -> "nodefaults" + | IPDepth depth -> "depth = " ^ string_of_int depth + | IPLevel level -> "level = " ^ string_of_int level + in + let s = String.concat " " (List.map pp_param l) in + if s = "" then s else " " ^ s + in + let pp_reduction_kind = pp_reduction_kind ~term_pp:lazy_term_pp in function (* Whelp *) | WInstance (_, term) -> "whelp instance " ^ term_pp term @@ -201,16 +299,21 @@ let pp_macro ~term_pp = | WElim (_, t) -> "whelp elim " ^ term_pp t | WMatch (_, term) -> "whelp match " ^ term_pp term (* real macros *) - | Check (_, term) -> sprintf "check %s" (term_pp term) - | Hint _ -> "hint" - | Inline (_,suri) -> sprintf "inline \"%s\"" suri + | Eval (_, kind, term) -> + Printf.sprintf "eval %s on %s" (pp_reduction_kind kind) (term_pp term) + | Check (_, term) -> Printf.sprintf "check %s" (term_pp term) + | Hint (_, true) -> "hint rewrite" + | Hint (_, false) -> "hint" + | AutoInteractive (_,params) -> "auto " ^ pp_auto_params ~term_pp params + | Inline (_, suri, params) -> + Printf.sprintf "inline \"%s\"%s" suri (pp_inline_params params) let pp_associativity = function | Gramext.LeftA -> "left associative" | Gramext.RightA -> "right associative" | Gramext.NonA -> "non associative" -let pp_precedence i = sprintf "with precedence %d" i +let pp_precedence i = Printf.sprintf "with precedence %d" i let pp_dir_opt = function | None -> "" @@ -218,18 +321,29 @@ let pp_dir_opt = function | Some `RightToLeft -> "< " let pp_default what uris = - sprintf "default \"%s\" %s" what + Printf.sprintf "default \"%s\" %s" what (String.concat " " (List.map UriManager.string_of_uri uris)) -let pp_coercion uri do_composites arity = - sprintf "coercion \"%s\" %d (* %s *)" (UriManager.string_of_uri uri) arity - (if do_composites then "compounds" else "no compounds") +let pp_coercion ~term_pp t do_composites arity saturations= + Printf.sprintf "coercion %s %d %d %s" + (term_pp t) arity saturations + (if do_composites then "" else "nocomposites") let pp_command ~term_pp ~obj_pp = function - | Coercion (_, uri, do_composites, i) -> pp_coercion uri do_composites i + | Index (_,_,uri) -> "Indexing " ^ UriManager.string_of_uri uri + | Select (_,uri) -> "Selecting " ^ UriManager.string_of_uri uri + | Coercion (_, t, do_composites, i, j) -> + pp_coercion ~term_pp t do_composites i j + | PreferCoercion (_,t) -> + "prefer coercion " ^ term_pp t + | Inverter (_,n,ty,params) -> + "inverter " ^ n ^ " for " ^ term_pp ty ^ " " ^ List.fold_left (fun acc x -> acc ^ (match x with true -> "%" | _ -> "?")) "" params + | UnificationHint (_,t, n) -> + "unification hint " ^ string_of_int n ^ " " ^ term_pp t | Default (_,what,uris) -> pp_default what uris | Drop _ -> "drop" - | Include (_,path) -> "include \"" ^ path ^ "\"" + | Include (_,false,path) -> "include \"" ^ path ^ "\"" + | Include (_,true,path) -> "include source \"" ^ path ^ "\"" | Obj (_,obj) -> obj_pp obj | Qed _ -> "qed" | Relation (_,id,a,aeq,refl,sym,trans) -> @@ -244,54 +358,54 @@ let pp_command ~term_pp ~obj_pp = function Some r -> " transitivity proved by " ^ term_pp r | None -> "") | Print (_,s) -> "print " ^ s - | Set (_, name, value) -> sprintf "set \"%s\" \"%s\"" name value + | Set (_, name, value) -> Printf.sprintf "set \"%s\" \"%s\"" name value + | NObj (_,o) -> "not supported" + | NUnivConstraint (_) -> "not supported" + | NQed (_) -> "not supported" + | Pump (_) -> "not supported" -let rec pp_tactical ~term_pp ~lazy_term_pp = - let pp_tactic = pp_tactic ~lazy_term_pp ~term_pp in - let pp_tacticals = pp_tacticals ~lazy_term_pp ~term_pp in +let pp_punctuation_tactical = function - | Tactic (_, tac) -> pp_tactic tac - | Do (_, count, tac) -> - sprintf "do %d %s" count (pp_tactical ~term_pp ~lazy_term_pp tac) - | Repeat (_, tac) -> "repeat " ^ pp_tactical ~term_pp ~lazy_term_pp tac - | Seq (_, tacs) -> pp_tacticals ~sep:"; " tacs - | Then (_, tac, tacs) -> - sprintf "%s; [%s]" (pp_tactical ~term_pp ~lazy_term_pp tac) - (pp_tacticals ~sep:" | " tacs) - | First (_, tacs) -> sprintf "tries [%s]" (pp_tacticals ~sep:" | " tacs) - | Try (_, tac) -> "try " ^ pp_tactical ~term_pp ~lazy_term_pp tac - | Solve (_, tac) -> sprintf "solve [%s]" (pp_tacticals ~sep:" | " tac) - | Progress (_, tac) -> "progress " ^ pp_tactical ~term_pp ~lazy_term_pp tac - | Dot _ -> "." | Semicolon _ -> ";" | Branch _ -> "[" | Shift _ -> "|" - | Pos (_, i) -> sprintf "%s:" (String.concat "," (List.map string_of_int i)) + | Pos (_, i) -> Printf.sprintf "%s:" (String.concat "," (List.map string_of_int i)) | Wildcard _ -> "*:" | Merge _ -> "]" + +let pp_non_punctuation_tactical = + function | Focus (_, goals) -> - sprintf "focus %s" (String.concat " " (List.map string_of_int goals)) + Printf.sprintf "focus %s" (String.concat " " (List.map string_of_int goals)) | Unfocus _ -> "unfocus" | Skip _ -> "skip" -and pp_tacticals ~term_pp ~lazy_term_pp ~sep tacs = - String.concat sep (List.map (pp_tactical~lazy_term_pp ~term_pp) tacs) - -let pp_executable ~term_pp ~lazy_term_pp ~obj_pp = +let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp = function - | Macro (_, macro) -> pp_macro ~term_pp macro ^ "." - | Tactical (_, tac, Some punct) -> - pp_tactical ~lazy_term_pp ~term_pp tac - ^ pp_tactical ~lazy_term_pp ~term_pp punct - | Tactical (_, tac, None) -> pp_tactical ~lazy_term_pp ~term_pp tac + | Macro (_, macro) -> pp_macro ~term_pp ~lazy_term_pp macro ^ "." + | Tactic (_, Some tac, punct) -> + pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp tac + ^ pp_punctuation_tactical punct + | Tactic (_, None, punct) -> + pp_punctuation_tactical punct + | NTactic (_,tac, punct) -> + pp_ntactic ~map_unicode_to_tex tac + ^ pp_punctuation_tactical punct + | NonPunctuationTactical (_, tac, punct) -> + pp_non_punctuation_tactical tac + ^ pp_punctuation_tactical punct + | NNonPunctuationTactical (_, tac, punct) -> + pp_non_punctuation_tactical tac + ^ pp_punctuation_tactical punct | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "." -let pp_comment ~term_pp ~lazy_term_pp ~obj_pp = +let pp_comment ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp = function - | Note (_,str) -> sprintf "(* %s *)" str + | Note (_,"") -> Printf.sprintf "\n" + | Note (_,str) -> Printf.sprintf "\n(* %s *)" str | Code (_,code) -> - sprintf "(** %s. **)" (pp_executable ~term_pp ~lazy_term_pp ~obj_pp code) + Printf.sprintf "\n(** %s. **)" (pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp code) let pp_statement ~term_pp ~lazy_term_pp ~obj_pp = function