Merge branch 'NSoiffer:main' into main

MartheGjelstad · web-flow · commit a51b14208f72 · 2025-06-19T09:35:48.000+02:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -11,14 +11,19 @@ env:
 
 jobs:
   build:
-
+    name: Build and Test
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
     - name: Build
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
-    - name: Run Clippy/Lint
+
+  clippy:
+    name: Clippy/Lint check
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: run clippy
       run: cargo clippy
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "(Windows) Launch",
-            "type": "lldb", //"cppvsdbg",
+            "type": "cppvsdbg", // "lldb",
             "request": "launch",
             "program": "${workspaceRoot}/target/debug/mathcat.exe",
             "args": [],
@@ -17,7 +17,7 @@
         },
         {
             "name": "Run Test Debugger",
-            "type": "lldb", //"cppvsdbg",
+            "type": "cppvsdbg", // "lldb",
             "request": "launch",
             "program": "${workspaceRoot}/target/debug/mathcat.exe",
             "args": [],
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,9 +38,9 @@ log = "0.4"
 env_logger = "0.11"
 cfg-if = "1.0"
 [target.'cfg(target_family = "wasm")'.dependencies]
-zip = { version = "4.0", default-features = false, features = ["deflate"] }
+zip = { version = "4.1", default-features = false, features = ["deflate"] }
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-zip = { version = "4.0", default-features = false, features = ["bzip2"] }
+zip = { version = "4.1", default-features = false, features = ["bzip2"] }
 fastrand = { version = "2.3.0" }
 
 android_logger = {version = "0.15.0", optional = true}
@@ -51,9 +51,9 @@ android_logger = {version = "0.15.0", optional = true}
 bitflags = "2.6"
 error-chain = "0.12.4"
 [target.'cfg(target_family = "wasm")'.build-dependencies]
-zip = { version = "4.0", default-features = false, features = ["deflate"] }
+zip = { version = "4.1", default-features = false, features = ["deflate"] }
 [target.'cfg(not(target_family = "wasm"))'.build-dependencies]
-zip = { version = "4.0", default-features = false, features = ["bzip2"] }
+zip = { version = "4.1", default-features = false, features = ["bzip2"] }
 
 [lib]
 name = "libmathcat"
diff --git a/Rules/Braille/UEB/UEB_Rules.yaml b/Rules/Braille/UEB/UEB_Rules.yaml
@@ -246,7 +246,7 @@
    tag: mo
      # add spaces around comparison operators unless they are in a script position,
    variables: # ratio not spaced in UEB; also make sure it is an infix operator (e.g., "~" can be prefix)
-   - AddSpaces: "$UEB_UseSpacesAroundAllOperators or
+   - AddSpaces: "$UseSpacesAroundAllOperators or
                        ( parent::*[self::m:mrow] and $NewScriptContext='' and
                          .!='∶' and IsInDefinition(., 'Braille', 'NemethComparisonOperators') )"
    match: "."
diff --git a/Rules/prefs.yaml b/Rules/prefs.yaml
@@ -56,7 +56,7 @@
   Braille:
     BrailleCode: "Nemeth"                # Any supported braille code (currently Nemeth, UEB)
     BrailleNavHighlight: EndPoints   # Highlight with dots 7 & 8 the current nav node -- values are Off, FirstChar, EndPoints, All
-    UseSpacesAroundAllOperators: false  # true/false
+    UseSpacesAroundAllOperators: false  # true/false (otherwise typically around comparison operators only)
 
     Nemeth:
       # Nemeth defines the typeforms: Bold, Italic, SansSerif, and Script. That leaves out DoubleStruck (Blackboard Bold)
@@ -69,7 +69,6 @@
 
     UEB:
       StartMode: "Grade2"   # Grade1/Grade2 -- assumed starting mode UEB braille (Grade1 assumes we are in G1 passage mode)
-      UseSpacesAroundAllOperators: false  # true/false
 
       # UEB Guide to Technical Material (https://iceb.org/Guidelines_for_Technical_Material_2008-10.pdf)
       #   says to normally treat Fraktur and DoubleStruck as Script
diff --git a/src/braille.rs b/src/braille.rs
diff --git a/src/infer_intent.rs b/src/infer_intent.rs
@@ -223,7 +223,7 @@ pub fn intent_speech_for_name(intent_name: &str, verbosity: &str, fixity: &str)
                 }
             }
         };
-        return intent_name.replace(&['_', '-'], " ").trim().to_string();
+        return intent_name.replace(['_', '-'], " ").trim().to_string();
     })
 }
 
