tweek the syntax a bit to make it easier to implement, and consequentially more flexible

Signed-off-by: Mattias Andrée <maandree@operamail.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/res/keyboard/compose/dead b/res/keyboard/compose/dead
index a281aef..fbebf38 100644
--- a/res/keyboard/compose/dead
+++ b/res/keyboard/compose/dead
@@ -1232,8 +1232,8 @@ macro boxes/2
     999 999 999 999  999 999 999 999  999 999 999 999  999 999 999 999
     999 999 999 999  1 4 2 8          16 64 32 128     33 132 18 40
   }
-  let \4 : \get(\3 \1)
-  let \5 : \get(\3 \2)
+  let \4 : \get(3 \1)
+  let \5 : \get(3 \2)
   if \or(\equals(\4 999) \equals(\5 999))
     return
   end if
@@ -1242,27 +1242,27 @@ macro boxes/2
   let \4 : { \and(\4 1) \and(\4 2) \and(\4 4) \and(\4 8) }
   let \5 : { \and(\5 1) \and(\5 2) \and(\5 4) \and(\5 8) }
   for 0 to 3 as \8
-    \set(\4 \8 \add(\rsh(\get(\4 \8) \8) \mul(2 \rsh(\get(\6 \8)))))
-    \set(\5 \8 \add(\rsh(\get(\5 \8) \8) \mul(2 \rsh(\get(\7 \8)))))
-    \set(\4 \8 \add(\get(\4 \8) \get(\4 \8)))
-    if \greater(\get(\4 \8) 2)
-      \set(\4 \8 2)
+    \set(4 \8 \add(\rsh(\get(4 \8) \8) \mul(2 \rsh(\get(6 \8)))))
+    \set(5 \8 \add(\rsh(\get(5 \8) \8) \mul(2 \rsh(\get(7 \8)))))
+    \set(4 \8 \add(\get(4 \8) \get(4 \8)))
+    if \greater(\get(4 \8) 2)
+      \set(4 \8 2)
     end if
   end for
   for 0 to 127 as \5
-    let \6 : \get(\3 \5)
+    let \6 : \get(3 \5)
     if \equals(\4 999)
       continue
     end if
     let \7 : { \and(\6 16) \and(\6 32) \and(\6 64) \and(\6 128) }
     let \6 : { \and(\6 1) \and(\6 2) \and(\6 4) \and(\6 8) }
     for 0 to 3 as \8
-      \set(\6 \8 \add(\rsh(\get(\6 \8) \8) \mul(2 \rsh(\get(\7 \8)))))
+      \set(6 \8 \add(\rsh(\get(6 \8) \8) \mul(2 \rsh(\get(7 \8)))))
     end for
-    if \equals(\get(\6 0) \get(\4 0))
-      if \equals(\get(\6 1) \get(\4 1))
-        if \equals(\get(\6 2) \get(\4 2))
-          if \equals(\get(\6 3) \get(\4 3))
+    if \equals(\get(6 0) \get(4 0))
+      if \equals(\get(6 1) \get(4 1))
+        if \equals(\get(6 2) \get(4 2))
+          if \equals(\get(6 3) \get(4 3))
             <dead compose> ("\add(\u2500 \1)" "\add(\u2500 \2)") : "\add(\u2500 \5)"
           end if
         end if