X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fdictionary-manager;h=9cbdb78f4984cb003c2d79e288b190521f1cf57e;hb=e46a25ff6f743a98282a391eba00443b6d2742fa;hp=6814586d9249896bf8b487effd432db42154c841;hpb=40a2e83600face2535bd28b6aa9d94b80a2af15e;p=ypp-sc-tools.db-live.git

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 6814586..9cbdb78 100755
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -28,6 +28,8 @@
 # ./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 '' . .
+
 
 # invocation:
 # OUT OF DATE
@@ -1134,7 +1136,7 @@ proc approve_decompose_data {specdata} {
     global data
     set data $specdata
     
-    regsub-data {^ypp-sc-tools dictionary update v1\n} {}
+    regsub-data {^ypp-sc-tools dictionary update v2\n} {}
     uplevel 1 chop_counted pirate
     uplevel 1 chop_counted caller
     uplevel 1 chop_counted dict
@@ -1184,9 +1186,14 @@ proc approve_showentry {ix file specdata} {
     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"
+    }
+    set image [exec pnmscale 2 << $image]
+
+    image create photo approve/$ix -data $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