Merge /u/ijackson/things/ypp-sc-tools

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index fb11565a1defde3fd1b27d7fe05af2d5dc381295..10218e0a6acbbd9a12627c0c7ea625a6c084ef18 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -889,7 +889,8 @@ set database_magic/char {# ypp-sc-tools pctb font v1}
     
 proc read_database_header/char {f} {
     global rows
-    if {([db_getsl $f])+0 != $rows} { error "wrong h ?" }
+    set l [db_getsl $f]
+    if {$l+0 != $rows} { error "wrong h $l $rows ?" }
 }
 proc read_database_entry/char {f context} {
     global database
@@ -1102,7 +1103,7 @@ proc dict2_reqkind_rows {dict} {
        debug "DICT PIXMAP"
     } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
        debug "DICT CHAR rqk=$reqkind r=$rows."
-       return [list $reqkind rows]
+       return [list $reqkind $rows]
     } else {
        error "$dict ?"
     }