compose table: improve braille pattern writting

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

1 files changed, 35 insertions, 33 deletions

diff --git a/res/compose b/res/compose
index 28c71b7..b28ebc7 100644
--- a/res/compose
+++ b/res/compose
@@ -41,7 +41,7 @@ dead_ascii("~")
 <compose> (["-" "="] ["y" "Y"]) : "¥"
 <compose> ("!" "|") : "¦"
 <compose> (["o" "O"] ["s" "S"]) : "§"
-dead_ascii("¨", "\"")
+dead_ascii("¨" "\"")
 <compose> (["o" "O"] ["c" "C"]) : "©"
 (<compose> <dead letter ~>) "_" "a" : "ª"
 <compose> "<" "<" : "«"
@@ -252,9 +252,9 @@ composite("¨" "\"" "y" "ÿ")
 <compose> "m" " " : "\u202F" # narrow no-break space
 <compose> "%" ["o" "."] : "‰"
 <compose> "%" ["O" ":"] : "‱"
-<compose> ("1" ["'", "´"]) : "′"
-<compose> ("2" ["'", "´"]) : "″"
-<compose> ("3" ["'", "´"]) : "‴"
+<compose> ("1" ["'" "´"]) : "′"
+<compose> ("2" ["'" "´"]) : "″"
+<compose> ("3" ["'" "´"]) : "‴"
 <compose> ("1" "`") : "‵"
 <compose> ("2" "`") : "‶"
 <compose> ("3" "`") : "‷"
@@ -291,7 +291,7 @@ composite("¨" "\"" "y" "ÿ")
 <sjift compose> ("_" "U") : "⁔"
 <compose> ("x" "*") : "⁕"
 <compose> "." ":" <space>  : "⁖"
-<compose> ("4" ["'", "´"]) : "⁗"
+<compose> ("4" ["'" "´"]) : "⁗"
 <compose> "." ":" "." : "⁘"
 <compose> ":" "." ":" : "⁙"
 <compose> "|" "." "." : "⁚"
@@ -375,50 +375,52 @@ dead_ascii("ˇ")
 # TODO Supplemental Arrows-A
 
 # Braille Patterns:
-<shift compose> "b" <space> : "\u2800"
-<shift compose> "b" "1" : "\u2801"
-<shift compose> "b" "2" : "\u2802"
-<shift compose> "b" "3" : "\u2804"
-<shift compose> "b" "4" : "\u2808"
-<shift compose> "b" "5" : "\u2810"
-<shift compose> "b" "6" : "\u2820"
-<shift compose> "b" "7" : "\u2840"
-<shift compose> "b" "8" : "\u2880"
+function braille/1
+  \or(\lsh(1 \sub("\1" "0")) "\u2800")
+end function
 macro braille_double/1
   let \2 : "\u2800"
-  if \and(\1, 1) = 1
-    let \2 : \or(\2, 8)
+  if \and(\1 1) = 1
+    let \2 : \or(\2 8)
   endif
-  if \and(\1, 2) = 2
-    let \2 : \or(\2, 16)
+  if \and(\1 2) = 2
+    let \2 : \or(\2 16)
   endif
-  if \and(\1, 4) = 4
-    let \2 : \or(\2, 32)
+  if \and(\1 4) = 4
+    let \2 : \or(\2 32)
   endif
-  if \and(\1, 8) = 8
-    let \2 : \or(\2, 1)
+  if \and(\1 8) = 8
+    let \2 : \or(\2 1)
   endif
-  if \and(\1, 16) = 16
-    let \2 : \or(\2, 2)
+  if \and(\1 16) = 16
+    let \2 : \or(\2 2)
   endif
-  if \and(\1, 32) = 32
-    let \2 : \or(\2, 4)
+  if \and(\1 32) = 32
+    let \2 : \or(\2 4)
   endif
-  if \and(\1, 64) = 64
-    let \2 : \or(\2, 128)
+  if \and(\1 64) = 64
+    let \2 : \or(\2 128)
   endif
-  if \and(\1, 128) = 128
-    let \2 : \or(\2, 64)
+  if \and(\1 128) = 128
+    let \2 : \or(\2 64)
   endif
-  <compose> "\1" "\1" : "\or(\1, \2)"
+  <compose> "\1" "\1" : "\or(\1 \2)"
 end macro
+<shift compose> "b" <space> : "\u2800"
+for "1" to "8" as \1
+  <shift compose> "b" "\1" : "\braille(\1)"
+  for \add(\1 1) to "8" as \2
+    <shift compose> "B" ("\1" "\2") : "\or(\braille(\1) \braille(\2))"
+  end for
+end for
 for "\u2800" to "\u28FF" as \1
   braille_double(\1)
-  for \add(\1, 1) to "\u28FF" as \2
-    <compose> ("\1" "\2") : "\or(\1, \2)"
+  for \add(\1 1) to "\u28FF" as \2
+    <compose> ("\1" "\2") : "\or(\1 \2)"
   end for
 end for
 
+
 # TODO Supplemental Arrows-B
 # TODO Miscellaneous Mathematical Symbols-B
 # TODO Supplemental Mathematical Operators