diff --git a/src/navigate.rs b/src/navigate.rs
diff --git a/src/speech.rs b/src/speech.rs
@@ -2459,7 +2459,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {
 
         // the 'b' for baseline indicator is really part of the previous token, so it needs to be highlighted but isn't because it is not Unicode braille
         let baseline_indicator_hack = PreferenceManager::get().borrow().pref_to_string("BrailleCode") == "Nemeth";
-        // debug!("highlight_braille_string: braille={}", braille);
+        // debug!("highlight_braille_string: highlight_style={}\n braille={}", highlight_style, braille);
         let mut i_first_modified = 0;
         for i in 0..chars.len() {
             let ch = chars[i];
@@ -2480,6 +2480,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {
                 chars[i] = modified_ch;
                 if ch !=  modified_ch {
                     i_last_modified = i;
+                    break;
                 }
             }
         }
@@ -2492,7 +2493,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {
         }
 
         let result = chars.into_iter().collect::<String>(); 
-        // debug!("                           result={}", result);
+        // debug!("    result={}", result);
         return result;
 
         fn add_dots_to_braille_char(ch: char, baseline_indicator_hack: bool) -> char {
diff --git a/tests/braille/CMU/once.rs b/tests/braille/CMU/once.rs
@@ -1468,8 +1468,6 @@ fn units_appendix_1_3_1_auto_intent() {
 
 // FIX: add 2.6 (Chemistry)
 
-// FIX: add 3.2.1 (repeating numbers)
-
 //  FIX: add 3.4 math variants
 
 
diff --git a/tests/braille/UEB/iceb.rs b/tests/braille/UEB/iceb.rs
@@ -274,13 +274,13 @@ fn signs_2_10_16() {
 #[test]
 fn expr_3_1_1_spaces() {
     let expr = "<math><mn>3</mn><mo>+</mo><mn>5</mn><mo>=</mo><mn>8</mn></math>";
-    test_braille_prefs("UEB", vec![("UEB_UseSpacesAroundAllOperators", "true")], expr, "⠼⠉⠀⠐⠖⠀⠼⠑⠀⠐⠶⠀⠼⠓");
+    test_braille_prefs("UEB", vec![("UseSpacesAroundAllOperators", "true")], expr, "⠼⠉⠀⠐⠖⠀⠼⠑⠀⠐⠶⠀⠼⠓");
 }
 
 #[test]
 fn expr_3_1_2_spaces() {
     let expr = "<math><mn>8</mn><mo>-</mo><mn>5</mn><mo>=</mo><mn>3</mn></math>";
-    test_braille_prefs("UEB", vec![("UEB_UseSpacesAroundAllOperators", "true")], expr, "⠼⠓⠀⠐⠤⠀⠼⠑⠀⠐⠶⠀⠼⠉");
+    test_braille_prefs("UEB", vec![("UseSpacesAroundAllOperators", "true")], expr, "⠼⠓⠀⠐⠤⠀⠼⠑⠀⠐⠶⠀⠼⠉");
 }
 
 #[test]
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
@@ -150,7 +150,7 @@ pub fn test_braille_prefs(code: &str, test_prefs: Vec<(&str, &str)>, mathml: &st
         "UEB" | "Nemeth" | _ => set_preference("Language".to_string(), "en".to_string()).unwrap(),
     }
 
-    set_preference("UEB_UseSpacesAroundAllOperators".to_string(), "false".to_string()).unwrap();         // makes testing simpler
+    set_preference("UseSpacesAroundAllOperators".to_string(), "false".to_string()).unwrap();         // makes testing simpler
     for (pref_name, pref_value) in test_prefs.clone() {
         set_preference(pref_name.to_string(), pref_value.to_string()).unwrap();
     };

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ pub fn intent_speech_for_name(intent_name: &str, verbosity: &str, fixity: &str)`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`	`};`
`226`		`- return intent_name.replace(&['_', '-'], " ").trim().to_string();`
	`226`	`+ return intent_name.replace(['_', '-'], " ").trim().to_string();`
`227`	`227`	`})`
`228`	`228`	`}`
`229`	`229`
Original file line number	Diff line number	Diff line change
`@@ -2459,7 +2459,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {`
`2459`	`2459`
`2460`	`2460`	`// the 'b' for baseline indicator is really part of the previous token, so it needs to be highlighted but isn't because it is not Unicode braille`
`2461`	`2461`	`let baseline_indicator_hack = PreferenceManager::get().borrow().pref_to_string("BrailleCode") == "Nemeth";`
`2462`		`- // debug!("highlight_braille_string: braille={}", braille);`
	`2462`	`+ // debug!("highlight_braille_string: highlight_style={}\n braille={}", highlight_style, braille);`
`2463`	`2463`	`let mut i_first_modified = 0;`
`2464`	`2464`	`for i in 0..chars.len() {`
`2465`	`2465`	`let ch = chars[i];`
`@@ -2480,6 +2480,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {`
`2480`	`2480`	`chars[i] = modified_ch;`
`2481`	`2481`	`if ch != modified_ch {`
`2482`	`2482`	`i_last_modified = i;`
	`2483`	`+ break;`
`2483`	`2484`	`}`
`2484`	`2485`	`}`
`2485`	`2486`	`}`
`@@ -2492,7 +2493,7 @@ impl<'c, 's:'c, 'r, 'm:'c> SpeechRulesWithContext<'c, 's,'m> {`
`2492`	`2493`	`}`
`2493`	`2494`
`2494`	`2495`	`let result = chars.into_iter().collect::<String>();`
`2495`		`- // debug!(" result={}", result);`
	`2496`	`+ // debug!(" result={}", result);`
`2496`	`2497`	`return result;`
`2497`	`2498`
`2498`	`2499`	`fn add_dots_to_braille_char(ch: char, baseline_indicator_hack: bool) -> char {`