Commit fd79bfde authored by Guillaume Melquiond's avatar Guillaume Melquiond
Browse files

Merge branch 'bugfix/v0.87'

parents c4416c9a 28fe8606
......@@ -2,9 +2,6 @@
/examples/hoare_logic/draft/ export-ignore
/tests/ export-ignore
/bench/encoding/ export-ignore
/share/images/boomy/ export-ignore
/share/images/boomy.rc export-ignore
/share/javascript/ export-ignore
/misc/ export-ignore
/ROADMAP export-ignore
/DEVELOPER.readme export-ignore
......@@ -12,5 +9,4 @@
.gitignore export-ignore
.gitattributes export-ignore
/check.sh export-ignore
/.merlin.in export-ignore
/TODO export-ignore
* marks an incompatible change
Version 0.87.0, March 15, 2016
================================
Language
* Add new logical connectives "by" and "so" as keywords
......@@ -8,6 +11,7 @@ Tools
o add a command-line option --extra-expl-prefix to specify
additional possible prefixes for VC explanations. (Available for
why3 commands "prove" and "ide".)
* removed "jstree" style from the "session" command
Transformations
* All split transformations respect the "stop_split" label now.
......@@ -45,7 +49,7 @@ Provers
o support for Zenon_modulo 0.4.1 (released Jul 2, 2015)
Distribution
* non-free files are distributed in an extra tar file: "boomy" icon set,
* non-free files have been removed: "boomy" icon set,
javascript helpers for "why3 session html --style jstree"
Version 0.86.3, February 8, 2016
......
......@@ -315,7 +315,6 @@ endif
cp -f share/images/*.png $(DATADIR)/why3/images
cp -f share/why3session.dtd $(DATADIR)/why3
cp -f share/Makefile.config $(DATADIR)/why3
cp -rf share/javascript $(DATADIR)/why3/javascript
cp -f share/vim/why3.vim $(DATADIR)/why3/vim/why3.vim
cp -f share/lang/why3.lang $(DATADIR)/why3/lang/why3.lang
......@@ -1927,8 +1926,6 @@ wc:
NAME = why3-@VERSION@
# see .gitattributes for the list of files that are not distributed
MORE_DIST = configure doc/manual.pdf
EXTRANAME = why3-extra-@VERSION@
EXTRA_DIST = share/images/boomy.rc share/images/boomy share/javascript
dist: $(MORE_DIST)
rm -rf distrib/$(NAME)/ distrib/$(NAME).tar.gz
......@@ -1937,9 +1934,6 @@ dist: $(MORE_DIST)
git archive --format tar --prefix $(NAME)/ HEAD | tar x -C distrib/
for f in $(MORE_DIST); do cp $$f distrib/$(NAME)/$$f; done
cd distrib; tar cf $(NAME).tar $(NAME); gzip -f --best $(NAME).tar
mkdir distrib/$(EXTRANAME)
cp -r $(EXTRA_DIST) distrib/$(EXTRANAME)
cd distrib; tar cf $(EXTRANAME).tar $(EXTRANAME); gzip -f --best $(EXTRANAME).tar
###############
......
......@@ -1599,7 +1599,6 @@ See manual Section xx
* INSTALL (done)
* LICENSE (done)
* OCAML-LICENSE (done)
* TODO: licence pour les boomy icons
* debuguer cpulimit pour gappa (pb de return code)
......
# Why version
VERSION=0.86+git
VERSION=0.87.0
......@@ -864,8 +864,8 @@ Section~\ref{chap:starting}, respectively with style 1 and 2.
\subsection{Command \texttt{html}}
This command produces a summary of the proof session in HTML syntax.
There are three styles of output: `table', `simpletree', and
`jstree'. The default is `table'.
There are two styles of output: `table' and `simpletree'. The default is
`table'.
The file generated is named \texttt{why3session.html} and is written
in the session directory by default (see option \texttt{-o} to
......@@ -908,16 +908,10 @@ The style `simpletree' displays the contents of the session under the
form of tree, similar to the tree view in the IDE. It uses only basic
HTML tags such as \verb|<ul>| and \verb|<li>|.
The style `jstree' displays a dynamic tree view of the session, where
you can click on various parts to expand or shrink some parts of the
tree. Clicking on an edited proof script also shows the contents of
this script. Technically, it uses the `jstree' plugin of the javascript
library `jquery'.
Specific options for this command are as follows.
\begin{description}
\item[\texttt{-{}-style \textsl{<style>}}] sets the style to use, among
\texttt{simpletree}, \texttt{jstree}, and \texttt{table}; defaults to
\texttt{simpletree} and \texttt{table}; defaults to
\texttt{table}.
\item[\texttt{-o \textsl{<dir>}}] sets the directory where to output
......
......@@ -108,7 +108,7 @@
%BEGIN LATEX
\begin{LARGE}
%END LATEX
Version \whyversion{}, February 2016
Version \whyversion{}, March 2016
%BEGIN LATEX
\end{LARGE}
%END LATEX
......
......@@ -69,7 +69,7 @@ timelimit = 2
default_editor = "editor %f"
error_color = "orange"
goal_color = "gold"
iconset = "boomy"
iconset = "fatcow"
intro_premises = true
premise_color = "chartreuse"
print_labels = false
......
archive: "https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz"
checksum: "910d5acca0082e94b8a86baf01600e03"
archive: "https://gforge.inria.fr/frs/download.php/file/35643/why3-0.87.0.tar.gz"
checksum: "e587a45b94201de16529a15c72b978df"
......@@ -19,7 +19,7 @@ tags: [
]
available: [ ocaml-version >= "4.01.0" ]
depends: [
"why3-base" { = "0.86.3" }
"why3-base" { = "0.87.0" }
"lablgtk"
"conf-gtksourceview"
"zarith"
......
......@@ -101,7 +101,7 @@ _why3()
return 0
;;
--style)
COMPREPLY=( $( compgen -W 'simple jstree' -- "$cur" ) )
COMPREPLY=( $( compgen -W 'simpletree table' -- "$cur" ) )
return 0
;;
session)
......
[iconset boomy]
name = "Boomy"
license = "license.txt"
default = "undone32"
undone = "undone32"
scheduled = "pausehalf32"
running = "play32"
valid = "accept32"
unknown = "help32"
invalid = "delete32"
timeout = "clock32"
outofmemory = "deletefile32"
steplimitexceeded = "cut32"
failure = "bug32"
valid_obs = "obsaccept32"
unknown_obs = "obshelp32"
invalid_obs = "obsdelete32"
timeout_obs = "obsclock32"
outofmemory_obs = "obsdeletefile32"
steplimitexceeded_obs = "cut32"
failure_obs = "obsbug32"
yes = "accept32"
no = "delete32"
file = "folder32"
theory = "folder32"
goal = "file32"
prover = "wizard32"
transf = "configure32"
#TODO change metas
metas = "movefile32"
editor = "edit32"
replay = "refresh32"
cancel = "cut32"
reload = "movefile32"
remove = "delete32"
cleaning = "trashb32"
Boomy toolbar icon set license
This is a legal agreement between You, the user, and Milosz Wlazlo.
By downloading the Boomy icon set, You agree to the following:
All icons in the Boomy toolbar package are for personal use only. You
may also use the icons in open source and freeware projects as long as
you give credits to the author of the icons and link to his website
(miloszwl.deviantart.com).
The image data may be changed by You in a limited way, only by
combining the included icons and adjusting hue, saturation,
brightness.
All icons are provided "As is". The Miloszwl.com shall not be liable
for any kind of harm caused by use of, or the inability to use, this
icon set or any individual image.
You agree that all ownership and copyrights of the icons remain the
property of Milosz Wlazlo (Miloszwl.com). You may not resell or
redistribute the icons in any kind of commercial project or internet
icon archive.
Contact: miloszwl@miloszwl.com
Web: miloszwl.deviantart.com
This diff is collapsed.
This diff is collapsed.
.verified{
color: green;
}
.notverified{
color: red;
}
#edited{
right:0px;
top: 20px;
position: fixed;
z-index: 50;
width: 50%;
height: 600px;
}
function showedited(s){
var iframe = document.getElementById("edited");
var addr = "edited/"+s;
iframe.src = addr;
$("#edited").show()
}
\ No newline at end of file
/*
* jsTree default theme 1.0
* Supported features: dots/no-dots, icons/no-icons, focused, loading
* Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
*/
.jstree-default li,
.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }
.jstree-default li.jstree-last { background:transparent; }
.jstree-default .jstree-open > ins { background-position:-72px 0; }
.jstree-default .jstree-closed > ins { background-position:-54px 0; }
.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
.jstree-default a .jstree-icon { background-position:-56px -19px; }
.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
.jstree-default.jstree-focused { background:#ffffee; }
.jstree-default .jstree-no-dots li,
.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
.jstree-default .jstree-search { font-style:italic; }
.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }
.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
#vakata-dragged.jstree-default ins { background:transparent !important; }
#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
.jstree-default a.jstree-search { color:aqua; }
.jstree-default .jstree-locked a { color:silver; cursor:default; }
#vakata-contextmenu.jstree-default-context,
#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
#vakata-contextmenu.jstree-default-context li { }
#vakata-contextmenu.jstree-default-context a { color:black; }
#vakata-contextmenu.jstree-default-context a:hover,
#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a,
#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
/* IE6 BEGIN */
.jstree-default li,
.jstree-default ins,
#vakata-dragged.jstree-default .jstree-invalid,
#vakata-dragged.jstree-default .jstree-ok,
#jstree-marker.jstree-default { _background-image:url("d.gif"); }
.jstree-default .jstree-open ins { _background-position:-72px 0; }
.jstree-default .jstree-closed ins { _background-position:-54px 0; }
.jstree-default .jstree-leaf ins { _background-position:-36px 0; }
.jstree-default a ins.jstree-icon { _background-position:-56px -19px; }
#vakata-contextmenu.jstree-default-context ins { _display:none; }
#vakata-contextmenu.jstree-default-context li { _zoom:1; }
.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
/* IE6 END */
\ No newline at end of file
......@@ -482,15 +482,6 @@ version_ok = "7.0"
command = "%e -noprompt"
driver = "drivers/mathematica.drv"
[ATP safeprover]
name = "SafeProver"
exec = "safeprover"
version_switch = "-version"
version_regexp = "The safe prover, version \\([^ \n\t]+\\)"
version_ok = "0.0.0"
command = "%e %f"
driver = "drivers/safeprover.drv"
# Coq 8.5: do not limit memory
[ITP coq]
name = "Coq"
......
......@@ -30,37 +30,35 @@ val create_label : string -> label
(* functions for working with counterexample model labels *)
val remove_model_labels : labels : Slab.t -> Slab.t
(** Returns a copy of labels without labels "model" and "model_projected". *)
(** Returns a copy of labels without labels ["model"] and ["model_projected"]. *)
val append_to_model_trace_label : labels : Slab.t ->
to_append : string ->
Slab.t
(** The returned set of labels will contain the same set of labels
as argument labels except that a label of the form "model_trace:*"
will be "model_trace:*to_append."*)
as argument labels except that a label of the form ["model_trace:*"]
will be ["model_trace:*to_append"]. *)
val append_to_model_element_name : labels : Slab.t ->
to_append : string ->
Slab.t
(** The returned set of labels will contain the same set of labels
as argument labels except that a label of the form "model_trace:name@context"
will be "model_trace:nameto_append@context."*)
as argument labels except that a label of the form ["model_trace:*@*"]
will be ["model_trace:*to_append@*"]. *)
val get_model_element_name : labels : Slab.t -> string
(** If labels contain a label of the form "model_trace:name@*",
return name.
Throws Not_found if there is no element name (there is no
label of the form "model_trace:+". *)
(** If labels contain a label of the form ["model_trace:name@*"],
return ["name"].
Throws [Not_found] if there is no label of the form ["model_trace:*"]. *)
val get_model_trace_string : labels : Slab.t -> string
(** If labels contain a label of the form "model_trace:mt_string*",
return mt_string.
Throws Not_found if there is no mt_string (there is no
label of the form "model_trace:*". *)
(** If labels contain a label of the form ["model_trace:mt_string"],
return ["mt_string"].
Throws [Not_found] if there is no label of the form ["model_trace:*"]. *)
val get_model_trace_label : labels : Slab.t -> Slab.elt
(** Return label of the for "model_trace:*".
Throws Not_found if there is no such label.*)
(** Return a label of the form ["model_trace:*"].
Throws [Not_found] if there is no such label. *)
(** {2 Identifiers} *)
......
......@@ -47,4 +47,4 @@ val has_prefix : string -> string -> bool
val remove_prefix : string -> string -> string
(** [remove_prefix pref s] removes the prefix [pref] from [s]. Raises
[Not_found if [s] does not start with [pref] *)
[Not_found] if [s] does not start with [pref] *)
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment