Skip to content

Commit 490ca4a

Browse files
Changed multiline rule for preference "None".
1 parent 7093326 commit 490ca4a

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎Rules/Languages/nb/ClearSpeak_Rules.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,6 @@
674674
then: [T: "den naturlige logaritmen"] # phrase(the 'natural log' of x)
675675
else: [SPELL: "'ln'"]
676676

677-
# Norwegian: The preference MultiLineLabel = none is handled differently than it is for English.
678677
- name: ClearSpeak-multi-line
679678
tag: [piecewise, system-of-equations, lines] # these are ignored in favor of the ClearSpeak prefs
680679
match: "."
@@ -691,37 +690,37 @@
691690
- if: "($ClearSpeak_MultiLineLabel = 'Auto' and self::m:piecewise) or $ClearSpeak_MultiLineLabel = 'Case'"
692691
then:
693692
- test:
694-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
693+
- if: "$LineCount > 1"
695694
then: [T: "tilfeller"]
696695
else: [T: "tilfelle"] # phrase(this is the first 'case' of three cases)
697-
- else_if: "$ClearSpeak_MultiLineLabel = 'Auto' or $ClearSpeak_MultiLineLabel = 'Line'" # already dealt with Auto/Case
696+
- else_if: "$ClearSpeak_MultiLineLabel = 'Auto' or $ClearSpeak_MultiLineLabel = 'Line' or $ClearSpeak_MultiLineLabel = 'None'" # already dealt with Auto/Case
698697
then:
699698
- test:
700-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
699+
- if: "$LineCount > 1"
701700
then: [T: "rader"] # phrase(this is the first 'line' of three lines)
702701
else: [T: "rad"] # phrase(this is the first 'line' of three lines)
703702
- else_if: "$ClearSpeak_MultiLineLabel = 'Constraint'"
704703
then:
705704
- test:
706-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
705+
- if: "$LineCount > 1"
707706
then: [T: "betingelser"] # phrase(this is the first 'constraint' of three constraints)
708707
else: [T: "betingelse"] # phrase(this is the first 'constraint' of three constraints)
709708
- else_if: "$ClearSpeak_MultiLineLabel = 'Equation'"
710709
then:
711710
- test:
712-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
711+
- if: "$LineCount > 1"
713712
then: [T: "likninger"] # phrase(this is the first 'equation' of three equations)
714713
else: [T: "likning"] # phrase(this is the first 'equation' of three equations)
715714
- else_if: "$ClearSpeak_MultiLineLabel = 'Row'"
716715
then:
717716
- test:
718-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
717+
- if: "$LineCount > 1"
719718
then: [T: "rader"] # phrase(this is the first 'row' of three rows)
720719
else: [T: "rad"] # phrase(this is the first 'row' of three rows)
721720
- else_if: "$ClearSpeak_MultiLineLabel = 'Step'"
722721
then:
723722
- test:
724-
- if: "$LineCount > 1 and $ClearSpeak_MultiLineLabel != 'None'"
723+
- if: "$LineCount > 1"
725724
then: [T: "steg"] # phrase(this is the first 'step' of three steps)
726725
else: [T: "steg"] # phrase(this is the first 'step' of three steps)
727726
# SWEDISH/NORWEGIAN: Every expression had to be inflected separately.

‎tests/Languages/nb/ClearSpeak/multiline.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fn equation_none() -> Result<()> {
138138
</math>
139139
";
140140
test_ClearSpeak("nb", "ClearSpeak_MultiLineLabel", "None", expr,
141-
"2; x pluss y er lik 7; 2 x pluss 3 y; er lik 17")?;
141+
"2 rader; x pluss y er lik 7; 2 x pluss 3 y; er lik 17")?;
142142
return Ok(());
143143
}
144144

0 commit comments

Comments
 (0)