Skip to content

Commit

Permalink
Merge pull request #54 from NSoiffer/main
Browse files Browse the repository at this point in the history
Additions agreed upon by group
  • Loading branch information
NSoiffer authored Nov 16, 2023
2 parents d4c5b71 + 4728da7 commit 5be9ffc
Show file tree
Hide file tree
Showing 2 changed files with 178 additions and 4 deletions.
8 changes: 8 additions & 0 deletions _data/core-properties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@
</mrow>"
en: ???

- property: shape
type: geometry
applicability: mo
comment: there are many shape characters in unicode, including filled and shaded ones. Some have mathematical meaning. The shape property is used when they are meant to be used as a geometric shape.
examples:
- mathml: "<mo intent=':shape'>▭</mo><mi>A</mi><mi>B</mi><mi>C</mi><mi>D</mi>"
en: rectangle A B C D

- property: chemical-element
type: chemistry
examples:
Expand Down
174 changes: 170 additions & 4 deletions _data/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defaultfixity:
- concept: measured-angle
characters: [∡]
- concept: minus
characters: [-, −]
characters: ["-", "−"]
- concept: not
characters: [¬]
- concept: partial-derivative
Expand All @@ -35,11 +35,17 @@ defaultfixity:
characters: [∄]
- concept: there-exists
characters: [∃]
- concept: number-of
characters: ["#"]
- concept: change
characters: ["Δ"]

- fixity: infix
concepts:
- concept: and
characters: [⁤∧]
- concept: applied-to
characters: [⁡U+2061]
- concept: approaches
characters: [→]
- concept: approximately
Expand Down Expand Up @@ -96,8 +102,6 @@ defaultfixity:
characters: [∉]
- concept: not-parallel-to
characters: [∦]
- concept: of
characters: [⁡U+2061]
- concept: or
characters: [∨]
- concept: outer-product
Expand Down Expand Up @@ -136,11 +140,46 @@ defaultfixity:
characters: [∪]
- concept: xor
characters: [⊕]
- concept: list-separator
characters: [",", ";"]
- concept: range-separator
characters: ["-", "‐", "‑", "–", "—"]
- concept: ellipsis
characters: ["…"]
- concept: evaluates-to
characters: ["→"]
- concept: maps-to
characters: ["→"]
- concept: translates-to
characters: ["→"]
- concept: such-that
characters: [":", "|"]
- concept: if-and-only-if
characters: ["⟺"]
- concept: perpendicular
characters: ["⟂"]
- concept: defined-as
characters: ["=", "≔"]

- fixity: postfix
concepts:
- concept: factorial
characters: ["!"]
- concept: percent
characters: ["%"]

- fixity: nofix
concepts:
- concept: radius
characters: ["r"]
- concept: diameter
characters: ["d"]
- concept: probability
characters: ["P"]
- concept: distance
characters: ["d", "D"]
- concept: volume
characters: ["V"]

- fixity: silent
concepts:
Expand Down Expand Up @@ -763,6 +802,55 @@ concepts:

## other areas =======================================================

- title: Geometry
intents:
- concept: line-segment
arity: 2
property: prefix
en:
- "line segment $1 $2"
comment:
- "Example: (`mover`): <math><mover><mrow><mi>A</mi><mi>B</mi></mrow><mo>_</mo></mover></math>"

- concept: line
arity: 2
property: prefix
en:
- "line $1 $2"
comment:
- "Example: (`mover`): <math><mover><mrow><mi>A</mi><mi>B</mi></mrow><mo>↔</mo></mover></math>"

- concept: ray
arity: 2
property: prefix
en:
- "ray $1 $2"
comment:
- "Example: (`mover`): <math><mover><mrow><mi>A</mi><mi>B</mi></mrow><mo>→</mo></mover></math>"

- concept: arc
arity: 2
property: prefix
en:
- "arc $1 $2"
comment:
- "Example: (`mover`): <math><mover><mrow><mi>A</mi><mi>B</mi></mrow><mo>⌒</mo></mover></math>"

- concept: shape
arity: "*"
property: prefix
en:
- "shape $1 $2 $3 $4"

- concept: point-at
arity: "3"
property: ???
en:
- "point $1 with coordinates $2 and $3"
comment:
- "Example: P(1,2)"


- title: Fill in the blank
intents:
- concept: blank
Expand All @@ -776,4 +864,82 @@ concepts:
- "`<mo intent='blank'>□</mo>`"
- "`<mspace intent='blank' width='3em'/>`"
- "`<menclose intent='blank' notation='box'>`<br/> `<mspace width='3em'/>`<br/> `</menclose>`"


- title: Separators
intents:
- concept: time-separator
arity: 2
property: infix
en: $1 $2
comment:
- "separates hours and minutes and is typically silent"
- "Example: 2:31"


- title: Generic Concepts
intents:
- concept: fenced-group
arity: 1
property: function
en: "fenced-group of $1"
comment:
- "this includes parens, brackets, and braces"

- concept: ordered-pair
arity: 2
property: function
en: "the pair $1 and $2"

- concept: highlight
arity: 1
property: postfix
en: "$1 highlighted"
comment:
- "this typically would be used inside of a larger expression and not on its own"
- "this might be used with `<menclose notation='box'>` or similar. It might also be used with color changes, although may be done with CSS"

- concept: least-common-denominator
arity: "*"
property: function
en: "least common denominator of $*"

- concept: rate
arity: 2
property: infix
en: "$1 per $2"
comment:
- "Typically used with units"
- "Used with `mfrac` or `/`"

- concept: translation
arity: 2
property: function
en: "translation by $1 comma $2"
comment:
- "Example: <math><msub><mi>T</mi><mrow><mo>(</mo><mn>1</mn><mo>,</mo><mn>3</mn><mo>)</mo></mrow></msub></math>"

- title: Grouping
intents:
- concept: fenced-group
arity: 1
property: function
en: "fenced-group of $1"
comment:
- "this includes parens, brackets, and braces"

- concept: annotation
arity: 2
property: function
en: "H 2 0, which is water"
comment:
- "used with `mover` or `munder`"
- "Example: <math><munder><munder><mrow><msub><mi mathvariant='normal'>H</mi><mn>2</mn></msub><mi mathvariant='normal'>O</mi></mrow><mo>&#x23DF;</mo></munder><mtext>water</mtext></munder></math>"


- concept: braced-group
arity: 1
property: function
en: "grouped $1 end-grouped"
comment:
- "used with `mover` or `munder`"
- "Example: <math><munder><mrow><mfrac><mn>1</mn><mn>3</mn></mfrac><mo>-</mo><mfrac><mn>1</mn><mn>6</mn></mfrac></mrow><mo>&#x23DF;</mo></munder></math>"

0 comments on commit 5be9ffc

Please sign in to comment.