diff --git a/Rules/Languages/sv/SharedRules/default.yaml b/Rules/Languages/sv/SharedRules/default.yaml index 5f85bbfb..d40fa767 100644 --- a/Rules/Languages/sv/SharedRules/default.yaml +++ b/Rules/Languages/sv/SharedRules/default.yaml @@ -333,7 +333,7 @@ then: [T: "och"] # phrase(10 is greater than 8 'and' less than 15) - T: "med" # phrase(substitute x 'with' y) - x: "count($Postscripts) div 2" - - T: "höger índex" # phrase(this material includes several 'postscripts') + - T: "höger index" # phrase(this material includes several 'postscripts') - pause: short - test: if: "not($Postscripts[1][self::m:none])" diff --git a/Rules/Languages/sv/definitions.yaml b/Rules/Languages/sv/definitions.yaml index 647d5f89..bb7eeafc 100644 --- a/Rules/Languages/sv/definitions.yaml +++ b/Rules/Languages/sv/definitions.yaml @@ -20,53 +20,53 @@ "skip-super": "silent=", # used with 'mo' for superscripts (e.g, "*") "absolute-value": "function= ; absolutbeloppet; slut absolutbelopp", - "binomial": "infix=binomial; över; end binomial", + "binomial": "infix=binomial; över; slut binomial", "limit": "prefix=gränsvärdet då", - "lim-sup": "prefix=lim sup as: the limit superior as: the limit superior as", - "lim-inf": "prefix=lim inf as: the limit inferior as : the limit inferior as", + "lim-sup": "prefix=lim sup då: övre gränsvärdet då: det övre gränsvärdet då", + "lim-inf": "prefix=lim inf då: undre gränsvärdet då : det undre gränsvärdet då", "logarithm-with-base": "prefix=logg bas: logaritmen med bas: logaritmen med bas", "minus": "infix=minus || prefix=minus", "plus": "infix=plus || prefix=positivt", "transpose": "postfix=transponat || function=transponat", "norm": "function=; normen; slut norm", - "trace": "function=;spåret; slut spåret", - "dimension": "function=; dimensionen; slut dimensionen", + "trace": "function=;spåret; slut spår", + "dimension": "function=; dimensionen; slut dimension", # "homomorphism": "function= ; homomorfism; slut homomorfism", # doesn't fit function pattern # "kernel": "function= ; noll-rummet : noll-rummet till: noll-rummet till; slut noll-rummet", # doesn't fit function pattern "vector": "function= ; vektor: vektorn: vektorn || prefix=vektor: vektorn: vektorn", - "cross-product": "infix=cross: cross product: cross product", - "dot-product": "infix=dot: dot product: dot:dot product", + "cross-product": "infix=kryss: kryssprodukt: kryssprodukt", + "dot-product": "infix=skalärt: skalärprodukt: skalärprodukt", - "divergence": "function= ; div: divergence: divergence; end divergence", - "curl": "function= ; curl; end curl", - "gradient": "function= ; grad: gradient: gradient; end gradient", - "laplacian": "function=lahplahsian", # speech engines don't do a good job with "laplacian" + "divergence": "function= ; div: divergens: divergens; slut divergens", + "curl": "function= ; rotation; slut rotation", + "gradient": "function= ; grad: gradient: gradient; slut gradient", + "laplacian": "function=laplacian", # speech engines don't do a good job with "laplacian" (swedish ones might) } - NavigationParts: { - "large-op": "base; lower limit; upper limit", - "mfrac": "numerator;denominator", - "fraction": "numerator;denominator", - "msqrt": "root", - "square-root": "root", - "mroot": "root;root index", - "root": "root;root index", - "msub": "base;subscript", - "sub": "base;subscript", - "msup": "base;superscript", - "say-super": "base;superscript", - "skip-super": "base;superscript", - "power": "base;exponent", - "msubsup": "base;subscript;superscript", - "munder": "base;under limit", - "mover": "base;upper limit", - "munderover": "base;under limit;upper limit", + "large-op": "bas; undre gräns; övre gräns", + "mfrac": "täljare;nämnare", + "fraction": "täljare;nämnare", + "msqrt": "rot", + "square-root": "rot", + "mroot": "rot;rot index", + "root": "rot;rot index", + "msub": "bas;nedre index", + "sub": "bas;nedre index", + "msup": "bas;övre index", + "say-super": "bas;upphöjt", + "skip-super": "bas;upphöjt", + "power": "bas;exponent", + "msubsup": "bas;nedre index;övre index", + "munder": "bas;undre gräns", + "mover": "bas;övre gräns", + "munderover": "bas;undre gräns;övre gräns", # words for moving into and out of one of the parts (e.g., "move right 'out of' numerator, 'in' denominator") # it's a hack to put them here, but at least they are grouped with the other navigation parts - "in": "in", - "out": "out of", + "in": "i", + "out": "ut ur", } - SIPrefixes: { diff --git a/Rules/Languages/sv/unicode-full.yaml b/Rules/Languages/sv/unicode-full.yaml index 50dc8af6..141ddc7c 100644 --- a/Rules/Languages/sv/unicode-full.yaml +++ b/Rules/Languages/sv/unicode-full.yaml @@ -494,37 +494,37 @@ - "⅝": [T: "fem åttondelar"] # 0x215d (en: 'five eighths') - "⅞": [T: "sju åttondelar"] # 0x215e (en: 'seven eighths') - "⅟": [T: "ett genom"] # 0x215f (en: 'one over', google: 'en över') - - "Ⅰ": [T: "Ⅰ"] # 0x2160 (en: 'I', google translation) + - "Ⅰ": [T: "I"] # 0x2160 (en: 'I', google translation) - "Ⅱ": [T: "i i"] # 0x2161 (en: 'I I', google translation) - "Ⅲ": [T: "i i i"] # 0x2162 (en: 'I I I', google translation) - "Ⅳ": [T: "i v"] # 0x2163 (en: 'I V', google translation) - - "Ⅴ": [T: "Ⅴ"] # 0x2164 (en: 'V', google translation) + - "Ⅴ": [T: "V"] # 0x2164 (en: 'V', google translation) - "Ⅵ": [T: "v i"] # 0x2165 (en: 'V I', google translation) - "Ⅶ": [T: "v i i"] # 0x2166 (en: 'V I I', google translation) - "Ⅷ": [T: "v i i i"] # 0x2167 (en: 'V I I I', google translation) - "Ⅸ": [T: "i x"] # 0x2168 (en: 'I X', google translation) - - "Ⅹ": [T: "Ⅹ"] # 0x2169 (en: 'X', google translation) + - "Ⅹ": [T: "X"] # 0x2169 (en: 'X', google translation) - "Ⅺ": [T: "x i"] # 0x216a (en: 'X I', google translation) - "Ⅻ": [T: "x i i"] # 0x216b (en: 'X I I', google translation) - - "Ⅼ": [T: "Ⅼ"] # 0x216c (en: 'L', google translation) - - "Ⅽ": [T: "Ⅽ"] # 0x216d (en: 'C', google translation) - - "Ⅾ": [T: "Ⅾ"] # 0x216e (en: 'D', google translation) - - "Ⅿ": [T: "Ⅿ"] # 0x216f (en: 'M', google translation) - - "ⅰ": [T: "ⅰ"] # 0x2170 (en: 'I', google translation) + - "Ⅼ": [T: "L"] # 0x216c (en: 'L', google translation) + - "Ⅽ": [T: "C"] # 0x216d (en: 'C', google translation) + - "Ⅾ": [T: "D"] # 0x216e (en: 'D', google translation) + - "Ⅿ": [T: "M"] # 0x216f (en: 'M', google translation) + - "ⅰ": [T: "i"] # 0x2170 (en: 'I', google translation) - "ⅱ": [T: "i i"] # 0x2171 (en: 'I I', google translation) - "ⅲ": [T: "i i i"] # 0x2172 (en: 'I I I', google translation) - "ⅳ": [T: "i v"] # 0x2173 (en: 'I V', google translation) - - "ⅴ": [T: "ⅴ"] # 0x2174 (en: 'V', google translation) + - "ⅴ": [T: "v"] # 0x2174 (en: 'V', google translation) - "ⅵ": [T: "v i"] # 0x2175 (en: 'V I', google translation) - "ⅶ": [T: "v i i"] # 0x2176 (en: 'V I I', google translation) - "ⅷ": [T: "v i i i"] # 0x2177 (en: 'V I I I', google translation) - "ⅸ": [T: "i x"] # 0x2178 (en: 'I X', google translation) - - "ⅹ": [T: "ⅹ"] # 0x2179 (en: 'X', google translation) + - "ⅹ": [T: "x"] # 0x2179 (en: 'X', google translation) - "ⅺ": [T: "x i"] # 0x217a (en: 'X I', google translation) - "ⅻ": [T: "x i i"] # 0x217b (en: 'X I I', google translation) - - "ⅼ": [T: "ⅼ"] # 0x217c (en: 'L', google translation) - - "ⅽ": [T: "ⅽ"] # 0x217d (en: 'C', google translation) - - "ⅾ": [T: "ⅾ"] # 0x217e (en: 'D', google translation) + - "ⅼ": [T: "l"] # 0x217c (en: 'L', google translation) + - "ⅽ": [T: "c"] # 0x217d (en: 'C', google translation) + - "ⅾ": [T: "d"] # 0x217e (en: 'D', google translation) - "ⅿ": [T: "ⅿ"] # 0x217f (en: 'M', google translation) - "↉": [T: "noll tredjedelar"] # 0x2189 (en: 'zero thirds') - "←": [T: "vänster-pil"] # 0x2190 (en: 'leftwards arrow') @@ -1156,7 +1156,7 @@ - "⋔": # 0x22d4 - T: "äkta snittet" # (en: 'proper intersection of', MathPlayer: 'pitchfork', google: 'korrekt skärningspunkt av') - "⋕": # 0x22d5 - - T: "lika med och och parallell med" # (en: 'equal to and parallel to') + - T: "lika med och parallell med" # (en: 'equal to and parallel to') - "⋖": [T: "mindre än med punkt"] # 0x22d6 (en: 'less than with dot') - "⋗": [T: "större än med punkt"] # 0x22d7 (en: 'greater than with dot') - "⋘": # 0x22d8 @@ -1345,7 +1345,7 @@ - "⒖": [T: "femton med punkt"] # 0x2496 (en: 'fifteen with period', google translation) - "⒗": [T: "sexton med punkt"] # 0x2497 (en: 'sixteen with period', google translation) - "⒘": [T: "sjutton med punkt"] # 0x2498 (en: 'seventeen with period', google translation) - - "⒙": [T: "ateen med punkt"] # 0x2499 (en: 'eighteen with period', google translation) + - "⒙": [T: "arton med punkt"] # 0x2499 (en: 'eighteen with period', google translation) - "⒚": [T: "nitton med punkt"] # 0x249a (en: 'nineteen with period', google translation) - "⒛": [T: "tjugo med punkt"] # 0x249b (en: 'twenty with period', google translation) - "⒜-⒵": # 0x249c - 0x24b5 @@ -2315,8 +2315,8 @@ - "』": [T: "höger vit hörn-parentes"] # 0x300f (en: 'right white corner bracket', google: 'höger vit hörnfäste') - "【": [T: "vänster svart linsformad hak-parentes"] # 0x3010 (en: 'left black lenticular bracket', google: 'vänster svart linsformell konsol') - "】": [T: "höger svart linsformad hak-parentes"] # 0x3011 (en: 'right black lenticular bracket', google: 'höger svart linsformell konsol') - - "〔": [T: "vänster tortoise shell bracket"] # 0x3014 (en: 'left tortoise shell bracket') - - "〕": [T: "höger tortoise shell bracket"] # 0x3015 (en: 'right tortoise shell bracket') + - "〔": [T: "vänster sköldpadds-skal hak-parentes"] # 0x3014 (en: 'left tortoise shell bracket') + - "〕": [T: "höger sköldpadds-skal hak-parentes"] # 0x3015 (en: 'right tortoise shell bracket') - "〖": [T: "vänster vit linsformad hak-parentes"] # 0x3016 (en: 'left white lenticular bracket', google: 'vänster vit linsformad konsol') - "〗": [T: "höger vit linsformad hak-parentes"] # 0x3017 (en: 'right white lenticular bracket', google: 'höger vit linsformad konsol') - "〘": [T: "vänster vit sköldpadds-skal hak-parentes"] # 0x3018 (en: 'left white tortoise shell bracket', google: 'vänster vit sköldpaddsskalfäste') @@ -2431,7 +2431,7 @@ - "㏁": [T: "mega-ohm"] # 0x33c1 (google translation) - "㏂": [T: "attometer"] # 0x33c2 (en: 'attometers', google translation) - "㏃": [T: "becquerel"] # 0x33c3 (google translation) - - "㏄": [T: "kubikcentimeter"] # 0x33c4 (en: 'cubic centimeters', google translation) + - "㏄": [T: "kubik-centimeter"] # 0x33c4 (en: 'cubic centimeters', google translation) - "㏅": [T: "candela"] # 0x33c5 (google translation) - "㏆": [T: "coulomb per kilo"] # 0x33c6 (en: 'coulombs per kilogram', google translation) - "㏇": [T: "hjärtminutvolym"] # 0x33c7 (en: 'cardiac output', google translation) @@ -3081,7 +3081,7 @@ else: [x: "$SpeechOverrides_CapitalLetters"] - pitch: value: "$CapitalLetters_Pitch" - replace: [T: "ligatur ae"] # (en: 'ligature ae', google translation) + replace: [T: "ligatur a e"] # (en: 'ligature ae', google translation) - "": # 0xf19b - test: if: "$CapitalLetters_Beep" diff --git a/tests/Languages/sv/shared.rs b/tests/Languages/sv/shared.rs index 9230c4ee..74738514 100644 --- a/tests/Languages/sv/shared.rs +++ b/tests/Languages/sv/shared.rs @@ -85,9 +85,9 @@ fn tensor_mmultiscripts() { R i j k l "; test_prefs("sv", "SimpleSpeak", vec![("Verbosity", "Verbose")], expr, - "versal r med 4 höger índex, nedsänkt i upphöjt j nedsänkt k nedsänkt l"); + "versal r med 4 höger index, nedsänkt i upphöjt j nedsänkt k nedsänkt l"); test_prefs("sv", "SimpleSpeak", vec![("Verbosity", "Medium")], expr, - "versal r med 4 höger índex, nedsänkt i upphöjt j nedsänkt k nedsänkt l"); + "versal r med 4 höger index, nedsänkt i upphöjt j nedsänkt k nedsänkt l"); } #[test] @@ -97,7 +97,7 @@ fn huge_num_mmultiscripts() { I J K L "; test_prefs("sv", "SimpleSpeak", vec![("Verbosity", "Verbose")], expr, - "versal r med 4 vänster index, nedsänkt versal i, upphöjt versal j och resterande vänster index versal k none versal l none slut vänster index och med 5 höger índex, nedsänkt i upphöjt j nedsänkt k nedsänkt l och resterande höger index m none slut index"); + "versal r med 4 vänster index, nedsänkt versal i, upphöjt versal j och resterande vänster index versal k none versal l none slut vänster index och med 5 höger index, nedsänkt i upphöjt j nedsänkt k nedsänkt l och resterande höger index m none slut index"); } #[test]