X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fwhere-vessels;h=7e64cce85e60a5d97401fee79a8fc025c8e54e31;hp=33df7f83c42aa44731c10a6327ff79a683fbbbd3;hb=84e330af6dabd818db6e87e0ff57db45fdf176ca;hpb=686285532be6809aade725d6b4c01f9d56826f7e

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 33df7f8..7e64cce 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -744,7 +744,7 @@ proc load-chart {} {
 	yppedia_chart_parse(\*STDIN, (new IO::File ">/dev/null"),
 		sub { sprintf "%d %d", @_; },
 		sub { printf "archlabel %d %d %s\n", @_; },
-		sub { printf "island %s %s\n", @_; },
+		sub { printf "island %s {%s} %s\n", @_; },
 		sub { printf "league %s %s %s.\n", @_; },
 		sub { printf STDERR "warning: %s: incomprehensible: %s", @_; }
 			);
@@ -761,17 +761,19 @@ proc coord {c} {
 }
 
 proc chart-got/archlabel {args} { }
-proc chart-got/island {x y args} {
-#	debug "ISLE $x $y $args"
+proc chart-got/island {x y isle sizecol} {
+	debug "ISLE $x $y $isle $sizecol"
 	global canvas isleloc
-	set isleloc($args) [list $x $y]
+	set isleloc($isle) [list $x $y]
 	set sz 5
 #	$canvas create oval \
 #		[expr {[coord $x] - $sz}] [expr {[coord $y] - $sz}] \
 #		[expr {[coord $x] + $sz}] [expr {[coord $y] + $sz}] \
 #		-fill blue
+	set colour "#888"
+	if {[string match *_col $sizecol]} { set colour black }
 	$canvas create text [coord $x] [coord $y] \
-		-text $args -anchor s
+		-text $isle -anchor s -fill $colour
 }
 proc chart-got/league {x1 y1 x2 y2 kind} {
 #	debug "LEAGUE $x1 $y1 $x2 $y2 $kind"