diff --git a/test/api/results/hand-20-0-10 b/test/api/results/hand-20-0-10
index 081f31606..def53eebb 100644
--- a/test/api/results/hand-20-0-10
+++ b/test/api/results/hand-20-0-10
@@ -1,115 +1,117 @@
 start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 13
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
-            radial gradient
-              p0 280.000000 440.000000 radius 0.000000
-              p1 280.000000 440.000000 radius 467.000000
+  start clip rectangle 64.000000 -224.000000 1216.000000 928.000000
+    push group
+      start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+        start clip glyph 13
+          start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+            start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
+              radial gradient
+                p0 280.000000 440.000000 radius 0.000000
+                p1 280.000000 440.000000 radius 467.000000
+                colors
+                  0.000000 186 141 104 255
+                  0.448792 183 138 103 255
+                  0.808594 173 130 100 255
+                  1.000000 164 123 98 255
+            end transform
+          end transform
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+        start clip glyph 14
+          start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+            linear gradient
+              p0 231.000000 -27.000000
+              p1 1019.000000 -27.000000
+              p2 231.000000 -815.000000
               colors
-                0.000000 186 141 104 255
-                0.448792 183 138 103 255
-                0.808594 173 130 100 255
+                0.000000 164 123 98 255
                 1.000000 164 123 98 255
           end transform
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 14
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          linear gradient
-            p0 231.000000 -27.000000
-            p1 1019.000000 -27.000000
-            p2 231.000000 -815.000000
-            colors
-              0.000000 164 123 98 255
-              1.000000 164 123 98 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 15
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 16
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          solid 30 136 229 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 21
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+        start clip glyph 15
+          start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+            solid 145 103 77 255
+          end transform
+        end clip
+      end transform
+    pop group mode 3
     push group
       start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
         start clip glyph 16
           start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-            linear gradient
-              p0 669.000000 776.000000
-              p1 180.000000 -106.000000
-              p2 -212.000000 1265.000000
-              colors
-                0.000000 100 181 246 255
-                1.000000 33 150 243 255
+            solid 30 136 229 255
           end transform
         end clip
       end transform
     pop group mode 3
     push group
       start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-        start clip glyph 18
+        start clip glyph 21
           start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-            solid 66 66 66 51
+            solid 145 103 77 255
           end transform
         end clip
       end transform
     pop group mode 3
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 19
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
-            radial gradient
-              p0 588.000000 198.000000 radius 0.000000
-              p1 588.000000 198.000000 radius 342.000000
-              colors
-                0.000000 186 141 104 255
-                0.448792 183 138 103 255
-                0.808594 173 130 100 255
-                1.000000 164 123 98 255
+    push group
+      push group
+        start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+          start clip glyph 16
+            start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+              linear gradient
+                p0 669.000000 776.000000
+                p1 180.000000 -106.000000
+                p2 -212.000000 1265.000000
+                colors
+                  0.000000 100 181 246 255
+                  1.000000 33 150 243 255
+            end transform
+          end clip
+        end transform
+      pop group mode 3
+      push group
+        start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+          start clip glyph 18
+            start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+              solid 66 66 66 51
+            end transform
+          end clip
+        end transform
+      pop group mode 3
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+        start clip glyph 19
+          start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+            start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
+              radial gradient
+                p0 588.000000 198.000000 radius 0.000000
+                p1 588.000000 198.000000 radius 342.000000
+                colors
+                  0.000000 186 141 104 255
+                  0.448792 183 138 103 255
+                  0.808594 173 130 100 255
+                  1.000000 164 123 98 255
+            end transform
           end transform
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
-      start clip glyph 20
-        start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -0.000000 51.200001 0.000000 0.000000
+        start clip glyph 20
+          start transform 0.019531 0.000000 0.000000 0.019531 0.000000 0.000000
+            solid 145 103 77 255
+          end transform
+        end clip
+      end transform
+    pop group mode 3
+  end clip
 end transform
