Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 689 #692

Merged
merged 8 commits into from
Nov 10, 2022
Merged

Issue 689 #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
be76046
Solves issue 689.
zorkow Nov 10, 2022
f3948e4
Improves end root and end matrix.
zorkow Nov 10, 2022
8d0879b
Shorten prefix rule.
zorkow Nov 10, 2022
b711023
Improved documentation of clearspeak context method.
zorkow Nov 10, 2022
7fbc15d
Removes explicit endroot removal.
zorkow Nov 10, 2022
c040616
Grammar fixes: explicit prefix, single layoutsummary, endmatrix.
zorkow Nov 10, 2022
ad998d2
Update tests.
zorkow Nov 10, 2022
08241e8
Merge branch 'develop' into issue_689
zorkow Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mathmaps/base/rules/clearspeak_base_actions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
[
"Action",
"prefix",
"[m] content/* (grammar:prefix); [n] children/*[1]"
"[m] content/* (grammar:?prefix); [n] children/*[1]"
],
[
"Action",
Expand Down Expand Up @@ -352,12 +352,12 @@
[
"Action",
"lines-summary-none",
"[n] . (grammar:layoutSummary)"
"[n] . (grammar:?layoutSummary)"
],
[
"Action",
"cases-summary-none",
"[n] . (grammar:layoutSummary)"
"[n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand Down
68 changes: 34 additions & 34 deletions mathmaps/de/rules/clearspeak_german_actions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,92 +527,92 @@
[
"Action",
"sqrt",
"[t] \"Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[t] \"Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"sqrt-nested",
"[p] (pause:\"short\"); [t] \"Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[p] (pause:\"short\"); [t] \"Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"negative-sqrt",
"[t] \"negative Quadratwurzel aus\"; [n] children/*[1]/children/*[1] (pause:short, grammar:!EndRoot)"
"[t] \"negative Quadratwurzel aus\"; [n] children/*[1]/children/*[1] (pause:short)"
],
[
"Action",
"negative-sqrt-default",
"[p] (pause:\"short\"); [t] \"negative Quadratwurzel aus\"; [n] children/*[1]/children/*[1] (pause:short, grammar:!EndRoot)"
"[p] (pause:\"short\"); [t] \"negative Quadratwurzel aus\"; [n] children/*[1]/children/*[1] (pause:short)"
],
[
"Action",
"sqrt-plus-minus",
"[t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"sqrt-nested-plus-minus",
"[p] (pause:\"short\"); [t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[p] (pause:\"short\"); [t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"sqrt-plus-minus-posnegsqrootend",
"[t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"sqrt-nested-plus-minus-posnegsqrootend",
"[p] (pause:\"short\"); [t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short, grammar:!EndRoot)"
"[p] (pause:\"short\"); [t] \"positive Quadratwurzel aus\"; [n] children/*[1] (pause:short)"
],
[
"Action",
"sqrt-endroot",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
"negative-sqrt-endroot",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
"sqrt-posnegsqrootend",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
"negative-sqrt-posnegsqrootend",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
"cubic",
"[t] \"Kubikwurzel aus\"; [n] children/*[2] (pause:short, grammar:!EndRoot)"
"[t] \"Kubikwurzel aus\"; [n] children/*[2] (pause:short)"
],
[
"Action",
"cubic-nested",
"[p] (pause:short); [t] \"Kubikwurzel aus\"; [n] children/*[2] (pause:short, grammar:!EndRoot)"
"[p] (pause:short); [t] \"Kubikwurzel aus\"; [n] children/*[2] (pause:short)"
],
[
"Action",
"root",
"[t] \"die\" (grammar:article); [n] children/*[1] (grammar:ordinal); [t] \"Wurzel aus\"; [n] children/*[2] (pause:short, grammar:!EndRoot)"
"[t] \"die\" (grammar:article); [n] children/*[1] (grammar:ordinal); [t] \"Wurzel aus\"; [n] children/*[2] (pause:short)"
],
[
"Action",
"root-nested",
"[p] (pause:short); [t] \"die\" (grammar:article); [n] children/*[1] (grammar:ordinal); [t] \"Wurzel aus\"; [n] children/*[2] (pause:short, grammar:!EndRoot)"
"[p] (pause:short); [t] \"die\" (grammar:article); [n] children/*[1] (grammar:ordinal); [t] \"Wurzel aus\"; [n] children/*[2] (pause:short)"
],
[
"Action",
"root-endroot",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
"root-posnegsqrootend",
"[n] . (grammar:EndRoot); [t] \"Wurzel Ende\" (pause:short)"
"[n] . (grammar:?EndRoot); [t] \"Wurzel Ende\" (pause:short)"
],
[
"Action",
Expand All @@ -632,12 +632,12 @@
[
"Action",
"set-prefix-operators-masculine",
"[t] \"der\" (grammar:article); [n] . (grammar:!prefix); [t] \"von\""
"[t] \"der\" (grammar:article); [n] . ; [t] \"von\""
],
[
"Action",
"set-prefix-operators-feminine",
"[t] \"die\" (grammar:article); [n] . (grammar:!prefix); [t] \"von\""
"[t] \"die\" (grammar:article); [n] . ; [t] \"von\""
],
[
"Action",
Expand Down Expand Up @@ -787,17 +787,17 @@
[
"Action",
"matrix-end-matrix",
"[n] . (grammar:EndMatrix); [t] \"Ende Matrize\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Matrize\""
],
[
"Action",
"matrix-end-vector",
"[n] . (grammar:EndMatrix); [t] \"Ende Matrize\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Matrize\""
],
[
"Action",
"matrix-end-determinant",
"[n] . (grammar:EndMatrix); [t] \"Ende Determinante\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Determinante\""
],
[
"Action",
Expand All @@ -822,22 +822,22 @@
[
"Action",
"vector-end-matrix",
"[n] . (grammar:EndMatrix); [t] \"Ende Matrize\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Matrize\""
],
[
"Action",
"vector-end-vector",
"[n] . (grammar:EndMatrix); [t] \"Ende Vektor\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Vektor\""
],
[
"Action",
"vector-end-vector-endvector",
"[n] . (grammar:EndMatrix); [t] \"Ende Vektor\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Vektor\""
],
[
"Action",
"vector-end-determinant",
"[n] . (grammar:EndMatrix); [t] \"Ende Determinante\""
"[n] . (grammar:?EndMatrix); [t] \"Ende Determinante\""
],
[
"Action",
Expand All @@ -847,12 +847,12 @@
[
"Action",
"lines-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Zeilen\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Zeilen\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
"cases-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Fälle\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Fälle\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand Down Expand Up @@ -887,7 +887,7 @@
[
"Action",
"lines-cases-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Fälle\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Fälle\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand All @@ -897,7 +897,7 @@
[
"Action",
"lines-equations-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Gleichungen\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Gleichungen\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand All @@ -907,7 +907,7 @@
[
"Action",
"lines-steps-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Rechenschritte\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Rechenschritte\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand All @@ -917,7 +917,7 @@
[
"Action",
"lines-rows-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Zeilen\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Zeilen\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand All @@ -927,7 +927,7 @@
[
"Action",
"lines-constraints-summary",
"[p] (pause:short); [t] count(children/*); [t] \"Bedingungen\"; [n] . (grammar:layoutSummary)"
"[p] (pause:short); [t] count(children/*); [t] \"Bedingungen\"; [n] . (grammar:?layoutSummary)"
],
[
"Action",
Expand Down
4 changes: 2 additions & 2 deletions mathmaps/en/rules/clearspeak_english.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
"Rule",
"caley-table",
"default",
"[p] (pause:short); [t] \"cayley table with\"; [t] count(children/*)-1; [t] \"elements\"; [n] . (grammar:layoutSummary)",
"[p] (pause:short); [t] \"cayley table with\"; [t] count(children/*)-1; [t] \"elements\"; [n] . (grammar:?layoutSummary)",
"self::table[@role=\"cayley\"]",
"not(contains(@grammar, \"layoutSummary\"))"
],
[
"Rule",
"caley-table-operator",
"default",
"[p] (pause:short); [t] \"cayley table for\"; [n] children/*[1]/children/*[1]/children/*[1]; [t] \"with\"; [t] count(children/*)-1; [t] \"elements\"; [n] . (grammar:layoutSummary)",
"[p] (pause:short); [t] \"cayley table for\"; [n] children/*[1]/children/*[1]/children/*[1]; [t] \"with\"; [t] count(children/*)-1; [t] \"elements\"; [n] . (grammar:?layoutSummary)",
"self::table[@role=\"cayley\"]",
"name(children/*[1]/children/*[1]/children/*[1])=\"operator\"",
"not(contains(@grammar, \"layoutSummary\"))"
Expand Down
Loading