decode: fix a bug of broken cmap cache

akinomyoga · Apr 13, 2020 · 16b56bf · 16b56bf
1 parent d19a9af
commit 16b56bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/init-cmap.sh b/lib/init-cmap.sh
@@ -48,6 +48,7 @@
 # 2019-05-06 ble-update 関連でバグがあったのを潰したので更新。
 # 2020-01-31 @ESC, @NUL を追加した。
 # 2020-03-12 __line_limit__ を追加
+# 2020-04-13 cmap キャッシュ生成のバグ修正に伴う更新。
 
 function ble/init:cmap/bind-single-csi {
   ble-bind -k "ESC [ $1" "$2"

diff --git a/src/decode.sh b/src/decode.sh
@@ -2452,10 +2452,15 @@ function ble/decode/cmap/initialize {
   else
     ble-edit/info/immediate-show text 'ble.sh: generating "'"$dump"'"...'
     source "$init"
-    ble-bind -D | ble/bin/sed '
-      s/^declare \{1,\}\(-[aAfFgilrtux]\{1,\} \{1,\}\)\{0,1\}//
-      s/^-- //
-      s/["'"'"']//g
+    ble-bind -D | ble/bin/awk '
+      {
+        sub(/^declare +(-[aAfFgiclrtux]+ +)?/, "");
+        sub(/^-- +/, "");
+      }
+      /^_ble_decode_(cmap|csimap|kbd)/ {
+        gsub(/["'\'']/, "");
+        print
+      }
     ' >| "$dump"
   fi