diff --git a/test/api/results/hand-20-0.2-10 b/test/api/results/hand-20-0.2-10
index 86cb6031a..708cf2c11 100644
--- a/test/api/results/hand-20-0.2-10
+++ b/test/api/results/hand-20-0.2-10
@@ -1,115 +1,117 @@
 start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 13
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
-            radial gradient
-              p0 280.000000 440.000000 radius 0.000000
-              p1 280.000000 440.000000 radius 467.000000
+  start clip rectangle 64.000000 -224.000000 1216.000000 928.000000
+    push group
+      start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+        start clip glyph 13
+          start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+            start transform 1.000000 0.000000 0.000000 0.976807 0.000000 0.000000
+              radial gradient
+                p0 280.000000 440.000000 radius 0.000000
+                p1 280.000000 440.000000 radius 467.000000
+                colors
+                  0.000000 186 141 104 255
+                  0.448792 183 138 103 255
+                  0.808594 173 130 100 255
+                  1.000000 164 123 98 255
+            end transform
+          end transform
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+        start clip glyph 14
+          start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+            linear gradient
+              p0 231.000000 -27.000000
+              p1 1019.000000 -27.000000
+              p2 231.000000 -815.000000
               colors
-                0.000000 186 141 104 255
-                0.448792 183 138 103 255
-                0.808594 173 130 100 255
+                0.000000 164 123 98 255
                 1.000000 164 123 98 255
           end transform
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 14
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          linear gradient
-            p0 231.000000 -27.000000
-            p1 1019.000000 -27.000000
-            p2 231.000000 -815.000000
-            colors
-              0.000000 164 123 98 255
-              1.000000 164 123 98 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 15
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 16
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          solid 30 136 229 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 21
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+        start clip glyph 15
+          start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+            solid 145 103 77 255
+          end transform
+        end clip
+      end transform
+    pop group mode 3
     push group
       start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
         start clip glyph 16
           start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-            linear gradient
-              p0 669.000000 776.000000
-              p1 180.000000 -106.000000
-              p2 -212.000000 1265.000000
-              colors
-                0.000000 100 181 246 255
-                1.000000 33 150 243 255
+            solid 30 136 229 255
           end transform
         end clip
       end transform
     pop group mode 3
     push group
       start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-        start clip glyph 18
+        start clip glyph 21
           start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-            solid 66 66 66 51
