diff --git a/Rules/Languages/ja/SharedRules/general.yaml b/Rules/Languages/ja/SharedRules/general.yaml index 5d632afe..cc771228 100644 --- a/Rules/Languages/ja/SharedRules/general.yaml +++ b/Rules/Languages/ja/SharedRules/general.yaml @@ -156,14 +156,14 @@ if: "$Verbosity!='Terse'" then: [ot: ""] # phrase('the' square root of 25 equals 5) - x: "*[1]" - - t: "から" # phrase(subtracting 5 'from' 10 gives 5) - x: "*[2]" + - t: "から" # phrase(subtracting 5 'from' 10 gives 5) - pause: short - - t: "に" # phrase(adding 6 'to' 6 equals 12) - x: "*[3]" + - t: "まで" # phrase(adding 6 'to' 6 equals 12) - test: if: "following-sibling::*" - then: [t: "の"] # phrase(the square root 'of' 25 equals 5) + then: [t: "オブ"] # phrase(the square root 'of' 25 equals 5) - name: bigop-under tag: large-op @@ -173,11 +173,11 @@ if: "$Verbosity!='Terse'" then: [ot: ""] # phrase('the' square root of 25 equals 5) - x: "*[1]" - - t: "分の" # phrase(2 'over' 3 equals two thirds) - x: "*[2]" + - t: "にわたる" # phrase(2 'over' 3 equals two thirds) - test: if: "following-sibling::*" - then: [t: "の"] # phrase(the square root 'of' 25 equals 5) + then: [t: "オブ"] # phrase(the square root 'of' 25 equals 5) - name: largeop tag: mrow diff --git a/tests/Languages/ja/ja.rs b/tests/Languages/ja/ja.rs index 46166d5e..17f794cb 100644 --- a/tests/Languages/ja/ja.rs +++ b/tests/Languages/ja/ja.rs @@ -246,7 +246,23 @@ fn set_membership() -> Result<()> { #[test] fn summation() -> Result<()> { let expr = "i=1ni"; - test("ja", "SimpleSpeak", expr, "総和 から i イコール 1, に n の i")?; + test("ja", "SimpleSpeak", expr, "総和 i イコール 1 から, n まで オブ i")?; + return Ok(()); +} + +/// A large operator with only a lower limit takes the postposed "over" cue. +#[test] +fn summation_lower_limit_only() -> Result<()> { + let expr = "i=1i"; + test("ja", "SimpleSpeak", expr, "総和 i イコール 1 にわたる オブ i")?; + return Ok(()); +} + +/// The same shape is used for the other large operators. +#[test] +fn product_with_limits() -> Result<()> { + let expr = "i=1ni"; + test("ja", "SimpleSpeak", expr, "プロダクト i イコール 1 から, n まで オブ i")?; return Ok(()); } @@ -254,6 +270,6 @@ fn summation() -> Result<()> { #[test] fn definite_integral() -> Result<()> { let expr = "01xx"; - test("ja", "SimpleSpeak", expr, "積分 から 0, に 1 の; x 微分 d x")?; + test("ja", "SimpleSpeak", expr, "積分 0 から, 1 まで オブ; x 微分 d x")?; return Ok(()); }