Fix inconsistant zoom in/out all the way. Fixes #413.

Author: NSoiffer

Rules/Languages/en/navigate.yaml

@@ -48,9 +48,16 @@
     - if: "$MatchCounter = 0 and $SayCommand = 'true'"
       then_test:
       - if: "self::m:math and starts-with($NavCommand, 'ZoomOut')"
-        then: [t: "zoomed out all the way", pause: "medium"]
+        then: [t: "zoomed out all of the way", pause: "medium"]
       - else_if: "IsNode(., 'leaf') and starts-with($NavCommand, 'ZoomIn')"
-        then: [t: "zoomed in all the way", pause: "medium"]
+        then:
+        - test:
+          - if: "string-length(.) = 1"
+            then: [t: "zoomed in all of the way"]       # phrase('zoomed in all of the way')
+          - else_if: "$NavNodeOffset = 0"
+            then: [t: "zoomed in to first character"]   # phrase('zoomed in to first character')
+            else: [t: "zoomed to character"]          # phrase('zoomed in to character')
+        - pause: "medium"
         else:
         - test:
           - if: "starts-with($NavCommand, 'Zoom')"
@@ -70,12 +77,12 @@
                 then: [t: "in"]                                  # phrase(zoom 'in' to see more details)
               - else_if: "substring($NavCommand, string-length($Prefix)+1) = 'InAll'"
                 # HACK: '\uF8FE' is used internally for the concatenation char by 'ct' -- this gets "ed" concatenated to "zoom"
-                then: [t: "\uF8FEed in all the way"]                     # phrase(zoom 'out all the way' to see more details)
+                then: [t: "\uF8FEed in all of the way"]                     # phrase(zoom 'out all of the way' to see more details)
               - else_if: "substring($NavCommand, string-length($Prefix)+1) = 'Out'"
                 then: [t: "out"]                                 # phrase(zoom 'out' to see more details)
               - else_if: "substring($NavCommand, string-length($Prefix)+1) = 'OutAll'"
                 # HACK: '\uF8FE' is used internally for the concatenation char by 'ct' -- this gets "ed" concatenated to "zoom"
-                then: [t: "\uF8FEed out all the way"]                     # phrase(zoom 'out all the way' to see more details)
+                then: [t: "\uF8FEed out all of the way"]                     # phrase(zoom 'out all of the way' to see more details)
               - else_if: "substring($NavCommand, string-length($Prefix)+1) = 'Next'"
                 then: [t: "right"]                               # phrase(move to the 'right')
               - else_if: "substring($NavCommand, string-length($Prefix)+1) = 'Previous'"
@@ -180,9 +187,9 @@
         - else_if: "$PreviousNavCommand = 'ZoomOut'"
           then: [t: "undo zoom out"]                      # phrase('undo zoom out')
         - else_if: "$PreviousNavCommand = 'ZoomInAll'"
-          then: [t: "undo zooming in all the way"]        # phrase('undo zooming in all the way')
+          then: [t: "undo zooming in all of the way"]        # phrase('undo zooming in all of the way')
         - else_if: "$PreviousNavCommand = 'ZoomOutAll'"
-          then: [t: "undo zooming out all the way"]       # phrase('undo zooming out all the way')
+          then: [t: "undo zooming out all of the way"]       # phrase('undo zooming out all of the way')
         - else_if: "$PreviousNavCommand = 'MovePrevious' or $PreviousNavCommand = 'MovePreviousZoom'"
           then: [t: "undo move left"]                     # phrase('undo move left')
         - else_if: "$PreviousNavCommand = 'MoveNext' or $PreviousNavCommand = 'MoveNextZoom'"
@@ -209,25 +216,15 @@
   tag: "*"
   match: "($NavCommand = 'ZoomIn' or $NavCommand = 'ZoomInAll') and IsNode(., 'leaf')"
   replace:
-  - test:
-      if: "$MatchCounter = 0 and $NavVerbosity != 'Terse'"
-      then:
-      - test:
-        - if: "string-length(.) = 1"
-          then:
-          - t: "zoomed in all of the way"
-        - else_if: "$NavNodeOffset = 0"
-          then:
-          - t: "zoomed in to first character" # phrase('zoomed in to first character')
-          else:          
-          - t: "zoomed to character"          # phrase('zoomed in to character')
-      - pause: "long"
+  - with:
+      variables: [SayCommand: "string($NavVerbosity != 'Terse')"]
+      replace: [x: "."]
   - test:
       if: "$ReadZoomLevel !=-1"
       then:
       - set_variables: [ReadZoomLevel: "0"]
   - test:
