chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip matching context selection
[ypp-sc-tools.db-test.git]
/
pctb
/
dictionary-manager
diff --git
a/pctb/dictionary-manager
b/pctb/dictionary-manager
index 81a480ef476a0278f84f6a7bd6a1f85e66899efa..9d92a66b78d04218db1214d2ee7e2045d783c882 100755
(executable)
--- a/
pctb/dictionary-manager
+++ b/
pctb/dictionary-manager
@@
-123,6
+123,7
@@
static unsigned char csr_bits[] = {
entry .d.csr.csr.e -bd 0
pack .d.csr.csr.l -side left
entry .d.csr.csr.e -bd 0
pack .d.csr.csr.l -side left
+ frame .d.seldict
frame .d.mi.csr_0 -bg white -width 1
frame .d.mi.csr_1 -bg white -width 1
frame .d.pe
frame .d.mi.csr_0 -bg white -width 1
frame .d.mi.csr_1 -bg white -width 1
frame .d.pe
@@
-262,10
+263,15
@@
proc required/char {} {
foreach {min max contexts got} $glyphsdone {
show_context maxh $min $contexts
}
foreach {min max contexts got} $glyphsdone {
show_context maxh $min $contexts
}
+
+ destroy [winfo children .d.seldict]
+ label .d.seldict.title -text {Select matching context:}
+ pack .d.seldict.title -side left
+
show_context maxh $unk_l $unk_contexts
.d.ctx configure -height $maxh
pack forget .d.pe
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.
seldict .d.
csr -side top -before .d.mi
pack .d.got .d.ctx -side top -after .d.mi
focus .d
pack .d.got .d.ctx -side top -after .d.mi
focus .d
@@
-274,6
+280,11
@@
proc required/char {} {
startup_cursor
}
startup_cursor
}
+proc approve_showentry_xinfo/char {w def} {
+ set unic [string2unicodenames $def]
+ label $w -text $unic
+}
+
#========== PIXMAPS ==========
#---------- pixmap database read and write ----------
#========== PIXMAPS ==========
#---------- pixmap database read and write ----------
@@
-380,7
+391,7
@@
proc required/pixmap {} {
place forget .d.mi.csr_0
place forget .d.mi.csr_1
place forget .d.mi.csr_0
place forget .d.mi.csr_1
- pack forget .d.csr .d.got
+ pack forget .d.
seldict .d.
csr .d.got
pack .d.pe -side top -before .d.mi -pady 2
.d configure -takefocus 0
#-pady 2 -fill x
pack .d.pe -side top -before .d.mi -pady 2
.d configure -takefocus 0
#-pady 2 -fill x
@@
-406,6
+417,10
@@
proc required/pixmap {} {
}
}
}
}
+proc approve_showentry_xinfo/pixmap {w def} {
+ label $w -image image/empty
+}
+
#========== UPLOADS TO DICTIONARY SERVER ==========
proc upload_init {} {
#========== UPLOADS TO DICTIONARY SERVER ==========
proc upload_init {} {
@@
-729,8
+744,8
@@
proc recursor/text {} {
focus .d.csr.csr.e
bind .d.csr.csr.e <Key-Return> {
set strq [.d.csr.csr.e get]
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> {
}
}
bind .d.csr.csr.e <Key-Escape> {
@@
-916,14
+931,7
@@
proc remote-serv/take {yesno file dict} {
must_gets_exactly stdin confirmed
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
if {$yesno} {
read_database $dictdir/master-$dict.txt
@@
-984,6
+992,18
@@
proc regsub-data {exp subspec args} {
}
}
}
}
+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
proc chop_counted {var} {
upvar 1 $var val
global data
@@
-1018,8
+1038,18
@@
proc approve_compare {fd1 fd2} {
return [string compare $sv1 $sv2]
}
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} {
proc approve_showentry {ix file specdata} {
- global approve_ixes
+ global approve_ixes
reqkind
approve_decompose_data $specdata
approve_decompose_data $specdata
@@
-1043,14
+1073,8
@@
proc approve_showentry {ix file specdata} {
image create photo approve/$ix -data $ppm
label $wb-image -image approve/$ix -bd 2 -relief sunken
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
if {$ix} {
label $wb-div -bd 1 -relief sunken -image image/empty
@@
-1061,7
+1085,7
@@
proc approve_showentry {ix file specdata} {
button $wb-act.rej -text Reject -command [list approve_reject $ix]
pack $wb-act.rej
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
grid configure $wb-image -ipadx 3 -ipady 3 -sticky w
lappend approve_ixes $ix