+            solid 145 103 77 255
           end transform
         end clip
       end transform
     pop group mode 3
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 19
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
-            radial gradient
-              p0 588.000000 198.000000 radius 0.000000
-              p1 588.000000 198.000000 radius 342.000000
-              colors
-                0.000000 186 141 104 255
-                0.448792 183 138 103 255
-                0.808594 173 130 100 255
-                1.000000 164 123 98 255
+    push group
+      push group
+        start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+          start clip glyph 16
+            start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+              linear gradient
+                p0 669.000000 776.000000
+                p1 180.000000 -106.000000
+                p2 -212.000000 1265.000000
+                colors
+                  0.000000 100 181 246 255
+                  1.000000 33 150 243 255
+            end transform
+          end clip
+        end transform
+      pop group mode 3
+      push group
+        start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+          start clip glyph 18
+            start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+              solid 66 66 66 51
+            end transform
+          end clip
+        end transform
+      pop group mode 3
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+        start clip glyph 19
+          start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+            start transform 1.000000 0.000000 0.000000 0.969116 0.000000 0.000000
+              radial gradient
+                p0 588.000000 198.000000 radius 0.000000
+                p1 588.000000 198.000000 radius 342.000000
+                colors
+                  0.000000 186 141 104 255
+                  0.448792 183 138 103 255
+                  0.808594 173 130 100 255
+                  1.000000 164 123 98 255
+            end transform
           end transform
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
-    start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
-      start clip glyph 20
-        start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
-          solid 145 103 77 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
+        end clip
+      end transform
+    pop group mode 3
+    push group
+      start transform 51.200001 0.000000 -10.240000 51.200001 0.000000 0.000000
+        start clip glyph 20
+          start transform 0.019531 0.000000 0.003906 0.019531 0.000000 0.000000
+            solid 145 103 77 255
+          end transform
+        end clip
+      end transform
+    pop group mode 3
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-10 b/test/api/results/test-20-0-10
index 8bb19a3bf..27772487c 100644
--- a/test/api/results/test-20-0-10
+++ b/test/api/results/test-20-0-10
@@ -1,16 +1,18 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-    start clip glyph 174
-      start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-        sweep gradient
-          center 500.000000 600.000000
-          angles 0.000000 6.283185
-          colors
-            0.250000 250 240 230 255
-            0.416687 0 0 255 255
-            0.583313 255 0 0 255
-            0.750000 47 79 79 255
-      end transform
-    end clip
-  end transform
+  start clip rectangle 0.000000 0.000000 1000.000000 1000.000000
+    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+      start clip glyph 174
+        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+          sweep gradient
+            center 500.000000 600.000000
+            angles 0.000000 6.283185
+            colors
+              0.250000 250 240 230 255
+              0.416687 0 0 255 255
+              0.583313 255 0 0 255
+              0.750000 47 79 79 255
+        end transform
+      end clip
+    end transform
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-106 b/test/api/results/test-20-0-106
index 8e09c8726..6803913f9 100644
--- a/test/api/results/test-20-0-106
+++ b/test/api/results/test-20-0-106
@@ -1,26 +1,28 @@
-start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  push group
-    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-      start clip glyph 3
-        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-          solid 0 0 255 127
-        end transform
-      end clip
-    end transform
+start clip rectangle 5.000000 5.000000 15.000000 15.000000
+  start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
     push group
-      start transform 0.000000 0.000000 0.000000 0.000000 1000.000000 1000.000000
-        start transform 1.000000 -0.363874 -0.176283 1.000000 0.000000 0.000000
-          start transform 0.000000 0.000000 0.000000 0.000000 -1000.000000 -1000.000000
-            start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-              start clip glyph 3
-                start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-                  solid 255 165 0 178
-                end transform
-              end clip
+      start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+        start clip glyph 3
+          start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+            solid 0 0 255 127
+          end transform
+        end clip
+      end transform
+      push group
+        start transform 0.000000 0.000000 0.000000 0.000000 1000.000000 1000.000000
+          start transform 1.000000 -0.363874 -0.176283 1.000000 0.000000 0.000000
+            start transform 0.000000 0.000000 0.000000 0.000000 -1000.000000 -1000.000000
+              start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+                start clip glyph 3
+                  start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+                    solid 255 165 0 178
+                  end transform
+                end clip
+              end transform
             end transform
           end transform
         end transform
-      end transform
-    pop group mode 4
-  pop group mode 3
-end transform
+      pop group mode 4
+    pop group mode 3
+  end transform
+end clip
diff --git a/test/api/results/test-20-0-116 b/test/api/results/test-20-0-116
index 128dff31b..d07157120 100644
--- a/test/api/results/test-20-0-116
+++ b/test/api/results/test-20-0-116
@@ -1,22 +1,24 @@
-start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  push group
-    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-      start clip glyph 3
-        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-          solid 0 0 255 127
-        end transform
-      end clip
-    end transform
+start clip rectangle 5.000000 5.000000 15.000000 15.000000
+  start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
     push group
-      start transform 1.000000 0.000000 0.000000 1.000000 200.000000 200.000000
-        start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-          start clip glyph 3
-            start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-              solid 255 165 0 178
-            end transform
-          end clip
-        end transform
+      start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+        start clip glyph 3
+          start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+            solid 0 0 255 127
+          end transform
+        end clip
       end transform
