# 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 '' . .
# if it wrote a byte to fd 4, it can take another question
+set aadepth 2
+
+
#---------- library routines ----------
proc manyset {list args} {
exit 16
}
+proc execpnm_createphoto {photoname args} {
+ set tmpfile ./_dictimage.tmp
+ eval exec $args > $tmpfile
+ image create photo $photoname -file $tmpfile
+ file delete $tmpfile
+}
+
#---------- display core ----------
set mul 6
button .pe.ok -text OK
pack .pe.grid .pe.ok -side left
+ bind .pe.ok <Key-Return> { .pe.ok invoke }
pack .d.mi .d.ctx -side top -anchor w
pack .d -fill x -padx 2 -pady 2
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} {
global dbname
set dbname $dbname_spec
- read_database "./#local-$dbname#.txt"
+ read_database "./_local-$dbname.txt"
}
proc do_database_update {im def} {
label .selctx.title -text \
{Select match context for altering dictionary:}
pack .selctx.title -side left
- set new_context [lindex $unk_contexts 0]
+ set new_context {}
set ci 0; foreach ctx [lsort [array names all_contexts]] {
set all_contexts($ctx) $ci
if {$col==$ncol} continue
.pe.grid.l$col selection clear 0 end
}
- pixmap_maybe_ok
+ if {[pixmap_maybe_ok]} {
+ focus .pe.ok
+ }
}
proc pixmap_maybe_ok {} {
global alloptions pixmap_selcol pixmap_selrow
if {$nsel==1} {
debug "MAYBE_OK YES col=$pixmap_selcol row=$pixmap_selrow."
.pe.ok configure -state normal -command pixmap_ok
+ return 1
} else {
.pe.ok configure -state disabled -command {}
+ return 0
}
}
proc pixmap_ok {} {
if {![string length $ppml]} break
append ppm $ppml "\n"
}
- set data [exec pnmscale 2 << $ppm]
- image create photo image/main -data $data
+ execpnm_createphoto image/main pnmscale 2 << $ppm
set alloptions [exec ./database-info-fetch $unk_what]
pixmap_maybe_ok
helptext {
- {{Indicate the meaning of this image, and click OK.}}
+ {{Indicate the meaning of this image; then click OK or hit Return.}}
}
}
}
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)]
append o $ointerl
}
-# debug "DATA $o"
- set data [exec pnmscale 1 << $o]
- image create photo image/main -data $data
+# debug "DATA1 $o"
+
+ execpnm_createphoto image/main pnmscale 1 << $o
}
#---------- character set editor display ----------
global glyphsdone unk_l unk_r
set cur_already [expr {[llength $glyphsdone]/5-1}]
- set cur_mode 1 ;# one of: 0 1 already text
+ set cur_mode 0 ;# one of: 0 1 already text
set cur_0 $unk_l
set cur_1 [expr {$unk_r+1}]
if {[lsearch -exact $okctxts $ctx] >= 0} {
bind_key [string tolower $key] "
[list set new_context $ctx]
- recursor
+ 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.}]
+ {Set match context for new glyph, confirm location, and start entry.}]
bind_key space { othercursor }
bind_leftright_q cur_$z1 0 [expr {$cols-1}]
# $database($context 0x<bits> 0x<bits>...) = $hex
-set database_magic/char {# ypp-sc-tools pctb font v2}
+set database_magic/char "# ypp-sc-tools pctb font v3 depth=$aadepth"
proc read_database_header/char {f} {
global rows
}
proc approve_decompose_data {specdata} {
- global data
+ global data aadepth
set data $specdata
- regsub-data {^ypp-sc-tools dictionary update v2\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} {
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"
+ }
+ execpnm_createphoto approve/$ix pnmscale 2 << $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
proc approve_confirm {} {
global approve_ixes approve_entryhow
+ .ok configure -state disabled
+ update idletasks
approve_check_server
foreach ix $approve_ixes {
set how $approve_entryhow($ix)
set approve_list [lsort -command approve_compare $approve_list]
approve_show_page 0
+ .ok configure -state normal
}
proc main/approve {} {
~yarrgweb / ypp-sc-tools.web-live.git / blobdiff