branch: externals/org-mathsheet
commit 892147efc55513028035ee55a2ada66c4bc16694
Author: Ian Martins <ia...@jhu.edu>
Commit: Ian Martins <ia...@jhu.edu>
Minor doc changes
---
README.md | 22 +++++++++++-----------
mathsheet.org | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index ccb4bdcfc0..d046663ee2 100644
--- a/README.md
+++ b/README.md
@@ -133,23 +133,23 @@ shows where variables or numbers should be.
These are the different ways fields can be defined:
- - **[-2..8]:** choose a random number from -2 to 8, inclusive
- - **[1,3,5]:** choose randomly from 1, 3 or 5
- - **[-3..-1,1..3]:** choose a random number from -3 to -1 or 1 to 3
- - **[10/(2-1)]:** evaluate the expression
- - **[round(sin(0.3))]:** expressions can use math functions
- - **[a=…]:** assign the variable `a` to the number chosen for
this field
- - **[-2..$a]:** any number from -2 to the value another field assigned
+ - **`[-2..8]`:** choose a random number from -2 to 8, inclusive
+ - **`[1,3,5]`:** choose randomly from 1, 3 or 5
+ - **`[-3..-1,1..3]`:** choose a random number from -3 to -1 or 1 to 3
+ - **`[10/(2-1)]`:** evaluate the expression
+ - **`[round(sin(0.3))]`:** expressions can use math functions
+ - **`[a=...]`:** assign the variable `a` to the number chosen for this
field
+ - **`[-2..$a]`:** any number from -2 to the value another field assigned
to `a`
- - **[0..[$a/2]]:** any number from 0 to half the value assigned to `a`.
+ - **`[0..[$a/2]]`:** any number from 0 to half the value assigned to `a`.
The ability to keep track of the random number chosen in one field and
use it to influence another allows the template to be written to avoid
answers that are negative or don't divide evenly.
- These math functions are allowed: sqrt, sin, cos, tan, asin, acos,
- atan, floor, ceil, round. Find more details about each of these
- functions in the Emacs Calc manual.
+ These math functions are allowed: `sqrt`, `sin`, `cos`, `tan`, `asin`,
`acos`,
+ `atan`, `floor`, `ceil`, `round`. Find more details about each of these
+ functions in the [Emacs Calc
manual](https://www.gnu.org/software/emacs/manual/html_mono/calc.html#Arithmetic).
4. Template Examples
diff --git a/mathsheet.org b/mathsheet.org
index d7c8d162d9..96e53c7eb3 100644
--- a/mathsheet.org
+++ b/mathsheet.org
@@ -102,23 +102,23 @@ This can produce the following problems:
#+end_example
**** Field Rules
These are the different ways fields can be defined:
-- [-2..8] :: choose a random number from -2 to 8, inclusive
-- [1,3,5] :: choose randomly from 1, 3 or 5
-- [-3..-1,1..3] :: choose a random number from -3 to -1 or 1 to 3
-- [10/(2-1)] :: evaluate the expression
-- [round(sin(0.3))] :: expressions can use math functions
-- [a=...] :: assign the variable ~a~ to the number chosen for this field
-- [-2..$a] :: any number from -2 to the value another field assigned
+- ~[-2..8]~ :: choose a random number from -2 to 8, inclusive
+- ~[1,3,5]~ :: choose randomly from 1, 3 or 5
+- ~[-3..-1,1..3]~ :: choose a random number from -3 to -1 or 1 to 3
+- ~[10/(2-1)]~ :: evaluate the expression
+- ~[round(sin(0.3))]~ :: expressions can use math functions
+- ~[a=...]~ :: assign the variable ~a~ to the number chosen for this field
+- ~[-2..$a]~ :: any number from -2 to the value another field assigned
to ~a~
-- [0..[$a/2]] :: any number from 0 to half the value assigned to ~a~.
+- ~[0..[$a/2]]~ :: any number from 0 to half the value assigned to ~a~.
The ability to keep track of the random number chosen in one field and
use it to influence another allows the template to be written to avoid
answers that are negative or don't divide evenly.
-These math functions are allowed: sqrt, sin, cos, tan, asin, acos,
-atan, floor, ceil, round. Find more details about each of these
-functions in the Emacs Calc manual.
+These math functions are allowed: ~sqrt~, ~sin~, ~cos~, ~tan~, ~asin~, ~acos~,
+~atan~, ~floor~, ~ceil~, ~round~. Find more details about each of these
+functions in the
[[https://www.gnu.org/software/emacs/manual/html_mono/calc.html#Arithmetic][Emacs
Calc manual]].
**** Template Examples
Here are a few more examples:
