20100313-1504

6 files changed, 9 insertions, 32 deletions

diff --git a/include/version.h b/include/version.h
index cb7e2de4..ba2c7d06 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20100310)"
+#define VERSION	"Fourth Edition (20100311)"
diff --git a/libmemdraw/draw.c b/libmemdraw/draw.c
index 8e8b2c5b..f8330713 100644
--- a/libmemdraw/draw.c
+++ b/libmemdraw/draw.c
@@ -305,9 +305,6 @@ drawclip(Memimage *dst, Rectangle *r, Memimage *src, Point *p0, Memimage *mask,
  * Conversion tables.
  */
 static uchar replbit[1+8][256];		/* replbit[x][y] is the replication of the x-bit quantity y to 8-bit depth */
-static uchar conv18[256][8];		/* conv18[x][y] is the yth pixel in the depth-1 pixel x */
-static uchar conv28[256][4];		/* ... */
-static uchar conv48[256][2];
 
 /*
  * bitmap of how to replicate n bits to fill 8, for 1 ≤ n ≤ 8.
@@ -341,7 +338,7 @@ static int replmul[1+8] = {
 static void
 mktables(void)
 {
-	int i, j, mask, sh, small;
+	int i, j, small;
 		
 	if(tablesbuilt)
 		return;
@@ -357,18 +354,6 @@ mktables(void)
 			replbit[j][i] = (small*replmul[j])>>8;
 		}
 	}
-
-	/* bit unpacking up to 8 bits, only powers of 2 */
-	for(i=0; i<256; i++){
-		for(j=0, sh=7, mask=1; j<8; j++, sh--)
-			conv18[i][j] = replbit[1][(i>>sh)&mask];
-
-		for(j=0, sh=6, mask=3; j<4; j++, sh-=2)
-			conv28[i][j] = replbit[2][(i>>sh)&mask];
-
-		for(j=0, sh=4, mask=15; j<2; j++, sh-=4)
-			conv48[i][j] = replbit[4][(i>>sh)&mask];
-	}
 }
 
 static uchar ones = 0xff;
diff --git a/libtk/scrol.c b/libtk/scrol.c
index 5f0db22b..29f51abd 100644
--- a/libtk/scrol.c
+++ b/libtk/scrol.c
@@ -44,7 +44,6 @@ TkOption opts[] =
 {
 	"activerelief",	OPTstab,	O(TkScroll, activer),	tkrelief,
 	"command",	OPTtext,	O(TkScroll, cmd),	nil,
-	"elementborderwidth",	OPTignore,	0,	nil,	/* deprecated */
 	"jump",	OPTstab,	O(TkScroll, jump),	tkbool,
 	"orient",	OPTstab,	O(TkScroll, orient),	tkorient,
 	nil
diff --git a/man/9/canvas b/man/9/canvas
index 6941cba0..6299248d 100644
--- a/man/9/canvas
+++ b/man/9/canvas
@@ -19,7 +19,7 @@ Defaults to 1.0.
 .B -confine \fIboolean\fP
 Specifies a boolean value that indicates whether or not it should be
 allowable to set the canvas's view outside the region defined by the
-\f5scrollRegion\fR argument.
+\f5scrollregion\fR option.
 Defaults to true, which means that the view will
 be constrained within the scroll region.
 .TP
@@ -1342,10 +1342,11 @@ the canvas widget or a child of some ancestor of the canvas widget.
 \fIPathName\fR may not refer to a top-level window.
 
 .SH BINDINGS
-In the current implementation, new canvases are not given any
-default behaviour:  you'll have to execute explicit Tk commands
-to give the canvas its behaviour.
-
+New canvases are not given any
+default behaviour.
+Use
+.IR bind (2)
+commands to give the canvas its behaviour.
 .SH CREDITS
 Tk's canvas widget is a blatant ripoff of ideas from Joel Bartlett's
 \fIezd\fR program.  \fIEzd\fR provides structured graphics in a Scheme
diff --git a/man/9/scrollbar b/man/9/scrollbar
index b7fe9ea4..d22f3db1 100644
--- a/man/9/scrollbar
+++ b/man/9/scrollbar
@@ -28,15 +28,6 @@ horizontal scrolling) or \f5yview\fR (for vertical scrolling).
 All scrollable widgets have \f5xview\fR and \f5yview\fR commands
 that take exactly the additional arguments appended by the scrollbar
 as described in SCROLLING COMMANDS below.
-.ig
-DEPRECATED
-.TP
-.B -elementborderwidth \fIdist\fP
-Specifies the width of borders drawn around the internal elements
-of the scrollbar (the two arrows and the slider).
-If this value is less than zero, the value of the \f5borderwidth\fR
-option is used in its place.
-..
 .TP
 .B -height \fIdist\fP
 Specifies a desired height for the scrollbar.
diff --git a/opt/README b/opt/README
new file mode 100644
index 00000000..98da882b
--- /dev/null
+++ b/opt/README
@@ -0,0 +1 @@
+optional components live in subdirectories of /opt.