rename dictionary-pixmap-options to database-info-fetch

[ypp-sc-tools.db-test.git] / pctb / dictionary-manager

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 105490d5817eb9549bca6ebf2a7644618a75923d..63c096dee04b9a45a733bb554832498b68012233 100755 (executable)
--- 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
 
@@ -739,12 +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}]
 
-    manyset [char_get_definition_info $cur_0 $cur_1] contexts
-    char_exactly_selctxts $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}]
@@ -756,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
@@ -773,8 +790,11 @@ proc othercursor {} {
 proc char_start_define_text {} {
     global cur_0 cur_1 cur_mode
     if {$cur_0 == $cur_1} 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,13 +806,12 @@ 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> {
        set strq [.d.csr.csr.e get]
        if {[string length $strq]} {
-           RETURN_RESULT DEFINE [list $cur_0 $cur_1 $strq]
+           RETURN_RESULT DEFINE [list $strq]
        }
     }
     bind .d.csr.csr.e <Key-Escape> {
@@ -904,11 +923,22 @@ proc dbkey {ctx l r} {
     return $bm
 }
 
-proc char_get_definition_info {c0 c1} {
-    # => ncontexts cl cr
+proc char_get_definition_cursors {} {
+    global cur_0 cur_1
+    if {$cur_0 <= $cur_1} {
+       set cl $cur_0; set cr $cur_1
+    } else {
+       set cl $cur_1; set cr $cur_0
+    }
+    incr cr -1
+    debug "CGD CURSORS $cl $cr"
+    return [list $cl $cr]
+}
+
+proc char_get_definition_contexts {} {
     global glyphsdone unk_l unk_contexts wordmap database
-    
-    if {$c0 > $c1} { manyset [list $c0 $c1] c1 c0 }
+
+    manyset [char_get_definition_cursors] c0 c1
     
     if {$c0 == $unk_l} {
        set ncontexts $unk_contexts
@@ -920,24 +950,31 @@ proc char_get_definition_info {c0 c1} {
            set ncontexts {}
        }
     }
-    incr c1 -1
-    set r [list $ncontexts $c0 $c1]
-    debug "CDGI $r"
-    return $r
+    debug "CGD CONTEXTS $ncontexts"
+    return $ncontexts
 }
 
-proc update_database/DEFINE {c0 c1 strq} {
+proc char_get_definition_context_actual {} {
     global new_context
-    manyset [char_get_definition_info $c0 $c1] ncontexts c0 c1
-    debug "DEFINE $c0 $c1 $new_context {$ncontexts}"
+    set ncontexts [char_get_definition_contexts]
     if {[llength $ncontexts]==1} {
        set c [lindex $ncontexts 0]
-    } elseif {[lsearch -exact $new_context $ncontexts]>=0} {
+    } elseif {[lsearch -exact $ncontexts $new_context]>=0} {
        set c $new_context
     } else {
-       puts stderr "Selected context is not one of the many possibilities."
-       return;
+       set c {}
+    }
+    debug "CDG CONTEXT ACTUAL $c FROM NEW $new_context ALLOW $ncontexts"
+    return $c
+}
+
+proc update_database/DEFINE {strq} {
+    manyset [char_get_definition_cursors] c0 c1
+    set c [char_get_definition_context_actual]
+    if {![string length $c]} {
+       error "Selected context is not one of the many possibilities."
     }
+    debug "DEFINE $strq"
     set bm [dbkey $c $c0 $c1]
     do_database_update $bm $strq
 }