X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fyppsc-ocr-resolver;fp=pctb%2Fyppsc-ocr-resolver;h=ec4473d2205ed19f7c114ad81775701490266916;hp=bb55d3d3901e21e8e4a068cc8b2a05c9a620fe1e;hb=b4e128efc860c4416fe913abe97b190404e866dd;hpb=5235400ea0618cdc6e4585f9b032edbc000ad8e8

diff --git a/pctb/yppsc-ocr-resolver b/pctb/yppsc-ocr-resolver
index bb55d3d..ec4473d 100755
--- a/pctb/yppsc-ocr-resolver
+++ b/pctb/yppsc-ocr-resolver
@@ -126,6 +126,11 @@ proc resize_widgets {} {
 
 #---------- xpm input processor ----------
 
+proc must_gets {f lvar} {
+    upvar 1 $lvar l
+    if {[gets $f l] < 0} { error "huh?" }
+}
+
 proc read_xpm {f} {
     global glyphsdone mul inter rhsmost_max unk_l unk_r mulcols mulrows
     global cols rows wordmap
@@ -133,7 +138,7 @@ proc read_xpm {f} {
     set o {}
     set y -3
     while 1 {
-	if {[gets $f l] < 0} { error "huh? "}
+	must_gets $f l
 	if {![regexp {^"(.*)",$} $l dummy l]} {
 	    append o "$l\n"
 	    if {[regexp {^\}\;$} $l]} break
@@ -552,6 +557,19 @@ proc required {} {
 	return
     }
     init_widgets
+
+    required/$l
+}
+
+proc required/pixmap {} {
+    global unk_what
+    must_gets stdin unk_what
+    error nyi
+}
+
+proc required/char {} {
+    must_gets stdin l
+
     manyset [lrange $l 0 3] unk_l unk_r unk_contexts
     set glyphsdone [lrange $l 3 end]
     debug "GOT $l"