-    pop group mode 4
-  pop group mode 3
-end transform
+      push group
+        start transform 1.000000 0.000000 0.000000 1.000000 200.000000 200.000000
+          start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+            start clip glyph 3
+              start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+                solid 255 165 0 178
+              end transform
+            end clip
+          end transform
+        end transform
+      pop group mode 4
+    pop group mode 3
+  end transform
+end clip
diff --git a/test/api/results/test-20-0-123 b/test/api/results/test-20-0-123
index f29e2ebcd..9d3fa7475 100644
--- a/test/api/results/test-20-0-123
+++ b/test/api/results/test-20-0-123
@@ -1,43 +1,45 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  push group
-    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-      start clip glyph 3
-        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-          solid 0 0 0 255
-        end transform
-      end clip
-    end transform
-  pop group mode 3
-  push group
+  start clip rectangle 0.000000 0.000000 1000.000000 1000.000000
     push group
-      start transform 0.000000 0.000000 0.000000 0.000000 333.000000 667.000000
-        start transform 8192.000000 0.000000 0.000000 8192.000000 0.000000 0.000000
-          start transform 0.000000 0.000000 0.000000 0.000000 -333.000000 -667.000000
-            start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-              start clip glyph 2
-                start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-                  solid 255 220 1 255
-                end transform
-              end clip
-            end transform
+      start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+        start clip glyph 3
+          start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+            solid 0 0 0 255
           end transform
-        end transform
+        end clip
       end transform
+    pop group mode 3
+    push group
       push group
-        start transform 0.000000 0.000000 0.000000 0.000000 667.000000 333.000000
+        start transform 0.000000 0.000000 0.000000 0.000000 333.000000 667.000000
           start transform 8192.000000 0.000000 0.000000 8192.000000 0.000000 0.000000
-            start transform 0.000000 0.000000 0.000000 0.000000 -667.000000 -333.000000
+            start transform 0.000000 0.000000 0.000000 0.000000 -333.000000 -667.000000
               start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
                 start clip glyph 2
                   start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-                    solid 104 199 232 255
+                    solid 255 220 1 255
                   end transform
                 end clip
               end transform
             end transform
           end transform
         end transform
-      pop group mode 5
+        push group
+          start transform 0.000000 0.000000 0.000000 0.000000 667.000000 333.000000
+            start transform 8192.000000 0.000000 0.000000 8192.000000 0.000000 0.000000
+              start transform 0.000000 0.000000 0.000000 0.000000 -667.000000 -333.000000
+                start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+                  start clip glyph 2
+                    start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+                      solid 104 199 232 255
+                    end transform
+                  end clip
+                end transform
+              end transform
+            end transform
+          end transform
+        pop group mode 5
+      pop group mode 3
     pop group mode 3
-  pop group mode 3
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-165 b/test/api/results/test-20-0-165
index f67bfdd44..ad5554d80 100644
--- a/test/api/results/test-20-0-165
+++ b/test/api/results/test-20-0-165
@@ -1,16 +1,18 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-    start clip glyph 165
-      start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-        linear gradient
-          p0 100.000000 950.000000
-          p1 2300.000000 950.000000
-          p2 -1000.000000 250.000000
-          colors
-            0.000000 255 0 0 255
-            0.500000 0 0 255 255
-            1.000000 255 255 0 255
-      end transform
-    end clip
-  end transform
+  start clip rectangle 100.000000 250.000000 1200.000000 950.000000
+    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+      start clip glyph 165
+        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+          linear gradient
+            p0 100.000000 950.000000
+            p1 2300.000000 950.000000
+            p2 -1000.000000 250.000000
+            colors
+              0.000000 255 0 0 255
+              0.500000 0 0 255 255
+              1.000000 255 255 0 255
+        end transform
+      end clip
+    end transform
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-175 b/test/api/results/test-20-0-175
index 4f9d775f2..ed4903f53 100644
--- a/test/api/results/test-20-0-175
+++ b/test/api/results/test-20-0-175
@@ -1,30 +1,32 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  push group
-    start transform 1.000000 0.000000 0.000000 1.000000 150.000000 0.000000
-      start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-        start clip glyph 174
-          start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-            solid 0 128 0 255
-          end transform
-        end clip
+  start clip rectangle 0.000000 0.000000 1000.000000 1000.000000
+    push group
+      start transform 1.000000 0.000000 0.000000 1.000000 150.000000 0.000000
+        start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+          start clip glyph 174
+            start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+              solid 0 128 0 255
+            end transform
+          end clip
+        end transform
       end transform
