Clafer.YAML-tmLanguage

@@ -17,7 +17,7 @@ patterns:
 - name: constant.numeric.clafer
   match: \b(\d+)\b
 - name: keyword.control.clafer
-  match: \b(clafer|this|parent|dref|root|children|int|integer|string|double|real|max|min|sum|product|xor|in|if|then|else|no|not|some|one|all|disj|opt|mux|or|lone|abstract|enum|assert|final|initial|let|never|sometime|lonce|once|always|must|precede|follow|initially|finally|U|until|W|weakuntil|F|eventually|G|globally|X|next|before|after|between|and|until)\b
+  match: \b(clafer|this|parent|dref|root|children|int|integer|string|double|real|maximize|minimize|max|min|sum|product|xor|in|if|then|else|no|not|some|one|all|disj|opt|mux|or|lone|abstract|enum|assert|final|initial|let|never|sometime|lonce|once|always|must|precede|follow|initially|finally|U|until|W|weakuntil|F|eventually|G|globally|X|next|before|after|between|and|until)\b
 - name: keyword.operator.clafer
   match: (#|\?|\*|\+|->|->>|\:|\+|-|/|%|\.|<:|:>|\\|\&\&|\|\||,|\+\+|\*\*|--|=|:=|!=|>=|<=|=>|<=>|<|>|(|)|[|]|\.\.|>>|<<|-->|-->>|-[|]->|]->>)
 ...

Clafer.sublime-build

@@ -1,4 +1,12 @@
-{
-	"cmd": [ "$packages/Clafer-Bin/clafer", "$file", "-m=alloy", "-m=clafer", "-m=html", "-m=choco", "--self-contained" ],
-	"selector": "source.clafer"
+{ "cmd": [ "$packages/Clafer-Bin/clafer"
+         , "$file"
+         , "-m=alloy"
+         , "-m=choco"
+				 , "-m=html"
+         , "--self-contained"
+         , "-k"
+         , "-v"
+         , "--tooldir=\"$packages/Clafer-Bin\""
+         ]
+	, "selector": "source.clafer"
 }

Clafer.tmLanguage

@@ -40,7 +40,7 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(clafer|this|parent|dref|root|children|int|integer|string|double|real|max|min|sum|product|xor|in|if|then|else|no|not|some|one|all|disj|opt|mux|or|lone|abstract|enum|assert|final|initial|let|never|sometime|lonce|once|always|must|precede|follow|initially|finally|U|until|W|weakuntil|F|eventually|G|globally|X|next|before|after|between|and|until)\b</string>
+			<string>\b(clafer|this|parent|dref|root|children|int|integer|string|double|real|maximize|minimize|max|min|sum|product|xor|in|if|then|else|no|not|some|one|all|disj|opt|mux|or|lone|abstract|enum|assert|final|initial|let|never|sometime|lonce|once|always|must|precede|follow|initially|finally|U|until|W|weakuntil|F|eventually|G|globally|X|next|before|after|between|and|until)\b</string>
 			<key>name</key>
 			<string>keyword.control.clafer</string>
 		</dict>

README.md

@@ -1,11 +1,11 @@
 Clafer Tools
 =============
 
-v0.4.1
+v0.4.2
 
 Integration of [Clafer Compiler and Instance Generators](http://clafer.org) into [Sublime Text 2/3](http://www.sublimetext.com/).
 
-See release notes for [Clafer 0.4.1](http://www.clafer.org/2015/09/clafer-claferig-claferwiki.html).
+See release notes for [Clafer 0.4.2](http://www.clafer.org/2015/09/clafer-claferig-claferwiki.html).
 
 Contributors
 ------------
@@ -16,7 +16,10 @@ Features and Usage
 ------------------
 
 * Syntax highlighting of keywords, operators, comments, and integer and string literals
-* Compilation `<CTRL>+b`
+* Compilation `<CTRL>+b`. To change parameters of the command:
+   * `Preferences->Browse Packages`
+   * `cd Clafer Tools`
+   * edit `Clafer.sublime-build`
 * Instance generation (with simple scope inference) using
    * Alloy-based instance generator `<CTRL>+i, g, a`
    * Choco-based instance generator `<CTRL>+i, g, c`
@@ -37,8 +40,8 @@ Installation
          * on Mac, use the `merge` option not `replace`
 3. Download the latest binary distribution of Clafer Tools
    * [Clafer Tools](http://gsd.uwaterloo.ca/clafer-tools-binary-distributions)
-   * Unzip the contents of the folder `clafer-tools-0.4.1` into `Packages/Clafer-Bin`
-      * Make sure the folder structure is NOT `Packages/Clafer-Bin/clafer-tools-0.4.1`, that is, the contents of the folder `clafer-tools-0.4.1` are directly inside `Clafer-Bin`
+   * Unzip the contents of the folder `clafer-tools-0.4.2` into `Packages/Clafer-Bin`
+      * Make sure the folder structure is NOT `Packages/Clafer-Bin/clafer-tools-0.4.2`, that is, the contents of the folder `clafer-tools-0.4.2` are directly inside `Clafer-Bin`
    * add `Clafer-Bin` to the variable `PATH`.
 
 ### Known Limitations and Workarounds

messages/install.md

@@ -7,8 +7,8 @@ To finish the installation
    * copy the folder `SublimeREPL` from `Clafer Tools` to `Packages`
 2. Download the latest binary distribution of Clafer Tools
    * [Clafer Tools](http://gsd.uwaterloo.ca/clafer-tools-binary-distributions)
-   * Unzip the contents of the folder `clafer-tools-0.4.1` into `Packages/Clafer-Bin`
-      * Make sure the folder structure is NOT `Packages/Clafer-Bin/clafer-tools-0.4.1`, that is, the contents of the folder `clafer-tools-0.4.1` are directly inside `Clafer-Bin`
+   * Unzip the contents of the folder `clafer-tools-0.4.2` into `Packages/Clafer-Bin`
+      * Make sure the folder structure is NOT `Packages/Clafer-Bin/clafer-tools-0.4.2`, that is, the contents of the folder `clafer-tools-0.4.2` are directly inside `Clafer-Bin`
    * add `Clafer-Bin` to the variable `PATH`.
 
 ### Known Limitations and Workarounds