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 required/char {} {
- global mulrows glyphsdone unk_l unk_r unk_contexts rows
+ global mulrows glyphsdone unk_l unk_r unk_contexts rows unk_context
must_gets stdin l
foreach {min max contexts got} $glyphsdone {
show_context maxh $min $contexts
}
+
+ destroy [winfo children .d.selctx]
+ label .d.selctx.title -text \
+ {Select match context for new dictionary entry:}
+ pack .d.selctx.title -side left
+ set unk_context [lindex $unk_contexts 0]
+ set ci 0; foreach ctx $unk_contexts {
+ radiobutton .d.selctx.c$ci -variable unk_context \
+ -value $ctx -text $ctx
+ pack .d.selctx.c$ci -side left
+ incr ci
+ }
+ set ci [expr {[llength $unk_contexts]-1}]
+ .d.selctx.c$ci configure -text [lindex $unk_contexts $ci].
+ if {[llength $unk_contexts]==1} {
+ foreach w [winfo children .d.selctx] { $w configure -state disabled }
+ }
+ 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
startup_cursor
}
+proc approve_showentry_xinfo/char {w def} {
+ set unic [string2unicodenames $def]
+ label $w -text $unic
+}
+
#========== PIXMAPS ==========
#---------- pixmap database read and write ----------
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
}
}
+proc approve_showentry_xinfo/pixmap {w def} {
+ label $w -image image/empty
+}
+
#========== UPLOADS TO DICTIONARY SERVER ==========
proc upload_init {} {
focus .d.csr.csr.e
bind .d.csr.csr.e <Key-Return> {
set strq [.d.csr.csr.e get]
- if {[regexp -line {^(?:[!-[]|[]-~]|\\\\|\\x[0-9a-f]{2})+} $strq]} {
- RETURN_RESULT DEFINE "$cur_0 $cur_1 $strq"
+ if {[string length $strq]} {
+ RETURN_RESULT DEFINE [list $cur_0 $cur_1 $strq]
}
}
bind .d.csr.csr.e <Key-Escape> {
must_gets_exactly stdin confirmed
- if {![string compare pixmap $dict]} {
- set reqkind pixmap
- debug "DICT PIXMAP"
- } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
- debug "DICT CHAR rqk=$reqkind r=$rows."
- } else {
- error "$dict ?"
- }
+ manyset [dict2_reqkind_rows reqkind rows]
if {$yesno} {
read_database $dictdir/master-$dict.txt
}
}
+proc dict2_reqkind_rows {dict} {
+ if {![string compare pixmap $dict]} {
+ return {pixmap {}}
+ debug "DICT PIXMAP"
+ } elseif {[regexp {^(char)([1-9]\d*)$} $dict dummy reqkind rows]} {
+ debug "DICT CHAR rqk=$reqkind r=$rows."
+ return [list $reqkind rows]
+ } else {
+ error "$dict ?"
+ }
+}
+
proc chop_counted {var} {
upvar 1 $var val
global data
return [string compare $sv1 $sv2]
}
+proc string2unicodenames {str} {
+ return [exec perl -e {
+ use Unicode::CharName qw(uname);
+ $ARGV[0] =~ s/^ //;
+ foreach $_ (split //,$ARGV[0]) {
+ print uname(ord),"\n" or die $!
+ }
+ } " $str"]
+}
+
proc approve_showentry {ix file specdata} {
- global approve_ixes
+ global approve_ixes reqkind
approve_decompose_data $specdata
image create photo approve/$ix -data $ppm
label $wb-image -image approve/$ix -bd 2 -relief sunken
- set unic [exec perl -e {
- use Unicode::CharName qw(uname);
- $ARGV[0] =~ s/^ //;
- foreach $_ (split //,$ARGV[0]) {
- print uname(ord),"\n" or die $!
- }
- } " $def"]
- label $wb-unicode -text $unic
+ manyset [dict2_reqkind_rows $dict] reqkind
+ approve_showentry_xinfo/$reqkind $wb-xinfo $def
+
+ if {$ix} {
+ label $wb-div -bd 1 -relief sunken -image image/empty
+ 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
- grid $wb-def $wb-image $wb-unicode $wb-act $wb-inf -padx 3
+ grid $wb-def $wb-image $wb-xinfo $wb-act $wb-inf -padx 3
grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
lappend approve_ixes $ix
pack .right -side right
pack .ok -side bottom
+ image create bitmap image/empty
+
set approve_page 0
approve_fetch_list
}