let make_args_for_apply term2pres args =
let module Con = Content in
let module P = Mpresentation in
- let rec make_arg_for_apply is_first arg row =
- (match arg with
+ let make_arg_for_apply is_first arg row =
+ let res =
+ match arg with
Con.Aux n -> assert false
| Con.Premise prem ->
let name =
(match prem.Con.premise_binder with
None -> "previous"
| Some s -> s) in
- P.smallskip::P.Mi([],name)::row
+ P.Mi([],name)::row
| Con.Lemma lemma ->
- P.smallskip::P.Mi([],lemma.Con.lemma_name)::row
+ P.Mi([],lemma.Con.lemma_name)::row
| Con.Term t ->
if is_first then
(term2pres t)::row
- else P.smallskip::P.Mi([],"_")::row
+ else P.Mi([],"_")::row
| Con.ArgProof _
| Con.ArgMethod _ ->
- P.smallskip::P.Mi([],"_")::row) in
- match args with
- hd::tl ->
- make_arg_for_apply true hd
- (List.fold_right (make_arg_for_apply false) tl [])
- | _ -> assert false;;
+ P.Mi([],"_")::row
+ in
+ if is_first then res else P.smallskip::res
+ in
+ match args with
+ hd::tl ->
+ make_arg_for_apply true hd
+ (List.fold_right (make_arg_for_apply false) tl [])
+ | _ -> assert false
+;;
let rec justification term2pres p =
let module Con = Content in
| `Hypothesis _ -> true
| _ -> false) in
((List.filter is_decl p.Con.proof_context) != []) in
+ let omit_conclusion = (not indent) && (p.Con.proof_context != []) in
let concl =
(match p.Con.proof_conclude.Con.conclude_conclusion with
None -> None
| Some t -> Some (term2pres t)) in
let body =
- let presconclude = conclude2pres p.Con.proof_conclude indent in
+ let presconclude =
+ conclude2pres p.Con.proof_conclude indent omit_conclusion in
let presacontext =
acontext2pres p.Con.proof_apply_context presconclude indent in
context2pres p.Con.proof_context presacontext in
match p.Con.proof_name with
None -> body
| Some name ->
- let ac =
- (match concl with
- None -> P.Mtext([],"NO PROOF!!!")
- | Some c -> c) in
let action =
- P.Maction([None,"actiontype","toggle" ;
- None,"selection","1"],
- [(make_concl "proof of" ac);
- body]) in
+ match concl with
+ None -> body
+(*
+ P.Maction
+ ([None,"actiontype","toggle" ; None,"selection","1"],
+ [P.Mtext [] "proof" ; body])
+*)
+ | Some ac ->
+ P.Maction
+ ([None,"actiontype","toggle" ; None,"selection","1"],
+ [(make_concl "proof of" ac); body])
+ in
P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
- None,"columnalign","left";Some "helm", "xref", p.Con.proof_id],
+ None,"columnalign","left"],
[P.Mtr ([],[P.Mtd ([],P.Mfenced([],[P.Mtext ([],name)]))]);
P.Mtr ([],[P.Mtd ([], P.indented action)])])
+(*
+ P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left";Some "helm", "xref", p.Con.proof_id],
+ [P.Mtr ([],[P.Mtd ([],P.Mfenced([],[P.Mtext ([],name)]))]);
+ P.Mtr ([],[P.Mtd ([], P.indented action)])]) *)
and context2pres c continuation =
(* we generate a subtable for each context element, for selection
- purposes *)
+ purposes
+ The table generated by the head-element does not have an xref;
+ the whole context-proof is already selectable *)
let module P = Mpresentation in
- List.fold_right
- (fun ce continuation ->
- let xref = get_xref ce in
+ match c with
+ [] -> continuation
+ | hd::tl ->
+ let continuation' =
+ List.fold_right
+ (fun ce continuation ->
+ let xref = get_xref ce in
+ P.Mtable([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left"; Some "helm", "xref", xref ],
+ [P.Mtr([Some "helm", "xref", "ce_"^xref],[P.Mtd ([],ce2pres ce)]);
+ P.Mtr([],[P.Mtd ([], continuation)])])) tl continuation in
+ let hd_xref= get_xref hd in
P.Mtable([None,"align","baseline 1"; None,"equalrows","false";
- None,"columnalign","left"; Some "helm", "xref", xref ],
- [P.Mtr([Some "helm", "xref", "ce_"^xref],[P.Mtd ([],ce2pres ce)]);
- P.Mtr([],[P.Mtd ([], continuation)])])) c continuation
-
+ None,"columnalign","left"],
+ [P.Mtr([Some "helm", "xref", "ce_"^hd_xref],
+ [P.Mtd ([],ce2pres hd)]);
+ P.Mtr([],[P.Mtd ([], continuation')])])
+
and ce2pres =
let module P = Mpresentation in
let module Con = Content in
P.Mrow ([],
[P.Mtext([None,"mathcolor","Red"],"Suppose");
P.Mspace([None,"width","0.1cm"]);
- P.Mtext([],"(");
+ P.Mo([],"(");
P.Mi ([],s);
- P.Mtext([],")");
+ P.Mo([],")");
P.Mspace([None,"width","0.1cm"]);
ty])
| None ->
prerr_endline "NO NAME!!"; assert false)
- | `Proof p -> proof2pres p
+ | `Proof p ->
+ (match p.Con.proof_name with
+ Some "w" -> prerr_endline ("processing w");
+ | _ -> ());
+ proof2pres p
| `Definition d ->
(match d.Con.def_name with
Some s ->
[P.Mtr([Some "helm","xref","ace_"^p.Con.proof_id],[P.Mtd ([],hd)]);
P.Mtr([],[P.Mtd ([], continuation)])])) ac continuation
- and conclude2pres conclude indent =
+ and conclude2pres conclude indent omit_conclusion =
+ let module Con = Content in
let module P = Mpresentation in
- if indent then
- P.indented (conclude_aux conclude)
+ let tconclude_body =
+ match conclude.Con.conclude_conclusion with
+ Some t when not omit_conclusion ->
+ let concl = (term2pres t) in
+ if conclude.Con.conclude_method = "BU_Conversion" then
+ make_concl "that is equivalent to" concl
+ else
+ let conclude_body = conclude_aux conclude in
+ let ann_concl =
+ if conclude.Con.conclude_method = "TD_Conversion" then
+ make_concl "that is equivalent to" concl
+ else make_concl "we conclude" concl in
+ P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left"],
+ [P.Mtr ([],[P.Mtd ([],conclude_body)]);
+ P.Mtr ([],[P.Mtd ([],ann_concl)])])
+ | _ -> conclude_aux conclude in
+ if indent then
+ P.indented (P.Mrow ([Some "helm", "xref", conclude.Con.conclude_id],
+ [tconclude_body]))
else
- conclude_aux conclude
+ P.Mrow ([Some "helm", "xref", conclude.Con.conclude_id],[tconclude_body])
+
and conclude_aux conclude =
let module Con = Content in
None -> P.Mtext([],"NO SYNTH!!!")
| Some c -> (term2pres c)) in
P.Mtable
- ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"; Some "helm", "xref", conclude.Con.conclude_id],
+ ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"],
[P.Mtr([],[P.Mtd([],make_concl "we must prove" expected)]);
P.Mtr([],[P.Mtd([],make_concl "or equivalently" synth)]);
P.Mtr([],[P.Mtd([],proof2pres subproof)])])
else if conclude.Con.conclude_method = "BU_Conversion" then
- let conclusion =
- (match conclude.Con.conclude_conclusion with
- None -> P.Mtext([],"NO Conclusion!!!")
- | Some c -> term2pres c) in
- make_concl
- ~attrs:[Some "helm", "xref", conclude.Con.conclude_id]
- "that is equivalent to" conclusion
+ assert false
else if conclude.Con.conclude_method = "Exact" then
- let conclusion =
- (match conclude.Con.conclude_conclusion with
- None -> P.Mtext([],"NO Conclusion!!!")
- | Some c -> term2pres c) in
let arg =
(match conclude.Con.conclude_args with
[Con.Term t] -> term2pres t
| _ -> assert false) in
- make_row ~attrs:[Some "helm", "xref", conclude.Con.conclude_id]
- [arg;P.Mspace([None,"width","0.1cm"]);P.Mtext([],"proves")] conclusion
+ (match conclude.Con.conclude_conclusion with
+ None ->
+ P.Mrow []
+ [P.Mtext [None, "mathcolor", "red"] "Consider" ; P.smallskip; arg]
+ | Some c -> let conclusion = term2pres c in
+ make_row
+ [arg; P.Mspace([None,"width","0.1cm"]);P.Mtext([],"proves")]
+ conclusion
+ )
else if conclude.Con.conclude_method = "Intros+LetTac" then
+ (match conclude.Con.conclude_args with
+ [Con.ArgProof p] -> proof2pres p
+ | _ -> assert false)
+(* OLD CODE
let conclusion =
(match conclude.Con.conclude_conclusion with
None -> P.Mtext([],"NO Conclusion!!!")
[Con.ArgProof p] ->
P.Mtable
([None,"align","baseline 1"; None,"equalrows","false";
- None,"columnalign","left";
- Some "helm", "xref", conclude.Con.conclude_id],
+ None,"columnalign","left"],
[P.Mtr([],[P.Mtd([],proof2pres p)]);
P.Mtr([],[P.Mtd([],
- (make_concl "we proved *" conclusion))])]);
+ (make_concl "we proved 1" conclusion))])]);
| _ -> assert false)
+*)
else if (conclude.Con.conclude_method = "ByInduction") then
byinduction conclude
+ else if (conclude.Con.conclude_method = "Exists") then
+ exists conclude
+ else if (conclude.Con.conclude_method = "AndInd") then
+ andind conclude
else if (conclude.Con.conclude_method = "Rewrite") then
let justif =
(match (List.nth conclude.Con.conclude_args 6) with
let term2 =
(match List.nth conclude.Con.conclude_args 5 with
Con.Term t -> term2pres t
- | _ -> assert false) in
+ | _ -> assert false) in
+ P.Mtable ([None,"align","baseline 1";None,"equalrows","false";
+ None,"columnalign","left"],
+ [P.Mtr ([],[P.Mtd ([],P.Mrow([],[
+ P.Mtext([None,"mathcolor","Red"],"rewrite");
+ P.Mspace([None,"width","0.1cm"]);term1;
+ P.Mspace([None,"width","0.1cm"]);
+ P.Mtext([None,"mathcolor","Red"],"with");
+ P.Mspace([None,"width","0.1cm"]);term2]))]);
+ P.Mtr ([],[P.Mtd ([],P.indented justif)])]);
+(* OLD CODE
let conclusion =
(match conclude.Con.conclude_conclusion with
None -> P.Mtext([],"NO Conclusion!!!")
| Some c -> term2pres c) in
P.Mtable ([None,"align","baseline 1";None,"equalrows","false";
- None,"columnalign","left";
- Some "helm", "xref", conclude.Con.conclude_id],
+ None,"columnalign","left"],
[P.Mtr ([],[P.Mtd ([],P.Mrow([],[
P.Mtext([None,"mathcolor","Red"],"rewrite");
P.Mspace([None,"width","0.1cm"]);term1;
P.Mtext([None,"mathcolor","Red"],"with");
P.Mspace([None,"width","0.1cm"]);term2]))]);
P.Mtr ([],[P.Mtd ([],P.indented justif)]);
- P.Mtr ([],[P.Mtd ([],make_concl "we proved" conclusion)])])
+ P.Mtr ([],[P.Mtd ([],make_concl "we proved 2" conclusion)])]) *)
else if conclude.Con.conclude_method = "Apply" then
let pres_args =
- make_args_for_apply term2pres conclude.Con.conclude_args in
+ make_args_for_apply term2pres conclude.Con.conclude_args in
+ P.Mrow([],
+ P.Mtext([None,"mathcolor","Red"],"by")::
+ P.Mspace([None,"width","0.1cm"])::
+ P.Mo([],"(")::pres_args@[P.Mo([],")")])
+(* OLD CODE
let by =
P.Mrow([],
P.Mtext([None,"mathcolor","Red"],"by")::P.Mspace([None,"width","0.1cm"])::
None -> P.Mrow([],[P.Mtext([],"QUA");by])
| Some t ->
let concl = (term2pres t) in
- let ann_concl = make_concl "we proved" concl in
+ let ann_concl = make_concl "we proved 3" concl in
P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
None,"columnalign","left";
Some "helm", "xref", conclude.Con.conclude_id],
[P.Mtr ([],[P.Mtd ([],by)]);
- P.Mtr ([],[P.Mtd ([],ann_concl)])])
- else let body =
+ P.Mtr ([],[P.Mtd ([],ann_concl)])]) *)
+ else
P.Mtable
- ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"; Some "helm", "xref", conclude.Con.conclude_id],
+ ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"],
[P.Mtr ([],[P.Mtd ([],P.Mtext([],"Apply method" ^ conclude.Con.conclude_method ^ " to"))]);
P.Mtr ([],
[P.Mtd ([],
(P.Mtable
([None,"align","baseline 1"; None,"equalrows","false";
None,"columnalign","left"],
- args2pres conclude.Con.conclude_args))))])]) in
+ args2pres conclude.Con.conclude_args))))])])
+(* OLD CODE
match conclude.Con.conclude_conclusion with
None -> body
| Some t ->
let concl = (term2pres t) in
- let ann_concl = make_concl "we proved" concl in
+ let ann_concl = make_concl "we proved 4" concl in
P.Mtable ([None,"align","baseline 1"; None,"equalrows","false";
None,"columnalign","left"],
[P.Mtr ([],[P.Mtd ([],body)]);
- P.Mtr ([],[P.Mtd ([],ann_concl)])])
+ P.Mtr ([],[P.Mtd ([],ann_concl)])]) *)
and args2pres l =
let module P = Mpresentation in
(make_concl "we proceede by induction on" arg) in
let to_prove =
(make_concl "to prove" proof_conclusion) in
- let we_proved =
- (make_concl "we proved" proof_conclusion) in
P.Mtable
- ([None,"align","baseline 1"; None,"equalrows","false"; None,"columnalign","left"],
+ ([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left"],
P.Mtr ([],[P.Mtd ([],induction_on)])::
P.Mtr ([],[P.Mtd ([],to_prove)])::
- (make_cases args_for_cases) @
- [P.Mtr ([],[P.Mtd ([],we_proved)])])
-
+ (make_cases args_for_cases))
+
and make_cases args_for_cases =
let module P = Mpresentation in
List.map
None -> "no name"
| Some s -> s) in
P.indented (P.Mrow ([],
- [P.Mtext([],"(");
+ [P.Mo([],"(");
P.Mi ([],name);
- P.Mtext([],")");
+ P.Mo([],")");
P.Mspace([None,"width","0.1cm"]);
term2pres h.Con.dec_type]))
| _ -> assert false in
text::hyps) in
(* let acontext =
acontext2pres_old p.Con.proof_apply_context true in *)
- let body = conclude2pres p.Con.proof_conclude true in
+ let body = conclude2pres p.Con.proof_conclude true false in
let presacontext =
P.Maction([None,"actiontype","toggle" ; None,"selection","1"],
[P.indented (P.Mtext([None,"mathcolor","Red"],"Proof"));
None,"columnalign","left"],
pattern::asubconcl::induction_hypothesis@
[P.Mtr([],[P.Mtd([],presacontext)])])
- | _ -> assert false in
+ | _ -> assert false
+
+ and andind conclude =
+ let module P = Mpresentation in
+ let module Con = Content in
+ let proof_conclusion =
+ (match conclude.Con.conclude_conclusion with
+ None -> P.Mtext([],"No conclusion???")
+ | Some t -> term2pres t) in
+ let proof,case_arg =
+ (match conclude.Con.conclude_args with
+ [Con.Aux(n);_;Con.ArgProof proof;case_arg] -> proof,case_arg
+ | _ -> assert false;
+ (*
+ List.map (ContentPp.parg 0) conclude.Con.conclude_args;
+ assert false *)) in
+ let arg =
+ (match case_arg with
+ Con.Aux n -> assert false
+ | Con.Premise prem ->
+ (match prem.Con.premise_binder with
+ None -> []
+ | Some n -> [P.Mtext([],"by");P.smallskip;P.Mi([],n)])
+ | Con.Lemma lemma ->
+ [P.Mtext([],"by");P.smallskip;P.Mi([],lemma.Con.lemma_name)]
+ | _ -> assert false) in
+ match proof.Con.proof_context with
+ `Hypothesis hyp1::`Hypothesis hyp2::tl ->
+ let get_name hyp =
+ (match hyp.Con.dec_name with
+ None -> "_"
+ | Some s -> s) in
+ let preshyp1 =
+ P.Mrow ([],
+ [P.Mtext([],"(");
+ P.Mi([],get_name hyp1);
+ P.Mtext([],")");
+ P.smallskip;
+ term2pres hyp1.Con.dec_type]) in
+ let preshyp2 =
+ P.Mrow ([],
+ [P.Mtext([],"(");
+ P.Mi([],get_name hyp2);
+ P.Mtext([],")");
+ P.smallskip;
+ term2pres hyp2.Con.dec_type]) in
+ (* let body = proof2pres {proof with Con.proof_context = tl} in *)
+ let body = conclude2pres proof.Con.proof_conclude false true in
+ let presacontext =
+ acontext2pres proof.Con.proof_apply_context body false in
+ P.Mtable
+ ([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left"],
+ [P.Mtr ([],[P.Mtd ([],
+ P.Mrow([],arg@[P.smallskip;P.Mtext([],"we have")]))]);
+ P.Mtr ([],[P.Mtd ([],preshyp1)]);
+ P.Mtr ([],[P.Mtd ([],P.Mtext([],"and"))]);
+ P.Mtr ([],[P.Mtd ([],preshyp2)]);
+ P.Mtr ([],[P.Mtd ([],presacontext)])]);
+ | _ -> assert false
+
+ and exists conclude =
+ let module P = Mpresentation in
+ let module Con = Content in
+ let proof_conclusion =
+ (match conclude.Con.conclude_conclusion with
+ None -> P.Mtext([],"No conclusion???")
+ | Some t -> term2pres t) in
+ let proof =
+ (match conclude.Con.conclude_args with
+ [Con.Aux(n);_;Con.ArgProof proof;_] -> proof
+ | _ -> assert false;
+ (*
+ List.map (ContentPp.parg 0) conclude.Con.conclude_args;
+ assert false *)) in
+ match proof.Con.proof_context with
+ `Declaration decl::`Hypothesis hyp::tl
+ | `Hypothesis decl::`Hypothesis hyp::tl ->
+ let get_name decl =
+ (match decl.Con.dec_name with
+ None -> "_"
+ | Some s -> s) in
+ let presdecl =
+ P.Mrow ([],
+ [P.Mtext([None,"mathcolor","Red"],"let");
+ P.smallskip;
+ P.Mi([],get_name decl);
+ P.Mtext([],":"); term2pres decl.Con.dec_type]) in
+ let suchthat =
+ P.Mrow ([],
+ [P.Mtext([None,"mathcolor","Red"],"such that");
+ P.smallskip;
+ P.Mtext([],"(");
+ P.Mi([],get_name hyp);
+ P.Mtext([],")");
+ P.smallskip;
+ term2pres hyp.Con.dec_type]) in
+ (* let body = proof2pres {proof with Con.proof_context = tl} in *)
+ let body = conclude2pres proof.Con.proof_conclude false true in
+ let presacontext =
+ acontext2pres proof.Con.proof_apply_context body false in
+ P.Mtable
+ ([None,"align","baseline 1"; None,"equalrows","false";
+ None,"columnalign","left"],
+ [P.Mtr ([],[P.Mtd ([],presdecl)]);
+ P.Mtr ([],[P.Mtd ([],suchthat)]);
+ P.Mtr ([],[P.Mtd ([],presacontext)])]);
+ | _ -> assert false in
proof2pres p
;;
(id,n,context,ty) ->
P.Mtr []
[P.Mtd []
- (P.Mrow []
+ (P.Mrow [Some "helm", "xref", id]
(List.map
(function
(_,None) ->
projects / helm.git / blobdiff