frame .d -bd 2 -relief groove -pady 2 -padx 2
image create bitmap image/main
- label .d.mi -image image/main -borderwidth 0
+ label .d.mi -image image/main -bd 0
frame .d.csr -bg black -height $csrh
frame .d.got -bg black -height $gotsh
entry .d.csr.csr.e -bd 0
pack .d.csr.csr.l -side left
+ frame .d.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
}
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} {
}
proc required/char {} {
- global mulrows glyphsdone unk_l unk_r unk_contexts rows
+ global mulrows glyphsdone unk_l unk_r unk_contexts rows new_context
+ global all_contexts
must_gets stdin l
char_read_xpm stdin
+ catch { unset all_contexts }
+
resize_widgets_core
foreach w {0 1} {
.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 }
+
+ eval destroy [winfo children .d.selctx]
+ label .d.selctx.title -text \
+ {Select match context for altering dictionary:}
+ pack .d.selctx.title -side left
+ set new_context [lindex $unk_contexts 0]
+
+ set ci 0; foreach ctx [lsort [array names all_contexts]] {
+ set all_contexts($ctx) $ci
+ set selw .d.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
+
show_context maxh $unk_l $unk_contexts
.d.ctx configure -height $maxh
pack forget .d.pe
- pack .d.csr -side top -before .d.mi
+ 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
focus .d
select_database char$rows
}
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
}
.d.pe.ok configure -state disabled
- helptext {{{ Processing }}}
+
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 {} {
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.csr .d.got
+ pack forget .d.selctx .d.csr .d.got
pack .d.pe -side top -before .d.mi -pady 2
.d configure -takefocus 0
#-pady 2 -fill x
if {!$quiet} {
puts stderr \
- "Uploaded $dbname dictionary entry `$def': $body"
+ "Uploaded $dbname `$def': $body"
}
}
set unk_l [expr {$unk_l - $chop_l}]
set unk_r [expr {$unk_r - $chop_l}]
set ngd {}
- foreach {min max contexts got} $glyphsdone {
+ foreach {min max context contexts got} $glyphsdone {
lappend ngd \
[expr {$min-$chop_l}] \
[expr {$max-$chop_l}] \
- $contexts $got
+ $context $contexts $got
}
set glyphsdone $ngd
set how q
} else {
set ab 0
- foreach {min max contexts got} $glyphsdone {
+ foreach {min max context contexts got} $glyphsdone {
set rhsmost_max $max
if {$x >= $min && $x <= $max} {
set how [lindex {a b} $ab]
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
#---------- character set runtime display and keystroke handling ----------
+proc char_exactly_selctxts {contexts} {
+ global all_contexts
+ foreach ctx [array names all_contexts] {
+ set ci $all_contexts($ctx)
+ set selw .d.selctx.c$ci
+ if {[lsearch -exact $contexts $ctx]>=0} {
+ set state normal
+ } else {
+ set state disabled
+ }
+ $selw configure -state $state
+ }
+}
+
proc recursor/0 {} { recursor//01 0 }
proc recursor/1 {} { recursor//01 1 }
proc recursor//01 {z1} {
- global mul rhsmost_max cols glyphsdone
+ 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}]
+
+ 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]
+ recursor
+ "
+ } else {
+ bind_key [string tolower $key] {}
+ }
+ lappend context_help $key
+ }
+ set context_help [list [join $context_help " "] \
+ {Set match context for new glyph.}]
+
bind_key space { othercursor }
bind_leftright_q cur_$z1 0 [expr {$cols-1}]
if {[llength $glyphsdone]} {
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
+
helptext {
{Return {confirm entry of new glyph}}
{Escape {abandon entry}}
}
unbind_all_keys
- .d.csr.csr.l configure -text {define:}
pack .d.csr.csr.e -side left
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*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}}
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
return $bm
}
-proc update_database/DEFINE {c0 c1 strq} {
+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 wordmap database
- if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
+
+ 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]} {
- puts stderr "must start at letter LHS!"
- return
+ set ncontexts {}
}
}
- incr c1 -1
- foreach c $ncontexts {
- set bm [dbkey $c $c0 $c1]
- do_database_update $bm $strq
+ debug "CGD CONTEXTS $ncontexts"
+ return $ncontexts
+}
+
+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 {}
}
+ 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_showentry {ix file specdata} {
- global approve_ixes reqkind
+ global approve_ixes reqkind approve_entryhow
approve_decompose_data $specdata
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} {
- approve_check_server
- approve_approve_reject_one $ix 0
- approve_fetch_list
-}
-
-proc approve_these {} {
- global approve_ixes
+proc approve_confirm {} {
+ global approve_ixes approve_entryhow
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
~yarrgweb / ypp-sc-tools.main.git / blobdiff