diff --git a/Cargo.lock b/Cargo.lock index 3b6efcd..5f64122 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -179,7 +179,7 @@ dependencies = [ [[package]] name = "kalk" -version = "2.1.2" +version = "2.2.0" dependencies = [ "lazy_static", "regex", @@ -191,7 +191,7 @@ dependencies = [ [[package]] name = "kalker" -version = "1.0.1" +version = "1.1.0" dependencies = [ "ansi_term", "atty", diff --git a/README.md b/README.md index 7b52a3e..216d366 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Kalker (or "kalk") is a calculator program/website that supports user-defined va [Kanban](https://kolan.strct.net/Board/4RAdMjLDz) | [Website - Try it out here!](https://kalker.xyz) | [Donate](#donation) -![](preview.png) + # Features @@ -18,11 +18,12 @@ Kalker (or "kalk") is a calculator program/website that supports user-defined va * Integration. `∫(0, pi, sin(x) dx)` or `∫(0, π, sin(x) dx)`, maybe sometimes be slightly off * Understands fairly ambiguous syntax. Eg. `2sin50 + 2xy` * Syntax highlighting -* Special-symbol completion on tab. Eg. write `sqrt` and press tab. It will be turned into `√`. +* Special-symbol completion on tab. Eg. write `sqrt` and press tab. It will be turned into `√` * Sum function: `sum(start, to, expression)` Eg. `sum(1, 3, 2n+1)` is the same as `2*1+1 + 2*2+1 + 2*3+1` = `15` -* Piecewise functions: `f(x) = { f(x + 1) if x <= 1; x otherwise }`, pressing enter before typing the final `}` will make a new line without submitting. -* Load a file including predefined functions and constants. For example, if you're going to use kalker for physics, you load up your file with physics functions/constants when starting kalker. `-i file` -* Misc: separate expressions by a semicolon to write them on the same line, use the `ans` variable to get the value of the previously calculated expression. +* Piecewise functions: `f(x) = { f(x + 1) if x <= 1; x otherwise }`, pressing enter before typing the final `}` will make a new line without submitting +* Load a file including predefined functions and constants. For example, if you're going to use kalker for physics, you load up your file with physics functions/constants when starting kalker. This is done either using the `-i file` flag or by putting files in a certain directory and then doing `load filename` inside kalker. [More about files here](https://kalker.xyz/#files) +* Different number bases: Either with a format like `0b1101`, `0o5.3`, `0xff` or a format like `1101_2`. The latter does not support letters, as they would be interpreted as variables +* Misc: separate expressions by a semicolon to write them on the same line, use the `ans` variable to get the value of the previously calculated expression # Installation diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 782af0c..c3822c7 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -9,11 +9,11 @@ license = "MIT" name = "kalker" readme = "../README.md" repository = "https://github.com/PaddiM8/kalker" -version = "1.0.1" +version = "1.1.0" [dependencies] ansi_term = "0.12.1" -kalk = { path = "../kalk", version = "^2.1.2" } +kalk = { path = "../kalk", version = "^2.2.0" } lazy_static = "1.4.0" regex = "1" rustyline = "7.1.0" diff --git a/kalk/Cargo.toml b/kalk/Cargo.toml index 744bb07..66ed698 100644 --- a/kalk/Cargo.toml +++ b/kalk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kalk" -version = "2.1.2" +version = "2.2.0" authors = ["PaddiM8"] edition = "2018" readme = "README.md" diff --git a/mobile/package.json b/mobile/package.json index 387704e..edca7d9 100644 --- a/mobile/package.json +++ b/mobile/package.json @@ -1,6 +1,6 @@ { "name": "kalk_mobile", - "version": "1.0.2", + "version": "1.1.0", "description": "kalk mobile", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -16,7 +16,7 @@ "@capacitor/android": "^2.4.5", "@capacitor/cli": "^2.4.5", "@capacitor/core": "^2.4.5", - "@paddim8/kalk-component": "^1.3.2" + "@paddim8/kalk-component": "^1.4.0" }, "devDependencies": { "@capacitor-community/electron": "^1.3.2", diff --git a/preview.png b/preview.png index a377873..a35cf8a 100644 Binary files a/preview.png and b/preview.png differ diff --git a/web/package.json b/web/package.json index 516fcfc..9aa3ba3 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "@paddim8/kalk-component", - "version": "1.3.3", + "version": "1.4.0", "description": "A Svelte component for kalk, a calculator that supports user-defined functions and variables.", "svelte": "src/main.ts", "main": "public/build/bundle.js", @@ -55,7 +55,7 @@ "webpack-dev-server": "^3.11.0" }, "dependencies": { - "@paddim8/kalk": "^2.1.2", + "@paddim8/kalk": "^2.2.0", "shadow-selection-polyfill": "^1.1.0" }, "browserslist": [