chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if -Drect and -Dcallout, make dictionary-manager print out whole image input
[ypp-sc-tools.main.git]
/
pctb
/
dictionary-manager
diff --git
a/pctb/dictionary-manager
b/pctb/dictionary-manager
index fb11565a1defde3fd1b27d7fe05af2d5dc381295..210af064c8d13f7f91447b2fae2d09e6ef942573 100755
(executable)
--- a/
pctb/dictionary-manager
+++ b/
pctb/dictionary-manager
@@
-53,6
+53,13
@@
proc must_gets {f lvar} {
if {[gets $f l] < 0} { error "huh?" }
}
if {[gets $f l] < 0} { error "huh?" }
}
+proc must_gets_imagel {f lvar} {
+ global debug_rect
+ upvar 1 $lvar l
+ must_gets $f l
+ if {$debug_rect} { debug "<< $l" }
+}
+
proc must_gets_exactly {f expected} {
must_gets $f got
if {[string compare $expected $got]} { error "$expected $got ?" }
proc must_gets_exactly {f expected} {
must_gets $f got
if {[string compare $expected $got]} { error "$expected $got ?" }
@@
-246,13
+253,13
@@
proc do_database_update {im def} {
proc required/char {} {
global mulrows glyphsdone unk_l unk_r unk_contexts rows new_context
proc required/char {} {
global mulrows glyphsdone unk_l unk_r unk_contexts rows new_context
- global all_contexts
+ global all_contexts
debug_rect
must_gets stdin l
must_gets stdin l
+ debug "GOT $l"
manyset [lrange $l 0 3] unk_l unk_r unk_contexts
set glyphsdone [lrange $l 3 end]
manyset [lrange $l 0 3] unk_l unk_r unk_contexts
set glyphsdone [lrange $l 3 end]
- debug "GOT $l"
char_read_xpm stdin
char_read_xpm stdin
@@
-397,7
+404,7
@@
proc required/pixmap {} {
debug "GOT pixmap $unk_what"
set ppm {}
while 1 {
debug "GOT pixmap $unk_what"
set ppm {}
while 1 {
- must_gets stdin ppml
+ must_gets
_imagel
stdin ppml
if {![string length $ppml]} break
append ppm $ppml "\n"
}
if {![string length $ppml]} break
append ppm $ppml "\n"
}
@@
-583,7
+590,7
@@
proc char_read_xpm {f} {
set o {}
set y -3
while 1 {
set o {}
set y -3
while 1 {
- must_gets $f l
+ must_gets
_imagel
$f l
if {![regexp {^"(.*)",$} $l dummy l]} {
append o "$l\n"
if {[regexp {^\}\;$} $l]} break
if {![regexp {^"(.*)",$} $l dummy l]} {
append o "$l\n"
if {[regexp {^\}\;$} $l]} break
@@
-889,7
+896,8
@@
set database_magic/char {# ypp-sc-tools pctb font v1}
proc read_database_header/char {f} {
global rows
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
}
proc read_database_entry/char {f context} {
global database
@@
-1102,7
+1110,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."
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 ?"
}
} else {
error "$dict ?"
}
@@
-1376,12
+1384,14
@@
proc debug {m} { }
set mainkind default
set ai 0
set debug 0
set mainkind default
set ai 0
set debug 0
+set debug_rect 0
set quiet 0
foreach arg $argv {
incr ai
switch -exact -- $arg {
{--quiet} { set quiet 1 }
{--debug} { set debug 1 }
set quiet 0
foreach arg $argv {
incr ai
switch -exact -- $arg {
{--quiet} { set quiet 1 }
{--debug} { set debug 1 }
+ {--debug-rect} { set debug_rect 1 }
{--debug-server} { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
{--noop-arg} { }
{--approve-updates} { set mainkind approve; break }
{--debug-server} { proc debug {m} { puts stderr "DICT-MGR-SVR $m" }}
{--noop-arg} { }
{--approve-updates} { set mainkind approve; break }