-    end transform
-  pop group mode 3
-  push group
-    start transform 1.000000 0.000000 0.000000 1.000000 -150.000000 0.000000
-      start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-        start clip glyph 174
-          start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-            linear gradient
-              p0 500.000000 250.000000
-              p1 500.000000 950.000000
-              p2 600.000000 250.000000
-              colors
-                0.000000 255 0 0 255
-                1.000000 0 0 255 255
-          end transform
-        end clip
+    pop group mode 3
+    push group
+      start transform 1.000000 0.000000 0.000000 1.000000 -150.000000 0.000000
+        start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+          start clip glyph 174
+            start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+              linear gradient
+                p0 500.000000 250.000000
+                p1 500.000000 950.000000
+                p2 600.000000 250.000000
+                colors
+                  0.000000 255 0 0 255
+                  1.000000 0 0 255 255
+            end transform
+          end clip
+        end transform
       end transform
-    end transform
-  pop group mode 3
+    pop group mode 3
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-6 b/test/api/results/test-20-0-6
index 58bbfdc29..8d4c45c55 100644
--- a/test/api/results/test-20-0-6
+++ b/test/api/results/test-20-0-6
@@ -1,15 +1,17 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-    start clip glyph 6
-      start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-        linear gradient
-          p0 100.000000 250.000000
-          p1 900.000000 250.000000
-          p2 100.000000 300.000000
-          colors
-            0.000000 255 0 0 255
-            1.000000 0 0 255 255
-      end transform
-    end clip
-  end transform
+  start clip rectangle 100.000000 250.000000 900.000000 950.000000
+    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+      start clip glyph 6
+        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+          linear gradient
+            p0 100.000000 250.000000
+            p1 900.000000 250.000000
+            p2 100.000000 300.000000
+            colors
+              0.000000 255 0 0 255
+              1.000000 0 0 255 255
+        end transform
+      end clip
+    end transform
+  end clip
 end transform
diff --git a/test/api/results/test-20-0-92 b/test/api/results/test-20-0-92
index e130ab088..463818616 100644
--- a/test/api/results/test-20-0-92
+++ b/test/api/results/test-20-0-92
@@ -1,15 +1,17 @@
 start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-  start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
-    start clip glyph 2
-      start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
-        radial gradient
-          p0 166.000000 768.000000 radius 0.000000
-          p1 166.000000 768.000000 radius 256.000000
-          colors
-            0.000000 0 128 0 255
-            0.500000 255 255 255 255
-            1.000000 255 0 0 255
-      end transform
-    end clip
-  end transform
+  start clip rectangle 0.000000 0.000000 1000.000000 1000.000000
+    start transform 50.000000 0.000000 -0.000000 50.000000 0.000000 0.000000
+      start clip glyph 2
+        start transform 0.020000 0.000000 0.000000 0.020000 0.000000 0.000000
+          radial gradient
+            p0 166.000000 768.000000 radius 0.000000
+            p1 166.000000 768.000000 radius 256.000000
+            colors
+              0.000000 0 128 0 255
+              0.500000 255 255 255 255
+              1.000000 255 0 0 255
+        end transform
+      end clip
+    end transform
+  end clip
 end transform