X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fcontent_pres%2Fcontent2pres.ml;fp=helm%2Fsoftware%2Fcomponents%2Fcontent_pres%2Fcontent2pres.ml;h=228b6fdeb0cc73c6c08efabc0b618800f6e4976f;hb=5649890273cf8e660bba744e84ce5fee1e5efe69;hp=b9e89769472371c31b3a27e4ae8beedf1db53c49;hpb=b2a190e3c2d5b594d409db937e88f9f4f7d22b8c;p=helm.git diff --git a/helm/software/components/content_pres/content2pres.ml b/helm/software/components/content_pres/content2pres.ml index b9e897694..228b6fdeb 100644 --- a/helm/software/components/content_pres/content2pres.ml +++ b/helm/software/components/content_pres/content2pres.ml @@ -121,7 +121,7 @@ let add_xref id = function | B.Text (attrs, t) -> B.Text (((Some "helm", "xref", id) :: attrs), t) | _ -> assert false (* TODO, add_xref is meaningful for all boxes *) -let rec justification ~ignore_atoms term2pres p = +let rec justification ~for_rewriting_step ~ignore_atoms term2pres p = if p.Con.proof_conclude.Con.conclude_method = "Exact" && ignore_atoms then @@ -136,10 +136,16 @@ let rec justification ~ignore_atoms term2pres p = make_args_for_apply term2pres p.Con.proof_conclude.Con.conclude_args in [B.H([], - (B.b_kw "by")::B.b_space:: + (if for_rewriting_step then (B.b_kw "exact") else (B.b_kw "by")):: + B.b_space:: B.Text([],"(")::pres_args@[B.Text([],")")])], None else - [B.H([],[B.b_kw "by"; B.b_space; B.b_kw "proof"])], + [B.H([], + if for_rewriting_step then + [B.b_kw "proof"] + else + [B.b_kw "by"; B.b_space; B.b_kw "proof"] + )], Some (B.b_toggle [B.b_kw "proof";B.indent (proof2pres true term2pres p)]) and proof2pres ?skip_initial_lambdas is_top_down term2pres p = @@ -441,7 +447,9 @@ let body = B.V([],[B.b_kw ("(*<<" ^ p.Con.proof_conclude.Con.conclude_method ^ ( || conclude.Con.conclude_method = "RewriteRL" then let justif1,justif2 = (match (List.nth conclude.Con.conclude_args 6) with - Con.ArgProof p -> justification ~ignore_atoms:true term2pres p + Con.ArgProof p -> + justification ~for_rewriting_step:true ~ignore_atoms:true + term2pres p | _ -> assert false) in let justif = match justif2 with @@ -483,7 +491,9 @@ let body = B.V([],[B.b_kw ("(*<<" ^ p.Con.proof_conclude.Con.conclude_method ^ ( B.V([], justif @ [B.b_kw "by _"]) else if conclude.Con.conclude_method = "Eq_chain" then let justification p = - let j1,j2 = justification ~ignore_atoms:false term2pres p in + let j1,j2 = + justification ~for_rewriting_step:true ~ignore_atoms:false term2pres p + in j1, match j2 with Some j -> [j] | None -> [] in let rec aux args =