From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 4 Jul 2009 15:33:52 +0000 (+0100)
Subject: antialiasing text conversion: dictionary-update-receiver and approval seems to work
X-Git-Tag: 1.9.2~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=5bcf61f52358ce7a1ceea3106c4c8a2d0a6dbfcd

antialiasing text conversion: dictionary-update-receiver and approval seems to work
---

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 6814586..3c338ca 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
diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver
index 13131f3..6641ddd 100755
--- a/pctb/dictionary-update-receiver
+++ b/pctb/dictionary-update-receiver
@@ -68,42 +68,45 @@ sub parseentryin__pixmap ($) {
 
 sub parseentryin__char ($$) {
     my ($ei,$h) = @_;
-    $ei =~ m/^(Digit|Upper|Lower)\n([^\n]+)\n/s or die;
+    $ei =~ m/^(Digit|Upper|Lower|Word)\n([^\n]+)\n/s or die;
     my ($ctx,$str)= ($1,$2);
-#print STDERR ">$'<\n";
+print STDERR ">ctx=$ctx|str=$str|$'<\n";
     my @d= grep { m/./ } split /\n/, $';
-#print STDERR ">@d<\n";
-    die if $h>31;
+print STDERR ">@d<\n";
+    die if $h>100;
     die if @d>400;
-    my $maxval= (1<<$h)-1;
-    map {
-	m/^[0-9a-f]{1,8}$/ or die;
-	$_= hex $_;
-	die "$_ ?" if $_ > $maxval;
-    } @d;
+
     my $w= @d;
-    my $ppm= "P2\n$w $h\n1\n";
-    my $whole='';
-    for (my $y=0; $y<$h; $y++) {
-	for (my $x=0; $x<$w; $x++) {
-	    my $pix= !($d[$x] & (1<<$y));
-	    $ppm .= sprintf " %d", $pix;
-	    $whole .= $pix ? '  ' : '<>';
-	}
-	$ppm .= "\n";
-	$whole .= "\n";
-    }
-    map { $_= sprintf "%x", $_; } @d;
+
+    my $pgm= "P2\n$h $w\n7\n";
+    map { # x, left to right
+	m/[^0-7]/ and die "$_ ?";
+	my $l= $_;
+	$l =~ s/./ $&/g;
+	$pgm .= "$l\n";
+    } @d;
+
     my $key= join ' ', $ctx, @d;
 
-#    my $whole= pipeval($ppm,
-#		      "pnmscale 2",
-#		      'pgmtopbm -threshold',
-#		      'pbmtoascii');
+    $pgm= pipeval($pgm,
+		  "pnmflip -xy",
+		  "pnmnoraw");
+
+    my $icon= pipeval($pgm,
+		      "pnmscale -xysize 156 ".($h*4),
+		      'pgmtopbm -threshold',
+		      'pnminvert',
+		      'pbmtoascii -2x4');
+
+    my $whole= pipeval($pgm,
+		       "pnmscale 4",
+		       'pgmtopbm -fs',
+		       'pnminvert',
+		       'pbmtoascii');
 
-    my $entry= "$ctx\n$str\n". join("\n", @d). "\n";
+    my $entry= "$ctx\n$str\n$key\n";
     
-    return ($ctx,$str,$ppm,$key,$str, $w*2,'',$whole,$entry);
+    return ($ctx,$str,$pgm,$key,$str, $w*4,$icon,$whole,$entry);
 }
 
 #---------- useful stuff ----------
@@ -209,6 +212,7 @@ END
     ;
 
 if (length $icon) {
+    $icon =~ s/^/ /gm;
     $email .= "$icon\n\n";
 }
 
@@ -246,7 +250,7 @@ open F, "> $fn_t" or die "$fn_t $!";
 (stat F) or die $!;
 my $fn_i= sprintf "_update.$$-%016x.rdy", (stat _)[1];
 
-print F "ypp-sc-tools dictionary update v1\n";
+print F "ypp-sc-tools dictionary update v2\n";
 
 foreach my $v ($pirate,$caller,$dict,$ctx,$def,$image,$key,$val) {
     printf F "%d\n", length($v) or die $!;