branch: externals/mathsheet
commit 4aeb27c2cf727f4aeed48aab386e1b01f52d438d
Author: Ian Martins <ia...@jhu.edu>
Commit: Ian Martins <ia...@jhu.edu>
Version bump
---
README.md | 4 ++--
examples/example.org | 64 ----------------------------------------------------
mathsheet.org | 2 +-
3 files changed, 3 insertions(+), 67 deletions(-)
diff --git a/README.md b/README.md
index a98311d6d1..6f9439ca82 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ parent, or any parent.
Here are some example worksheets generated by this tool, along with
the templates from which they were built. Template syntax is described
-in greater in the [Problem Templates](#org3b64385) section below.
+in greater in the [Problem Templates](#org60d67dd) section below.
1. [arithmetic](examples/add-sub-1.pdf)
made from these templates:
@@ -214,7 +214,7 @@ format.
;; Author: Ian Martins <ia...@jhu.edu>
;; Keywords: tools, education, math
;; Homepage: https://gitlab.com/ianxm/mathsheet
- ;; Version: 1.0
+ ;; Version: 1.1
;; Package-Requires: ((peg "1.0")
;; (emacs "28.1")
;; calc)
diff --git a/examples/example.org b/examples/example.org
deleted file mode 100644
index bdc48d12ef..0000000000
--- a/examples/example.org
+++ /dev/null
@@ -1,64 +0,0 @@
-* add and subtract
-
-#+name: add-sub-1
-| weight | order | template | descr
|
-|--------+-------+--------------------------------------+-----------------------------------------|
-| 3 | 1 | [1..10] + [0..10] | simple
|
-| 2 | 2 | [1..10] + [8..15] | second number bigger
|
-| 1 | 2 | [a=3..10] - [0..$a] | subtraction
|
-| 1 | 3 | [1..10] + [1..7] + [1..5] | three numbers
|
-| 1 | 4 | [a=1..10] + [0..10] - [0..$a] | three with
subtraction, positive result |
-| 0 | 0 | [$a*[1..5]] / [a=1..10] | division
|
-| 5 | 5 | [a=1..10] + [b=0..10] - [0..($a+$b)] | three with
subtraction, positive result |
-
-#+BEGIN: problem-set :templates "add-sub-1" :count 24 :prob-cols 3
:instruction "Compute the answer"
-| problem | answer |
-|------------+--------|
-| 5 + 6 | 11 |
-| 1 + 5 | 6 |
-| 4 + 7 | 11 |
-| 7 + 1 | 8 |
-| 5 + 4 | 9 |
-| 9 + 1 | 10 |
-| 5 - 4 | 1 |
-| 3 + 13 | 16 |
-| 7 + 8 | 15 |
-| 9 + 12 | 21 |
-| 4 + 9 | 13 |
-| 8 - 5 | 3 |
-| 8 + 5 + 4 | 17 |
-| 6 + 6 + 3 | 15 |
-| 7 + 9 - 1 | 15 |
-| 3 + 2 - 0 | 5 |
-| 8 + 7 - 4 | 11 |
-| 5 + 4 - 7 | 2 |
-| 2 + 9 - 6 | 5 |
-| 1 + 3 - 0 | 4 |
-| 9 + 5 - 3 | 11 |
-| 7 + 8 - 12 | 3 |
-| 8 + 4 - 7 | 5 |
-| 8 + 2 - 8 | 2 |
-#+END:
-
-* algebra
-#+name: algebra-1
-| weight | order | template | descr
|
-|--------+-------+---------------------------------------+-----------------------|
-| 3 | 1 | x / ([2..4] + [a=0..5]) = [$a..10] | simple
|
-| 2 | 2 | [$a*[2..10]] / x = [a=1,2,4] | simple
|
-| 2 | 3 | x/[-5..-1,1..5] + [1..10] = [-10..10] | double range
sequence |
-| 1 | 3 | x = x/[a=2..6] + [round([1..20]/$a)] | var twice
|
-| 1 | 3 | x^2 = sqrt([16 - $a] + [a=1..5]) | sqrt
|
-
-#+BEGIN: problem-set :templates "algebra-1" :count 8 :prob-cols 2 :instruction
"Solve for x"
-| problem | answer |
-|--------------------+---------|
-| x / (3 + 4) = 5 | x = 35 |
-| x / (2 + 4) = 7 | x = 42 |
-| 9 / x = 1 | x = 9 |
-| 12 / x = 2 | x = 6 |
-| x^2 = sqrt(13 + 3) | x = 2 |
-| x/3 + 6 = -8 | x = -42 |
-| x = x/5 + 0 | x = 0 |
-| x/-2 + 9 = 4 | x = 10 |
-#+END:
diff --git a/mathsheet.org b/mathsheet.org
index 39c7e031a3..53cc302020 100644
--- a/mathsheet.org
+++ b/mathsheet.org
@@ -204,7 +204,7 @@ format.
;; Author: Ian Martins <ia...@jhu.edu>
;; Keywords: tools, education, math
;; Homepage: https://gitlab.com/ianxm/mathsheet
- ;; Version: 1.0
+ ;; Version: 1.1
;; Package-Requires: ((peg "1.0")
;; (emacs "28.1")
;; calc)
