X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fdictionary-manager;h=fb11565a1defde3fd1b27d7fe05af2d5dc381295;hb=3b564897d1c81b80783da2f95d56770de55996b6;hp=cfb4a690498314997cc6f8ca37bc349301c6c0a2;hpb=479a3cc7b4b79e8cb4df95664da5a9b0cb7918de;p=ypp-sc-tools.db-test.git

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index cfb4a69..fb11565 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -404,7 +404,7 @@ 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
 
@@ -568,7 +568,7 @@ proc maybe_upload_entry {im def} {
 
     if {!$quiet} {
 	puts stderr \
-	    "Uploaded $dbname dictionary entry `$def': $body"
+	    "Uploaded $dbname `$def': $body"
     }
 }
 
@@ -739,11 +739,28 @@ proc recursor/0 {} { recursor//01 0 }
 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}]
 
-    char_exactly_selctxts [char_get_definition_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]
+                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}]
@@ -755,13 +772,14 @@ proc recursor//01 {z1} {
     bind_key Return {
 	char_start_define_text
     }
-    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}}
-    }
+    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
@@ -772,9 +790,11 @@ proc othercursor {} {
 proc char_start_define_text {} {
     global cur_0 cur_1 cur_mode
     if {$cur_0 == $cur_1} return
-    if {![string length [char_get_definition_context_actual]]} 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
 }
 
@@ -786,7 +806,6 @@ proc recursor/text {} {
 	{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> {
@@ -1016,7 +1035,7 @@ proc remote-serv/take {yesno file dict} {
 
     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
@@ -1134,7 +1153,7 @@ proc string2unicodenames {str} {
 }
 
 proc approve_showentry {ix file specdata} {
-    global approve_ixes reqkind
+    global approve_ixes reqkind approve_entryhow
     
     approve_decompose_data $specdata
 
@@ -1166,9 +1185,14 @@ proc approve_showentry {ix file 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
@@ -1197,16 +1221,18 @@ proc approve_check_server {} {
     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
 }
 
@@ -1247,7 +1273,7 @@ proc main/approve {} {
     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"
 
@@ -1260,7 +1286,7 @@ proc main/approve {} {
 
     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