-      if: "string-length(.) > 1 and $MatchCounter = 0 and $NavNodeOffset = 0"
+      if: "string-length(.) > 1 and $MatchCounter = 1 and $NavNodeOffset = 0"
       then: [set_variables: [NavNodeOffset: "1"]]
   - set_variables: [NavNode: "@id"]
 
@@ -372,7 +369,7 @@
   match: "$NavCommand = 'ZoomOut' or $NavCommand = 'ZoomOutAll'"
   replace:
   - with:
-      variables: [SayCommand: "string($NavVerbosity = 'Verbose')"]
+      variables: [SayCommand: "string($NavVerbosity != 'Terse')"]
       replace: [x: "."]
   - set_variables: [NavNode: "*[1]/@id"] # no-op for $NavCommand = 'ZoomOut'
 
@@ -389,7 +386,7 @@
   tag: "*"
   match:
   - "($NavCommand = 'ZoomOut' or $NavCommand = 'ZoomOutAll') and"
-  - "parent::m:math "
+  - "parent::m:math"
   replace:
   - x: ".." # let math rule deal with it
 

src/navigate.rs

@@ -1410,7 +1410,7 @@ mod tests {
         return MATHML_INSTANCE.with(|package_instance| {
             let package_instance = package_instance.borrow();
             let mathml = get_element(&*package_instance);
-            assert_eq!("zoomed in all the way; 1", test_command("ZoomInAll", mathml, "id-2"));
+            assert_eq!("zoomed in all of the way; 1", test_command("ZoomInAll", mathml, "id-2"));
             assert_eq!("move right; plus", test_command("MoveNext", mathml, "id-3"));
             assert_eq!("move right; in base; x", test_command("MoveNext", mathml, "id-5"));
             assert_eq!("move right; in subscript; 2", test_command("MoveNext", mathml, "id-6"));
@@ -1449,7 +1449,7 @@ mod tests {
             return MATHML_INSTANCE.with(|package_instance| {
             let package_instance = package_instance.borrow();
             let mathml = get_element(&*package_instance);
-            assert_eq!("zoomed in all the way; in base; open bracket", test_command("ZoomInAll", mathml, "id-3"));
+            assert_eq!("zoomed in all of the way; in base; open bracket", test_command("ZoomInAll", mathml, "id-3"));
             assert_eq!("move right; in base; cap c o", test_command("MoveNext", mathml, "id-5"));
             assert_eq!("move right; in subscript; 6", test_command("MoveNext", mathml, "id-6"));
             assert_eq!("move right; out of subscript; close bracket", test_command("MoveNext", mathml, "id-8"));
@@ -1634,6 +1634,7 @@ mod tests {
 
     #[test]
     fn move_inside_leaves() -> Result<()> {
+        init_logger();
         let mathml_str = "<math display='block' id='id-0'>
                 <mrow id='id-1'>
                     <mfrac id='id-2'>
@@ -2174,7 +2175,7 @@ mod tests {
             let speech = test_command("MoveNext", mathml, "row2-negative");
             assert_eq!(speech, "move right; column 2, negative 6");
             let speech = test_command("ZoomOutAll", mathml, "table");
-            assert_eq!(speech, "zoomed out all the way; the 2 by 2 determinant; row 1; 9, negative 13; row 2; 5, negative 6");
+            assert_eq!(speech, "zoomed out all of the way; the 2 by 2 determinant; row 1; 9, negative 13; row 2; 5, negative 6");
             return Ok( () );
         });
     }
@@ -2386,7 +2387,7 @@ mod tests {
             let package_instance = package_instance.borrow();
             let mathml = get_element(&*package_instance);
             let speech = test_command("ZoomOutAll", mathml, "mrow");
-            assert_eq!(speech, "zoomed out all the way; 1 plus 2 plus 3 plus 4 plus 5 plus 6 plus 7");
+            assert_eq!(speech, "zoomed out all of the way; 1 plus 2 plus 3 plus 4 plus 5 plus 6 plus 7");
             let speech = test_command("ReadCurrent", mathml, "mrow");
             assert_eq!(speech, "read current; 1 plus 2 plus 3 plus 4 plus 5 plus 6 plus 7");
             let speech = test_command("DescribeCurrent", mathml, "mrow");