diff --git a/Rules/Languages/en/SharedRules/general.yaml b/Rules/Languages/en/SharedRules/general.yaml
index d6feca1d..a9cff7f7 100644
--- a/Rules/Languages/en/SharedRules/general.yaml
+++ b/Rules/Languages/en/SharedRules/general.yaml
@@ -744,7 +744,11 @@
- test:
if: "self::m:determinant"
then: [t: "determinant"] # phrase(the 2 by 2 'determinant')
- else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
+ else:
+ - test:
+ if: "@columnlines and (contains(normalize-space(@columnlines), 'solid') or contains(normalize-space(@columnlines), 'dashed'))"
+ then: [t: "augmented matrix"] # phrase(the 2 by 2 'augmented matrix')
+ else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
- pause: long
- x: "*"
- test:
@@ -768,7 +772,11 @@
- test:
if: "self::m:determinant"
then: [t: "determinant"] # phrase(the 2 by 2 'determinant')
- else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
+ else:
+ - test:
+ if: "@columnlines and (contains(normalize-space(@columnlines), 'solid') or contains(normalize-space(@columnlines), 'dashed'))"
+ then: [t: "augmented matrix"] # phrase(the 2 by 2 'augmented matrix')
+ else: [t: "matrix"] # phrase(the 2 by 2 'matrix')
- pause: long
- x: "*"
- test:
diff --git a/tests/Languages/en/mtable.rs b/tests/Languages/en/mtable.rs
index f3c51174..0889a0e0 100644
--- a/tests/Languages/en/mtable.rs
+++ b/tests/Languages/en/mtable.rs
@@ -238,6 +238,44 @@ fn matrix_2x3() -> Result<()> {
}
+#[test]
+fn augmented_matrix_2x3() -> Result<()> {
+ let expr = "
+
+ ";
+ test("en", "ClearSpeak", expr, "the 2 by 3 augmented matrix; row 1; 3, 1, 4; row 2; 0, 2, 6")?;
+ test("en", "SimpleSpeak", expr, "the 2 by 3 augmented matrix; row 1; 3, 1, 4; row 2; 0, 2, 6")?;
+ Ok(())
+}
+
#[test]
fn matrix_2x3_labeled() -> Result<()> {
let expr = "
@@ -859,6 +897,45 @@ test_ClearSpeak("en", "ClearSpeak_Matrix", "EndMatrix",
return Ok(());
}
+#[test]
+fn augmented_matrix_3x4_end_matrix() -> Result<()> {
+let expr = "";
+test_ClearSpeak("en", "ClearSpeak_Matrix", "EndMatrix",
+ expr, "the 3 by 4 augmented matrix; row 1; column 1; 1, column 2; 2, column 3; negative 1, column 4; 3; \
+ row 2; column 1; negative 3, column 2; 3, column 3; negative 1, column 4; 2; \
+ row 3; column 1; 2, column 2; 3, column 3; 2, column 4; negative 1; end matrix")?;
+ test("en", "SimpleSpeak",
+ expr, "the 3 by 4 augmented matrix; row 1; column 1; 1, column 2; 2, column 3; negative 1, column 4; 3; \
+ row 2; column 1; negative 3, column 2; 3, column 3; negative 1, column 4; 2; \
+ row 3; column 1; 2, column 2; 3, column 3; 2, column 4; negative 1; end matrix")?;
+ Ok(())
+ }
+
#[test]
fn simple_matrix_vector() -> Result<()> {