Skip to content

Merge nb into main branch #387

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

Merged
NSoiffer merged 20 commits into from
Aug 13, 2025
Merged

Merge nb into main branch #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
95a6c20
Bring Norwegian translation fork into main repo (#383)
NSoiffer Aug 5, 2025
64aafb2
Update the nb rules to match what is in 'en'. Some tests needed tweaks.
NSoiffer Aug 5, 2025
5eb21dd
Use table look up for denominators before a unit
NSoiffer Aug 5, 2025
f1c6fb4
Merge branch 'main' into nb
NSoiffer Aug 6, 2025
d6c469b
Tests for fractions followed by units (#385)
MartheGjelstad Aug 6, 2025
139378d
Merge branch 'main' into nb
NSoiffer Aug 6, 2025
e258822
Merge branch 'main' into nb
NSoiffer Aug 7, 2025
885f8a7
reformat a rule
NSoiffer Aug 9, 2025
b03f5c1
Split `NeuterUnits` into `NeuterUnits` and `NeuterUnitsWithoutPrefixes`.
NSoiffer Aug 9, 2025
5094a90
add 'Speech' arg to IsInDefinition
NSoiffer Aug 9, 2025
98a5263
Get speech to use "ett" for 1 in front of neuter units. This includes…
NSoiffer Aug 9, 2025
f2781b0
Changed "en" to "1". MathCAT assumes "en" will be used for 1.
NSoiffer Aug 9, 2025
c5836f1
fixed comment
NSoiffer Aug 9, 2025
b20ace1
Propogated `:unit` to `mfrac` and `msup` so that it is easier to tell…
NSoiffer Aug 9, 2025
c5fd142
Fixed intent's attr rule. There were several things wrong with it:
NSoiffer Aug 9, 2025
7560142
fix test that was wrong
NSoiffer Aug 12, 2025
7eead93
Merge branch 'main' into nb
NSoiffer Aug 12, 2025
2a7954d
Added mprescript to tags that should be skipped
NSoiffer Aug 12, 2025
a74b6fb
Merge branch 'main' into nb
NSoiffer Aug 13, 2025
1c0592e
Made '1' in front of mixed fraction say "ett".
NSoiffer Aug 13, 2025
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
13 changes: 0 additions & 13 deletions Rules/Languages/en/ClearSpeak_Rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,6 @@
- x: "*[1]"
- x: "ToOrdinal(*[2], true(), $IsPlural)" # extra args specify fractional ordinal and whether it is plural

- name: common-fraction-mixed-number
tag: fraction
match:
- "preceding-sibling::*[1][self::m:mo][.='⁤'] and" # preceding element is invisible plus
- "($ClearSpeak_Fractions='Auto' or $ClearSpeak_Fractions='Ordinal' or $ClearSpeak_Fractions='EndFrac') and"
- "*[1][self::m:mn][not(contains(., '.')) and ($ClearSpeak_Fractions='Ordinal' or text()<20)] and"
- "*[2][self::m:mn][not(contains(., '.')) and ($ClearSpeak_Fractions='Ordinal' or (2<= text() and text()<=10))]"
variables: [IsPlural: "*[1]!=1"]
replace:
- x: "*[1]"
- x: "ToOrdinal(*[2], true(), $IsPlural)" # extra args specify fractional ordinal and whether it is plural


- name: fraction-over-simple
tag: fraction
match:
Expand Down
2 changes: 1 addition & 1 deletion Rules/Languages/es/SharedRules/general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
- IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
- IsSingular: "(not($MRowForCoefficient) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"
- Prefix: "''"
- Word: "''"
Expand Down
2 changes: 1 addition & 1 deletion Rules/Languages/fi/SharedRules/general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
- IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
- IsSingular: "(not($MRowForCoefficient) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"
- Prefix: "''"
- Word: "''"
Expand Down
2 changes: 1 addition & 1 deletion Rules/Languages/id/SharedRules/general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
IfThenElse(parent::m:power, ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:fraction and not(preceding-sibling::*), ancestor::*[2][self::m:mrow],
IfThenElse(parent::m:power[parent::m:fraction and not(preceding-sibling::*)], ancestor::*[3][self::m:mrow], false()) ) ) )"
- IsSingular: "(not(DEBUG($MRowForCoefficient)) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
- IsSingular: "(not($MRowForCoefficient) and parent::*[name(.)!='skip-super' or *[1][.=1]]) or
($MRowForCoefficient and $MRowForCoefficient[(count(*) = 3 and *[1][self::m:mn and .=1] and *[2]='\u2062')])"

- Prefix: "''"
Expand Down
Loading
Loading