more feedback on context

[ypp-sc-tools.web-live.git] / pctb / dictionary-manager

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index cfb4a690498314997cc6f8ca37bc349301c6c0a2..a31ce1bdf2eb08514bd41751700726c3671c868b 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -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> {