# sponsored by Three Rings.
-# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/pctb /home/ftp/users/ijackson/pctb
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
+
+# ./dictionary-manager --approve-updates '' . .
+
# invocation:
# OUT OF DATE
# if it wrote a byte to fd 4, it can take another question
+set aadepth 2
+
+
#---------- library routines ----------
proc manyset {list args} {
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 ?" }
upload_init
- frame .d -bd 2 -relief groove -pady 2 -padx 2
+ frame .d -pady 2 -padx 2 -bg black -bd 2 -relief sunken
image create bitmap image/main
label .d.mi -image image/main -bd 0
frame .d.got -bg black -height $gotsh
frame .d.ctx -bg black
- image create bitmap image/cursor -data \
+ image create bitmap image/cursor -foreground white -background black \
+ -data \
{#define csr_width 11
#define csr_height 11
static unsigned char csr_bits[] = {
}
frame .d.csr.csr
- label .d.csr.csr.l -image image/cursor -compound left
+ label .d.csr.csr.l -image image/cursor -compound left -fg white -bg black
entry .d.csr.csr.e -bd 0
pack .d.csr.csr.l -side left
- frame .d.selctx -bd 2 -relief groove
+ frame .selctx -bd 2 -relief groove
frame .d.mi.csr_0 -bg white -width 1
frame .d.mi.csr_1 -bg white -width 1
- frame .d.pe
- frame .d.pe.grid
+ frame .pe
+ frame .pe.grid
- button .d.pe.ok -text OK
- pack .d.pe.grid .d.pe.ok -side left
+ button .pe.ok -text OK
+ pack .pe.grid .pe.ok -side left
- pack .d.mi .d.ctx -side top
+ pack .d.mi .d.ctx -side top -anchor w
pack .d -fill x -padx 2 -pady 2
frame .help -bd 2 -relief groove
}
proc resize_widgets_core {} {
- global mulcols mulrows csrh gotsh ctxh glyphsdone
+ global mulcols mulrows csrh gotsh ctxh
global unk_l unk_contexts
foreach w {.d.csr .d.got .d.ctx} {
$w configure -width $mulcols
}
+ .d.csr configure -width [expr {$mulcols+150}]
eval destroy [winfo children .d.ctx]
}
set database_fn $fn
if {![file exists $database_fn]} return
set f [open $database_fn r]
- if {[string compare [db_getsl $f] $magic]} { error "$l $reqkind ?" }
+ if {[string compare [db_getsl $f] $magic]} { error "$magic $reqkind ?" }
read_database_header/$reqkind $f
while 1 {
global reqkind database_fn database
upvar #0 database_magic/$reqkind magic
- set f [open $database_fn.new w]
+ set f [open $database_fn.tmp w]
puts $f $magic
write_database_header/$reqkind $f
}
puts $f "."
close $f
- file rename -force $database_fn.new $database_fn
+ file rename -force $database_fn.tmp $database_fn
}
proc select_database {dbname_spec} {
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
+ debug "GOT $l"
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_pgm stdin
catch { unset all_contexts }
.d.mi.csr_$w configure -height $mulrows
}
set maxh 0
- foreach {min max contexts got} $glyphsdone {
- show_context maxh $min $contexts
+ foreach {min max context contexts got} $glyphsdone {
+ show_context maxh $min $context
foreach ctx $contexts { set all_contexts($ctx) 1 }
}
foreach ctx $unk_contexts { set all_contexts($ctx) 1 }
- destroy [winfo children .d.selctx]
- label .d.selctx.title -text \
+ eval destroy [winfo children .selctx]
+ label .selctx.title -text \
{Select match context for altering dictionary:}
- pack .d.selctx.title -side left
- set new_context [lindex $unk_contexts 0]
+ pack .selctx.title -side left
+ set new_context {}
set ci 0; foreach ctx [lsort [array names all_contexts]] {
set all_contexts($ctx) $ci
- set selw .d.selctx.c$ci
+ set selw .selctx.c$ci
set seltxt $ctx
radiobutton $selw -variable new_context -value $ctx -text $seltxt
pack $selw -side left
incr ci
}
$selw configure -text "$seltxt."
- label .d.selctx.warning -text {See README.charset.}
- pack .d.selctx.warning -side left
+ label .selctx.warning -text {See README.charset.}
+ pack .selctx.warning -side left
show_context maxh $unk_l $unk_contexts
.d.ctx configure -height $maxh
- pack forget .d.pe
- pack .d.selctx .d.csr -side top -before .d.mi
- pack .d.got .d.ctx -side top -after .d.mi
- pack configure .d.selctx -fill x
+ pack forget .pe
+ pack .selctx -before .d -padx 2 -fill x
+ pack .d.csr -side top -before .d.mi -anchor w
+ pack .d.got .d.ctx -side top -after .d.mi -anchor w
+ pack configure .selctx -fill x
focus .d
select_database char$rows
debug "PIX SELECT $ncol [llength $alloptions]"
foreach_pixmap_col col {
if {$col==$ncol} continue
- .d.pe.grid.l$col selection clear 0 end
+ .pe.grid.l$col selection clear 0 end
}
pixmap_maybe_ok
}
global alloptions pixmap_selcol pixmap_selrow
set nsel 0
foreach_pixmap_col col {
- set cs [.d.pe.grid.l$col curselection]
+ set cs [.pe.grid.l$col curselection]
set lcs [llength $cs]
if {!$lcs} continue
incr nsel $lcs
}
if {$nsel==1} {
debug "MAYBE_OK YES col=$pixmap_selcol row=$pixmap_selrow."
- .d.pe.ok configure -state normal -command pixmap_ok
+ .pe.ok configure -state normal -command pixmap_ok
} else {
- .d.pe.ok configure -state disabled -command {}
+ .pe.ok configure -state disabled -command {}
}
}
proc pixmap_ok {} {
global database ppm pixmap_selcol pixmap_selrow mainkind alloptions
+
+ return_result_start
foreach_pixmap_col col {
- .d.pe.grid.l$col configure -state disabled
+ .pe.grid.l$col configure -state disabled
}
- .d.pe.ok configure -state disabled
- helptext {{{ Processing }}}
+ .pe.ok configure -state disabled
+
manyset [lrange $alloptions [expr {$pixmap_selcol*3}] end] \
colname coldesc rows
manyset [lrange $rows [expr {$pixmap_selrow*2}] end] \
debug "UPDATE PIXMAP AS >$result<"
do_database_update $ppm $result
- done/$mainkind
+
+ return_result_finish
}
proc required/pixmap {} {
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"
}
set data [exec pnmscale 2 << $ppm]
image create photo image/main -data $data
- set alloptions [exec ./dictionary-pixmap-options $unk_what]
+ set alloptions [exec ./database-info-fetch $unk_what]
select_database pixmap
place forget .d.mi.csr_0
place forget .d.mi.csr_1
- pack forget .d.selctx .d.csr .d.got
- pack .d.pe -side top -before .d.mi -pady 2
+ pack forget .selctx .d.csr .d.got
+ pack .pe -side top -before .d -pady 2
.d configure -takefocus 0
#-pady 2 -fill x
- eval destroy [winfo children .d.pe.grid]
+ eval destroy [winfo children .pe.grid]
set col 0; foreach {colname coldesc rows} $alloptions {
debug "INIT $col $colname \"$coldesc\""
- label .d.pe.grid.t$col -text $colname
- listbox .d.pe.grid.l$col
+ label .pe.grid.t$col -text $colname
+ listbox .pe.grid.l$col
foreach {rowname rowdesc} $rows {
debug "INIT $col $colname \"$coldesc\" $rowname \"$rowdesc\""
- .d.pe.grid.l$col insert end $rowdesc
+ .pe.grid.l$col insert end $rowdesc
}
- bind .d.pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
- grid .d.pe.grid.t$col -column $col -row 0
- grid .d.pe.grid.l$col -column $col -row 1
+ bind .pe.grid.l$col <<ListboxSelect>> [list pixmap_select $col]
+ grid .pe.grid.t$col -column $col -row 0
+ grid .pe.grid.l$col -column $col -row 1
incr col
}
pixmap_maybe_ok
}
proc maybe_upload_entry {im def} {
- global reqkind privacy_setting env dbname quiet
+ global reqkind privacy_setting env dbname quiet aadepth
debug "DB-UPDATE PRIVACY $privacy_setting"
if {!$privacy_setting} return
set pl {}
lappend pl dict $dbname
+ lappend pl version 3
+ lappend pl depth $aadepth
if {$privacy_setting>=2} {
set pirate [string totitle $env(YPPSC_PIRATE)]
if {!$quiet} {
puts stderr \
- "Uploaded $dbname dictionary entry `$def': $body"
+ "Uploaded $dbname `$def': $body"
}
}
#========== CHARACTER SET ==========
-#---------- xpm input processor ----------
+#---------- pgm input processor ----------
-proc char_read_xpm {f} {
+proc char_read_pgm {f} {
global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
- global cols rows wordmap
+ global cols rows charkey
- set o {}
- set y -3
- while 1 {
- must_gets $f l
- if {![regexp {^"(.*)",$} $l dummy l]} {
- append o "$l\n"
- if {[regexp {^\}\;$} $l]} break
- continue
- }
- if {$y==-3} {
- manyset $l cols rows colours cpp
- if {$colours!=2 || $cpp!=1} { error "$l ?" }
-
- set chop_l [expr {$unk_l - 80}]
- set chop_r [expr {$cols - $unk_l - 100}]
- if {$chop_l<0} { set chop_l 0 }
-
- set unk_l [expr {$unk_l - $chop_l}]
- set unk_r [expr {$unk_r - $chop_l}]
- set ngd {}
- foreach {min max contexts got} $glyphsdone {
- lappend ngd \
- [expr {$min-$chop_l}] \
- [expr {$max-$chop_l}] \
- $contexts $got
- }
- set glyphsdone $ngd
+ must_gets_imagel $f l
+ if {[string compare $l P2]} { error "magic $l ?" }
+
+ must_gets_imagel $f l
+ if {![regexp {^([1-9]\d{0,3}) ([1-9]\d{0,3}) ([1-9]\d?)$} \
+ $l dummy cols rows maxval]} { error "head $l ?" }
- set realcols $cols
- set cols [expr {$cols - $chop_l - $chop_r}]
- debug "NOW cols=$cols chop_l,r=$chop_l,$chop_r rows=$rows\
+ for {set depth 1} {$maxval != (1<<$depth)-1} {incr depth} {
+ if {$depth >= 16} { error "maxval $maxval ?" }
+ }
+
+ set chop_l [expr {$unk_l - 80}]
+ set chop_r [expr {$cols - $unk_l - 100}]
+ if {$chop_l<0} { set chop_l 0 }
+ if {$chop_r<0} { set chop_r 0 }
+
+ set unk_l [expr {$unk_l - $chop_l}]
+ set unk_r [expr {$unk_r - $chop_l}]
+ set ngd {}
+ foreach {min max context contexts got} $glyphsdone {
+ lappend ngd \
+ [expr {$min-$chop_l}] \
+ [expr {$max-$chop_l}] \
+ $context $contexts $got
+ }
+ set glyphsdone $ngd
+
+ set realcols $cols
+ set cols [expr {$cols - $chop_l - $chop_r}]
+ debug "NOW cols=$cols chop_l,r=$chop_l,$chop_r rows=$rows\
$unk_l $unk_r $ngd"
-
- set mulcols [expr {$cols*$mul+$inter}]
- set mulrows [expr {$rows*$mul+$inter}]
- append o "\"$mulcols $mulrows 9 1\",\n"
- for {set x 0} {$x<$cols} {incr x} { set wordmap($x) 0 }
- } elseif {$y==-2} { # first pixel
- append o \
-"\"+ c #111\",
-\"a c #800\",
-\"A c #fcc\",
-\"b c #00c\",
-\"B c #fff\",
-\"u c #000\",
-\"U c #ff0\",
-\"q c #000\",
-\"Q c #ff0\",\n"
- } elseif {$y==-1} { # 2nd pixel but we've already printed ours
- } else {
- set ybit [expr {1<<$y}]
- set x 0
- set ol "\"+"
- set olh $ol
- if {$chop_r>=0} {
- set l [string range $l $chop_l end-$chop_r]
+
+ set mulcols [expr {$cols*$mul+$inter}]
+ set mulrows [expr {$rows*$mul+$inter}]
+
+ set o "P3\n$mulcols $mulrows 15\n"
+
+ for {set x 0} {$x<$cols} {incr x} { set charkey($x) {} }
+
+ set ointer1 " 1 1 1"
+ set ointer [string repeat $ointer1 $inter]
+ set ointerl "[string repeat $ointer1 $mulcols]\n"
+
+ append o $ointerl
+
+ for {set y 0} {$y<$rows} {incr y} {
+ must_gets_imagel $f l
+ if {[llength $l] != $realcols} { error "realcols=$realcols $l ?" }
+
+ set ol $ointer
+
+ for {set x 0} {$x<$cols} {incr x} {
+ set realx [expr {$x + $chop_l}]
+ set c [lindex $l $realx]
+ append charkey($x) [format %x $c]
+
+ set how "u"
+ if {$x >= $unk_l && $x <= $unk_r} {
+ set how q
} else {
- set l [string range $l $chop_l end]
- append l [string repeat " " [expr -$chop_r]]
- }
- foreach c [split $l ""] {
- set how "u"
- if {$x >= $unk_l && $x <= $unk_r} {
- set how q
- } else {
- set ab 0
- foreach {min max contexts got} $glyphsdone {
- set rhsmost_max $max
- if {$x >= $min && $x <= $max} {
- set how [lindex {a b} $ab]
- break
- }
- set ab [expr {!$ab}]
+ set ab 0
+ foreach {min max context contexts got} $glyphsdone {
+ set rhsmost_max $max
+ if {$x >= $min && $x <= $max} {
+ set how [lindex {a b} $ab]
+ break
}
+ set ab [expr {!$ab}]
}
- switch -exact $c {
- " " { set p $how }
- "o" {
- set p [string toupper $how]
- incr wordmap($x) $ybit
- }
- default { error "$c ?" }
- }
- append ol "[string repeat $p [expr {$mul-$inter}]][
- string repeat + $inter]"
- append olh [string repeat + $mul]
- incr x
}
- set ole "\",\n"
- append ol $ole
- append olh $ole
- set olhn [string repeat $olh $inter]
- if {!$y} { append o $olhn }
- append o [string repeat $ol [expr {$mul-1}]]
- append o $olhn
+ set c15 [expr {$c << (16-$depth)}]
+ set c15 [expr {$c15 | ($c15 >> $depth)}]
+ set c15 [expr {$c15 | ($c15 >> $depth*2)}]
+ set c15 [expr {$c15 >> 12}]
+
+ foreach rgb {r g b} { set $rgb {$c15} }
+ switch -exact $how {
+ a { set r {$c15>>1 | 0x8} }
+ b { set b {$c15>>2 | 0xc} }
+ u { set b 0 }
+ q { set b 0 }
+ default { error "how $how ?" }
+ }
+#debug "PIXEL $x,$y how=$how c=$c c15=$c15 $r $g $b"
+
+ set opixel " "
+ foreach rgb {r g b} {
+ append opixel [format " %2d" [expr [set $rgb]]]
+ }
+ append ol [string repeat $opixel [expr {$mul-$inter}]]
+ append ol $ointer
}
- incr y
+ append ol "\n"
+ append o [string repeat $ol [expr {$mul-$inter}]]
+ append o $ointerl
}
- set data [exec xpmtoppm << $o]
- image create photo image/main -data $data
+
+ debug "DATA1 $o"
+ set tmpfile ./#dictimage#.tmp
+ exec pnmscale 1 << $o >$tmpfile
+ image create photo image/main -file $tmpfile
+ file delete $tmpfile
}
#---------- character set editor display ----------
proc draw_glyphsdone {} {
global glyphsdone mul inter
eval destroy [winfo children .d.got]
- foreach {min max contexts got} $glyphsdone {
+ foreach {min max context contexts got} $glyphsdone {
frame .d.got.m$min -bd 0 -background \#888
label .d.got.m$min.l -text "$got" -fg white -bg black -bd 0
pack .d.got.m$min.l -padx 1 -pady 1
global cur_already cur_mode cur_0 cur_1 last_ht
global glyphsdone unk_l unk_r
- set cur_already [expr {[llength $glyphsdone]/4-1}]
+ set cur_already [expr {[llength $glyphsdone]/5-1}]
set cur_mode 1 ;# one of: 0 1 already text
set cur_0 $unk_l
global all_contexts
foreach ctx [array names all_contexts] {
set ci $all_contexts($ctx)
- set selw .d.selctx.c$ci
+ set selw .selctx.c$ci
if {[lsearch -exact $contexts $ctx]>=0} {
set state normal
} else {
proc recursor/1 {} { recursor//01 1 }
proc recursor//01 {z1} {
global mul rhsmost_max cols glyphsdone cur_0 cur_1
+ global all_contexts
upvar #0 cur_$z1 cur
- .d.csr.csr.l configure -text {adjust}
+ .d.csr.csr.l configure -text "adjust [char_get_definition_context_actual]"
place .d.csr.csr -x [expr {$cur*$mul - 7}]
- manyset [char_get_definition_info $cur_0 $cur_1] contexts
- char_exactly_selctxts $contexts
+ set okctxts [char_get_definition_contexts]
+ char_exactly_selctxts $okctxts
+
+ foreach ctx [lsort [array names all_contexts]] {
+ set key [string range $ctx 0 0]
+ if {[lsearch -exact $okctxts $ctx] >= 0} {
+ bind_key [string tolower $key] "
+ [list set new_context $ctx]
+ char_start_define_text
+ "
+ } else {
+ bind_key [string tolower $key] {}
+ }
+ lappend context_help $key
+ }
+ set context_help [list [join $context_help " "] \
+ {Set match context for new glyph, confirm location, and start entry.}]
bind_key space { othercursor }
bind_leftright_q cur_$z1 0 [expr {$cols-1}]
bind_key BackSpace {}
}
bind_key Return {
- if {$cur_0 != $cur_1} {
- .d.csr.csr.e delete 0 end
- set cur_mode text
- recursor
- }
- }
- helptext {
- {{<- ->} {move cursor, adjusting area to define}}
- {Space {switch to moving other cursor}}
- {Return {confirm location, enter letter(s)}}
- {Backspace {switch to correcting earlier ocr}}
- {Q {quit and abandon OCR run}}
+ char_start_define_text
}
+ helptext [list \
+ {{<- ->} {move cursor, adjusting area to define}} \
+ {Space {switch to moving other cursor}} \
+ {Return {confirm location, enter letter(s)}} \
+ {Backspace {switch to correcting earlier ocr}} \
+ {Q {quit and abandon OCR run}} \
+ $context_help \
+ ]
}
proc othercursor {} {
global cur_mode
recursor
}
+proc char_start_define_text {} {
+ global cur_0 cur_1 cur_mode
+ if {$cur_0 == $cur_1} return
+ set cdgdca [char_get_definition_context_actual]
+ if {![string length $cdgdca]} return
+ .d.csr.csr.e delete 0 end
+ set cur_mode text
+ .d.csr.csr.l configure -text "define $cdgdca:"
+ recursor
+}
+
proc recursor/text {} {
global all_contexts
{Escape {abandon entry}}
}
unbind_all_keys
- .d.csr.csr.l configure -text {define:}
- pack .d.csr.csr.e -side left
+ pack .d.csr.csr.e -side left -padx 2
focus .d.csr.csr.e
bind .d.csr.csr.e <Key-Return> {
set strq [.d.csr.csr.e get]
if {[string length $strq]} {
- RETURN_RESULT DEFINE [list $cur_0 $cur_1 $strq]
+ RETURN_RESULT DEFINE [list $strq]
}
}
bind .d.csr.csr.e <Key-Escape> {
proc recursor/already {} {
global mul
- global glyphsdone
global cur_already mul
global glyphsdone cur_already mul
- char_exactly_selctxts [lindex $glyphsdone [expr {$cur_already*4+2}]]
+ char_exactly_selctxts [lindex $glyphsdone [expr {$cur_already*5+2}]]
.d.csr.csr.l configure -text {correct}
- set rmax [lindex $glyphsdone [expr {$cur_already*4}]]
+ set rmax [lindex $glyphsdone [expr {$cur_already*5}]]
place .d.csr.csr -x [expr {$rmax*$mul-3}]
bind_key Return {}
- bind_leftright_q cur_already 0 [expr {[llength $glyphsdone]/4-1}]
+ bind_leftright_q cur_already 0 [expr {[llength $glyphsdone]/5-1}]
bind_key space { bind_key Delete {}; set cur_mode 1; recursor }
bind_key Delete {
RETURN_RESULT DELETE [lrange $glyphsdone \
- [expr $cur_already*4] \
- [expr $cur_already*4+2]]
+ [expr $cur_already*5] \
+ [expr $cur_already*5+2]]
}
helptext {
{{<- ->} {move cursor, selecting glyph to correct}}
# $database($context 0x<bits> 0x<bits>...) = $hex
-set database_magic/char {# ypp-sc-tools pctb font v1}
+set database_magic/char "# ypp-sc-tools pctb font v3 depth=$aadepth"
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
while 1 {
set l [db_getsl $f]
if {![string length $l]} break
- lappend bm [format %x 0x$l]
+ lappend bm $l
}
set database($bm) $strq
}
}
proc dbkey {ctx l r} {
- global wordmap
+ global charkey
set bm $ctx
for {set x $l} {$x <= $r} {incr x} {
- lappend bm [format %x $wordmap($x)]
+ lappend bm $charkey($x)
}
return $bm
}
-proc char_get_definition_info {c0 c1} {
- # => ncontexts cl cr
- global glyphsdone unk_l unk_contexts wordmap database
-
- if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
+proc char_get_definition_cursors {} {
+ global cur_0 cur_1
+ if {$cur_0 <= $cur_1} {
+ set cl $cur_0; set cr $cur_1
+ } else {
+ set cl $cur_1; set cr $cur_0
+ }
+ incr cr -1
+ debug "CGD CURSORS $cl $cr"
+ return [list $cl $cr]
+}
+
+proc char_get_definition_contexts {} {
+ global glyphsdone unk_l unk_contexts database
+
+ manyset [char_get_definition_cursors] c0 c1
if {$c0 == $unk_l} {
set ncontexts $unk_contexts
} else {
- foreach {l r contexts got} $glyphsdone {
+ foreach {l r context contexts got} $glyphsdone {
if {$l==$c0} { set ncontexts $contexts; break }
}
if {![info exists ncontexts]} {
set ncontexts {}
}
}
- incr c1 -1
- set r [list $ncontexts $c0 $c1]
- debug "CDGI $r"
- return $r
+ debug "CGD CONTEXTS $ncontexts"
+ return $ncontexts
}
-proc update_database/DEFINE {c0 c1 strq} {
- manyset [char_get_definition_info $c0 $c1] ncontexts c0 c1
- if {![llength $ncontexts]} {
- puts stderr "must start at letter LHS!"
- return
+proc char_get_definition_context_actual {} {
+ global new_context
+ set ncontexts [char_get_definition_contexts]
+ if {[llength $ncontexts]==1} {
+ set c [lindex $ncontexts 0]
+ } elseif {[lsearch -exact $ncontexts $new_context]>=0} {
+ set c $new_context
+ } else {
+ set c {}
}
- foreach c $ncontexts {
- set bm [dbkey $c $c0 $c1]
- do_database_update $bm $strq
+ debug "CDG CONTEXT ACTUAL $c FROM NEW $new_context ALLOW $ncontexts"
+ return $c
+}
+
+proc update_database/DEFINE {strq} {
+ manyset [char_get_definition_cursors] c0 c1
+ set c [char_get_definition_context_actual]
+ if {![string length $c]} {
+ error "Selected context is not one of the many possibilities."
}
+ debug "DEFINE $strq"
+ set bm [dbkey $c $c0 $c1]
+ do_database_update $bm $strq
}
proc update_database/DELETE {l r ctxs} {
global database
+ if {[llength $ctxs]!=1} { error "$ctxs ?" }
foreach ctx $ctxs {
set bm [dbkey $ctx $l $r]
catch { unset database($bm) }
}
write_database
}
-
+
proc RETURN_RESULT {how what} {
- global mainkind
+ return_result_start
+
place forget .d.csr.csr
pack forget .d.csr.csr.e
- helptext {{{ Processing }}}
- unbind_all_keys
- update idletasks
+
debug "$how $what"
eval update_database/$how $what
- done/$mainkind
+
+ return_result_finish
}
#========== server for approving updates ==========
must_gets_exactly stdin confirmed
- manyset [dict2_reqkind_rows reqkind rows]
+ manyset [dict2_reqkind_rows $dict] reqkind rows
if {$yesno} {
read_database $dictdir/master-$dict.txt
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 ?"
}
}
proc approve_decompose_data {specdata} {
- global data
+ global data aadepth
set data $specdata
- regsub-data {^ypp-sc-tools dictionary update v1\n} {}
+ regsub-data "^ypp-sc-tools dictionary update v3 depth=$aadepth\\n" {}
uplevel 1 chop_counted pirate
uplevel 1 chop_counted caller
uplevel 1 chop_counted dict
uplevel 1 chop_counted key
uplevel 1 chop_counted val
- return [uplevel 1 {list $dict $def $image}]
+ return [uplevel 1 {list $dict $ctx $def $image}]
}
proc approve_compare {fd1 fd2} {
}
proc approve_showentry {ix file specdata} {
- global approve_ixes reqkind
+ global approve_ixes reqkind approve_entryhow
approve_decompose_data $specdata
label $wb-def.def -text $def
pack $wb-def.scope $wb-def.def -side bottom
- set ppm [exec pnmscale 2 << $image]
- image create photo approve/$ix -data $ppm
- label $wb-image -image approve/$ix -bd 2 -relief sunken
+ if {[regexp {^P2} $image]} {
+ set image [exec pgmtoppm {#008-white} << $image | pnmnoraw]
+ append image "\n"
+ }
+ set image [exec pnmscale 2 << $image]
+
+ image create photo approve/$ix -data $image
+ label $wb-image -image approve/$ix -bd 2 -relief flat -bg black
manyset [dict2_reqkind_rows $dict] reqkind
approve_showentry_xinfo/$reqkind $wb-xinfo $def
grid configure $wb-div -columnspan 5 -sticky ew -padx 5
}
- frame $wb-act
- button $wb-act.rej -text Reject -command [list approve_reject $ix]
- pack $wb-act.rej
+ frame $wb-act -bd 2 -relief groove
+ set approve_entryhow($ix) approve
+ foreach how {approve reject defer} {
+ set w $wb-act.$how
+ radiobutton $w -variable approve_entryhow($ix) \
+ -text [string totitle $how] -value $how
+ pack $w -side left
+ }
grid $wb-def $wb-image $wb-xinfo $wb-act $wb-inf -padx 3
grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
must_gets_exactly_server ok
}
-proc approve_reject {ix} {
+proc approve_confirm {} {
+ global approve_ixes approve_entryhow
approve_check_server
- approve_approve_reject_one $ix 0
- approve_fetch_list
-}
-
-proc approve_these {} {
- global approve_ixes
- approve_check_server
- foreach ix $approve_ixes { approve_approve_reject_one $ix 1 }
+ foreach ix $approve_ixes {
+ set how $approve_entryhow($ix)
+ switch -exact $how {
+ approve { approve_approve_reject_one $ix 1 }
+ reject { approve_approve_reject_one $ix 0 }
+ defer { }
+ default { error $how? }
+ }
+ }
approve_fetch_list
}
switch -glob $userhost {
{} { }
{* *} { set cmd $userhost }
- * { set cmd [concat [list ssh $userhost] $cmd] }
+ * { set cmd [concat [list ssh -o compression=yes $userhost] $cmd] }
}
debug "APPROVER RUNS $cmd"
label .title -text {}
frame .app -bd 2 -relief groove
- button .ok -text "Approve These" -command approve_these
+ button .ok -text "Confirm" -command approve_confirm
pack .title .app -side top
pack .left -side left
pack .right -side right
#========== main program ==========
+proc return_result_start {} {
+ helptext {{{ Processing }}}
+ unbind_all_keys
+ update idletasks
+}
+proc return_result_finish {} {
+ global mainkind
+ done/$mainkind
+}
+
proc main/default {} {
puts stderr "Do not run this program directly."
exit 12
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 }
+ {--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 }
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff