Formatting of braces.

10 files changed, 748 insertions, 1464 deletions

diff --git a/generic/tkTreeColumn.c b/generic/tkTreeColumn.c
index 205e155..d907cbe 100644
--- a/generic/tkTreeColumn.c
+++ b/generic/tkTreeColumn.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2003 Christian Krone
  * Copyright (c) 2003 ActiveState Corporation
  *
- * RCS: @(#) $Id: tkTreeColumn.c,v 1.74 2006/12/08 20:45:57 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeColumn.c,v 1.75 2006/12/22 22:32:59 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -912,15 +912,13 @@ Qualifiers_Scan(
 	    goto errorExit;
 	}
 	switch ((enum qualEnum) qual) {
-	    case QUAL_LOCK:
-	    {
+	    case QUAL_LOCK: {
 		if (Tcl_GetIndexFromObj(interp, objv[j + 1], lockST,
 			"lock", 0, &q->lock) != TCL_OK)
 		    goto errorExit;
 		break;
 	    }
-	    case QUAL_STATE:
-	    {
+	    case QUAL_STATE: {
 		int i, listObjc;
 		Tcl_Obj **listObjv;
 
@@ -936,8 +934,7 @@ Qualifiers_Scan(
 		}
 		break;
 	    }
-	    case QUAL_TAG:
-	    {
+	    case QUAL_TAG: {
 		if (q->exprOK)
 		    TagExpr_Free(&q->expr);
 		if (TagExpr_Init(tree, objv[j + 1], &q->expr) != TCL_OK)
@@ -945,18 +942,15 @@ Qualifiers_Scan(
 		q->exprOK = TRUE;
 		break;
 	    }
-	    case QUAL_VISIBLE:
-	    {
+	    case QUAL_VISIBLE: {
 		q->visible = 1;
 		break;
 	    }
-	    case QUAL_NOT_TAIL:
-	    {
+	    case QUAL_NOT_TAIL: {
 		q->ntail = 1;
 		break;
 	    }
-	    case QUAL_NOT_VISIBLE:
-	    {
+	    case QUAL_NOT_VISIBLE: {
 		q->visible = 0;
 		break;
 	    }
@@ -1159,8 +1153,7 @@ TreeColumnList_FromObj(
 	}
 
 	switch ((enum indexEnum) index) {
-	    case INDEX_ALL:
-	    {
+	    case INDEX_ALL: {
 		if (qualArgsTotal) {
 		    column = tree->columns;
 		    while (column != NULL) {
@@ -1190,24 +1183,21 @@ TreeColumnList_FromObj(
 		}
 		break;
 	    }
-	    case INDEX_FIRST:
-	    {
+	    case INDEX_FIRST: {
 		column = tree->columns;
 		while (!Qualifies(&q, column))
 		    column = column->next;
 		break;
 	    }
 	    case INDEX_END:
-	    case INDEX_LAST:
-	    {
+	    case INDEX_LAST: {
 		column = tree->columnLast;
 		while (!Qualifies(&q, column)) {
 		    column = column->prev;
 		}
 		break;
 	    }
-	    case INDEX_LIST:
-	    {
+	    case INDEX_LIST: {
 		int listObjc;
 		Tcl_Obj **listObjv;
 		int count;
@@ -1241,8 +1231,7 @@ TreeColumnList_FromObj(
 		    column = NULL;
 		break;
 	    }
-	    case INDEX_ORDER:
-	    {
+	    case INDEX_ORDER: {
 		int order;
 
 		if (Tcl_GetIntFromObj(NULL, objv[listIndex + 1], &order) != TCL_OK)
@@ -1256,8 +1245,7 @@ TreeColumnList_FromObj(
 		}
 		break;
 	    }
-	    case INDEX_RANGE:
-	    {
+	    case INDEX_RANGE: {
 		TreeColumn _first, _last;
 
 		if (TreeColumn_FromObj(tree, objv[listIndex + 1],
@@ -1281,13 +1269,11 @@ TreeColumnList_FromObj(
 		column = NULL;
 		break;
 	    }
-	    case INDEX_TAIL:
-	    {
+	    case INDEX_TAIL: {
 		column = tree->columnTail;
 		break;
 	    }
-	    case INDEX_TREE:
-	    {
+	    case INDEX_TREE: {
 		column = tree->columnTree;
 		break;
 	    }
@@ -1429,8 +1415,7 @@ gotFirstPart:
 	    }
 	}
 	switch ((enum modEnum) index) {
-	    case TMOD_NEXT:
-	    {
+	    case TMOD_NEXT: {
 		int isTail = IS_TAIL(column);
 		if (isTail) {
 		    column = NULL;
@@ -1446,8 +1431,7 @@ gotFirstPart:
 		}
 		break;
 	    }
-	    case TMOD_PREV:
-	    {
+	    case TMOD_PREV: {
 		int isTail = IS_TAIL(column);
 		if (isTail)
 		    column = tree->columnLast;
@@ -3587,29 +3571,24 @@ ColumnTagCmd(
     TreeColumn column;
     int result = TCL_OK;
 
-    if (objc < 4)
-    {
+    if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 3, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[3], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
+    switch (index) {
 	/* T column tag add C tagList */
-	case COMMAND_ADD:
-	{
+	case COMMAND_ADD: {
 	    int i, numTags;
 	    Tcl_Obj **listObjv;
 	    Tk_Uid staticTags[STATIC_SIZE], *tags = staticTags;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "column tagList");
 		return TCL_ERROR;
 	    }
@@ -3632,13 +3611,11 @@ ColumnTagCmd(
 	}
 
 	/* T column tag expr C tagExpr */
-	case COMMAND_EXPR:
-	{
+	case COMMAND_EXPR: {
 	    TagExpr expr;
 	    int ok = TRUE;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "column tagExpr");
 		return TCL_ERROR;
 	    }
@@ -3661,14 +3638,12 @@ ColumnTagCmd(
 	}
 
 	/* T column tag names C */
-	case COMMAND_NAMES:
-	{
+	case COMMAND_NAMES: {
 	    Tcl_Obj *listObj;
 	    Tk_Uid *tags = NULL;
 	    int i, tagSpace, numTags = 0;
 
-	    if (objc != 5)
-	    {
+	    if (objc != 5) {
 		Tcl_WrongNumArgs(interp, 4, objv, "column");
 		return TCL_ERROR;
 	    }
@@ -3691,14 +3666,12 @@ ColumnTagCmd(
 	}
 
 	/* T column tag remove C tagList */
-	case COMMAND_REMOVE:
-	{
+	case COMMAND_REMOVE: {
 	    int i, numTags;
 	    Tcl_Obj **listObjv;
 	    Tk_Uid staticTags[STATIC_SIZE], *tags = staticTags;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "column tagList");
 		return TCL_ERROR;
 	    }
@@ -3786,8 +3759,7 @@ TreeColumnCmd(
     }
 
     switch (index) {
-	case COMMAND_BBOX:
-	{
+	case COMMAND_BBOX: {
 	    int left, top, width, height;
 
 	    if (objc != 4) {
@@ -3804,8 +3776,7 @@ TreeColumnCmd(
 	    break;
 	}
 
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    TreeColumn column;
 	    Tcl_Obj *resultObjPtr;
 
@@ -3825,8 +3796,7 @@ TreeColumnCmd(
 	}
 
 	/* T column compare C op C */
-	case COMMAND_COMPARE:
-	{
+	case COMMAND_COMPARE: {
 	    TreeColumn column1, column2;
 	    static CONST char *opName[] = { "<", "<=", "==", ">=", ">", "!=", NULL };
 	    int op, compare = 0, index1, index2;
@@ -3858,8 +3828,7 @@ TreeColumnCmd(
 	    break;
 	}
 
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    if (objc < 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "column ?option? ?value? ?option value ...?");
 		return TCL_ERROR;
@@ -3892,14 +3861,12 @@ TreeColumnCmd(
 	    break;
 	}
 
-	case COMMAND_CREATE:
-	{
+	case COMMAND_CREATE: {
 	    TreeColumn column, last = tree->columnLast;
 
 	    /* FIXME: -count N -tags $tags */
 	    column = Column_Alloc(tree);
-	    if (Column_Config(column, objc - 3, objv + 3, TRUE) != TCL_OK)
-	    {
+	    if (Column_Config(column, objc - 3, objv + 3, TRUE) != TCL_OK) {
 		Column_Free(column);
 		return TCL_ERROR;
 	    }
@@ -3944,8 +3911,7 @@ TreeColumnCmd(
 	}
 
 	/* T column delete first ?last? */
-	case COMMAND_DELETE:
-	{
+	case COMMAND_DELETE: {
 	    TreeColumnList columns, column2s;
 	    TreeColumn prev, next;
 	    int flags = CFO_NOT_NULL | CFO_NOT_TAIL;
@@ -4073,8 +4039,7 @@ doneDELETE:
 	}
 
 	/* T column dragcget option */
-	case COMMAND_DRAGCGET:
-	{
+	case COMMAND_DRAGCGET: {
 	    Tcl_Obj *resultObjPtr;
 
 	    if (objc != 4) {
@@ -4090,8 +4055,7 @@ doneDELETE:
 	}
 
 	/* T column dragconfigure ?option? ?value? ?option value ...? */
-	case COMMAND_DRAGCONF:
-	{
+	case COMMAND_DRAGCONF: {
 	    Tcl_Obj *resultObjPtr;
 	    Tk_SavedOptions savedOptions;
 	    int mask, result;
@@ -4128,8 +4092,7 @@ doneDELETE:
 	    break;
 	}
 
-	case COMMAND_COUNT:
-	{
+	case COMMAND_COUNT: {
 	    int count = tree->columnCount;
 
 	    if (objc < 3 || objc > 4) {
@@ -4149,8 +4112,7 @@ doneDELETE:
 	    break;
 	}
 
-	case COMMAND_WIDTH:
-	{
+	case COMMAND_WIDTH: {
 	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "column");
 		return TCL_ERROR;
@@ -4189,8 +4151,7 @@ doneDELETE:
 	}
 
 	/* T column list ?-visible? */
-	case COMMAND_LIST:
-	{
+	case COMMAND_LIST: {
 	    TreeColumn column = tree->columns;
 	    Tcl_Obj *listObj;
 	    int visible = FALSE;
@@ -4222,8 +4183,7 @@ doneDELETE:
 	}
 
 	/* T column move C before */
-	case COMMAND_MOVE:
-	{
+	case COMMAND_MOVE: {
 	    TreeColumn move, before;
 	    TreeColumn first = NULL, last = tree->columnTail;
 
@@ -4271,8 +4231,7 @@ doneDELETE:
 	    break;
 	}
 
-	case COMMAND_NEEDEDWIDTH:
-	{
+	case COMMAND_NEEDEDWIDTH: {
 	    TreeColumn column;
 	    int width;
 
@@ -4293,8 +4252,7 @@ doneDELETE:
 	}
 
 	/* T column order C ?-visible? */
-	case COMMAND_ORDER:
-	{
+	case COMMAND_ORDER: {
 	    TreeColumn column;
 	    int visible = FALSE;
 	    int index = 0;
@@ -4335,8 +4293,7 @@ doneDELETE:
 	    break;
 	}
 
-	case COMMAND_TAG:
-	{
+	case COMMAND_TAG: {
 	    return ColumnTagCmd(clientData, interp, objc, objv);
 	}
     }
diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c
index d2f59e5..bc253c2 100644
--- a/generic/tkTreeCtrl.c
+++ b/generic/tkTreeCtrl.c
@@ -7,7 +7,7 @@
  * Copyright (c) 2002-2003 Christian Krone
  * Copyright (c) 2003-2005 ActiveState, a division of Sophos
  *
- * RCS: @(#) $Id: tkTreeCtrl.c,v 1.97 2006/12/08 23:14:16 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeCtrl.c,v 1.98 2006/12/22 22:32:59 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -555,8 +555,7 @@ static int TreeWidgetCmd(
     Tree_PreserveItems(tree);
 
     switch (index) {
-	case COMMAND_ACTIVATE:
-	{
+	case COMMAND_ACTIVATE: {
 	    TreeItem active, item;
 
 	    if (objc != 3) {
@@ -586,8 +585,7 @@ static int TreeWidgetCmd(
 	}
 
 	/* .t bbox ?area? */
-	case COMMAND_BBOX:
-	{
+	case COMMAND_BBOX: {
 	    static CONST char *areaName[] = { "content", "header", "left",
 		    "right", (char *) NULL };
 	    int x1, y1, x2, y2;
@@ -615,8 +613,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_CANVASX:
-	{
+	case COMMAND_CANVASX: {
 	    int x;
 
 	    if (objc != 3) {
@@ -629,8 +626,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_CANVASY:
-	{
+	case COMMAND_CANVASY: {
 	    int y;
 
 	    if (objc != 3) {
@@ -643,8 +639,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 2, objv, "option");
 		goto error;
@@ -659,8 +654,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    resultObjPtr = NULL;
 	    if (objc <= 3) {
 		resultObjPtr = Tk_GetOptionInfo(interp, (char *) tree,
@@ -678,8 +672,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_CONTENTBOX:
-	{
+	case COMMAND_CONTENTBOX: {
 	    int x1, y1, x2, y2;
 
 	    if (objc != 2) {
@@ -696,8 +689,7 @@ static int TreeWidgetCmd(
 	/* T expand ?-recurse? I ... */
 	case COMMAND_COLLAPSE:
 	case COMMAND_EXPAND:
-	case COMMAND_TOGGLE:
-	{
+	case COMMAND_TOGGLE: {
 	    char *s;
 	    int recurse = 0;
 	    int mode = 0; /* lint */
@@ -757,15 +749,13 @@ static int TreeWidgetCmd(
 	}
 #endif /* DEPRECATED */
 
-	case COMMAND_COLUMN:
-	{
+	case COMMAND_COLUMN: {
 	    result = TreeColumnCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
 #ifdef DEPRECATED
-	case COMMAND_COMPARE:
-	{
+	case COMMAND_COMPARE: {
 	    TreeItem item1, item2;
 	    static CONST char *opName[] = { "<", "<=", "==", ">=", ">", "!=", NULL };
 	    int op, compare = 0, index1, index2;
@@ -804,14 +794,12 @@ static int TreeWidgetCmd(
 	}
 #endif /* DEPRECATED */
 
-	case COMMAND_DEBUG:
-	{
+	case COMMAND_DEBUG: {
 	    result = TreeDebugCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_DEPTH:
-	{
+	case COMMAND_DEPTH: {
 	    TreeItem item;
 	    int depth;
 
@@ -833,20 +821,17 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_DRAGIMAGE:
-	{
+	case COMMAND_DRAGIMAGE: {
 	    result = DragImageCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_ELEMENT:
-	{
+	case COMMAND_ELEMENT: {
 	    result = TreeElementCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_IDENTIFY:
-	{
+	case COMMAND_IDENTIFY: {
 	    int x, y, width, height, depth;
 	    TreeColumn treeColumn;
 	    TreeItem item;
@@ -945,8 +930,7 @@ static int TreeWidgetCmd(
 	}
 
 #ifdef DEPRECATED
-	case COMMAND_INDEX:
-	{
+	case COMMAND_INDEX: {
 	    TreeItem item;
 
 	    if (objc != 3) {
@@ -962,27 +946,23 @@ static int TreeWidgetCmd(
 	}
 #endif /* DEPRECATED */
 
-	case COMMAND_ITEM:
-	{
+	case COMMAND_ITEM: {
 	    result = TreeItemCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_MARQUEE:
-	{
+	case COMMAND_MARQUEE: {
 	    result = TreeMarqueeCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_NOTIFY:
-	{
+	case COMMAND_NOTIFY: {
 	    result = TreeNotifyCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
 #ifdef DEPRECATED
-	case COMMAND_NUMCOLUMNS:
-	{
+	case COMMAND_NUMCOLUMNS: {
 	    if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 2, objv, (char *) NULL);
 		goto error;
@@ -991,8 +971,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_NUMITEMS:
-	{
+	case COMMAND_NUMITEMS: {
 	    if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 2, objv, (char *) NULL);
 		goto error;
@@ -1002,8 +981,7 @@ static int TreeWidgetCmd(
 	}
 #endif /* DEPRECATED */
 
-	case COMMAND_ORPHANS:
-	{
+	case COMMAND_ORPHANS: {
 	    Tcl_HashEntry *hPtr;
 	    Tcl_HashSearch search;
 	    Tcl_Obj *listObj;
@@ -1031,8 +1009,7 @@ static int TreeWidgetCmd(
 	}
 
 #ifdef DEPRECATED
-	case COMMAND_RANGE:
-	{
+	case COMMAND_RANGE: {
 	    TreeItem item, itemFirst, itemLast;
 	    Tcl_Obj *listObj;
 
@@ -1060,8 +1037,7 @@ static int TreeWidgetCmd(
 	}
 #endif /* DEPRECATED */
 
-	case COMMAND_SCAN:
-	{
+	case COMMAND_SCAN: {
 	    static CONST char *optionName[] = { "dragto", "mark",
 						(char *) NULL };
 	    int x, y, gain = 10, xOrigin, yOrigin;
@@ -1111,8 +1087,7 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_SEE:
-	{
+	case COMMAND_SEE: {
 	    TreeItem item;
 	    int x, y, w, h;
 	    int visWidth = Tree_ContentWidth(tree);
@@ -1175,32 +1150,27 @@ static int TreeWidgetCmd(
 	    break;
 	}
 
-	case COMMAND_SELECTION:
-	{
+	case COMMAND_SELECTION: {
 	    result = TreeSelectionCmd(interp, tree, objc, objv);
 	    break;
 	}
 
-	case COMMAND_STATE:
-	{
+	case COMMAND_STATE: {
 	    result = TreeStateCmd(tree, objc, objv);
 	    break;
 	}
 
-	case COMMAND_STYLE:
-	{
+	case COMMAND_STYLE: {
 	    result = TreeStyleCmd(clientData, interp, objc, objv);
 	    break;
 	}
 
-	case COMMAND_XVIEW:
-	{
+	case COMMAND_XVIEW: {
 	    result = TreeXviewCmd(interp, tree, objc, objv);
 	    break;
 	}
 
-	case COMMAND_YVIEW:
-	{
+	case COMMAND_YVIEW: {
 	    result = TreeYviewCmd(interp, tree, objc, objv);
 	    break;
 	}
@@ -1625,8 +1595,7 @@ TreeEventProc(
     TreeCtrl *tree = clientData;
 
     switch (eventPtr->type) {
-	case Expose:
-	{
+	case Expose: {
 	    int x = eventPtr->xexpose.x;
 	    int y = eventPtr->xexpose.y;
 	    Tree_ExposeArea(tree, x, y,
@@ -1634,8 +1603,7 @@ TreeEventProc(
 		    y + eventPtr->xexpose.height);
 	    break;
 	}
-	case ConfigureNotify:
-	{
+	case ConfigureNotify: {
 	    if ((tree->prevWidth != Tk_Width(tree->tkwin)) ||
 		    (tree->prevHeight != Tk_Height(tree->tkwin))) {
 		tree->widthOfColumns = -1;
@@ -1650,8 +1618,7 @@ TreeEventProc(
 	    /* Handle focus as Tile does */
 	    if (   eventPtr->xfocus.detail == NotifyInferior
 		|| eventPtr->xfocus.detail == NotifyAncestor
-		|| eventPtr->xfocus.detail == NotifyNonlinear)
-	    {
+		|| eventPtr->xfocus.detail == NotifyNonlinear) {
 		Tree_FocusChanged(tree, 1);
 	    }
 	    break;
@@ -1659,8 +1626,7 @@ TreeEventProc(
 	    /* Handle focus as Tile does */
 	    if (   eventPtr->xfocus.detail == NotifyInferior
 		|| eventPtr->xfocus.detail == NotifyAncestor
-		|| eventPtr->xfocus.detail == NotifyNonlinear)
-	    {
+		|| eventPtr->xfocus.detail == NotifyNonlinear) {
 		Tree_FocusChanged(tree, 0);
 	    }
 	    break;
@@ -2362,8 +2328,7 @@ TreeStateCmd(
     }
 
     switch (index) {
-	case COMMAND_DEFINE:
-	{
+	case COMMAND_DEFINE: {
 	    char *string;
 	    int i, length, slot = -1;
 
@@ -2396,8 +2361,7 @@ TreeStateCmd(
 	    break;
 	}
 
-	case COMMAND_LINKAGE:
-	{
+	case COMMAND_LINKAGE: {
 	    int index;
 
 	    if (objc != 4) {
@@ -2412,8 +2376,7 @@ TreeStateCmd(
 	    break;
 	}
 
-	case COMMAND_NAMES:
-	{
+	case COMMAND_NAMES: {
 	    Tcl_Obj *listObj;
 	    int i;
 
@@ -2431,8 +2394,7 @@ TreeStateCmd(
 	    break;
 	}
 
-	case COMMAND_UNDEFINE:
-	{
+	case COMMAND_UNDEFINE: {
 	    int i, index;
 
 	    for (i = 3; i < objc; i++) {
@@ -2584,8 +2546,7 @@ TreeSelectionCmd(
     }
 
     switch (index) {
-	case COMMAND_ADD:
-	{
+	case COMMAND_ADD: {
 	    int i, count;
 	    TreeItemList items;
 	    Tcl_HashEntry *hPtr;
@@ -2680,8 +2641,7 @@ doneADD:
 	    break;
 	}
 
-	case COMMAND_ANCHOR:
-	{
+	case COMMAND_ANCHOR: {
 	    if (objc != 3 && objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?item?");
 		return TCL_ERROR;
@@ -2696,8 +2656,7 @@ doneADD:
 	    break;
 	}
 
-	case COMMAND_CLEAR:
-	{
+	case COMMAND_CLEAR: {
 	    int i, count;
 	    TreeItemList items;
 	    Tcl_HashEntry *hPtr;
@@ -2776,8 +2735,7 @@ doneCLEAR:
 	    break;
 	}
 
-	case COMMAND_COUNT:
-	{
+	case COMMAND_COUNT: {
 	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, (char *) NULL);
 		return TCL_ERROR;
@@ -2786,8 +2744,7 @@ doneCLEAR:
 	    break;
 	}
 
-	case COMMAND_GET:
-	{
+	case COMMAND_GET: {
 	    TreeItem item;
 	    Tcl_Obj *listObj;
 	    Tcl_HashEntry *hPtr;
@@ -2871,8 +2828,7 @@ doneCLEAR:
 	    break;
 	}
 
-	case COMMAND_INCLUDES:
-	{
+	case COMMAND_INCLUDES: {
 	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "item");
 		return TCL_ERROR;
@@ -2884,8 +2840,7 @@ doneCLEAR:
 	    break;
 	}
 
-	case COMMAND_MODIFY:
-	{
+	case COMMAND_MODIFY: {
 	    int i, j, k, objcS, objcD;
 	    Tcl_Obj **objvS, **objvD;
 	    Tcl_HashEntry *hPtr;
@@ -3398,8 +3353,7 @@ TreeDebugCmd(
 
     switch (index) {
 	/* T debug alloc */
-	case COMMAND_ALLOC:
-	{
+	case COMMAND_ALLOC: {
 #ifdef ALLOC_HAX
 #ifdef TREECTRL_DEBUG
 	    AllocHax_Stats(interp, tree->allocData);
@@ -3413,8 +3367,7 @@ TreeDebugCmd(
 	}
 
 	/* T debug cget option */
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr;
 
 	    if (objc != 4) {
@@ -3430,8 +3383,7 @@ TreeDebugCmd(
 	}
 
 	/* T debug configure ?option? ?value? ?option value ...? */
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    Tcl_Obj *resultObjPtr;
 	    Tk_SavedOptions savedOptions;
 	    int mask, result;
@@ -3469,8 +3421,7 @@ TreeDebugCmd(
 	    break;
 	}
 
-	case COMMAND_DINFO:
-	{
+	case COMMAND_DINFO: {
 	    extern void DumpDInfo(TreeCtrl *tree, int index);
 	    static CONST char *optionNames[] = {
 		"ditem", "onscreen", "range", (char *) NULL
@@ -3489,8 +3440,7 @@ TreeDebugCmd(
 	}
 
 	/* T debug expose x1 y1 x2 y2 */
-	case COMMAND_EXPOSE:
-	{
+	case COMMAND_EXPOSE: {
 	    int x1, y1, x2, y2;
 
 	    if (objc != 7) {
@@ -3510,8 +3460,7 @@ TreeDebugCmd(
 	    break;
 	}
 
-	case COMMAND_SCROLL:
-	{
+	case COMMAND_SCROLL: {
 	    int visHeight = Tree_ContentHeight(tree);
 	    int totHeight = Tree_TotalHeight(tree);
 	    int yIncr = tree->yScrollIncrement;
@@ -3671,8 +3620,7 @@ TextLayoutCmd(
 	}
 
 	switch (index) {
-	    case OPT_IGNORENEWLINES:
-	    {
+	    case OPT_IGNORENEWLINES: {
 		int v;
 		if (Tcl_GetBooleanFromObj(interp, objv[i + 1], &v) != TCL_OK) {
 		    result = TCL_ERROR;
@@ -3684,8 +3632,7 @@ TextLayoutCmd(
 		    flags &= ~TK_IGNORE_NEWLINES;
 		break;
 	    }
-	    case OPT_IGNORETABS:
-	    {
+	    case OPT_IGNORETABS: {
 		int v;
 		if (Tcl_GetBooleanFromObj(interp, objv[i + 1], &v) != TCL_OK) {
 		    result = TCL_ERROR;
@@ -3697,16 +3644,14 @@ TextLayoutCmd(
 		    flags &= ~TK_IGNORE_TABS;
 		break;
 	    }
-	    case OPT_JUSTIFY:
-	    {
+	    case OPT_JUSTIFY: {
 		if (Tk_GetJustifyFromObj(interp, objv[i + 1], &justify) != TCL_OK) {
 		    result = TCL_ERROR;
 		    goto done;
 		}
 		break;
 	    }
-	    case OPT_WIDTH:
-	    {
+	    case OPT_WIDTH: {
 		if (Tk_GetPixelsFromObj(interp, tkwin, objv[i + 1], &width) != TCL_OK) {
 		    result = TCL_ERROR;
 		    goto done;
diff --git a/generic/tkTreeDrag.c b/generic/tkTreeDrag.c
index 311f5b7..f7942fe 100644
--- a/generic/tkTreeDrag.c
+++ b/generic/tkTreeDrag.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeDrag.c,v 1.23 2006/12/02 21:23:25 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeDrag.c,v 1.24 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -141,8 +141,7 @@ TreeDragImage_Init(
     dragImage->tree = tree;
     dragImage->optionTable = Tk_CreateOptionTable(tree->interp, optionSpecs);
     if (Tk_InitOptions(tree->interp, (char *) dragImage, dragImage->optionTable,
-	tree->tkwin) != TCL_OK)
-    {
+	tree->tkwin) != TCL_OK) {
 	WFREE(dragImage, TreeDragImage_);
 	return TCL_ERROR;
     }
@@ -204,8 +203,7 @@ TreeDragImage_Display(
 {
     TreeCtrl *tree = dragImage->tree;
 
-    if (!dragImage->onScreen && dragImage->visible)
-    {
+    if (!dragImage->onScreen && dragImage->visible) {
 	dragImage->sx = 0 - tree->xOrigin;
 	dragImage->sy = 0 - tree->yOrigin;
 	TreeDragImage_Draw(dragImage, Tk_WindowId(tree->tkwin), dragImage->sx, dragImage->sy);
@@ -236,8 +234,7 @@ TreeDragImage_Undisplay(
 {
     TreeCtrl *tree = dragImage->tree;
 
-    if (dragImage->onScreen)
-    {
+    if (dragImage->onScreen) {
 	TreeDragImage_Draw(dragImage, Tk_WindowId(tree->tkwin), dragImage->sx, dragImage->sy);
 	dragImage->onScreen = FALSE;
     }
@@ -276,13 +273,10 @@ DragImage_Config(
     Tcl_Obj *errorResult = NULL;
     int mask;
 
-    for (error = 0; error <= 1; error++)
-    {
-	if (error == 0)
-	{
+    for (error = 0; error <= 1; error++) {
+	if (error == 0) {
 	    if (Tk_SetOptions(tree->interp, (char *) dragImage, dragImage->optionTable,
-		objc, objv, tree->tkwin, &savedOptions, &mask) != TCL_OK)
-	    {
+		objc, objv, tree->tkwin, &savedOptions, &mask) != TCL_OK) {
 		mask = 0;
 		continue;
 	    }
@@ -306,8 +300,7 @@ DragImage_Config(
 	}
     }
 
-    if (mask & DRAG_CONF_VISIBLE)
-    {
+    if (mask & DRAG_CONF_VISIBLE) {
 	TreeDragImage_Undisplay((TreeDragImage) dragImage);
 	TreeDragImage_Display((TreeDragImage) dragImage);
     }
@@ -344,8 +337,7 @@ void TreeDragImage_Draw(TreeDragImage dragImage, Drawable drawable, int x, int y
 
     DotRect_Setup(tree, drawable, &dotState);
 
-    while (elem != NULL)
-    {
+    while (elem != NULL) {
 	DotRect_Draw(&dotState,
 	    x + dragImage->x + elem->x,
 	    y + dragImage->y + elem->y,
@@ -390,23 +382,19 @@ DragImageCmd(
 	COMMAND_OFFSET };
     int index;
 
-    if (objc < 3)
-    {
+    if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[2], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
+    switch (index) {
 	/* T dragimage add I ?C? ?E ...? */
-	case COMMAND_ADD:
-	{
+	case COMMAND_ADD: {
 	    TreeItem item;
 	    TreeItemColumn itemColumn;
 	    TreeColumn treeColumn;
@@ -414,8 +402,7 @@ DragImageCmd(
 	    DragElem *elem;
 	    int i, count, result = TCL_OK;
 
-	    if (objc < 4)
-	    {
+	    if (objc < 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "item ?column? ?element ...?");
 		return TCL_ERROR;
 	    }
@@ -505,12 +492,10 @@ doneADD:
 	}
 
 	/* T dragimage cget option */
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr;
 
-	    if (objc != 4)
-	    {
+	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "option");
 		return TCL_ERROR;
 	    }
@@ -523,15 +508,12 @@ doneADD:
 	}
 
 	/* T dragimage clear */
-	case COMMAND_CLEAR:
-	{
-	    if (objc != 3)
-	    {
+	case COMMAND_CLEAR: {
+	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, (char *) NULL);
 		return TCL_ERROR;
 	    }
-	    if (dragImage->elem != NULL)
-	    {
+	    if (dragImage->elem != NULL) {
 		DragElem *elem = dragImage->elem;
 		TreeDragImage_Undisplay(tree->dragImage);
 /*				if (dragImage->visible)
@@ -544,17 +526,14 @@ doneADD:
 	}
 
 	/* T dragimage configure ?option? ?value? ?option value ...? */
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    Tcl_Obj *resultObjPtr;
 
-	    if (objc < 3)
-	    {
+	    if (objc < 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?option? ?value?");
 		return TCL_ERROR;
 	    }
-	    if (objc <= 4)
-	    {
+	    if (objc <= 4) {
 		resultObjPtr = Tk_GetOptionInfo(interp, (char *) dragImage,
 		    dragImage->optionTable,
 		    (objc == 3) ? (Tcl_Obj *) NULL : objv[3],
@@ -568,17 +547,14 @@ doneADD:
 	}
 
 	/* T dragimage offset ?x y? */
-	case COMMAND_OFFSET:
-	{
+	case COMMAND_OFFSET: {
 	    int x, y;
 
-	    if (objc != 3 && objc != 5)
-	    {
+	    if (objc != 3 && objc != 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?x y?");
 		return TCL_ERROR;
 	    }
-	    if (objc == 3)
-	    {
+	    if (objc == 3) {
 		FormatResult(interp, "%d %d", dragImage->x, dragImage->y);
 		break;
 	    }
diff --git a/generic/tkTreeElem.c b/generic/tkTreeElem.c
index bd04c2a..8d1e37b 100644
--- a/generic/tkTreeElem.c
+++ b/generic/tkTreeElem.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeElem.c,v 1.60 2006/12/07 03:44:01 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeElem.c,v 1.61 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -859,30 +859,25 @@ static int ActualProcBitmap(ElementArgs *args)
 	return TCL_ERROR;
 
     switch (index) {
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstColor, bg, args->state)
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstBitmap, bitmap, args->state)
 	    break;
 	}
 #ifdef DEPRECATED
-	case 2:
-	{
+	case 2: {
 	    OBJECT_FOR_STATE(obj, pstBoolean, draw, args->state)
 	    break;
 	}
-	case 3:
-	{
+	case 3: {
 	    OBJECT_FOR_STATE(obj, pstColor, fg, args->state)
 	    break;
 	}
 #else
-	case 2:
-	{
+	case 2: {
 	    OBJECT_FOR_STATE(obj, pstColor, fg, args->state)
 	    break;
 	}
@@ -1204,25 +1199,21 @@ static int ActualProcBorder(ElementArgs *args)
 	return TCL_ERROR;
 
     switch (index) {
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstBorder, border, args->state)
 	    break;
 	}
 #ifdef DEPRECATED
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstBoolean, draw, args->state)
 	    break;
 	}
-	case 2:
-	{
+	case 2: {
 	    OBJECT_FOR_STATE(obj, pstRelief, relief, args->state)
 	    break;
 	}
 #else
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstRelief, relief, args->state)
 	    break;
 	}
@@ -1546,8 +1537,7 @@ static int ActualProcCheckButton(ElementArgs *args)
 	return TCL_ERROR;
 
     switch (index) {
-	case 0:
-	{
+	case 0: {
 	    obj = PerStateInfo_ObjForState(tree, &pstImage,
 		    &elemX->image, args->state, &match);
 	    if ((match != MATCH_EXACT) && (masterX != NULL)) {
@@ -1868,19 +1858,16 @@ static int ActualProcImage(ElementArgs *args)
 
     switch (index) {
 #ifdef DEPRECATED
-	case 0:
-	{
+	case 0: {
 	    obj = DO_ObjectForState(tree, &pstBoolean, args->elem, 1002, args->state);
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstImage, image, args->state)
 	    break;
 	}
 #else
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstImage, image, args->state)
 	    break;
 	}
@@ -2040,8 +2027,7 @@ static int ConfigProcRect(ElementArgs *args)
 			    case 'n': case 'N': elemX->open |= 0x02; break;
 			    case 'e': case 'E': elemX->open |= 0x04; break;
 			    case 's': case 'S': elemX->open |= 0x08; break;
-			    default:
-			    {
+			    default: {
 				Tcl_ResetResult(tree->interp);
 				Tcl_AppendResult(tree->interp, "bad open value \"",
 					elemX->openString, "\": must be a string ",
@@ -2291,29 +2277,24 @@ static int ActualProcRect(ElementArgs *args)
 
     switch (index) {
 #ifdef DEPRECATED
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstBoolean, draw, args->state)
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstColor, fill, args->state)
 	    break;
 	}
-	case 2:
-	{
+	case 2: {
 	    OBJECT_FOR_STATE(obj, pstColor, outline, args->state)
 	    break;
 	}
 #else
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstColor, fill, args->state)
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    OBJECT_FOR_STATE(obj, pstColor, outline, args->state)
 	    break;
 	}
@@ -3528,29 +3509,24 @@ static int ActualProcText(ElementArgs *args)
 
     switch (index) {
 #ifdef DEPRECATED
-	case 0:
-	{
+	case 0: {
 	    obj = DO_ObjectForState(tree, &pstBoolean, args->elem, 1002, args->state);
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    obj = DO_ObjectForState(tree, &pstColor, args->elem, 1003, args->state);
 	    break;
 	}
-	case 2:
-	{
+	case 2: {
 	    obj = DO_ObjectForState(tree, &pstFont, args->elem, 1004, args->state);
 	    break;
 	}
 #else
-	case 0:
-	{
+	case 0: {
 	    obj = DO_ObjectForState(tree, &pstColor, args->elem, 1003, args->state);
 	    break;
 	}
-	case 1:
-	{
+	case 1: {
 	    obj = DO_ObjectForState(tree, &pstFont, args->elem, 1004, args->state);
 	    break;
 	}
@@ -4151,8 +4127,7 @@ static int ActualProcWindow(ElementArgs *args)
 	return TCL_ERROR;
 
     switch (index) {
-	case 0:
-	{
+	case 0: {
 	    OBJECT_FOR_STATE(obj, pstBoolean, draw, args->state)
 	    break;
 	}
@@ -4218,20 +4193,16 @@ int TreeElement_TypeFromObj(TreeCtrl *tree, Tcl_Obj *objPtr, ElementType **typeP
     typeList = assocData->typeList;
 
     typeStr = Tcl_GetStringFromObj(objPtr, &length);
-    if (!length)
-    {
+    if (!length) {
 	FormatResult(interp, "invalid element type \"\"");
 	return TCL_ERROR;
     }
     for (typePtr = typeList;
 	typePtr != NULL;
-	typePtr = typePtr->next)
-    {
+	typePtr = typePtr->next) {
 	if ((typeStr[0] == typePtr->name[0]) &&
-		!strncmp(typeStr, typePtr->name, length))
-	{
-	    if (matchPtr != NULL)
-	    {
+		!strncmp(typeStr, typePtr->name, length)) {
+	    if (matchPtr != NULL) {
 		FormatResult(interp,
 			"ambiguous element type \"%s\"",
 			typeStr);
@@ -4240,8 +4211,7 @@ int TreeElement_TypeFromObj(TreeCtrl *tree, Tcl_Obj *objPtr, ElementType **typeP
 	    matchPtr = typePtr;
 	}
     }
-    if (matchPtr == NULL)
-    {
+    if (matchPtr == NULL) {
 	FormatResult(interp, "unknown element type \"%s\"", typeStr);
 	return TCL_ERROR;
     }
@@ -4313,8 +4283,7 @@ static void FreeAssocData(ClientData clientData, Tcl_Interp *interp)
     ElementType *typeList = assocData->typeList;
     ElementType *next;
 
-    while (typeList != NULL)
-    {
+    while (typeList != NULL) {
 	next = typeList->next;
 	/* The ElementType.optionTables are freed when the interp is deleted */
 	ckfree((char *) typeList);
diff --git a/generic/tkTreeItem.c b/generic/tkTreeItem.c
index 13cacc9..d86df43 100644
--- a/generic/tkTreeItem.c
+++ b/generic/tkTreeItem.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeItem.c,v 1.98 2006/12/08 20:48:48 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeItem.c,v 1.99 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -1562,21 +1562,18 @@ Qualifiers_Scan(
 	    goto errorExit;
 	}
 	switch ((enum qualEnum) qual) {
-	    case QUAL_DEPTH:
-	    {
+	    case QUAL_DEPTH: {
 		if (Tcl_GetIntFromObj(interp, objv[j + 1], &q->depth) != TCL_OK)
 		    goto errorExit;
 		break;
 	    }
-	    case QUAL_STATE:
-	    {
+	    case QUAL_STATE: {
 		if (Tree_StateFromListObj(tree, objv[j + 1], q->states,
 			SFO_NOT_TOGGLE) != TCL_OK)
 		    goto errorExit;
 		break;
 	    }
-	    case QUAL_TAG:
-	    {
+	    case QUAL_TAG: {
 		if (q->exprOK)
 		    TagExpr_Free(&q->expr);
 		if (TagExpr_Init(tree, objv[j + 1], &q->expr) != TCL_OK)
@@ -1584,13 +1581,11 @@ Qualifiers_Scan(
 		q->exprOK = TRUE;
 		break;
 	    }
-	    case QUAL_VISIBLE:
-	    {
+	    case QUAL_VISIBLE: {
 		q->visible = 1;
 		break;
 	    }
-	    case QUAL_NOT_VISIBLE:
-	    {
+	    case QUAL_NOT_VISIBLE: {
 		q->visible = 0;
 		break;
 	    }
@@ -1831,13 +1826,11 @@ TreeItemList_FromObj(
 	}
 
 	switch ((enum indexEnum) index) {
-	    case INDEX_ACTIVE:
-	    {
+	    case INDEX_ACTIVE: {
 		item = tree->activeItem;
 		break;
 	    }
-	    case INDEX_ALL:
-	    {
+	    case INDEX_ALL: {
 		if (qualArgsTotal) {
 		    hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
 		    while (hPtr != NULL) {
@@ -1861,21 +1854,18 @@ TreeItemList_FromObj(
 		}
 		break;
 	    }
-	    case INDEX_ANCHOR:
-	    {
+	    case INDEX_ANCHOR: {
 		item = tree->anchorItem;
 		break;
 	    }
-	    case INDEX_FIRST:
-	    {
+	    case INDEX_FIRST: {
 		item = tree->root;
 		while (!Qualifies(&q, item))
 		    item = TreeItem_Next(tree, item);
 		break;
 	    }
 	    case INDEX_END:
-	    case INDEX_LAST:
-	    {
+	    case INDEX_LAST: {
 		item = tree->root;
 		while (item->lastChild) {
 		    item = item->lastChild;
@@ -1884,8 +1874,7 @@ TreeItemList_FromObj(
 		    item = TreeItem_Prev(tree, item);
 		break;
 	    }
-	    case INDEX_LIST:
-	    {
+	    case INDEX_LIST: {
 		int listObjc;
 		Tcl_Obj **listObjv;
 		int count;
@@ -1917,8 +1906,7 @@ TreeItemList_FromObj(
 		    item = NULL;
 		break;
 	    }
-	    case INDEX_NEAREST:
-	    {
+	    case INDEX_NEAREST: {
 		int x, y;
 
 		if (Tk_GetPixelsFromObj(interp, tree->tkwin,
@@ -1932,8 +1920,7 @@ TreeItemList_FromObj(
 		item = Tree_ItemUnderPoint(tree, &x, &y, TRUE);
 		break;
 	    }
-	    case INDEX_RANGE:
-	    {
+	    case INDEX_RANGE: {
 		TreeItem itemFirst, itemLast;
 
 		if (TreeItem_FromObj(tree, objv[listIndex + 1], &itemFirst,
@@ -1955,8 +1942,7 @@ TreeItemList_FromObj(
 		item = NULL;
 		break;
 	    }
-	    case INDEX_RNC:
-	    {
+	    case INDEX_RNC: {
 		int row, col;
 
 		if (Tcl_GetIntFromObj(interp, objv[listIndex + 1], &row) != TCL_OK)
@@ -1966,8 +1952,7 @@ TreeItemList_FromObj(
 		item = Tree_RNCToItem(tree, row, col);
 		break;
 	    }
-	    case INDEX_ROOT:
-	    {
+	    case INDEX_ROOT: {
 		item = tree->root;
 		break;
 	    }
@@ -2107,13 +2092,11 @@ gotFirstPart:
 	}
 
 	switch ((enum modEnum) index) {
-	    case TMOD_ABOVE:
-	    {
+	    case TMOD_ABOVE: {
 		item = Tree_ItemAbove(tree, item);
 		break;
 	    }
-	    case TMOD_ANCESTORS:
-	    {
+	    case TMOD_ANCESTORS: {
 		item = item->parent;
 		while (item != NULL) {
 		    if (Qualifies(&q, item)) {
@@ -2124,18 +2107,15 @@ gotFirstPart:
 		item = NULL;
 		break;
 	    }
-	    case TMOD_BELOW:
-	    {
+	    case TMOD_BELOW: {
 		item = Tree_ItemBelow(tree, item);
 		break;
 	    }
-	    case TMOD_BOTTOM:
-	    {
+	    case TMOD_BOTTOM: {
 		item = Tree_ItemBottom(tree, item);
 		break;
 	    }
-	    case TMOD_CHILD:
-	    {
+	    case TMOD_CHILD: {
 		int n, endRelative;
 
 		if (Tree_GetIntForIndex(tree, objv[listIndex + 1], &n,
@@ -2161,8 +2141,7 @@ gotFirstPart:
 		}
 		break;
 	    }
-	    case TMOD_CHILDREN:
-	    {
+	    case TMOD_CHILDREN: {
 		item = item->firstChild;
 		while (item != NULL) {
 		    if (Qualifies(&q, item)) {
@@ -2173,8 +2152,7 @@ gotFirstPart:
 		item = NULL;
 		break;
 	    }
-	    case TMOD_DESCENDANTS:
-	    {
+	    case TMOD_DESCENDANTS: {
 		TreeItem last = item;
 
 		while (last->lastChild != NULL)
@@ -2191,75 +2169,63 @@ gotFirstPart:
 		item = NULL;
 		break;
 	    }
-	    case TMOD_FIRSTCHILD:
-	    {
+	    case TMOD_FIRSTCHILD: {
 		item = item->firstChild;
 		while (!Qualifies(&q, item))
 		    item = item->nextSibling;
 		break;
 	    }
-	    case TMOD_LASTCHILD:
-	    {
+	    case TMOD_LASTCHILD: {
 		item = item->lastChild;
 		while (!Qualifies(&q, item))
 		    item = item->prevSibling;
 		break;
 	    }
-	    case TMOD_LEFT:
-	    {
+	    case TMOD_LEFT: {
 		item = Tree_ItemLeft(tree, item);
 		break;
 	    }
-	    case TMOD_LEFTMOST:
-	    {
+	    case TMOD_LEFTMOST: {
 		item = Tree_ItemLeftMost(tree, item);
 		break;
 	    }
-	    case TMOD_NEXT:
-	    {
+	    case TMOD_NEXT: {
 		item = TreeItem_Next(tree, item);
 		while (!Qualifies(&q, item))
 		    item = TreeItem_Next(tree, item);
 		break;
 	    }
-	    case TMOD_NEXTSIBLING:
-	    {
+	    case TMOD_NEXTSIBLING: {
 		item = item->nextSibling;
 		while (!Qualifies(&q, item))
 		    item = item->nextSibling;
 		break;
 	    }
-	    case TMOD_PARENT:
-	    {
+	    case TMOD_PARENT: {
 		item = item->parent;
 		break;
 	    }
-	    case TMOD_PREV:
-	    {
+	    case TMOD_PREV: {
 		item = TreeItem_Prev(tree, item);
 		while (!Qualifies(&q, item))
 		    item = TreeItem_Prev(tree, item);
 		break;
 	    }
-	    case TMOD_PREVSIBLING:
-	    {
+	    case TMOD_PREVSIBLING: {
 		item = item->prevSibling;
 		while (!Qualifies(&q, item))
 		    item = item->prevSibling;
 		break;
 	    }
-	    case TMOD_RIGHT:
-	    {
+	    case TMOD_RIGHT: {
 		item = Tree_ItemRight(tree, item);
 		break;
 	    }
-	    case TMOD_RIGHTMOST:
-	    {
+	    case TMOD_RIGHTMOST: {
 		item = Tree_ItemRightMost(tree, item);
 		break;
 	    }
-	    case TMOD_SIBLING:
-	    {
+	    case TMOD_SIBLING: {
 		int n, endRelative;
 
 		if (Tree_GetIntForIndex(tree, objv[listIndex + 1], &n,
@@ -2288,8 +2254,7 @@ gotFirstPart:
 		}
 		break;
 	    }
-	    case TMOD_TOP:
-	    {
+	    case TMOD_TOP: {
 		item = Tree_ItemTop(tree, item);
 		break;
 	    }
@@ -4824,8 +4789,7 @@ ItemCreateCmd(
 	    return TCL_ERROR;
 	}
 	switch (index) {
-	    case OPT_BUTTON:
-	    {
+	    case OPT_BUTTON: {
 		int length;
 		char *s = Tcl_GetStringFromObj(objv[i + 1], &length);
 		if (s[0] == 'a' && strncmp(s, "auto", length) == 0) {
@@ -5127,8 +5091,7 @@ ItemElementCmd(
 #ifdef DEPRECATED
 	case COMMAND_ACTUAL:
 #endif
-	case COMMAND_PERSTATE:
-	{
+	case COMMAND_PERSTATE: {
 	    int state;
 
 	    if (objc < 8 || objc > 9) {
@@ -5164,8 +5127,7 @@ ItemElementCmd(
 	}
 
 	/* T item element cget I C E option */
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    if (objc != 8) {
 		Tcl_WrongNumArgs(tree->interp, 4, objv,
 			"item column element option");
@@ -5188,8 +5150,7 @@ ItemElementCmd(
 	}
 
 	/* T item element configure I C E ... */
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    struct columnObj {
 		TreeColumnList columns;
 		int isColumn;
@@ -5438,8 +5399,7 @@ ItemStyleCmd(
 
     switch (index) {
 	/* T item style elements I C */
-	case COMMAND_ELEMENTS:
-	{
+	case COMMAND_ELEMENTS: {
 	    Column *column;
 	    int columnIndex;
 
@@ -5463,8 +5423,7 @@ ItemStyleCmd(
 	}
 
 	/* T item style map I C S map */
-	case COMMAND_MAP:
-	{
+	case COMMAND_MAP: {
 	    TreeStyle style;
 	    TreeColumnList columns;
 	    TreeColumn treeColumn;
@@ -5526,8 +5485,7 @@ doneMAP:
 	}
 
 	/* T item style set I ?C? ?S? ?C S ...?*/
-	case COMMAND_SET:
-	{
+	case COMMAND_SET: {
 	    struct columnStyle {
 		TreeColumnList columns;
 		TreeStyle style;
@@ -6220,8 +6178,7 @@ ItemSortCmd(
 	    case OPT_DICT:
 		sortData.columns[sortData.columnCount - 1].sortBy = SORT_DICT;
 		break;
-	    case OPT_ELEMENT:
-	    {
+	    case OPT_ELEMENT: {
 		int listObjc;
 		Tcl_Obj **listObjv;
 
@@ -6666,8 +6623,7 @@ ItemStateCmd(
 
     switch (index) {
 	/* T item state forcolumn I C ?stateList? */
-	case COMMAND_FORCOLUMN:
-	{
+	case COMMAND_FORCOLUMN: {
 	    TreeItemList itemList;
 	    TreeColumnList columns;
 	    TreeColumn treeColumn;
@@ -6742,8 +6698,7 @@ doneFORC:
 	}
 
 	/* T item state get I ?state? */
-	case COMMAND_GET:
-	{
+	case COMMAND_GET: {
 	    Tcl_Obj *listObj;
 	    int i, states[3];
 
@@ -6776,8 +6731,7 @@ doneFORC:
 	}
 
 	/* T item state set I ?I? {state ...} */
-	case COMMAND_SET:
-	{
+	case COMMAND_SET: {
 	    TreeItemList itemList, item2List;
 	    int states[3], stateOn, stateOff;
 	    ItemForEach iter;
@@ -6863,29 +6817,24 @@ ItemTagCmd(
     TreeItem item;
     int result = TCL_OK;
 
-    if (objc < 4)
-    {
+    if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 3, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[3], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
+    switch (index) {
 	/* T item tag add I tagList */
-	case COMMAND_ADD:
-	{
+	case COMMAND_ADD: {
 	    int i, numTags;
 	    Tcl_Obj **listObjv;
 	    Tk_Uid staticTags[STATIC_SIZE], *tags = staticTags;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "item tagList");
 		return TCL_ERROR;
 	    }
@@ -6908,13 +6857,11 @@ ItemTagCmd(
 	}
 
 	/* T item tag expr I tagExpr */
-	case COMMAND_EXPR:
-	{
+	case COMMAND_EXPR: {
 	    TagExpr expr;
 	    int ok = TRUE;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "item tagExpr");
 		return TCL_ERROR;
 	    }
@@ -6937,14 +6884,12 @@ ItemTagCmd(
 	}
 
 	/* T item tag names I */
-	case COMMAND_NAMES:
-	{
+	case COMMAND_NAMES: {
 	    Tcl_Obj *listObj;
 	    Tk_Uid *tags = NULL;
 	    int i, tagSpace, numTags = 0;
 
-	    if (objc != 5)
-	    {
+	    if (objc != 5) {
 		Tcl_WrongNumArgs(interp, 4, objv, "item");
 		return TCL_ERROR;
 	    }
@@ -6967,14 +6912,12 @@ ItemTagCmd(
 	}
 
 	/* T item tag remove I tagList */
-	case COMMAND_REMOVE:
-	{
+	case COMMAND_REMOVE: {
 	    int i, numTags;
 	    Tcl_Obj **listObjv;
 	    Tk_Uid staticTags[STATIC_SIZE], *tags = staticTags;
 
-	    if (objc != 6)
-	    {
+	    if (objc != 6) {
 		Tcl_WrongNumArgs(interp, 4, objv, "item tagList");
 		return TCL_ERROR;
 	    }
@@ -7310,8 +7253,7 @@ TreeItemCmd(
     }
 
     switch (index) {
-	case COMMAND_ANCESTORS:
-	{
+	case COMMAND_ANCESTORS: {
 	    Tcl_Obj *listObj;
 	    TreeItem parent = item->parent;
 
@@ -7327,8 +7269,7 @@ TreeItemCmd(
 	    break;
 	}
 	/* T item bbox I ?C? ?E? */
-	case COMMAND_BBOX:
-	{
+	case COMMAND_BBOX: {
 	    int x, y, w, h;
 	    int count;
 	    TreeColumn treeColumn;
@@ -7371,8 +7312,7 @@ TreeItemCmd(
 		    y - tree->yOrigin + h);
 	    break;
 	}
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr;
 
 	    resultObjPtr = Tk_GetOptionValue(interp, (char *) item,
@@ -7382,8 +7322,7 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, resultObjPtr);
 	    break;
 	}
-	case COMMAND_CHILDREN:
-	{
+	case COMMAND_CHILDREN: {
 	    if (item->numChildren != 0) {
 		Tcl_Obj *listObj;
 
@@ -7400,8 +7339,7 @@ TreeItemCmd(
 	}
 	case COMMAND_COLLAPSE:
 	case COMMAND_EXPAND:
-	case COMMAND_TOGGLE:
-	{
+	case COMMAND_TOGGLE: {
 	    int recurse = 0;
 	    int mode = 0; /* lint */
 	    int i, count;
@@ -7447,8 +7385,7 @@ TreeItemCmd(
 	    break;
 	}
 	/* T item compare I op I */
-	case COMMAND_COMPARE:
-	{
+	case COMMAND_COMPARE: {
 	    static CONST char *opName[] = { "<", "<=", "==", ">=", ">", "!=", NULL };
 	    int op, compare = 0, index1, index2;
 
@@ -7470,8 +7407,7 @@ TreeItemCmd(
 	}
 
 #ifdef DEPRECATED
-	case COMMAND_COMPLEX:
-	{
+	case COMMAND_COMPLEX: {
 	    int i, j, columnIndex;
 	    int objc1, objc2;
 	    Tcl_Obj **objv1, **objv2;
@@ -7553,8 +7489,7 @@ TreeItemCmd(
 #endif /* DEPRECATED*/
 
 	/* T item configure I ?option? ?value? ?option value ...? */
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    if (objc <= 5) {
 		Tcl_Obj *resultObjPtr;
 
@@ -7578,8 +7513,7 @@ TreeItemCmd(
 	    }
 	    break;
 	}
-	case COMMAND_COUNT:
-	{
+	case COMMAND_COUNT: {
 	    int count = tree->itemCount;
 
 	    if (objc == 4) {
@@ -7591,8 +7525,7 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, Tcl_NewIntObj(count));
 	    break;
 	}
-	case COMMAND_DELETE:
-	{
+	case COMMAND_DELETE: {
 	    TreeItemList deleted, selected;
 	    int i, count;
 
@@ -7688,8 +7621,7 @@ TreeItemCmd(
 	    TreeItemList_Free(&deleted);
 	    break;
 	}
-	case COMMAND_DESCENDANTS:
-	{
+	case COMMAND_DESCENDANTS: {
 	    Tcl_Obj *listObj;
 
 	    if (item->firstChild == NULL)
@@ -7709,16 +7641,14 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, listObj);
 	    break;
 	}
-	case COMMAND_DUMP:
-	{
+	case COMMAND_DUMP: {
 	    Tree_UpdateItemIndex(tree);
 	    FormatResult(interp, "index %d indexVis %d",
 		    item->index, item->indexVis);
 	    break;
 	}
 	/* T item enabled I ?boolean? */
-	case COMMAND_ENABLED:
-	{
+	case COMMAND_ENABLED: {
 	    int enabled;
 	    TreeItemList newD;
 	    int stateOff, stateOn;
@@ -7753,8 +7683,7 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(enabled));
 	    break;
 	}
-	case COMMAND_FIRSTCHILD:
-	{
+	case COMMAND_FIRSTCHILD: {
 	    if (item2 != NULL && item2 != item->firstChild) {
 		TreeItem_RemoveFromParent(tree, item2);
 		item2->nextSibling = item->firstChild;
@@ -7775,8 +7704,7 @@ TreeItemCmd(
 	    break;
 	}
 	/* T item id I */
-	case COMMAND_ID:
-	{
+	case COMMAND_ID: {
 	    Tcl_Obj *listObj;
 
 	    listObj = Tcl_NewListObj(0, NULL);
@@ -7787,19 +7715,16 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, listObj);
 	    break;
 	}
-	case COMMAND_ISANCESTOR:
-	{
+	case COMMAND_ISANCESTOR: {
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
 				 TreeItem_IsAncestor(tree, item, item2)));
 	    break;
 	}
-	case COMMAND_ISOPEN:
-	{
+	case COMMAND_ISOPEN: {
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(item->state & STATE_OPEN));
 	    break;
 	}
-	case COMMAND_LASTCHILD:
-	{
+	case COMMAND_LASTCHILD: {
 	    /* Don't allow non-deleted items to become children of a
 	     * deleted item. */
 	    if (item2 != NULL && item2 != item->lastChild) {
@@ -7821,8 +7746,7 @@ TreeItemCmd(
 		Tcl_SetObjResult(interp, TreeItem_ToObj(tree, item->lastChild));
 	    break;
 	}
-	case COMMAND_NEXTSIBLING:
-	{
+	case COMMAND_NEXTSIBLING: {
 	    if (item2 != NULL && item2 != item->nextSibling) {
 		TreeItem_RemoveFromParent(tree, item2);
 		item2->prevSibling = item;
@@ -7843,14 +7767,12 @@ TreeItemCmd(
 		Tcl_SetObjResult(interp, TreeItem_ToObj(tree, item->nextSibling));
 	    break;
 	}
-	case COMMAND_NUMCHILDREN:
-	{
+	case COMMAND_NUMCHILDREN: {
 	    Tcl_SetObjResult(interp, Tcl_NewIntObj(item->numChildren));
 	    break;
 	}
 	/* T item order I ?-visible? */
-	case COMMAND_ORDER:
-	{
+	case COMMAND_ORDER: {
 	    int visible = FALSE;
 	    if (objc == 5) {
 		int len;
@@ -7869,8 +7791,7 @@ TreeItemCmd(
 	    break;
 	}
 	/* T item range I I */
-	case COMMAND_RANGE:
-	{
+	case COMMAND_RANGE: {
 	    TreeItem itemFirst = item;
 	    TreeItem itemLast = item2;
 	    Tcl_Obj *listObj;
@@ -7891,14 +7812,12 @@ TreeItemCmd(
 	    Tcl_SetObjResult(interp, listObj);
 	    break;
 	}
-	case COMMAND_PARENT:
-	{
+	case COMMAND_PARENT: {
 	    if (item->parent != NULL)
 		Tcl_SetObjResult(interp, TreeItem_ToObj(tree, item->parent));
 	    break;
 	}
-	case COMMAND_PREVSIBLING:
-	{
+	case COMMAND_PREVSIBLING: {
 	    if (item2 != NULL && item2 != item->prevSibling) {
 		TreeItem_RemoveFromParent(tree, item2);
 		item2->nextSibling = item;
@@ -7919,8 +7838,7 @@ TreeItemCmd(
 		Tcl_SetObjResult(interp, TreeItem_ToObj(tree, item->prevSibling));
 	    break;
 	}
-	case COMMAND_REMOVE:
-	{
+	case COMMAND_REMOVE: {
 	    int removed = FALSE;
 
 	    ITEM_FOR_EACH(item, &itemList, NULL, &iter) {
@@ -7940,8 +7858,7 @@ TreeItemCmd(
 #endif
 	    break;
 	}
-	case COMMAND_RNC:
-	{
+	case COMMAND_RNC: {
 	    int row,col;
 
 	    if (Tree_ItemToRNC(tree, item, &row, &col) == TCL_OK)
@@ -7950,8 +7867,7 @@ TreeItemCmd(
 	}
 
 	/* T item span I ?C? ?span? ?C span ...? */
-	case COMMAND_SPAN:
-	{
+	case COMMAND_SPAN: {
 	    TreeColumn treeColumn = tree->columns;
 	    Column *column = item->columns;
 	    Tcl_Obj *listObj;
@@ -8049,8 +7965,7 @@ doneSPAN:
 	/* T item image I ?C? ?image? ?C image ...? */
 	case COMMAND_IMAGE:
 	/* T item text I ?C? ?text? ?C text ...? */
-	case COMMAND_TEXT:
-	{
+	case COMMAND_TEXT: {
 	    TreeColumn treeColumn = tree->columns;
 	    Column *column;
 	    Tcl_Obj *objPtr;
diff --git a/generic/tkTreeMarquee.c b/generic/tkTreeMarquee.c
index cdc2ec8..e6af421 100644
--- a/generic/tkTreeMarquee.c
+++ b/generic/tkTreeMarquee.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeMarquee.c,v 1.12 2006/12/02 21:36:02 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeMarquee.c,v 1.13 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -67,8 +67,7 @@ TreeMarquee_Init(
     marquee->tree = tree;
     marquee->optionTable = Tk_CreateOptionTable(tree->interp, optionSpecs);
     if (Tk_InitOptions(tree->interp, (char *) marquee, marquee->optionTable,
-	tree->tkwin) != TCL_OK)
-    {
+	tree->tkwin) != TCL_OK) {
 	WFREE(marquee, TreeMarquee_);
 	return TCL_ERROR;
     }
@@ -126,8 +125,7 @@ TreeMarquee_Display(
 {
     TreeCtrl *tree = marquee->tree;
 
-    if (!marquee->onScreen && marquee->visible)
-    {
+    if (!marquee->onScreen && marquee->visible) {
 	marquee->sx = 0 - tree->xOrigin;
 	marquee->sy = 0 - tree->yOrigin;
 	TreeMarquee_Draw(marquee, Tk_WindowId(tree->tkwin), marquee->sx, marquee->sy);
@@ -158,8 +156,7 @@ TreeMarquee_Undisplay(
 {
     TreeCtrl *tree = marquee->tree;
 
-    if (marquee->onScreen)
-    {
+    if (marquee->onScreen) {
 	TreeMarquee_Draw(marquee, Tk_WindowId(tree->tkwin), marquee->sx, marquee->sy);
 	marquee->onScreen = FALSE;
     }
@@ -236,13 +233,10 @@ Marquee_Config(
     Tcl_Obj *errorResult = NULL;
     int mask;
 
-    for (error = 0; error <= 1; error++)
-    {
-	if (error == 0)
-	{
+    for (error = 0; error <= 1; error++) {
+	if (error == 0) {
 	    if (Tk_SetOptions(tree->interp, (char *) marquee, marquee->optionTable,
-		objc, objv, tree->tkwin, &savedOptions, &mask) != TCL_OK)
-	    {
+		objc, objv, tree->tkwin, &savedOptions, &mask) != TCL_OK) {
 		mask = 0;
 		continue;
 	    }
@@ -266,8 +260,7 @@ Marquee_Config(
 	}
     }
 
-    if (mask & MARQ_CONF_VISIBLE)
-    {
+    if (mask & MARQ_CONF_VISIBLE) {
 	TreeMarquee_Undisplay(marquee);
 	TreeMarquee_Display(marquee);
     }
@@ -309,32 +302,26 @@ TreeMarqueeCmd(
 	COMMAND_CORNER, COMMAND_IDENTIFY };
     int index;
 
-    if (objc < 3)
-    {
+    if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[2], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
+    switch (index) {
 	/* T marquee anchor ?x y?*/
-	case COMMAND_ANCHOR:
-	{
+	case COMMAND_ANCHOR: {
 	    int x, y;
 
-	    if (objc != 3 && objc != 5)
-	    {
+	    if (objc != 3 && objc != 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?x y?");
 		return TCL_ERROR;
 	    }
-	    if (objc == 3)
-	    {
+	    if (objc == 3) {
 		FormatResult(interp, "%d %d", marquee->x1, marquee->y1);
 		break;
 	    }
@@ -352,12 +339,10 @@ TreeMarqueeCmd(
 	}
 
 	/* T marquee cget option */
-	case COMMAND_CGET:
-	{
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr;
 
-	    if (objc != 4)
-	    {
+	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "option");
 		return TCL_ERROR;
 	    }
@@ -370,17 +355,14 @@ TreeMarqueeCmd(
 	}
 
 	/* T marquee configure ?option? ?value? ?option value ...? */
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    Tcl_Obj *resultObjPtr;
 
-	    if (objc < 3)
-	    {
+	    if (objc < 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?option? ?value?");
 		return TCL_ERROR;
 	    }
-	    if (objc <= 4)
-	    {
+	    if (objc <= 4) {
 		resultObjPtr = Tk_GetOptionInfo(interp, (char *) marquee,
 		    marquee->optionTable,
 		    (objc == 3) ? (Tcl_Obj *) NULL : objv[3],
@@ -394,17 +376,14 @@ TreeMarqueeCmd(
 	}
 
 	/* T marquee coords ?x y x y? */
-	case COMMAND_COORDS:
-	{
+	case COMMAND_COORDS: {
 	    int x1, y1, x2, y2;
 
-	    if (objc != 3 && objc != 7)
-	    {
+	    if (objc != 3 && objc != 7) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?x y x y?");
 		return TCL_ERROR;
 	    }
-	    if (objc == 3)
-	    {
+	    if (objc == 3) {
 		FormatResult(interp, "%d %d %d %d", marquee->x1, marquee->y1,
 		    marquee->x2, marquee->y2);
 		break;
@@ -430,17 +409,14 @@ TreeMarqueeCmd(
 	}
 
 	/* T marquee corner ?x y?*/
-	case COMMAND_CORNER:
-	{
+	case COMMAND_CORNER: {
 	    int x, y;
 
-	    if (objc != 3 && objc != 5)
-	    {
+	    if (objc != 3 && objc != 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?x y?");
 		return TCL_ERROR;
 	    }
-	    if (objc == 3)
-	    {
+	    if (objc == 3) {
 		FormatResult(interp, "%d %d", marquee->x2, marquee->y2);
 		break;
 	    }
@@ -458,16 +434,14 @@ TreeMarqueeCmd(
 	}
 
 	/* T marquee identify */
-	case COMMAND_IDENTIFY:
-	{
+	case COMMAND_IDENTIFY: {
 	    int x1, y1, x2, y2, n = 0;
 	    int totalWidth = Tree_TotalWidth(tree);
 	    int totalHeight = Tree_TotalHeight(tree);
 	    TreeItemList items;
 	    Tcl_Obj *listObj;
 
-	    if (objc != 3)
-	    {
+	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, (char *) NULL);
 		return TCL_ERROR;
 	    }
@@ -504,8 +478,7 @@ TreeMarqueeCmd(
 	    }
 
 	    listObj = Tcl_NewListObj(0, NULL);
-	    for (n = 0; n < TreeItemList_Count(&items); n++)
-	    {
+	    for (n = 0; n < TreeItemList_Count(&items); n++) {
 		Tcl_Obj *subListObj = Tcl_NewListObj(0, NULL);
 		TreeItem item = TreeItemList_Nth(&items, n);
 		Tcl_ListObjAppendElement(interp, subListObj,
diff --git a/generic/tkTreeNotify.c b/generic/tkTreeNotify.c
index ce4ff77..382f6e5 100644
--- a/generic/tkTreeNotify.c
+++ b/generic/tkTreeNotify.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeNotify.c,v 1.19 2006/12/02 21:36:13 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeNotify.c,v 1.20 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -88,8 +88,7 @@ DumpPercents(
     buf[1] = '\0';
 
     Tcl_DStringStartSublist(args->result);
-    for (i = 0; chars[i]; i++)
-    {
+    for (i = 0; chars[i]; i++) {
 	args->which = chars[i];
 	buf[0] = chars[i];
 	Tcl_DStringAppendElement(args->result, buf);
@@ -131,8 +130,7 @@ Percents_Any(
     } *data = args->clientData;
     char chars2[64];
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'd': /* detail */
 	    QE_ExpandDetail(args->bindingTable, args->event, args->detail,
 		args->result);
@@ -192,8 +190,7 @@ Percents_Expand(
 	int id;
     } *data = args->clientData;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'I':
 	    ExpandItem(data->tree, data->id, args->result);
 	    break;
@@ -234,15 +231,13 @@ Percents_ItemVisibility(
     TreeItemList *table;
     int i, count;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'v':
 	case 'h':
 	    table = (args->which == 'v') ? data->v : data->h;
 	    Tcl_DStringStartSublist(args->result);
 	    count = TreeItemList_Count(table);
-	    for (i = 0; i < count; i++)
-	    {
+	    for (i = 0; i < count; i++) {
 		TreeItem item = TreeItemList_Nth(table, i);
 		if (tree->itemPrefixLen) {
 		    char buf[10 + TCL_INTEGER_SPACE];
@@ -295,23 +290,20 @@ Percents_Selection(
     TreeItemList *itemList;
     int i, count;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'c':
 	    QE_ExpandNumber(data->count, args->result);
 	    break;
 	case 'D':
 	case 'S':
 	    itemList = (args->which == 'D') ? data->deselect : data->select;
-	    if (itemList == NULL)
-	    {
+	    if (itemList == NULL) {
 		Tcl_DStringAppend(args->result, "{}", 2);
 		break;
 	    }
 	    Tcl_DStringStartSublist(args->result);
 	    count = TreeItemList_Count(itemList);
-	    for (i = 0; i < count; i++)
-	    {
+	    for (i = 0; i < count; i++) {
 		TreeItem item = TreeItemList_Nth(itemList, i);
 		if (tree->itemPrefixLen) {
 		    char buf[10 + TCL_INTEGER_SPACE];
@@ -360,8 +352,7 @@ Percents_ActiveItem(
 	int current;
     } *data = args->clientData;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'c':
 	    ExpandItem(data->tree, data->current, args->result);
 	    break;
@@ -403,8 +394,7 @@ Percents_Scroll(
 	double upper;
     } *data = args->clientData;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'l':
 	    QE_ExpandDouble(data->lower, args->result);
 	    break;
@@ -456,37 +446,30 @@ TreeNotifyCmd(
     };
     int index;
 
-    if (objc < 3)
-    {
+    if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[2], commandName, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
-	case COMMAND_BIND:
-	{
+    switch (index) {
+	case COMMAND_BIND: {
 	    return QE_BindCmd(tree->bindingTable, 2, objc, objv);
 	}
 
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    return QE_ConfigureCmd(tree->bindingTable, 2, objc, objv);
 	}
 
 	/* T notify detailnames $eventName */
-	case COMMAND_DETAILNAMES:
-	{
+	case COMMAND_DETAILNAMES: {
 	    char *eventName;
 
-	    if (objc != 4)
-	    {
+	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "eventName");
 		return TCL_ERROR;
 	    }
@@ -495,38 +478,31 @@ TreeNotifyCmd(
 	}
 
 	/* T notify eventnames */
-	case COMMAND_EVENTNAMES:
-	{
-	    if (objc != 3)
-	    {
+	case COMMAND_EVENTNAMES: {
+	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, (char *) NULL);
 		return TCL_ERROR;
 	    }
 	    return QE_GetEventNames(tree->bindingTable);
 	}
 
-	case COMMAND_GENERATE:
-	{
+	case COMMAND_GENERATE: {
 	    return QE_GenerateCmd(tree->bindingTable, 2, objc, objv);
 	}
 
-	case COMMAND_INSTALL:
-	{
+	case COMMAND_INSTALL: {
 	    return QE_InstallCmd(tree->bindingTable, 2, objc, objv);
 	}
 
-	case COMMAND_LINKAGE:
-	{
+	case COMMAND_LINKAGE: {
 	    return QE_LinkageCmd(tree->bindingTable, 2, objc, objv);
 	}
 
-	case COMMAND_UNBIND:
-	{
+	case COMMAND_UNBIND: {
 	    return QE_UnbindCmd(tree->bindingTable, 2, objc, objv);
 	}
 
-	case COMMAND_UNINSTALL:
-	{
+	case COMMAND_UNINSTALL: {
 	    return QE_UninstallCmd(tree->bindingTable, 2, objc, objv);
 	}
     }
@@ -568,8 +544,7 @@ TreeNotify_OpenClose(
     data.tree = tree;
     data.id = TreeItem_GetID(tree, item);
 
-    if (state & STATE_OPEN)
-    {
+    if (state & STATE_OPEN) {
 	event.type = EVENT_EXPAND;
 	event.detail = before ? DETAIL_EXPAND_BEFORE : DETAIL_EXPAND_AFTER;
     }
@@ -737,13 +712,11 @@ Percents_ItemDelete(
     TreeCtrl *tree = data->tree;
     int i, count;
 
-    switch (args->which)
-    {
+    switch (args->which) {
 	case 'i':
 	    Tcl_DStringStartSublist(args->result);
 	    count = TreeItemList_Count(data->items);
-	    for (i = 0; i < count; i++)
-	    {
+	    for (i = 0; i < count; i++) {
 		TreeItem item = TreeItemList_Nth(data->items, i);
 		if (tree->itemPrefixLen) {
 		    char buf[10 + TCL_INTEGER_SPACE];
diff --git a/generic/tkTreeStyle.c b/generic/tkTreeStyle.c
index 09f4015..e9b088c 100644
--- a/generic/tkTreeStyle.c
+++ b/generic/tkTreeStyle.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeStyle.c,v 1.70 2006/12/07 03:46:32 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeStyle.c,v 1.71 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -226,8 +226,7 @@ Style_DoExpandH(
     {
 	if (flags & ELF_eEXPAND_W) numExpand++;
 	if (flags & ELF_iEXPAND_W) numExpand++;
-	if (flags & ELF_iEXPAND_X)
-	{
+	if (flags & ELF_iEXPAND_X) {
 	    if ((eLink1->maxWidth < 0) ||
 		(eLink1->maxWidth > layout->useWidth))
 		numExpand++;
@@ -236,8 +235,7 @@ Style_DoExpandH(
 	if (flags & ELF_eEXPAND_E) numExpand++;
     }
 
-    while ((spaceRemaining > 0) && (numExpand > 0))
-    {
+    while ((spaceRemaining > 0) && (numExpand > 0)) {
 	int each = (spaceRemaining >= numExpand) ? (spaceRemaining / numExpand) : 1;
 
 	numExpand = 0;
@@ -245,8 +243,7 @@ Style_DoExpandH(
 	/* Allocate extra space to the *right* padding first so that any
 	 * extra single pixel is given to the right. */
 
-	if (flags & ELF_eEXPAND_E)
-	{
+	if (flags & ELF_eEXPAND_E) {
 	    int add = each;
 	    ePadX[PAD_BOTTOM_RIGHT] += add;
 	    layout->eWidth += add;
@@ -257,8 +254,7 @@ Style_DoExpandH(
 	    numExpand++;
 	}
 
-	if (flags & ELF_iEXPAND_E)
-	{
+	if (flags & ELF_iEXPAND_E) {
 	    int add = each;
 	    iPadX[PAD_BOTTOM_RIGHT] += add;
 	    layout->iWidth += add;
@@ -270,11 +266,9 @@ Style_DoExpandH(
 	    numExpand++;
 	}
 
-	if (flags & ELF_iEXPAND_X)
-	{
+	if (flags & ELF_iEXPAND_X) {
 	    int max = eLink1->maxWidth;
-	    if ((max < 0) || (layout->useWidth < max))
-	    {
+	    if ((max < 0) || (layout->useWidth < max)) {
 		int add = (max < 0) ? each : MIN(each, max - layout->useWidth);
 		layout->useWidth += add;
 		layout->iWidth += add;
@@ -290,8 +284,7 @@ Style_DoExpandH(
 	    }
 	}
 
-	if (flags & ELF_iEXPAND_W)
-	{
+	if (flags & ELF_iEXPAND_W) {
 	    int add = each;
 	    iPadX[PAD_TOP_LEFT] += add;
 	    layout->iWidth += add;
@@ -303,8 +296,7 @@ Style_DoExpandH(
 	    numExpand++;
 	}
 
-	if (flags & ELF_eEXPAND_W)
-	{
+	if (flags & ELF_eEXPAND_W) {
 	    int add = each;
 	    ePadX[PAD_TOP_LEFT] += add;
 	    layout->eWidth += add;
@@ -369,8 +361,7 @@ Style_DoExpandV(
     {
 	if (flags & ELF_eEXPAND_N) numExpand++;
 	if (flags & ELF_iEXPAND_N) numExpand++;
-	if (flags & ELF_iEXPAND_Y)
-	{
+	if (flags & ELF_iEXPAND_Y) {
 	    if ((eLink1->maxHeight < 0) ||
 		(eLink1->maxHeight > layout->useHeight))
 		numExpand++;
@@ -379,8 +370,7 @@ Style_DoExpandV(
 	if (flags & ELF_eEXPAND_S) numExpand++;
     }
 
-    while ((spaceRemaining > 0) && (numExpand > 0))
-    {
+    while ((spaceRemaining > 0) && (numExpand > 0)) {
 	int each = (spaceRemaining >= numExpand) ? (spaceRemaining / numExpand) : 1;
 
 	numExpand = 0;
@@ -388,8 +378,7 @@ Style_DoExpandV(
 	/* Allocate extra space to the *bottom* padding first so that any
 	 * extra single pixel is given to the bottom. */
 
-	if (flags & ELF_eEXPAND_S)
-	{
+	if (flags & ELF_eEXPAND_S) {
 	    int add = each;
 	    ePadY[PAD_BOTTOM_RIGHT] += add;
 	    layout->eHeight += add;
@@ -400,8 +389,7 @@ Style_DoExpandV(
 	    numExpand++;
 	}
 
-	if (flags & ELF_iEXPAND_S)
-	{
+	if (flags & ELF_iEXPAND_S) {
 	    int add = each;
 	    iPadY[PAD_BOTTOM_RIGHT] += add;
 	    layout->iHeight += add;
@@ -413,11 +401,9 @@ Style_DoExpandV(
 	    numExpand++;
 	}
 
-	if (flags & ELF_iEXPAND_Y)
-	{
+	if (flags & ELF_iEXPAND_Y) {
 	    int max = eLink1->maxHeight;
-	    if ((max < 0) || (layout->useHeight < max))
-	    {
+	    if ((max < 0) || (layout->useHeight < max)) {
 		int add = (max < 0) ? each : MIN(each, max - layout->useHeight);
 		layout->useHeight += add;
 		layout->iHeight += add;
@@ -433,8 +419,7 @@ Style_DoExpandV(
 	    }
 	}
 
-	if (flags & ELF_iEXPAND_N)
-	{
+	if (flags & ELF_iEXPAND_N) {
 	    int add = each;
 	    iPadY[PAD_TOP_LEFT] += add;
 	    layout->iHeight += add;
@@ -446,8 +431,7 @@ Style_DoExpandV(
 	    numExpand++;
 	}
 
-	if (flags & ELF_eEXPAND_N)
-	{
+	if (flags & ELF_eEXPAND_N) {
 	    int add = each;
 	    ePadY[PAD_TOP_LEFT] += add;
 	    layout->eHeight += add;
@@ -491,8 +475,7 @@ Element_NeededSize(
     ElementArgs args;
     int width, height;
 
-    if ((eLink1->fixedWidth >= 0) && (eLink1->fixedHeight >= 0))
-    {
+    if ((eLink1->fixedWidth >= 0) && (eLink1->fixedHeight >= 0)) {
 	width = eLink1->fixedWidth;
 	height = eLink1->fixedHeight;
     }
@@ -580,8 +563,7 @@ Style_DoLayoutH(
     eLinks2 = style->elements;
     eLinkCount = masterStyle->numElements;
 
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	eLink1 = &eLinks1[i];
@@ -608,8 +590,7 @@ Style_DoLayoutH(
 #endif
 	}
 
-	for (j = 0; j < 2; j++)
-	{
+	for (j = 0; j < 2; j++) {
 	    /* Pad values before expansion */
 	    layout->ePadX[j] = eLink1->ePadX[j];
 	    layout->ePadY[j] = eLink1->ePadY[j];
@@ -629,8 +610,7 @@ Style_DoLayoutH(
     }
 
     /* Calculate the padding around elements surrounded by -union elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 	int first = -1, last = -1;
 
@@ -642,8 +622,7 @@ Style_DoLayoutH(
 	if (eLink1->onion == NULL)
 	    continue;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout))
@@ -668,8 +647,7 @@ Style_DoLayoutH(
 	iPadX = eLink1->iPadX;
 	iPadY = eLink1->iPadY;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout))
@@ -678,8 +656,7 @@ Style_DoLayoutH(
 	    uPadX = layout->uPadX;
 	    uPadY = layout->uPadY;
 
-	    if (masterStyle->vertical)
-	    {
+	    if (masterStyle->vertical) {
 		uPadX[PAD_TOP_LEFT] = MAX(uPadX[PAD_TOP_LEFT], iPadX[PAD_TOP_LEFT] + ePadX[PAD_TOP_LEFT]);
 		uPadX[PAD_BOTTOM_RIGHT] = MAX(uPadX[PAD_BOTTOM_RIGHT], iPadX[PAD_BOTTOM_RIGHT] + ePadX[PAD_BOTTOM_RIGHT]);
 		if (j == first) /* topmost */
@@ -702,19 +679,16 @@ Style_DoLayoutH(
     /* Left-to-right layout. Make the width of some elements less than they
      * need */
     if (!masterStyle->vertical &&
-	(drawArgs->width < style->neededWidth + drawArgs->indent) &&
-	(numSqueezeX > 0))
-    {
+	    (drawArgs->width < style->neededWidth + drawArgs->indent) &&
+	    (numSqueezeX > 0)) {
 	int numSqueeze = numSqueezeX;
 	int spaceRemaining  = (style->neededWidth + drawArgs->indent) - drawArgs->width;
 
-	while ((spaceRemaining > 0) && (numSqueeze > 0))
-	{
+	while ((spaceRemaining > 0) && (numSqueeze > 0)) {
 	    int each = (spaceRemaining >= numSqueeze) ? (spaceRemaining / numSqueeze) : 1;
 
 	    numSqueeze = 0;
-	    for (i = 0; i < eLinkCount; i++)
-	    {
+	    for (i = 0; i < eLinkCount; i++) {
 		struct Layout *layout = &layouts[i];
 		int min = 0;
 
@@ -731,8 +705,7 @@ Style_DoLayoutH(
 
 		if (eLink1->minWidth >= 0)
 		    min = eLink1->minWidth;
-		if (layout->useWidth > min)
-		{
+		if (layout->useWidth > min) {
 		    int sub = MIN(each, layout->useWidth - min);
 		    layout->useWidth -= sub;
 		    spaceRemaining -= sub;
@@ -746,8 +719,7 @@ Style_DoLayoutH(
 
     /* Reduce the width of all non-union elements, except for the
      * cases handled above. */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 	int width, subtract;
 
@@ -778,8 +750,7 @@ Style_DoLayoutH(
 	if (!(eLink1->flags & ELF_DETACH) || (eLink1->flags & ELF_INDENT))
 	    subtract += drawArgs->indent;
 
-	if (subtract > 0)
-	{
+	if (subtract > 0) {
 	    if ((eLink1->minWidth >= 0) &&
 		(eLink1->minWidth <= layout->useWidth) &&
 		(layout->useWidth - subtract < eLink1->minWidth))
@@ -790,8 +761,7 @@ Style_DoLayoutH(
     }
 
     /* Layout elements left-to-right */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 	int right;
 
@@ -833,14 +803,12 @@ Style_DoLayoutH(
      * more space available horizontally than is needed by the Style. */
     if (!masterStyle->vertical &&
 	(drawArgs->width > rightEdge) &&
-	(numExpandWE > 0))
-    {
+	(numExpandWE > 0)) {
 	int numExpand = 0;
 	int spaceRemaining = drawArgs->width - rightEdge;
 
 	/* Each element has 5 areas that can optionally expand. */
-	for (i = 0; i < eLinkCount; i++)
-	{
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 
 	    if (IS_HIDDEN(layout))
@@ -855,8 +823,7 @@ Style_DoLayoutH(
 
 	    if (eLink1->flags & ELF_eEXPAND_W) layout->temp++;
 	    if (eLink1->flags & ELF_iEXPAND_W) layout->temp++;
-	    if (eLink1->flags & ELF_iEXPAND_X)
-	    {
+	    if (eLink1->flags & ELF_iEXPAND_X) {
 		if ((eLink1->maxWidth < 0) ||
 		    (eLink1->maxWidth > layout->useWidth))
 		    layout->temp++;
@@ -867,13 +834,11 @@ Style_DoLayoutH(
 	    numExpand += layout->temp;
 	}
 
-	while ((spaceRemaining > 0) && (numExpand > 0))
-	{
+	while ((spaceRemaining > 0) && (numExpand > 0)) {
 	    int each = (spaceRemaining >= numExpand) ? spaceRemaining / numExpand : 1;
 
 	    numExpand = 0;
-	    for (i = 0; i < eLinkCount; i++)
-	    {
+	    for (i = 0; i < eLinkCount; i++) {
 		struct Layout *layout = &layouts[i];
 		int spaceUsed;
 
@@ -890,8 +855,7 @@ Style_DoLayoutH(
 		    MAX(layout->ePadX[PAD_BOTTOM_RIGHT], layout->uPadX[PAD_BOTTOM_RIGHT]) +
 		    MIN(each * layout->temp, spaceRemaining));
 
-		if (spaceUsed)
-		{
+		if (spaceUsed) {
 		    /* Shift following elements to the right */
 		    for (j = i + 1; j < eLinkCount; j++)
 			if (!DETACH_OR_UNION(&eLinks1[j]))
@@ -912,10 +876,8 @@ Style_DoLayoutH(
     }
 
     /* Top-to-bottom layout. Expand some elements horizontally */
-    if (masterStyle->vertical && (numExpandWE > 0))
-    {
-	for (i = 0; i < eLinkCount; i++)
-	{
+    if (masterStyle->vertical && (numExpandWE > 0)) {
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 	    int right;
 
@@ -939,12 +901,10 @@ Style_DoLayoutH(
 
     /* Now handle column justification */
     /* All the non-union, non-detach elements are moved as a group */
-    if (drawArgs->width > rightEdge)
-    {
+    if (drawArgs->width > rightEdge) {
 	int dx = drawArgs->width - rightEdge;
 
-	for (i = 0; i < eLinkCount; i++)
-	{
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 
 	    if (IS_HIDDEN(layout))
@@ -955,8 +915,7 @@ Style_DoLayoutH(
 	    if (DETACH_OR_UNION(eLink1))
 		continue;
 
-	    switch (drawArgs->justify)
-	    {
+	    switch (drawArgs->justify) {
 		case TK_JUSTIFY_LEFT:
 		    break;
 		case TK_JUSTIFY_RIGHT:
@@ -970,8 +929,7 @@ Style_DoLayoutH(
     }
 
     /* Position and expand -detach elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -998,8 +956,7 @@ Style_DoLayoutH(
     }
 
     /* Now calculate layout of -union elements. */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	eLink1 = &eLinks1[i];
@@ -1016,8 +973,7 @@ Style_DoLayoutH(
 
 	w = 1000000, e = -1000000;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout2 = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout2))
@@ -1035,8 +991,7 @@ Style_DoLayoutH(
 
     /* Expand -union elements if needed: horizontal */
     /* Expansion of "-union" elements is different than non-"-union" elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 	int extraWidth;
 
@@ -1053,10 +1008,8 @@ Style_DoLayoutH(
 
 	/* External and internal expansion: W */
 	extraWidth = layout->x - drawArgs->indent;
-	if ((extraWidth > 0) && (eLink1->flags & ELF_EXPAND_W))
-	{
-	    if ((eLink1->flags & ELF_EXPAND_W) == ELF_EXPAND_W)
-	    {
+	if ((extraWidth > 0) && (eLink1->flags & ELF_EXPAND_W)) {
+	    if ((eLink1->flags & ELF_EXPAND_W) == ELF_EXPAND_W) {
 		int eExtra = extraWidth / 2;
 		int iExtra = extraWidth - extraWidth / 2;
 
@@ -1072,8 +1025,7 @@ Style_DoLayoutH(
 	    }
 
 	    /* External expansion only: W */
-	    else if (eLink1->flags & ELF_eEXPAND_W)
-	    {
+	    else if (eLink1->flags & ELF_eEXPAND_W) {
 		layout->ePadX[PAD_TOP_LEFT] += extraWidth;
 		layout->x = drawArgs->indent;
 		layout->eWidth += extraWidth;
@@ -1091,10 +1043,8 @@ Style_DoLayoutH(
 
 	/* External and internal expansion: E */
 	extraWidth = drawArgs->width - (layout->x + layout->eWidth);
-	if ((extraWidth > 0) && (eLink1->flags & ELF_EXPAND_E))
-	{
-	    if ((eLink1->flags & ELF_EXPAND_E) == ELF_EXPAND_E)
-	    {
+	if ((extraWidth > 0) && (eLink1->flags & ELF_EXPAND_E)) {
+	    if ((eLink1->flags & ELF_EXPAND_E) == ELF_EXPAND_E) {
 		int eExtra = extraWidth / 2;
 		int iExtra = extraWidth - extraWidth / 2;
 
@@ -1108,8 +1058,7 @@ Style_DoLayoutH(
 	    }
 
 	    /* External expansion only: E */
-	    else if (eLink1->flags & ELF_eEXPAND_E)
-	    {
+	    else if (eLink1->flags & ELF_eEXPAND_E) {
 		layout->ePadX[PAD_BOTTOM_RIGHT] += extraWidth;
 		layout->eWidth += extraWidth;
 	    }
@@ -1125,8 +1074,7 @@ Style_DoLayoutH(
     }
 
     /* Add internal padding to display area for -union elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1186,8 +1134,7 @@ Style_DoLayoutV(
     eLinks2 = style->elements;
     eLinkCount = masterStyle->numElements;
 
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	if (IS_HIDDEN(&layouts[i]))
 	    continue;
 
@@ -1203,19 +1150,16 @@ Style_DoLayoutV(
     /* Top-top-bottom layout. Make the height of some elements less than they
      * need */
     if (masterStyle->vertical &&
-	(drawArgs->height < style->neededHeight) &&
-	(numSqueezeY > 0))
-    {
+	    (drawArgs->height < style->neededHeight) &&
+	    (numSqueezeY > 0)) {
 	int numSqueeze = numSqueezeY;
 	int spaceRemaining  = style->neededHeight - drawArgs->height;
 
-	while ((spaceRemaining > 0) && (numSqueeze > 0))
-	{
+	while ((spaceRemaining > 0) && (numSqueeze > 0)) {
 	    int each = (spaceRemaining >= numSqueeze) ? (spaceRemaining / numSqueeze) : 1;
 
 	    numSqueeze = 0;
-	    for (i = 0; i < eLinkCount; i++)
-	    {
+	    for (i = 0; i < eLinkCount; i++) {
 		struct Layout *layout = &layouts[i];
 		int min = 0;
 
@@ -1232,8 +1176,7 @@ Style_DoLayoutV(
 
 		if (eLink1->minHeight >= 0)
 		    min = eLink1->minHeight;
-		if (layout->useHeight > min)
-		{
+		if (layout->useHeight > min) {
 		    int sub = MIN(each, layout->useHeight - min);
 		    layout->useHeight -= sub;
 		    spaceRemaining -= sub;
@@ -1247,10 +1190,8 @@ Style_DoLayoutV(
 
     /* Reduce the height of all non-union elements, except for the
      * cases handled above. */
-    if (drawArgs->height < style->neededHeight)
-    {
-	for (i = 0; i < eLinkCount; i++)
-	{
+    if (drawArgs->height < style->neededHeight) {
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 	    int height, subtract;
 
@@ -1278,8 +1219,7 @@ Style_DoLayoutV(
 		MAX(ePadY[PAD_BOTTOM_RIGHT], uPadY[PAD_BOTTOM_RIGHT]);
 	    subtract = height - drawArgs->height;
 
-	    if (subtract > 0)
-	    {
+	    if (subtract > 0) {
 		if ((eLink1->minHeight >= 0) &&
 		    (eLink1->minHeight <= layout->useHeight) &&
 		    (layout->useHeight - subtract < eLink1->minHeight))
@@ -1291,8 +1231,7 @@ Style_DoLayoutV(
     }
 
     /* Layout elements top-to-bottom */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1315,8 +1254,7 @@ Style_DoLayoutV(
 	if (masterStyle->vertical)
 	    y = layout->y + layout->eHeight;
 
-	if (masterStyle->vertical)
-	{
+	if (masterStyle->vertical) {
 	    bottomEdge = layout->y + layout->ePadY[PAD_TOP_LEFT] +
 		layout->iHeight +
 		MAX(ePadY[PAD_BOTTOM_RIGHT], uPadY[PAD_BOTTOM_RIGHT]);
@@ -1331,13 +1269,11 @@ Style_DoLayoutV(
      * more space available vertically than is needed by the Style. */
     if (masterStyle->vertical &&
 	(drawArgs->height > bottomEdge) &&
-	(numExpandNS > 0))
-    {
+	(numExpandNS > 0)) {
 	int numExpand = 0;
 	int spaceRemaining = drawArgs->height - bottomEdge;
 
-	for (i = 0; i < eLinkCount; i++)
-	{
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 
 	    if (IS_HIDDEN(layout))
@@ -1352,8 +1288,7 @@ Style_DoLayoutV(
 
 	    if (eLink1->flags & ELF_eEXPAND_N) layout->temp++;
 	    if (eLink1->flags & ELF_iEXPAND_N) layout->temp++;
-	    if (eLink1->flags & ELF_iEXPAND_Y)
-	    {
+	    if (eLink1->flags & ELF_iEXPAND_Y) {
 		if ((eLink1->maxHeight < 0) ||
 		    (eLink1->maxHeight > layout->useHeight))
 		    layout->temp++;
@@ -1364,13 +1299,11 @@ Style_DoLayoutV(
 	    numExpand += layout->temp;
 	}
 
-	while ((spaceRemaining > 0) && (numExpand > 0))
-	{
+	while ((spaceRemaining > 0) && (numExpand > 0)) {
 	    int each = (spaceRemaining >= numExpand) ? spaceRemaining / numExpand : 1;
 
 	    numExpand = 0;
-	    for (i = 0; i < eLinkCount; i++)
-	    {
+	    for (i = 0; i < eLinkCount; i++) {
 		struct Layout *layout = &layouts[i];
 		int spaceUsed;
 
@@ -1387,8 +1320,7 @@ Style_DoLayoutV(
 		    MAX(layout->ePadY[PAD_BOTTOM_RIGHT], layout->uPadY[PAD_BOTTOM_RIGHT]) +
 		    MIN(each * layout->temp, spaceRemaining));
 
-		if (spaceUsed)
-		{
+		if (spaceUsed) {
 		    /* Shift following elements down */
 		    for (j = i + 1; j < eLinkCount; j++)
 			if (!DETACH_OR_UNION(&eLinks1[j]))
@@ -1407,10 +1339,8 @@ Style_DoLayoutV(
     }
 
     /* Left-to-right layout. Expand some elements vertically */
-    if (!masterStyle->vertical && (numExpandNS > 0))
-    {
-	for (i = 0; i < eLinkCount; i++)
-	{
+    if (!masterStyle->vertical && (numExpandNS > 0)) {
+	for (i = 0; i < eLinkCount; i++) {
 	    struct Layout *layout = &layouts[i];
 
 	    if (IS_HIDDEN(layout))
@@ -1427,8 +1357,7 @@ Style_DoLayoutV(
     }
 
     /* Position and expand -detach elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1453,8 +1382,7 @@ Style_DoLayoutV(
     }
 
     /* Now calculate layout of -union elements. */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1471,8 +1399,7 @@ Style_DoLayoutV(
 
 	n = 1000000, s = -1000000;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout2 = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout2))
@@ -1489,8 +1416,7 @@ Style_DoLayoutV(
     }
 
     /* Expand -union elements if needed: vertical */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 	int extraHeight;
 
@@ -1507,10 +1433,8 @@ Style_DoLayoutV(
 
 	/* External and internal expansion: N */
 	extraHeight = layout->y;
-	if ((extraHeight > 0) && (eLink1->flags & ELF_EXPAND_N))
-	{
-	    if ((eLink1->flags & ELF_EXPAND_N) == ELF_EXPAND_N)
-	    {
+	if ((extraHeight > 0) && (eLink1->flags & ELF_EXPAND_N)) {
+	    if ((eLink1->flags & ELF_EXPAND_N) == ELF_EXPAND_N) {
 		int eExtra = extraHeight / 2;
 		int iExtra = extraHeight - extraHeight / 2;
 
@@ -1525,8 +1449,7 @@ Style_DoLayoutV(
 	    }
 
 	    /* External expansion only: N */
-	    else if (eLink1->flags & ELF_eEXPAND_N)
-	    {
+	    else if (eLink1->flags & ELF_eEXPAND_N) {
 		layout->ePadY[PAD_TOP_LEFT] += extraHeight;
 		layout->y = 0;
 		layout->eHeight += extraHeight;
@@ -1544,10 +1467,8 @@ Style_DoLayoutV(
 
 	/* External and internal expansion: S */
 	extraHeight = drawArgs->height - (layout->y + layout->eHeight);
-	if ((extraHeight > 0) && (eLink1->flags & ELF_EXPAND_S))
-	{
-	    if ((eLink1->flags & ELF_EXPAND_S) == ELF_EXPAND_S)
-	    {
+	if ((extraHeight > 0) && (eLink1->flags & ELF_EXPAND_S)) {
+	    if ((eLink1->flags & ELF_EXPAND_S) == ELF_EXPAND_S) {
 		int eExtra = extraHeight / 2;
 		int iExtra = extraHeight - extraHeight / 2;
 
@@ -1561,8 +1482,7 @@ Style_DoLayoutV(
 	    }
 
 	    /* External expansion only: S */
-	    else if (eLink1->flags & ELF_eEXPAND_S)
-	    {
+	    else if (eLink1->flags & ELF_eEXPAND_S) {
 		layout->ePadY[PAD_BOTTOM_RIGHT] += extraHeight;
 		layout->eHeight += extraHeight;
 	    }
@@ -1578,8 +1498,7 @@ Style_DoLayoutV(
     }
 
     /* Add internal padding to display area for -union elements */
-    for (i = 0; i < eLinkCount; i++)
-    {
+    for (i = 0; i < eLinkCount; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1629,8 +1548,7 @@ Layout_Size(
 
     W = 1000000, N = 1000000, E = -1000000, S = -1000000;
 
-    for (i = 0; i < numLayouts; i++)
-    {
+    for (i = 0; i < numLayouts; i++) {
 	struct Layout *layout = &layouts[i];
 	int w, n, e, s;
 	int *ePadX, *iPadX, *uPadX, *ePadY, *iPadY, *uPadY;
@@ -1646,8 +1564,7 @@ Layout_Size(
 	e = layout->x + layout->eWidth - ePadX[PAD_BOTTOM_RIGHT] + MAX(ePadX[PAD_BOTTOM_RIGHT], uPadX[PAD_BOTTOM_RIGHT]);
 	s = layout->y + layout->eHeight - ePadY[PAD_BOTTOM_RIGHT] + MAX(ePadY[PAD_BOTTOM_RIGHT], uPadY[PAD_BOTTOM_RIGHT]);
 
-	if (vertical)
-	{
+	if (vertical) {
 	    N = MIN(N, n);
 	    S = MAX(S, s);
 	    width = MAX(width, e - w);
@@ -1708,8 +1625,7 @@ Style_DoLayoutNeededV(
     eLinks2 = style->elements;
 
     /* Layout elements left-to-right, or top-to-bottom */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1720,8 +1636,7 @@ Style_DoLayoutNeededV(
 
 	/* The size of a -union element is determined by the elements
 	 * it surrounds */
-	if (eLink1->onion != NULL)
-	{
+	if (eLink1->onion != NULL) {
 	    /* I don't need good values because I'm only calculating the
 	     * needed height */
 	    layout->y = layout->iHeight = layout->eHeight = 0;
@@ -1745,8 +1660,7 @@ Style_DoLayoutNeededV(
     }
 
     /* -detach elements */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -1810,8 +1724,7 @@ Style_DoLayout(
 #endif
     Style_DoLayoutH(drawArgs, layouts);
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 	MElementLink *eLink1 = layout->master;
 	IElementLink *eLink2 = layout->eLink;
@@ -1822,8 +1735,7 @@ Style_DoLayout(
 
 	/* The size of a -union element is determined by the elements
 	 * it surrounds */
-	if (eLink1->onion != NULL)
-	{
+	if (eLink1->onion != NULL) {
 	    layout->useHeight = 0;
 	    continue;
 	}
@@ -1849,8 +1761,7 @@ Style_DoLayout(
 	    continue;
 
 	/* Already calculated the height at this width */
-	if (layout->useWidth == eLink2->layoutWidth)
-	{
+	if (layout->useWidth == eLink2->layoutWidth) {
 	    layout->useHeight = eLink2->layoutHeight;
 	    continue;
 	}
@@ -1938,8 +1849,7 @@ Style_NeededSize(
     eLinks1 = masterStyle->elements;
     eLinks2 = style->elements;
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	eLink1 = &eLinks1[i];
@@ -1977,8 +1887,7 @@ Style_NeededSize(
     }
 
     /* Figure out the padding around elements surrounded by -union elements */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 	int first = -1, last = -1;
 
@@ -1990,8 +1899,7 @@ Style_NeededSize(
 	if (eLink1->onion == NULL)
 	    continue;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout))
@@ -2016,8 +1924,7 @@ Style_NeededSize(
 	iPadX = eLink1->iPadX;
 	iPadY = eLink1->iPadY;
 
-	for (j = 0; j < eLink1->onionCount; j++)
-	{
+	for (j = 0; j < eLink1->onionCount; j++) {
 	    struct Layout *layout = &layouts[eLink1->onion[j]];
 
 	    if (IS_HIDDEN(layout))
@@ -2026,8 +1933,7 @@ Style_NeededSize(
 	    uPadX = layout->uPadX;
 	    uPadY = layout->uPadY;
 
-	    if (masterStyle->vertical)
-	    {
+	    if (masterStyle->vertical) {
 		uPadX[PAD_TOP_LEFT] = MAX(uPadX[PAD_TOP_LEFT], iPadX[PAD_TOP_LEFT] + ePadX[PAD_TOP_LEFT]);
 		uPadX[PAD_BOTTOM_RIGHT] = MAX(uPadX[PAD_BOTTOM_RIGHT], iPadX[PAD_BOTTOM_RIGHT] + ePadX[PAD_BOTTOM_RIGHT]);
 		if (j == first) /* topmost */
@@ -2048,8 +1954,7 @@ Style_NeededSize(
     }
 
     /* Layout elements left-to-right, or top-to-bottom */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -2067,8 +1972,7 @@ Style_NeededSize(
 
 	/* The size of a -union element is determined by the elements
 	 * it surrounds */
-	if (eLink1->onion != NULL)
-	{
+	if (eLink1->onion != NULL) {
 	    layout->x = layout->y = layout->eWidth = layout->eHeight = 0;
 	    layout->ePadX[PAD_TOP_LEFT]     = 0;
 	    layout->ePadX[PAD_BOTTOM_RIGHT] = 0;
@@ -2081,8 +1985,7 @@ Style_NeededSize(
 	    continue;
 	}
 
-	if (eLink1->flags & ELF_SQUEEZE_X)
-	{
+	if (eLink1->flags & ELF_SQUEEZE_X) {
 	    if ((eLink1->minWidth >= 0) &&
 		    (eLink1->minWidth <= layout->useWidth)) {
 		squeezeX += layout->useWidth - eLink1->minWidth;
@@ -2090,8 +1993,7 @@ Style_NeededSize(
 		squeezeX += layout->useWidth;
 	    }
 	}
-	if (eLink1->flags & ELF_SQUEEZE_Y)
-	{
+	if (eLink1->flags & ELF_SQUEEZE_Y) {
 	    if ((eLink1->minHeight >= 0) &&
 		    (eLink1->minHeight <= layout->useHeight)) {
 		squeezeY += layout->useHeight - eLink1->minHeight;
@@ -2112,8 +2014,7 @@ Style_NeededSize(
 	layout->eWidth = ePadX[PAD_TOP_LEFT] + layout->iWidth + ePadX[PAD_BOTTOM_RIGHT];
 	layout->eHeight = ePadY[PAD_TOP_LEFT] + layout->iHeight + ePadY[PAD_BOTTOM_RIGHT];
 
-	for (j = 0; j < 2; j++)
-	{
+	for (j = 0; j < 2; j++) {
 	    layout->ePadX[j] = eLink1->ePadX[j];
 	    layout->ePadY[j] = eLink1->ePadY[j];
 	    layout->iPadX[j] = eLink1->iPadX[j];
@@ -2127,8 +2028,7 @@ Style_NeededSize(
     }
 
     /* -detach elements */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -2156,8 +2056,7 @@ Style_NeededSize(
 	layout->eWidth = ePadX[PAD_TOP_LEFT] + layout->iWidth + ePadX[PAD_BOTTOM_RIGHT];
 	layout->eHeight = ePadY[PAD_TOP_LEFT] + layout->iHeight + ePadY[PAD_BOTTOM_RIGHT];
 
-	for (j = 0; j < 2; j++)
-	{
+	for (j = 0; j < 2; j++) {
 	    layout->ePadX[j] = eLink1->ePadX[j];
 	    layout->ePadY[j] = eLink1->ePadY[j];
 	    layout->iPadX[j] = eLink1->iPadX[j];
@@ -2199,8 +2098,7 @@ Style_CheckNeededSize(
     int state			/* STATE_xxx flags. */
     )
 {
-    if (style->neededWidth == -1)
-    {
+    if (style->neededWidth == -1) {
 	int minWidth, minHeight;
 
 	Style_NeededSize(tree, style, state,
@@ -2366,8 +2264,7 @@ TreeStyle_UseHeight(
      */
     if ((drawArgs->width == -1) ||
 	(drawArgs->width >= style->neededWidth + drawArgs->indent) ||
-	(style->neededWidth == minWidth))
-    {
+	(style->neededWidth == minWidth)) {
 	return style->neededHeight;
     }
 
@@ -2469,8 +2366,7 @@ void TreeStyle_Draw(
     args.state = drawArgs->state;
     args.display.drawable = drawArgs->drawable;
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -2490,8 +2386,7 @@ void TreeStyle_Draw(
 	    continue;
 #endif
 
-	if ((layout->useWidth > 0) && (layout->useHeight > 0))
-	{
+	if ((layout->useWidth > 0) && (layout->useHeight > 0)) {
 	    args.elem = layout->eLink->elem;
 	    args.display.x = drawArgs->x + layout->x + layout->ePadX[PAD_TOP_LEFT];
 	    args.display.y = drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT];
@@ -2501,13 +2396,11 @@ void TreeStyle_Draw(
 	    args.display.height = layout->useHeight;
 	    args.display.sticky = layout->master->flags & ELF_STICKY;
 #ifdef DEBUG_DRAW
-	    if (debugDraw)
-	    {
+	    if (debugDraw) {
 		XColor *color[3];
 		GC gc[3];
 
-		if (layout->master->onion != NULL)
-		{
+		if (layout->master->onion != NULL) {
 		    color[0] = Tk_GetColor(tree->interp, tree->tkwin, "blue2");
 		    gc[0] = Tk_GCForColor(color[0], Tk_WindowId(tree->tkwin));
 		    color[1] = Tk_GetColor(tree->interp, tree->tkwin, "blue3");
@@ -2550,8 +2443,7 @@ void TreeStyle_Draw(
 
 #ifdef DEBUG_DRAW
     if (debugDraw)
-	for (i = 0; i < masterStyle->numElements; i++)
-	{
+	for (i = 0; i < masterStyle->numElements; i++) {
 	    struct Layout *layout = &layouts[i];
 
 	    if (IS_HIDDEN(layout))
@@ -2559,8 +2451,7 @@ void TreeStyle_Draw(
 
 	    if (layout->master->onion == NULL)
 		continue;
-	    if (layout->useWidth > 0 && layout->useHeight > 0)
-	    {
+	    if (layout->useWidth > 0 && layout->useHeight > 0) {
 		args.elem = layout->eLink->elem;
 		args.display.x = drawArgs->x + layout->x + layout->ePadX[PAD_TOP_LEFT];
 		args.display.y = drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT];
@@ -2672,8 +2563,7 @@ TreeStyle_UpdateWindowPositions(
     args.state = drawArgs->state;
     args.display.drawable = drawArgs->drawable;
 
-    for (i = 0; i < numElements; i++)
-    {
+    for (i = 0; i < numElements; i++) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -2686,8 +2576,7 @@ TreeStyle_UpdateWindowPositions(
 		drawArgs->state, NULL) == 0)
 	    continue;
 
-	if ((layout->useWidth > 0) && (layout->useHeight > 0))
-	{
+	if ((layout->useWidth > 0) && (layout->useHeight > 0)) {
 	    int requests;
 
 	    TreeDisplay_GetReadyForTrouble(tree, &requests);
@@ -2751,8 +2640,7 @@ TreeStyle_OnScreen(
     args.tree = tree;
     args.screen.visible = onScreen;
 
-    for (i = 0; i < style->master->numElements; i++)
-    {
+    for (i = 0; i < style->master->numElements; i++) {
 	IElementLink *eLink = &style->elements[i];
 
 	if (eLink->elem->typePtr->onScreenProc == NULL)
@@ -2789,8 +2677,7 @@ Element_FreeResources(
     ElementArgs args;
     Tcl_HashEntry *hPtr;
 
-    if (elem->master == NULL)
-    {
+    if (elem->master == NULL) {
 	hPtr = Tcl_FindHashEntry(&tree->elementHash, elem->name);
 	Tcl_DeleteHashEntry(hPtr);
     }
@@ -2925,8 +2812,7 @@ MStyle_FreeResources(
     hPtr = Tcl_FindHashEntry(&tree->styleHash, style->name);
     Tcl_DeleteHashEntry(hPtr);
 
-    if (style->numElements > 0)
-    {
+    if (style->numElements > 0) {
 	for (i = 0; i < style->numElements; i++)
 	    MElementLink_FreeResources(tree, &style->elements[i]);
 #ifdef ALLOC_HAX
@@ -2968,8 +2854,7 @@ IStyle_FreeResources(
     MStyle *masterStyle = style->master;
     int i;
 
-    if (masterStyle->numElements > 0)
-    {
+    if (masterStyle->numElements > 0) {
 	for (i = 0; i < masterStyle->numElements; i++)
 	    IElementLink_FreeResources(tree, &style->elements[i]);
 #ifdef ALLOC_HAX
@@ -3045,11 +2930,9 @@ MStyle_FindElem(
 {
     int i;
 
-    for (i = 0; i < style->numElements; i++)
-    {
+    for (i = 0; i < style->numElements; i++) {
 	MElementLink *eLink = &style->elements[i];
-	if (eLink->elem->name == master->name)
-	{
+	if (eLink->elem->name == master->name) {
 	    if (index != NULL) (*index) = i;
 	    return eLink;
 	}
@@ -3086,11 +2969,9 @@ IStyle_FindElem(
     MStyle *masterStyle = style->master;
     int i;
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	IElementLink *eLink = &style->elements[i];
-	if (eLink->elem->name == master->name)
-	{
+	if (eLink->elem->name == master->name) {
 	    if (index != NULL) (*index) = i;
 	    return eLink;
 	}
@@ -3131,8 +3012,7 @@ TreeStyle_FindElement(
     if (((style->master == NULL) &&
 	    (MStyle_FindElem(tree, masterStyle, elem, index) == NULL)) ||
 	    ((style->master != NULL) &&
-	    (IStyle_FindElem(tree, style, elem, index) == NULL)))
-    {
+	    (IStyle_FindElem(tree, style, elem, index) == NULL))) {
 	FormatResult(tree->interp, "style %s does not use element %s",
 	    style->master ? style->master->name : masterStyle->name,
 	    elem->name);
@@ -3179,8 +3059,7 @@ Element_CreateAndConfig(
     Element *elem;
     ElementArgs args;
 
-    if (masterElem != NULL)
-    {
+    if (masterElem != NULL) {
 	type = masterElem->typePtr;
 	name = masterElem->name;
     }
@@ -3199,8 +3078,7 @@ Element_CreateAndConfig(
     args.elem = elem;
     args.create.item = item;
     args.create.column = column;
-    if ((*type->createProc)(&args) != TCL_OK)
-    {
+    if ((*type->createProc)(&args) != TCL_OK) {
 #ifdef ALLOC_HAX
 	AllocHax_Free(tree->allocData, type->name, (char *) elem, type->size);
 #else
@@ -3210,8 +3088,7 @@ Element_CreateAndConfig(
     }
 
     if (Tk_InitOptions(tree->interp, (char *) elem,
-	type->optionTable, tree->tkwin) != TCL_OK)
-    {
+	type->optionTable, tree->tkwin) != TCL_OK) {
 #ifdef ALLOC_HAX
 	AllocHax_Free(tree->allocData, type->name, (char *) elem, type->size);
 #else
@@ -3224,8 +3101,7 @@ Element_CreateAndConfig(
     args.config.flagSelf = 0;
     args.config.item = item;
     args.config.column = column;
-    if ((*type->configProc)(&args) != TCL_OK)
-    {
+    if ((*type->configProc)(&args) != TCL_OK) {
 	(*type->deleteProc)(&args);
 	Tk_FreeConfigOptions((char *) elem,
 	    type->optionTable,
@@ -3291,11 +3167,9 @@ Style_CreateElem(
 
     if (isNew != NULL) (*isNew) = FALSE;
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	eLink = &style->elements[i];
-	if (eLink->elem == masterElem)
-	{
+	if (eLink->elem == masterElem) {
 	    /* Allocate instance Element here */
 	    break;
 	}
@@ -3356,8 +3230,7 @@ TreeStyle_NewInstance(
     copy->master = style;
     copy->neededWidth = -1;
     copy->neededHeight = -1;
-    if (style->numElements > 0)
-    {
+    if (style->numElements > 0) {
 #ifdef ALLOC_HAX
 	copy->elements = (IElementLink *) AllocHax_CAlloc(tree->allocData,
 		IElementLinkUid, sizeof(IElementLink), style->numElements,
@@ -3367,8 +3240,7 @@ TreeStyle_NewInstance(
 		style->numElements);
 #endif
 	memset(copy->elements, '\0', sizeof(IElementLink) * style->numElements);
-	for (i = 0; i < style->numElements; i++)
-	{
+	for (i = 0; i < style->numElements; i++) {
 	    eLink = &copy->elements[i];
 	    eLink->elem = style->elements[i].elem;
 #ifdef CACHE_ELEM_SIZE
@@ -3409,8 +3281,7 @@ Element_FromObj(
 
     name = Tcl_GetString(obj);
     hPtr = Tcl_FindHashEntry(&tree->elementHash, name);
-    if (hPtr == NULL)
-    {
+    if (hPtr == NULL) {
 	Tcl_AppendResult(tree->interp, "element \"", name, "\" doesn't exist",
 	    NULL);
 	return TCL_ERROR;
@@ -3499,8 +3370,7 @@ TreeStyle_FromObj(
 
     name = Tcl_GetString(obj);
     hPtr = Tcl_FindHashEntry(&tree->styleHash, name);
-    if (hPtr == NULL)
-    {
+    if (hPtr == NULL) {
 	Tcl_AppendResult(tree->interp, "style \"", name, "\" doesn't exist",
 	    NULL);
 	return TCL_ERROR;
@@ -3596,22 +3466,18 @@ Style_Changed(
     IStyle *style;
 
     hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	item = (TreeItem) Tcl_GetHashValue(hPtr);
 	treeColumn = tree->columns;
 	column = TreeItem_GetFirstColumn(tree, item);
 	columnIndex = 0;
 	layout = FALSE;
-	while (column != NULL)
-	{
+	while (column != NULL) {
 	    style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
-	    if ((style != NULL) && (style->master == masterStyle))
-	    {
+	    if ((style != NULL) && (style->master == masterStyle)) {
 #ifdef CACHE_ELEM_SIZE
 		int i;
-		for (i = 0; i < masterStyle->numElements; i++)
-		{
+		for (i = 0; i < masterStyle->numElements; i++) {
 		    IElementLink *eLink = &style->elements[i];
 		    /* This is needed if the -width/-height layout options change */
 		    eLink->neededWidth = eLink->neededHeight = -1;
@@ -3626,8 +3492,7 @@ Style_Changed(
 	    column = TreeItemColumn_GetNext(tree, column);
 	    treeColumn = TreeColumn_Next(treeColumn);
 	}
-	if (layout)
-	{
+	if (layout) {
 	    TreeItem_InvalidateHeight(tree, item);
 	    Tree_FreeItemDInfo(tree, item, NULL);
 	    updateDInfo = TRUE;
@@ -3685,10 +3550,8 @@ MStyle_ChangeElementsAux(
     for (i = 0; i < style->numElements; i++)
 	keep[i] = 0;
 
-    for (i = 0; i < count; i++)
-    {
-	if (map[i] != -1)
-	{
+    for (i = 0; i < count; i++) {
+	if (map[i] != -1) {
 	    eLinks[i] = style->elements[map[i]];
 	    keep[map[i]] = 1;
 	}
@@ -3698,11 +3561,9 @@ MStyle_ChangeElementsAux(
 	}
     }
 
-    if (style->numElements > 0)
-    {
+    if (style->numElements > 0) {
 	/* Free unused ElementLinks */
-	for (i = 0; i < style->numElements; i++)
-	{
+	for (i = 0; i < style->numElements; i++) {
 	    if (!keep[i]) {
 		MElementLink_FreeResources(tree, &style->elements[i]);
 	    }
@@ -3770,10 +3631,8 @@ IStyle_ChangeElementsAux(
     for (i = 0; i < oldCount; i++)
 	keep[i] = 0;
 
-    for (i = 0; i < count; i++)
-    {
-	if (map[i] != -1)
-	{
+    for (i = 0; i < count; i++) {
+	if (map[i] != -1) {
 	    eLinks[i] = style->elements[map[i]];
 	    keep[map[i]] = 1;
 	}
@@ -3787,11 +3646,9 @@ IStyle_ChangeElementsAux(
 	}
     }
 
-    if (oldCount > 0)
-    {
+    if (oldCount > 0) {
 	/* Free unused ElementLinks */
-	for (i = 0; i < oldCount; i++)
-	{
+	for (i = 0; i < oldCount; i++) {
 	    if (!keep[i]) {
 		IElementLink_FreeResources(tree, &style->elements[i]);
 	    }
@@ -3851,8 +3708,7 @@ Style_ChangeElements(
     int i, j, k, oldCount;
 
     /* Update -union lists */
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	MElementLink *eLink = &masterStyle->elements[i];
 	int staticKeep[STATIC_SIZE], *keep = staticKeep;
 	int onionCnt = 0, *onion = NULL;
@@ -3863,17 +3719,14 @@ Style_ChangeElements(
 	STATIC_ALLOC(keep, int, eLink->onionCount);
 
 	/* Check every Element in this -union */
-	for (j = 0; j < eLink->onionCount; j++)
-	{
+	for (j = 0; j < eLink->onionCount; j++) {
 	    MElementLink *eLink2 = &masterStyle->elements[eLink->onion[j]];
 
 	    /* Check the new list of Elements */
 	    keep[j] = -1;
-	    for (k = 0; k < count; k++)
-	    {
+	    for (k = 0; k < count; k++) {
 		/* This new Element is in the -union */
-		if (elemList[k] == eLink2->elem)
-		{
+		if (elemList[k] == eLink2->elem) {
 		    keep[j] = k;
 		    onionCnt++;
 		    break;
@@ -3881,15 +3734,13 @@ Style_ChangeElements(
 	    }
 	}
 
-	if (onionCnt > 0)
-	{
+	if (onionCnt > 0) {
 	    if (onionCnt != eLink->onionCount)
 		onion = (int *) ckalloc(sizeof(int) * onionCnt);
 	    else
 		onion = eLink->onion;
 	    k = 0;
-	    for (j = 0; j < eLink->onionCount; j++)
-	    {
+	    for (j = 0; j < eLink->onionCount; j++) {
 		if (keep[j] != -1)
 		    onion[k++] = keep[j];
 	    }
@@ -3897,8 +3748,7 @@ Style_ChangeElements(
 
 	STATIC_FREE(keep, int, eLink->onionCount);
 
-	if (onionCnt != eLink->onionCount)
-	{
+	if (onionCnt != eLink->onionCount) {
 	    WCFREE(eLink->onion, int, eLink->onionCount);
 	    eLink->onion = onion;
 	    eLink->onionCount = onionCnt;
@@ -3909,18 +3759,15 @@ Style_ChangeElements(
     MStyle_ChangeElementsAux(tree, masterStyle, count, elemList, map);
 
     hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	item = (TreeItem) Tcl_GetHashValue(hPtr);
 	treeColumn = tree->columns;
 	column = TreeItem_GetFirstColumn(tree, item);
 	columnIndex = 0;
 	layout = FALSE;
-	while (column != NULL)
-	{
+	while (column != NULL) {
 	    style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
-	    if ((style != NULL) && (style->master == masterStyle))
-	    {
+	    if ((style != NULL) && (style->master == masterStyle)) {
 		IStyle_ChangeElementsAux(tree, style, oldCount, count, elemList, map);
 		style->neededWidth = style->neededHeight = -1;
 		Tree_InvalidateColumnWidth(tree, treeColumn);
@@ -3931,8 +3778,7 @@ Style_ChangeElements(
 	    column = TreeItemColumn_GetNext(tree, column);
 	    treeColumn = TreeColumn_Next(treeColumn);
 	}
-	if (layout)
-	{
+	if (layout) {
 	    TreeItem_InvalidateHeight(tree, item);
 	    Tree_FreeItemDInfo(tree, item, NULL);
 	    updateDInfo = TRUE;
@@ -3995,22 +3841,18 @@ Style_ElemChanged(
     args.change.flagSelf = 0;
 
     hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	item = (TreeItem) Tcl_GetHashValue(hPtr);
 	treeColumn = tree->columns;
 	column = TreeItem_GetFirstColumn(tree, item);
 	columnIndex = 0;
 	iMask = 0;
-	while (column != NULL)
-	{
+	while (column != NULL) {
 	    cMask = 0;
 	    style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
-	    if ((style != NULL) && (style->master == masterStyle))
-	    {
+	    if ((style != NULL) && (style->master == masterStyle)) {
 		eLink = &style->elements[masterElemIndex];
-		if (eLink->elem == masterElem)
-		{
+		if (eLink->elem == masterElem) {
 #ifdef CACHE_ELEM_SIZE
 		    if (csM & CS_LAYOUT)
 			eLink->neededWidth = eLink->neededHeight = -1;
@@ -4029,14 +3871,12 @@ Style_ElemChanged(
 		    cMask |= eMask;
 		}
 		iMask |= cMask;
-		if (cMask & CS_LAYOUT)
-		{
+		if (cMask & CS_LAYOUT) {
 		    style->neededWidth = style->neededHeight = -1;
 		    Tree_InvalidateColumnWidth(tree, treeColumn);
 		    TreeItemColumn_InvalidateSize(tree, column);
 		}
-		else if (cMask & CS_DISPLAY)
-		{
+		else if (cMask & CS_DISPLAY) {
 		    Tree_InvalidateItemDInfo(tree, treeColumn, item, NULL);
 		}
 	    }
@@ -4044,14 +3884,12 @@ Style_ElemChanged(
 	    column = TreeItemColumn_GetNext(tree, column);
 	    treeColumn = TreeColumn_Next(treeColumn);
 	}
-	if (iMask & CS_LAYOUT)
-	{
+	if (iMask & CS_LAYOUT) {
 	    TreeItem_InvalidateHeight(tree, item);
 	    Tree_FreeItemDInfo(tree, item, NULL);
 	    updateDInfo = TRUE;
 	}
-	else if (iMask & CS_DISPLAY)
-	{
+	else if (iMask & CS_DISPLAY) {
 	}
 	hPtr = Tcl_NextHashEntry(&search);
     }
@@ -4118,17 +3956,14 @@ Style_GetImageOrText(
     IElementLink *eLink;
     int i;
 
-    if (*optionNameObj == NULL)
-    {
+    if (*optionNameObj == NULL) {
 	*optionNameObj = Tcl_NewStringObj(optionName, -1);
 	Tcl_IncrRefCount(*optionNameObj);
     }
 
-    for (i = 0; i < style->master->numElements; i++)
-    {
+    for (i = 0; i < style->master->numElements; i++) {
 	eLink = &style->elements[i];
-	if (ELEMENT_TYPE_MATCHES(eLink->elem->typePtr, typePtr))
-	{
+	if (ELEMENT_TYPE_MATCHES(eLink->elem->typePtr, typePtr)) {
 	    Tcl_Obj *resultObjPtr;
 	    resultObjPtr = Tk_GetOptionValue(tree->interp,
 		(char *) eLink->elem, eLink->elem->typePtr->optionTable,
@@ -4232,17 +4067,14 @@ Style_SetImageOrText(
     IElementLink *eLink;
     int i;
 
-    if (*optionNameObj == NULL)
-    {
+    if (*optionNameObj == NULL) {
 	*optionNameObj = Tcl_NewStringObj(optionName, -1);
 	Tcl_IncrRefCount(*optionNameObj);
     }
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	Element *masterElem = masterStyle->elements[i].elem;
-	if (ELEMENT_TYPE_MATCHES(masterElem->typePtr, typePtr))
-	{
+	if (ELEMENT_TYPE_MATCHES(masterElem->typePtr, typePtr)) {
 	    Tcl_Obj *objv[2];
 	    ElementArgs args;
 
@@ -4371,17 +4203,14 @@ Style_Deleted(
     int columnIndex;
 
     hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	item = (TreeItem) Tcl_GetHashValue(hPtr);
 	treeColumn = tree->columns;
 	column = TreeItem_GetFirstColumn(tree, item);
 	columnIndex = 0;
-	while (column != NULL)
-	{
+	while (column != NULL) {
 	    style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
-	    if ((style != NULL) && (style->master == masterStyle))
-	    {
+	    if ((style != NULL) && (style->master == masterStyle)) {
 		Tree_InvalidateColumnWidth(tree, treeColumn);
 		TreeItemColumn_ForgetStyle(tree, column);
 		TreeItem_InvalidateHeight(tree, item);
@@ -4403,18 +4232,15 @@ Style_Deleted(
 
 #ifdef DEPRECATED
     /* Update -defaultstyle option */
-    if (tree->defaultStyle.stylesObj != NULL)
-    {
+    if (tree->defaultStyle.stylesObj != NULL) {
 	Tcl_Obj *stylesObj = tree->defaultStyle.stylesObj;
-	if (Tcl_IsShared(stylesObj))
-	{
+	if (Tcl_IsShared(stylesObj)) {
 	    stylesObj = Tcl_DuplicateObj(stylesObj);
 	    Tcl_DecrRefCount(tree->defaultStyle.stylesObj);
 	    Tcl_IncrRefCount(stylesObj);
 	    tree->defaultStyle.stylesObj = stylesObj;
 	}
-	for (columnIndex = 0; columnIndex < tree->defaultStyle.numStyles; columnIndex++)
-	{
+	for (columnIndex = 0; columnIndex < tree->defaultStyle.numStyles; columnIndex++) {
 	    Tcl_Obj *emptyObj;
 	    if (tree->defaultStyle.styles[columnIndex] != (TreeStyle) masterStyle)
 		continue;
@@ -4463,14 +4289,11 @@ Element_Changed(
     int i;
 
     hPtr = Tcl_FirstHashEntry(&tree->styleHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	masterStyle = (MStyle *) Tcl_GetHashValue(hPtr);
-	for (i = 0; i < masterStyle->numElements; i++)
-	{
+	for (i = 0; i < masterStyle->numElements; i++) {
 	    eLink = &masterStyle->elements[i];
-	    if (eLink->elem == masterElem)
-	    {
+	    if (eLink->elem == masterElem) {
 		Style_ElemChanged(tree, masterStyle, masterElem, i, flagM, flagT, csM);
 		break;
 	    }
@@ -4509,22 +4332,18 @@ Element_Deleted(
     int i, j;
 
     hPtr = Tcl_FirstHashEntry(&tree->styleHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	masterStyle = (MStyle *) Tcl_GetHashValue(hPtr);
-	for (i = 0; i < masterStyle->numElements; i++)
-	{
+	for (i = 0; i < masterStyle->numElements; i++) {
 	    eLink = &masterStyle->elements[i];
-	    if (eLink->elem == masterElem)
-	    {
+	    if (eLink->elem == masterElem) {
 		Element *staticElemList[STATIC_SIZE], **elemList = staticElemList;
 		int staticElemMap[STATIC_SIZE], *elemMap = staticElemMap;
 
 		STATIC_ALLOC(elemList, Element *, masterStyle->numElements);
 		STATIC_ALLOC(elemMap, int, masterStyle->numElements);
 
-		for (j = 0; j < masterStyle->numElements; j++)
-		{
+		for (j = 0; j < masterStyle->numElements; j++) {
 		    if (j == i)
 			continue;
 		    elemList[(j < i) ? j : (j - 1)] =
@@ -4566,8 +4385,7 @@ Tree_RedrawElement(
     )
 {
     /* Master element */
-    if (elem->master == NULL)
-    {
+    if (elem->master == NULL) {
     }
 
     /* Instance element */
@@ -4594,13 +4412,10 @@ static int IterateItem(Iterate *iter)
 {
     int i;
 
-    while (iter->column != NULL)
-    {
+    while (iter->column != NULL) {
 	iter->style = (IStyle *) TreeItemColumn_GetStyle(iter->tree, iter->column);
-	if (iter->style != NULL)
-	{
-	    for (i = 0; i < iter->style->master->numElements; i++)
-	    {
+	if (iter->style != NULL) {
+	    for (i = 0; i < iter->style->master->numElements; i++) {
 		iter->eLink = &iter->style->elements[i];
 		if (ELEMENT_TYPE_MATCHES(iter->eLink->elem->typePtr, iter->elemTypePtr))
 		    return 1;
@@ -4620,8 +4435,7 @@ TreeIterate Tree_ElementIterateBegin(TreeCtrl *tree, ElementType *elemTypePtr)
     iter->tree = tree;
     iter->elemTypePtr = elemTypePtr;
     iter->hPtr = Tcl_FirstHashEntry(&tree->itemHash, &iter->search);
-    while (iter->hPtr != NULL)
-    {
+    while (iter->hPtr != NULL) {
 	iter->item = (TreeItem) Tcl_GetHashValue(iter->hPtr);
 	iter->column = TreeItem_GetFirstColumn(tree, iter->item);
 	iter->columnIndex = 0;
@@ -4642,8 +4456,7 @@ TreeIterate Tree_ElementIterateNext(TreeIterate iter_)
     if (IterateItem(iter))
 	return iter_;
     iter->hPtr = Tcl_NextHashEntry(&iter->search);
-    while (iter->hPtr != NULL)
-    {
+    while (iter->hPtr != NULL) {
 	iter->item = (TreeItem) Tcl_GetHashValue(iter->hPtr);
 	iter->column = TreeItem_GetFirstColumn(iter->tree, iter->item);
 	iter->columnIndex = 0;
@@ -4686,13 +4499,11 @@ Tree_ElementChangedItself(
     )
 {
     /* Master element. */
-    if (item == NULL)
-    {
+    if (item == NULL) {
 	Element_Changed(tree, elem, flags, 0, csM);
 	return;
     }
-    if (csM & CS_LAYOUT)
-    {
+    if (csM & CS_LAYOUT) {
 	IStyle *style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
 	int i;
 	IElementLink *eLink = NULL;
@@ -4701,8 +4512,7 @@ Tree_ElementChangedItself(
 	if (style == NULL)
 	    panic("Tree_ElementChangedItself but style is NULL\n");
 
-	for (i = 0; i < style->master->numElements; i++)
-	{
+	for (i = 0; i < style->master->numElements; i++) {
 	    eLink = &style->elements[i];
 	    if (eLink->elem == elem)
 		break;
@@ -4737,8 +4547,7 @@ void Tree_ElementIterateChanged(TreeIterate iter_, int mask)
 {
     Iterate *iter = (Iterate *) iter_;
 
-    if (mask & CS_LAYOUT)
-    {
+    if (mask & CS_LAYOUT) {
 #ifdef CACHE_ELEM_SIZE
 	iter->eLink->neededWidth = iter->eLink->neededHeight = -1;
 #endif
@@ -4800,8 +4609,7 @@ TreeStyle_TreeChanged(
     args.change.flagSelf = 0;
 
     hPtr = Tcl_FirstHashEntry(&tree->elementHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	masterElem = (Element *) Tcl_GetHashValue(hPtr);
 	args.elem = masterElem;
 	eMask = (*masterElem->typePtr->changeProc)(&args);
@@ -4847,8 +4655,7 @@ TreeStyle_ElementCget(
 	return TCL_ERROR;
 
     eLink = IStyle_FindElem(tree, style, elem, NULL);
-    if ((eLink != NULL) && (eLink->elem == elem))
-    {
+    if ((eLink != NULL) && (eLink->elem == elem)) {
 	int index = TreeItemColumn_Index(tree, item, column);
 	TreeColumn treeColumn = Tree_FindColumn(tree, index);
 
@@ -4858,8 +4665,7 @@ TreeStyle_ElementCget(
 	    tree->columnPrefix, TreeColumn_GetID(treeColumn));
 	return TCL_ERROR;
     }
-    if (eLink == NULL)
-    {
+    if (eLink == NULL) {
 	FormatResult(tree->interp, "style %s does not use element %s",
 	    style->master->name, elem->name);
 	return TCL_ERROR;
@@ -4913,13 +4719,11 @@ TreeStyle_ElementConfigure(
     if (Element_FromObj(tree, elemObj, &elem) != TCL_OK)
 	return TCL_ERROR;
 
-    if (objc <= 1)
-    {
+    if (objc <= 1) {
 	Tcl_Obj *resultObjPtr;
 
 	eLink = IStyle_FindElem(tree, style, elem, NULL);
-	if ((eLink != NULL) && (eLink->elem == elem))
-	{
+	if ((eLink != NULL) && (eLink->elem == elem)) {
 	    int index = TreeItemColumn_Index(tree, item, column);
 	    TreeColumn treeColumn = Tree_FindColumn(tree, index);
 
@@ -4929,8 +4733,7 @@ TreeStyle_ElementConfigure(
 		tree->columnPrefix, TreeColumn_GetID(treeColumn));
 	    return TCL_ERROR;
 	}
-	if (eLink == NULL)
-	{
+	if (eLink == NULL) {
 	    FormatResult(tree->interp, "style %s does not use element %s",
 		style->master->name, elem->name);
 	    return TCL_ERROR;
@@ -4949,8 +4752,7 @@ TreeStyle_ElementConfigure(
 	int isNew;
 
 	eLink = Style_CreateElem(tree, item, column, style, elem, &isNew);
-	if (eLink == NULL)
-	{
+	if (eLink == NULL) {
 	    FormatResult(tree->interp, "style %s does not use element %s",
 		style->master->name, elem->name);
 	    return TCL_ERROR;
@@ -4959,8 +4761,7 @@ TreeStyle_ElementConfigure(
 	/* Do this before configProc(). If eLink was just allocated and an
 	 * error occurs in configProc() it won't be done */
 	(*eMask) = 0;
-	if (isNew)
-	{
+	if (isNew) {
 #ifdef CACHE_ELEM_SIZE
 	    eLink->neededWidth = eLink->neededHeight = -1;
 #endif
@@ -4983,8 +4784,7 @@ TreeStyle_ElementConfigure(
 	args.change.flagMaster = 0;
 	(*eMask) |= (*elem->typePtr->changeProc)(&args);
 
-	if (!isNew && ((*eMask) & CS_LAYOUT))
-	{
+	if (!isNew && ((*eMask) & CS_LAYOUT)) {
 #ifdef CACHE_ELEM_SIZE
 	    eLink->neededWidth = eLink->neededHeight = -1;
 #endif
@@ -5030,8 +4830,7 @@ TreeStyle_ElementActual(
 	return TCL_ERROR;
 
     eLink = IStyle_FindElem(tree, style, masterElem, NULL);
-    if (eLink == NULL)
-    {
+    if (eLink == NULL) {
 	FormatResult(tree->interp, "style %s does not use element %s",
 	    style->master->name, masterElem->name);
 	return TCL_ERROR;
@@ -5081,27 +4880,22 @@ TreeElementCmd(
     };
     int index;
 
-    if (objc < 3)
-    {
+    if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[2], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
-	case COMMAND_CGET:
-	{
+    switch (index) {
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr = NULL;
 	    Element *elem;
 
-	    if (objc != 5)
-	    {
+	    if (objc != 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name option");
 		return TCL_ERROR;
 	    }
@@ -5115,21 +4909,18 @@ TreeElementCmd(
 	    break;
 	}
 
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    Tcl_Obj *resultObjPtr = NULL;
 	    Element *elem;
 	    int eMask;
 
-	    if (objc < 4)
-	    {
+	    if (objc < 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name ?option? ?value option value ...?");
 		return TCL_ERROR;
 	    }
 	    if (Element_FromObj(tree, objv[3], &elem) != TCL_OK)
 		return TCL_ERROR;
-	    if (objc <= 5)
-	    {
+	    if (objc <= 5) {
 		resultObjPtr = Tk_GetOptionInfo(interp, (char *) elem,
 		    elem->typePtr->optionTable,
 		    (objc == 4) ? (Tcl_Obj *) NULL : objv[4],
@@ -5162,8 +4953,7 @@ TreeElementCmd(
 	    break;
 	}
 
-	case COMMAND_CREATE:
-	{
+	case COMMAND_CREATE: {
 	    char *name;
 	    int length;
 	    int isNew;
@@ -5171,8 +4961,7 @@ TreeElementCmd(
 	    ElementType *typePtr;
 	    Tcl_HashEntry *hPtr;
 
-	    if (objc < 5)
-	    {
+	    if (objc < 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name type ?option value ...?");
 		return TCL_ERROR;
 	    }
@@ -5180,8 +4969,7 @@ TreeElementCmd(
 	    if (!length)
 		return TCL_ERROR;
 	    hPtr = Tcl_FindHashEntry(&tree->elementHash, name);
-	    if (hPtr != NULL)
-	    {
+	    if (hPtr != NULL) {
 		FormatResult(interp, "element \"%s\" already exists", name);
 		return TCL_ERROR;
 	    }
@@ -5196,13 +4984,11 @@ TreeElementCmd(
 	    break;
 	}
 
-	case COMMAND_DELETE:
-	{
+	case COMMAND_DELETE: {
 	    Element *elem;
 	    int i;
 
-	    for (i = 3; i < objc; i++)
-	    {
+	    for (i = 3; i < objc; i++) {
 		if (Element_FromObj(tree, objv[i], &elem) != TCL_OK)
 		    return TCL_ERROR;
 		Element_Deleted(tree, elem);
@@ -5211,22 +4997,19 @@ TreeElementCmd(
 	    break;
 	}
 
-	case COMMAND_NAMES:
-	{
+	case COMMAND_NAMES: {
 	    Tcl_Obj *listObj;
 	    Tcl_HashSearch search;
 	    Tcl_HashEntry *hPtr;
 	    Element *elem;
 
-	    if (objc != 3)
-	    {
+	    if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, NULL);
 		return TCL_ERROR;
 	    }
 	    listObj = Tcl_NewListObj(0, NULL);
 	    hPtr = Tcl_FirstHashEntry(&tree->elementHash, &search);
-	    while (hPtr != NULL)
-	    {
+	    while (hPtr != NULL) {
 		elem = (Element *) Tcl_GetHashValue(hPtr);
 		Tcl_ListObjAppendElement(interp, listObj, Element_ToObj(elem));
 		hPtr = Tcl_NextHashEntry(&search);
@@ -5236,8 +5019,7 @@ TreeElementCmd(
 	}
 
 	/* T element perstate E option stateList */
-	case COMMAND_PERSTATE:
-	{
+	case COMMAND_PERSTATE: {
 	    Element *elem;
 	    int states[3];
 	    ElementArgs args;
@@ -5262,12 +5044,10 @@ TreeElementCmd(
 	    return (*elem->typePtr->actualProc)(&args);
 	}
 
-	case COMMAND_TYPE:
-	{
+	case COMMAND_TYPE: {
 	    Element *elem;
 
-	    if (objc != 4)
-	    {
+	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name");
 		return TCL_ERROR;
 	    }
@@ -5316,8 +5096,7 @@ Style_CreateAndConfig(
     style->name = Tk_GetUid(name);
 
     if (Tk_InitOptions(tree->interp, (char *) style,
-	tree->styleOptionTable, tree->tkwin) != TCL_OK)
-    {
+	tree->styleOptionTable, tree->tkwin) != TCL_OK) {
 #ifdef ALLOC_HAX
 	AllocHax_Free(tree->allocData, MStyleUid, (char *) style, sizeof(MStyle));
 #else
@@ -5328,8 +5107,7 @@ Style_CreateAndConfig(
 
     if (Tk_SetOptions(tree->interp, (char *) style,
 	tree->styleOptionTable, objc, objv, tree->tkwin,
-	NULL, NULL) != TCL_OK)
-    {
+	NULL, NULL) != TCL_OK) {
 	Tk_FreeConfigOptions((char *) style, tree->styleOptionTable, tree->tkwin);
 #ifdef ALLOC_HAX
 	AllocHax_Free(tree->allocData, MStyleUid, (char *) style, sizeof(MStyle));
@@ -5377,8 +5155,7 @@ TreeStyle_ListElements(
 	return;
 
     listObj = Tcl_NewListObj(0, NULL);
-    for (i = 0; i < numElements; i++)
-    {
+    for (i = 0; i < numElements; i++) {
 	if (style->master != NULL) {
 	    elem = style->elements[i].elem;
 	    if (elem->master == NULL)
@@ -5426,8 +5203,7 @@ LayoutOptionToObj(
 {
     Tcl_Interp *interp = tree->interp;
 
-    switch (option)
-    {
+    switch (option) {
 	case OPTION_PADX:
 	    return TreeCtrl_NewPadAmountObj(eLink->ePadX);
 	case OPTION_PADY:
@@ -5438,8 +5214,7 @@ LayoutOptionToObj(
 	    return TreeCtrl_NewPadAmountObj(eLink->iPadY);
 	case OPTION_DETACH:
 	    return Tcl_NewStringObj((eLink->flags & ELF_DETACH) ? "yes" : "no", -1);
-	case OPTION_EXPAND:
-	{
+	case OPTION_EXPAND: {
 	    char flags[4];
 	    int n = 0;
 
@@ -5451,8 +5226,7 @@ LayoutOptionToObj(
 		return Tcl_NewStringObj(flags, n);
 	    break;
 	}
-	case OPTION_iEXPAND:
-	{
+	case OPTION_iEXPAND: {
 	    char flags[6];
 	    int n = 0;
 
@@ -5468,8 +5242,7 @@ LayoutOptionToObj(
 	}
 	case OPTION_INDENT:
 	    return Tcl_NewStringObj((eLink->flags & ELF_INDENT) ? "yes" : "no", -1);
-	case OPTION_SQUEEZE:
-	{
+	case OPTION_SQUEEZE: {
 	    char flags[2];
 	    int n = 0;
 
@@ -5479,8 +5252,7 @@ LayoutOptionToObj(
 		return Tcl_NewStringObj(flags, n);
 	    break;
 	}
-	case OPTION_UNION:
-	{
+	case OPTION_UNION: {
 	    int i;
 	    Tcl_Obj *objPtr;
 
@@ -5492,44 +5264,37 @@ LayoutOptionToObj(
 		    Element_ToObj(style->elements[eLink->onion[i]].elem));
 	    return objPtr;
 	}
-	case OPTION_MAXHEIGHT:
-	{
+	case OPTION_MAXHEIGHT: {
 	    if (eLink->maxHeight >= 0)
 		return Tcl_NewIntObj(eLink->maxHeight);
 	    break;
 	}
-	case OPTION_MINHEIGHT:
-	{
+	case OPTION_MINHEIGHT: {
 	    if (eLink->minHeight >= 0)
 		return Tcl_NewIntObj(eLink->minHeight);
 	    break;
 	}
-	case OPTION_HEIGHT:
-	{
+	case OPTION_HEIGHT: {
 	    if (eLink->fixedHeight >= 0)
 		return Tcl_NewIntObj(eLink->fixedHeight);
 	    break;
 	}
-	case OPTION_MAXWIDTH:
-	{
+	case OPTION_MAXWIDTH: {
 	    if (eLink->maxWidth >= 0)
 		return Tcl_NewIntObj(eLink->maxWidth);
 	    break;
 	}
-	case OPTION_MINWIDTH:
-	{
+	case OPTION_MINWIDTH: {
 	    if (eLink->minWidth >= 0)
 		return Tcl_NewIntObj(eLink->minWidth);
 	    break;
 	}
-	case OPTION_WIDTH:
-	{
+	case OPTION_WIDTH: {
 	    if (eLink->fixedWidth >= 0)
 		return Tcl_NewIntObj(eLink->fixedWidth);
 	    break;
 	}
-	case OPTION_STICKY:
-	{
+	case OPTION_STICKY: {
 	    char flags[4];
 	    int n = 0;
 
@@ -5541,12 +5306,10 @@ LayoutOptionToObj(
 		return Tcl_NewStringObj(flags, n);
 	    break;
 	}
-	case OPTION_DRAW:
-	{
+	case OPTION_DRAW: {
 	    return eLink->draw.obj;
 	}
-	case OPTION_VISIBLE:
-	{
+	case OPTION_VISIBLE: {
 	    return eLink->visible.obj;
 	}
     }
@@ -5592,8 +5355,7 @@ StyleLayoutCmd(
 	"-width", "-visible",
 	(char *) NULL
     };
-    if (objc < 5)
-    {
+    if (objc < 5) {
 	Tcl_WrongNumArgs(interp, 3, objv, "name element ?option? ?value? ?option value ...?");
 	return TCL_ERROR;
     }
@@ -5606,21 +5368,18 @@ StyleLayoutCmd(
 	return TCL_ERROR;
 
     eLink = MStyle_FindElem(tree, style, elem, NULL);
-    if (eLink == NULL)
-    {
+    if (eLink == NULL) {
 	FormatResult(interp, "style %s does not use element %s",
 	    style->name, elem->name);
 	return TCL_ERROR;
     }
 
     /* T style layout S E */
-    if (objc == 5)
-    {
+    if (objc == 5) {
 	Tcl_Obj *listObj = Tcl_NewListObj(0, NULL);
 	Tcl_Obj *objPtr;
 
-	for (i = 0; optionNames[i] != NULL; i++)
-	{
+	for (i = 0; optionNames[i] != NULL; i++) {
 	    Tcl_ListObjAppendElement(interp, listObj,
 		Tcl_NewStringObj(optionNames[i], -1));
 	    objPtr = LayoutOptionToObj(tree, style, eLink, i);
@@ -5632,8 +5391,7 @@ StyleLayoutCmd(
     }
 
     /* T style layout S E option */
-    if (objc == 6)
-    {
+    if (objc == 6) {
 	Tcl_Obj *objPtr;
 
 	if (Tcl_GetIndexFromObj(interp, objv[5], optionNames, "option",
@@ -5647,23 +5405,18 @@ StyleLayoutCmd(
 
     saved = *eLink;
 
-    for (i = 5; i < objc; i += 2)
-    {
-	if (i + 2 > objc)
-	{
+    for (i = 5; i < objc; i += 2) {
+	if (i + 2 > objc) {
 	    FormatResult(interp, "value for \"%s\" missing",
 		Tcl_GetString(objv[i]));
 	    goto badConfig;
 	}
 	if (Tcl_GetIndexFromObj(interp, objv[i], optionNames, "option",
-	    0, &index) != TCL_OK)
-	{
+	    0, &index) != TCL_OK) {
 	    goto badConfig;
 	}
-	switch (index)
-	{
-	    case OPTION_PADX:
-	    {
+	switch (index) {
+	    case OPTION_PADX: {
 		if (TreeCtrl_GetPadAmountFromObj(interp,
 		    tree->tkwin, objv[i + 1],
 		    &eLink->ePadX[PAD_TOP_LEFT],
@@ -5671,8 +5424,7 @@ StyleLayoutCmd(
 		    goto badConfig;
 		break;
 	    }
-	    case OPTION_PADY:
-	    {
+	    case OPTION_PADY: {
 		if (TreeCtrl_GetPadAmountFromObj(interp,
 		    tree->tkwin, objv[i + 1],
 		    &eLink->ePadY[PAD_TOP_LEFT],
@@ -5680,8 +5432,7 @@ StyleLayoutCmd(
 		    goto badConfig;
 		break;
 	    }
-	    case OPTION_iPADX:
-	    {
+	    case OPTION_iPADX: {
 		if (TreeCtrl_GetPadAmountFromObj(interp,
 		    tree->tkwin, objv[i + 1],
 		    &eLink->iPadX[PAD_TOP_LEFT],
@@ -5689,8 +5440,7 @@ StyleLayoutCmd(
 		    goto badConfig;
 		break;
 	    }
-	    case OPTION_iPADY:
-	    {
+	    case OPTION_iPADY: {
 		if (TreeCtrl_GetPadAmountFromObj(interp,
 		    tree->tkwin, objv[i + 1],
 		    &eLink->iPadY[PAD_TOP_LEFT],
@@ -5698,8 +5448,7 @@ StyleLayoutCmd(
 		    goto badConfig;
 		break;
 	    }
-	    case OPTION_DETACH:
-	    {
+	    case OPTION_DETACH: {
 		int detach;
 		if (Tcl_GetBooleanFromObj(interp, objv[i + 1], &detach) != TCL_OK)
 		    goto badConfig;
@@ -5709,22 +5458,18 @@ StyleLayoutCmd(
 		    eLink->flags &= ~ELF_DETACH;
 		break;
 	    }
-	    case OPTION_EXPAND:
-	    {
+	    case OPTION_EXPAND: {
 		char *expand;
 		int len, k;
 		expand = Tcl_GetStringFromObj(objv[i + 1], &len);
 		eLink->flags &= ~ELF_eEXPAND;
-		for (k = 0; k < len; k++)
-		{
-		    switch (expand[k])
-		    {
+		for (k = 0; k < len; k++) {
+		    switch (expand[k]) {
 			case 'w': case 'W': eLink->flags |= ELF_eEXPAND_W; break;
 			case 'n': case 'N': eLink->flags |= ELF_eEXPAND_N; break;
 			case 'e': case 'E': eLink->flags |= ELF_eEXPAND_E; break;
 			case 's': case 'S': eLink->flags |= ELF_eEXPAND_S; break;
-			default:
-			{
+			default: {
 			    Tcl_ResetResult(tree->interp);
 			    Tcl_AppendResult(tree->interp, "bad expand value \"",
 				expand, "\": must be a string ",
@@ -5736,24 +5481,20 @@ StyleLayoutCmd(
 		}
 		break;
 	    }
-	    case OPTION_iEXPAND:
-	    {
+	    case OPTION_iEXPAND: {
 		char *expand;
 		int len, k;
 		expand = Tcl_GetStringFromObj(objv[i + 1], &len);
 		eLink->flags &= ~(ELF_iEXPAND | ELF_iEXPAND_X | ELF_iEXPAND_Y);
-		for (k = 0; k < len; k++)
-		{
-		    switch (expand[k])
-		    {
+		for (k = 0; k < len; k++) {
+		    switch (expand[k]) {
 			case 'x': case 'X': eLink->flags |= ELF_iEXPAND_X; break;
 			case 'y': case 'Y': eLink->flags |= ELF_iEXPAND_Y; break;
 			case 'w': case 'W': eLink->flags |= ELF_iEXPAND_W; break;
 			case 'n': case 'N': eLink->flags |= ELF_iEXPAND_N; break;
 			case 'e': case 'E': eLink->flags |= ELF_iEXPAND_E; break;
 			case 's': case 'S': eLink->flags |= ELF_iEXPAND_S; break;
-			default:
-			{
+			default: {
 			    Tcl_ResetResult(tree->interp);
 			    Tcl_AppendResult(tree->interp, "bad iexpand value \"",
 				expand, "\": must be a string ",
@@ -5765,8 +5506,7 @@ StyleLayoutCmd(
 		}
 		break;
 	    }
-	    case OPTION_INDENT:
-	    {
+	    case OPTION_INDENT: {
 		int indent;
 		if (Tcl_GetBooleanFromObj(interp, objv[i + 1], &indent) != TCL_OK)
 		    goto badConfig;
@@ -5776,20 +5516,16 @@ StyleLayoutCmd(
 		    eLink->flags &= ~ELF_INDENT;
 		break;
 	    }
-	    case OPTION_SQUEEZE:
-	    {
+	    case OPTION_SQUEEZE: {
 		char *string;
 		int len, k;
 		string = Tcl_GetStringFromObj(objv[i + 1], &len);
 		eLink->flags &= ~(ELF_SQUEEZE_X | ELF_SQUEEZE_Y);
-		for (k = 0; k < len; k++)
-		{
-		    switch (string[k])
-		    {
+		for (k = 0; k < len; k++) {
+		    switch (string[k]) {
 			case 'x': case 'X': eLink->flags |= ELF_SQUEEZE_X; break;
 			case 'y': case 'Y': eLink->flags |= ELF_SQUEEZE_Y; break;
-			default:
-			{
+			default: {
 			    Tcl_ResetResult(tree->interp);
 			    Tcl_AppendResult(tree->interp, "bad squeeze value \"",
 				string, "\": must be a string ",
@@ -5801,8 +5537,7 @@ StyleLayoutCmd(
 		}
 		break;
 	    }
-	    case OPTION_UNION:
-	    {
+	    case OPTION_UNION: {
 		int objc1;
 		Tcl_Obj **objv1;
 		int j, k, n, *onion, count = 0;
@@ -5810,10 +5545,8 @@ StyleLayoutCmd(
 		if (Tcl_ListObjGetElements(interp, objv[i + 1],
 		    &objc1, &objv1) != TCL_OK)
 		    goto badConfig;
-		if (objc1 == 0)
-		{
-		    if (eLink->onion != NULL)
-		    {
+		if (objc1 == 0) {
+		    if (eLink->onion != NULL) {
 			if (eLink->onion != saved.onion)
 			    WCFREE(eLink->onion, int, eLink->onionCount);
 			eLink->onionCount = 0;
@@ -5822,28 +5555,24 @@ StyleLayoutCmd(
 		    break;
 		}
 		onion = (int *) ckalloc(sizeof(int) * objc1);
-		for (j = 0; j < objc1; j++)
-		{
+		for (j = 0; j < objc1; j++) {
 		    Element *elem2;
 		    MElementLink *eLink2;
 
-		    if (Element_FromObj(tree, objv1[j], &elem2) != TCL_OK)
-		    {
+		    if (Element_FromObj(tree, objv1[j], &elem2) != TCL_OK) {
 			ckfree((char *) onion);
 			goto badConfig;
 		    }
 
 		    eLink2 = MStyle_FindElem(tree, style, elem2, &n);
-		    if (eLink2 == NULL)
-		    {
+		    if (eLink2 == NULL) {
 			ckfree((char *) onion);
 			FormatResult(interp,
 			    "style %s does not use element %s",
 			    style->name, elem2->name);
 			goto badConfig;
 		    }
-		    if (eLink == eLink2)
-		    {
+		    if (eLink == eLink2) {
 			ckfree((char *) onion);
 			FormatResult(interp,
 			    "element %s can't form union with itself",
@@ -5851,8 +5580,7 @@ StyleLayoutCmd(
 			goto badConfig;
 		    }
 		    /* Silently ignore duplicates */
-		    for (k = 0; k < count; k++)
-		    {
+		    for (k = 0; k < count; k++) {
 			if (onion[k] == n)
 			    break;
 		    }
@@ -5874,17 +5602,14 @@ StyleLayoutCmd(
 		eLink->onionCount = count;
 		break;
 	    }
-	    case OPTION_MAXHEIGHT:
-	    {
+	    case OPTION_MAXHEIGHT: {
 		int height;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->maxHeight = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &height) != TCL_OK) || (height < 0))
-		{
+		    &height) != TCL_OK) || (height < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5892,17 +5617,14 @@ StyleLayoutCmd(
 		eLink->maxHeight = height;
 		break;
 	    }
-	    case OPTION_MINHEIGHT:
-	    {
+	    case OPTION_MINHEIGHT: {
 		int height;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->minHeight = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &height) != TCL_OK) || (height < 0))
-		{
+		    &height) != TCL_OK) || (height < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5910,17 +5632,14 @@ StyleLayoutCmd(
 		eLink->minHeight = height;
 		break;
 	    }
-	    case OPTION_HEIGHT:
-	    {
+	    case OPTION_HEIGHT: {
 		int height;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->fixedHeight = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &height) != TCL_OK) || (height < 0))
-		{
+			&height) != TCL_OK) || (height < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5928,17 +5647,14 @@ StyleLayoutCmd(
 		eLink->fixedHeight = height;
 		break;
 	    }
-	    case OPTION_MAXWIDTH:
-	    {
+	    case OPTION_MAXWIDTH: {
 		int width;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->maxWidth = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &width) != TCL_OK) || (width < 0))
-		{
+		    &width) != TCL_OK) || (width < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5946,17 +5662,14 @@ StyleLayoutCmd(
 		eLink->maxWidth = width;
 		break;
 	    }
-	    case OPTION_MINWIDTH:
-	    {
+	    case OPTION_MINWIDTH: {
 		int width;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->minWidth = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &width) != TCL_OK) || (width < 0))
-		{
+			&width) != TCL_OK) || (width < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5964,17 +5677,14 @@ StyleLayoutCmd(
 		eLink->minWidth = width;
 		break;
 	    }
-	    case OPTION_WIDTH:
-	    {
+	    case OPTION_WIDTH: {
 		int width;
-		if (ObjectIsEmpty(objv[i + 1]))
-		{
+		if (ObjectIsEmpty(objv[i + 1])) {
 		    eLink->fixedWidth = -1;
 		    break;
 		}
 		if ((Tk_GetPixelsFromObj(interp, tree->tkwin, objv[i + 1],
-		    &width) != TCL_OK) || (width < 0))
-		{
+			&width) != TCL_OK) || (width < 0)) {
 		    FormatResult(interp, "bad screen distance \"%s\"",
 			Tcl_GetString(objv[i + 1]));
 		    goto badConfig;
@@ -5982,22 +5692,18 @@ StyleLayoutCmd(
 		eLink->fixedWidth = width;
 		break;
 	    }
-	    case OPTION_STICKY:
-	    {
+	    case OPTION_STICKY: {
 		char *sticky;
 		int len, k;
 		sticky = Tcl_GetStringFromObj(objv[i + 1], &len);
 		eLink->flags &= ~ELF_STICKY;
-		for (k = 0; k < len; k++)
-		{
-		    switch (sticky[k])
-		    {
+		for (k = 0; k < len; k++) {
+		    switch (sticky[k]) {
 			case 'w': case 'W': eLink->flags |= ELF_STICKY_W; break;
 			case 'n': case 'N': eLink->flags |= ELF_STICKY_N; break;
 			case 'e': case 'E': eLink->flags |= ELF_STICKY_E; break;
 			case 's': case 'S': eLink->flags |= ELF_STICKY_S; break;
-			default:
-			{
+			default: {
 			    Tcl_ResetResult(tree->interp);
 			    Tcl_AppendResult(tree->interp, "bad sticky value \"",
 				sticky, "\": must be a string ",
@@ -6010,8 +5716,7 @@ StyleLayoutCmd(
 		break;
 	    }
 	    case OPTION_DRAW:
-	    case OPTION_VISIBLE:
-	    {
+	    case OPTION_VISIBLE: {
 		PerStateInfo *psi, *psiSaved;
 
 		if (index == OPTION_DRAW) {
@@ -6111,26 +5816,21 @@ TreeStyleCmd(
     TreeStyle _style;
     MStyle *style;
 
-    if (objc < 3)
-    {
+    if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "command ?arg arg ...?");
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObj(interp, objv[2], commandNames, "command", 0,
-	&index) != TCL_OK)
-    {
+	&index) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    switch (index)
-    {
-	case COMMAND_CGET:
-	{
+    switch (index) {
+	case COMMAND_CGET: {
 	    Tcl_Obj *resultObjPtr;
 
-	    if (objc != 5)
-	    {
+	    if (objc != 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name option");
 		return TCL_ERROR;
 	    }
@@ -6145,20 +5845,17 @@ TreeStyleCmd(
 	    break;
 	}
 
-	case COMMAND_CONFIGURE:
-	{
+	case COMMAND_CONFIGURE: {
 	    Tcl_Obj *resultObjPtr = NULL;
 
-	    if (objc < 4)
-	    {
+	    if (objc < 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name ?option? ?value option value ...?");
 		return TCL_ERROR;
 	    }
 	    if (TreeStyle_FromObj(tree, objv[3], &_style) != TCL_OK)
 		return TCL_ERROR;
 	    style = (MStyle *) _style;
-	    if (objc <= 5)
-	    {
+	    if (objc <= 5) {
 		resultObjPtr = Tk_GetOptionInfo(interp, (char *) style,
 		    tree->styleOptionTable,
 		    (objc == 4) ? (Tcl_Obj *) NULL : objv[4],
@@ -6178,27 +5875,23 @@ TreeStyleCmd(
 	    break;
 	}
 
-	case COMMAND_CREATE:
-	{
+	case COMMAND_CREATE: {
 	    char *name;
 	    int len;
 	    Tcl_HashEntry *hPtr;
 	    int isNew;
 
-	    if (objc < 4)
-	    {
+	    if (objc < 4) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name ?option value ...?");
 		return TCL_ERROR;
 	    }
 	    name = Tcl_GetStringFromObj(objv[3], &len);
-	    if (!len)
-	    {
+	    if (!len) {
 		FormatResult(interp, "invalid style name \"\"");
 		return TCL_ERROR;
 	    }
 	    hPtr = Tcl_FindHashEntry(&tree->styleHash, name);
-	    if (hPtr != NULL)
-	    {
+	    if (hPtr != NULL) {
 		FormatResult(interp, "style \"%s\" already exists", name);
 		return TCL_ERROR;
 	    }
@@ -6211,17 +5904,14 @@ TreeStyleCmd(
 	    break;
 	}
 
-	case COMMAND_DELETE:
-	{
+	case COMMAND_DELETE: {
 	    int i;
 
-	    if (objc < 3)
-	    {
+	    if (objc < 3) {
 		Tcl_WrongNumArgs(interp, 3, objv, "?name ...?");
 		return TCL_ERROR;
 	    }
-	    for (i = 3; i < objc; i++)
-	    {
+	    for (i = 3; i < objc; i++) {
 		if (TreeStyle_FromObj(tree, objv[i], &_style) != TCL_OK)
 		    return TCL_ERROR;
 		Style_Deleted(tree, (MStyle *) _style);
@@ -6231,39 +5921,33 @@ TreeStyleCmd(
 	}
 
 	/* T style elements S ?{E ...}? */
-	case COMMAND_ELEMENTS:
-	{
+	case COMMAND_ELEMENTS: {
 	    Element *elem, **elemList = NULL;
 	    int i, j, count = 0;
 	    int staticMap[STATIC_SIZE], *map = staticMap;
 	    int listObjc;
 	    Tcl_Obj **listObjv;
 
-	    if (objc < 4 || objc > 5)
-	    {
+	    if (objc < 4 || objc > 5) {
 		Tcl_WrongNumArgs(interp, 3, objv, "name ?elementList?");
 		return TCL_ERROR;
 	    }
 	    if (TreeStyle_FromObj(tree, objv[3], &_style) != TCL_OK)
 		return TCL_ERROR;
 	    style = (MStyle *) _style;
-	    if (objc == 5)
-	    {
+	    if (objc == 5) {
 		if (Tcl_ListObjGetElements(interp, objv[4], &listObjc, &listObjv) != TCL_OK)
 		    return TCL_ERROR;
 		if (listObjc > 0)
 		    elemList = (Element **) ckalloc(sizeof(Element *) * listObjc);
-		for (i = 0; i < listObjc; i++)
-		{
-		    if (Element_FromObj(tree, listObjv[i], &elem) != TCL_OK)
-		    {
+		for (i = 0; i < listObjc; i++) {
+		    if (Element_FromObj(tree, listObjv[i], &elem) != TCL_OK) {
 			ckfree((char *) elemList);
 			return TCL_ERROR;
 		    }
 
 		    /* Ignore duplicate elements */
-		    for (j = 0; j < count; j++)
-		    {
+		    for (j = 0; j < count; j++) {
 			if (elemList[j] == elem)
 			    break;
 		    }
@@ -6279,16 +5963,12 @@ TreeStyleCmd(
 		    map[i] = -1;
 
 		/* Reassigning Elements to a Style */
-		if (style->numElements > 0)
-		{
+		if (style->numElements > 0) {
 		    /* Check each Element */
-		    for (i = 0; i < count; i++)
-		    {
+		    for (i = 0; i < count; i++) {
 			/* See if this Element is already used by the Style */
-			for (j = 0; j < style->numElements; j++)
-			{
-			    if (elemList[i] == style->elements[j].elem)
-			    {
+			for (j = 0; j < style->numElements; j++) {
+			    if (elemList[i] == style->elements[j].elem) {
 				/* Preserve it */
 				map[i] = j;
 				break;
@@ -6307,21 +5987,18 @@ TreeStyleCmd(
 	}
 
 	/* T style layout S E ?option? ?value? ?option value ...? */
-	case COMMAND_LAYOUT:
-	{
+	case COMMAND_LAYOUT: {
 	    return StyleLayoutCmd(clientData, interp, objc, objv);
 	}
 
-	case COMMAND_NAMES:
-	{
+	case COMMAND_NAMES: {
 	    Tcl_Obj *listObj;
 	    Tcl_HashSearch search;
 	    Tcl_HashEntry *hPtr;
 
 	    listObj = Tcl_NewListObj(0, NULL);
 	    hPtr = Tcl_FirstHashEntry(&tree->styleHash, &search);
-	    while (hPtr != NULL)
-	    {
+	    while (hPtr != NULL) {
 		_style = (TreeStyle) Tcl_GetHashValue(hPtr);
 		Tcl_ListObjAppendElement(interp, listObj,
 		    TreeStyle_ToObj(_style));
@@ -6365,8 +6042,7 @@ ButtonMaxWidth(
     PerStateBitmap_MaxSize(tree, &tree->buttonBitmap, &w, &h);
     width = MAX(width, w);
 
-    if (tree->useTheme)
-    {
+    if (tree->useTheme) {
 	if (TreeTheme_GetButtonSize(tree, Tk_WindowId(tree->tkwin),
 	    TRUE, &w, &h) == TCL_OK)
 	    width = MAX(width, w);
@@ -6474,8 +6150,7 @@ TreeStyle_Identify(
 
     Style_DoLayout(drawArgs, layouts, FALSE, __FILE__, __LINE__);
 
-    for (i = style->master->numElements - 1; i >= 0; i--)
-    {
+    for (i = style->master->numElements - 1; i >= 0; i--) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -6483,8 +6158,7 @@ TreeStyle_Identify(
 
 	eLink = layout->eLink;
 	if ((x >= layout->x + layout->ePadX[PAD_TOP_LEFT]) && (x < layout->x + layout->ePadX[PAD_TOP_LEFT] + layout->iWidth) &&
-	    (y >= layout->y + layout->ePadY[PAD_TOP_LEFT]) && (y < layout->y + layout->ePadY[PAD_TOP_LEFT] + layout->iHeight))
-	{
+	    (y >= layout->y + layout->ePadY[PAD_TOP_LEFT]) && (y < layout->y + layout->ePadY[PAD_TOP_LEFT] + layout->iHeight)) {
 	    goto done;
 	}
     }
@@ -6547,8 +6221,7 @@ TreeStyle_Identify2(
 
     Style_DoLayout(drawArgs, layouts, FALSE, __FILE__, __LINE__);
 
-    for (i = style->master->numElements - 1; i >= 0; i--)
-    {
+    for (i = style->master->numElements - 1; i >= 0; i--) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
@@ -6558,8 +6231,7 @@ TreeStyle_Identify2(
 	if ((drawArgs->x + layout->x + layout->ePadX[PAD_TOP_LEFT] < x2) &&
 	    (drawArgs->x + layout->x + layout->ePadX[PAD_TOP_LEFT] + layout->iWidth > x1) &&
 	    (drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT] < y2) &&
-	    (drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT] + layout->iHeight > y1))
-	{
+	    (drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT] + layout->iHeight > y1)) {
 	    Tcl_ListObjAppendElement(drawArgs->tree->interp, listObj,
 		Tcl_NewStringObj(eLink->elem->name, -1));
 	}
@@ -6626,18 +6298,15 @@ TreeStyle_Remap(
     for (i = 0; i < styleFromNumElements; i++)
 	map[i] = -1;
 
-    for (i = 0; i < objc; i += 2)
-    {
+    for (i = 0; i < objc; i += 2) {
 	/* Get the old-style element */
-	if (Element_FromObj(tree, objv[i], &elemFrom) != TCL_OK)
-	{
+	if (Element_FromObj(tree, objv[i], &elemFrom) != TCL_OK) {
 	    result = TCL_ERROR;
 	    goto done;
 	}
 
 	/* Verify the old style uses the element */
-	if (MStyle_FindElem(tree, styleFrom->master, elemFrom, &indexFrom) == NULL)
-	{
+	if (MStyle_FindElem(tree, styleFrom->master, elemFrom, &indexFrom) == NULL) {
 	    FormatResult(tree->interp, "style %s does not use element %s",
 		styleFrom->master->name, elemFrom->name);
 	    result = TCL_ERROR;
@@ -6645,15 +6314,13 @@ TreeStyle_Remap(
 	}
 
 	/* Get the new-style element */
-	if (Element_FromObj(tree, objv[i + 1], &elemTo) != TCL_OK)
-	{
+	if (Element_FromObj(tree, objv[i + 1], &elemTo) != TCL_OK) {
 	    result = TCL_ERROR;
 	    goto done;
 	}
 
 	/* Verify the new style uses the element */
-	if (MStyle_FindElem(tree, styleTo, elemTo, &indexTo) == NULL)
-	{
+	if (MStyle_FindElem(tree, styleTo, elemTo, &indexTo) == NULL) {
 	    FormatResult(tree->interp, "style %s does not use element %s",
 		styleTo->name, elemTo->name);
 	    result = TCL_ERROR;
@@ -6661,8 +6328,7 @@ TreeStyle_Remap(
 	}
 
 	/* Must be the same type */
-	if (elemFrom->typePtr != elemTo->typePtr)
-	{
+	if (elemFrom->typePtr != elemTo->typePtr) {
 	    FormatResult(tree->interp, "can't map element type %s to %s",
 		elemFrom->typePtr->name, elemTo->typePtr->name);
 	    result = TCL_ERROR;
@@ -6671,36 +6337,31 @@ TreeStyle_Remap(
 
 	/* See if the instance style has any info for this element */
 	eLink = &styleFrom->elements[indexFrom];
-	if (eLink->elem->master != NULL)
-	{
+	if (eLink->elem->master != NULL) {
 	    map[indexFrom] = indexTo;
 	    elemMap[indexFrom] = eLink->elem;
 	}
     }
 
-    for (i = 0; i < styleFromNumElements; i++)
-    {
+    for (i = 0; i < styleFromNumElements; i++) {
 	eLink = &styleFrom->elements[i];
 	indexTo = map[i];
 
 	/* Free info for any Elements not being remapped */
-	if ((indexTo == -1) && (eLink->elem->master != NULL))
-	{
+	if ((indexTo == -1) && (eLink->elem->master != NULL)) {
 	    elemFrom = eLink->elem->master;
 	    Element_FreeResources(tree, eLink->elem);
 	    eLink->elem = elemFrom;
 	}
 
 	/* Remap this Element */
-	if (indexTo != -1)
-	{
+	if (indexTo != -1) {
 	    elemMap[i]->master = styleTo->elements[indexTo].elem;
 	    elemMap[i]->name = styleTo->elements[indexTo].elem->name;
 	}
     }
 
-    if (styleFromNumElements != styleTo->numElements)
-    {
+    if (styleFromNumElements != styleTo->numElements) {
 #ifdef ALLOC_HAX
 	if (styleFromNumElements > 0)
 	    AllocHax_CFree(tree->allocData, IElementLinkUid,
@@ -6717,16 +6378,14 @@ TreeStyle_Remap(
 #endif
 	memset(styleFrom->elements, '\0', sizeof(IElementLink) * styleTo->numElements);
     }
-    for (i = 0; i < styleTo->numElements; i++)
-    {
+    for (i = 0; i < styleTo->numElements; i++) {
 	styleFrom->elements[i].elem = styleTo->elements[i].elem;
 #ifdef CACHE_ELEM_SIZE
 	styleFrom->elements[i].neededWidth = -1;
 	styleFrom->elements[i].neededHeight = -1;
 #endif
     }
-    for (i = 0; i < styleFromNumElements; i++)
-    {
+    for (i = 0; i < styleFromNumElements; i++) {
 	indexTo = map[i];
 	if (indexTo != -1)
 	    styleFrom->elements[indexTo].elem = elemMap[i];
@@ -6773,10 +6432,8 @@ TreeStyle_GetSortData(
     IElementLink *eLink = style->elements;
     int i;
 
-    if (elemIndex == -1)
-    {
-	for (i = 0; i < style->master->numElements; i++)
-	{
+    if (elemIndex == -1) {
+	for (i = 0; i < style->master->numElements; i++) {
 	    if (ELEMENT_TYPE_MATCHES(eLink->elem->typePtr, &elemTypeText))
 		return Element_GetSortData(tree, eLink->elem, type, lv, dv, sv);
 	    eLink++;
@@ -6829,14 +6486,12 @@ TreeStyle_ValidateElements(
     MElementLink *eLink;
     int i;
 
-    for (i = 0; i < objc; i++)
-    {
+    for (i = 0; i < objc; i++) {
 	if (Element_FromObj(tree, objv[i], &elem) != TCL_OK)
 	    return TCL_ERROR;
 
 	eLink = MStyle_FindElem(tree, master, elem, NULL);
-	if (eLink == NULL)
-	{
+	if (eLink == NULL) {
 	    FormatResult(tree->interp,
 		"style %s does not use element %s",
 		master->name, elem->name);
@@ -6882,17 +6537,14 @@ TreeStyle_GetElemRects(
 
     STATIC_ALLOC(elems, Element *, objc);
 
-    for (j = 0; j < objc; j++)
-    {
-	if (Element_FromObj(drawArgs->tree, objv[j], &elems[j]) != TCL_OK)
-	{
+    for (j = 0; j < objc; j++) {
+	if (Element_FromObj(drawArgs->tree, objv[j], &elems[j]) != TCL_OK) {
 	    count = -1;
 	    goto done;
 	}
 
 	eLink = MStyle_FindElem(drawArgs->tree, master, elems[j], NULL);
-	if (eLink == NULL)
-	{
+	if (eLink == NULL) {
 	    FormatResult(drawArgs->tree->interp,
 		"style %s does not use element %s",
 		master->name, elems[j]->name);
@@ -6917,15 +6569,13 @@ TreeStyle_GetElemRects(
 
     Style_DoLayout(drawArgs, layouts, FALSE, __FILE__, __LINE__);
 
-    for (i = master->numElements - 1; i >= 0; i--)
-    {
+    for (i = master->numElements - 1; i >= 0; i--) {
 	struct Layout *layout = &layouts[i];
 
 	if (IS_HIDDEN(layout))
 	    continue;
 
-	if (objc > 0)
-	{
+	if (objc > 0) {
 	    for (j = 0; j < objc; j++)
 		if (elems[j] == layout->eLink->elem ||
 		    elems[j] == layout->master->elem)
@@ -6935,8 +6585,7 @@ TreeStyle_GetElemRects(
 	}
 	rects[count].x = drawArgs->x + layout->x + layout->ePadX[PAD_TOP_LEFT];
 	rects[count].y = drawArgs->y + layout->y + layout->ePadY[PAD_TOP_LEFT];
-	if (layout->master->onion == NULL)
-	{
+	if (layout->master->onion == NULL) {
 	    rects[count].x += layout->iPadX[PAD_TOP_LEFT];
 	    rects[count].y += layout->iPadY[PAD_TOP_LEFT];
 	    rects[count].width = layout->useWidth;
@@ -6976,7 +6625,7 @@ done:
 int
 TreeStyle_ChangeState(
     TreeCtrl *tree,		/* Widget info. */
-    TreeStyle style_,		/* This instance style. */
+    TreeStyle style_,		/* The instance style. */
     int state1,			/* The previous state. */
     int state2			/* The current state. */
     )
@@ -6994,8 +6643,7 @@ TreeStyle_ChangeState(
 
     args.tree = tree;
 
-    for (i = 0; i < masterStyle->numElements; i++)
-    {
+    for (i = 0; i < masterStyle->numElements; i++) {
 	eLink2 = &style->elements[i];
 	args.elem = eLink2->elem;
 	args.states.state1 = state1;
@@ -7006,6 +6654,8 @@ TreeStyle_ChangeState(
 	eLink1 = &masterStyle->elements[i];
 	undisplay = FALSE;
 	eMask = 0;
+
+	/* Check for the style layout option -draw changing. */
 	if (eLink1->draw.count > 0) {
 	    args.states.draw1 = PerStateBoolean_ForState(tree,
 		    &eLink1->draw, state1, NULL) != 0;
@@ -7017,6 +6667,8 @@ TreeStyle_ChangeState(
 		    undisplay = TRUE;
 	    }
 	}
+
+	/* Check for the style layout option -visible changing. */
 	if (eLink1->visible.count > 0) {
 	    args.states.visible1 = PerStateBoolean_ForState(tree,
 		    &eLink1->visible, state1, NULL) != 0;
@@ -7030,19 +6682,19 @@ TreeStyle_ChangeState(
 	    }
 	}
 
+	/* Tell the element about the state change. */
 	eMask |= (*args.elem->typePtr->stateProc)(&args);
 
 	/* Hack: If a window element becomes hidden, then tell it it is
-	* not onscreen, otherwise it will never be "drawn" in the
-	* hidden state. */
+	 * not onscreen, otherwise it will never be "drawn" in the
+	 * hidden state. */
 	if (undisplay && ELEMENT_TYPE_MATCHES(args.elem->typePtr,
 		&elemTypeWindow)) {
 	    args.screen.visible = FALSE;
 	    (*args.elem->typePtr->onScreenProc)(&args);
 	}
 
-	if (eMask)
-	{
+	if (eMask) {
 #ifdef CACHE_ELEM_SIZE
 	    if (eMask & CS_LAYOUT)
 		eLink2->neededWidth = eLink2->neededHeight = -1;
@@ -7095,12 +6747,12 @@ Tree_UndefineState(
     int i, columnIndex;
     ElementArgs args;
 
+    /* Undefine the state for the -draw and -visible style layout
+     * options for each element of this style. */
     hPtr = Tcl_FirstHashEntry(&tree->styleHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	MStyle *masterStyle = (MStyle *) Tcl_GetHashValue(hPtr);
-	for (i = 0; i < masterStyle->numElements; i++)
-	{
+	for (i = 0; i < masterStyle->numElements; i++) {
 	    MElementLink *eLink1 = &masterStyle->elements[i];
 	    PerStateInfo_Undefine(tree, &pstBoolean, &eLink1->draw, state);
 	    PerStateInfo_Undefine(tree, &pstBoolean, &eLink1->visible, state);
@@ -7112,18 +6764,14 @@ Tree_UndefineState(
     args.state = state;
 
     hPtr = Tcl_FirstHashEntry(&tree->itemHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	item = (TreeItem) Tcl_GetHashValue(hPtr);
 	column = TreeItem_GetFirstColumn(tree, item);
 	columnIndex = 0;
-	while (column != NULL)
-	{
+	while (column != NULL) {
 	    IStyle *style = (IStyle *) TreeItemColumn_GetStyle(tree, column);
-	    if (style != NULL)
-	    {
-		for (i = 0; i < style->master->numElements; i++)
-		{
+	    if (style != NULL) {
+		for (i = 0; i < style->master->numElements; i++) {
 		    eLink = &style->elements[i];
 		    /* Instance element */
 		    if (eLink->elem->master != NULL) {
@@ -7149,8 +6797,7 @@ Tree_UndefineState(
     Tree_DInfoChanged(tree, DINFO_REDO_RANGES);
 
     hPtr = Tcl_FirstHashEntry(&tree->elementHash, &search);
-    while (hPtr != NULL)
-    {
+    while (hPtr != NULL) {
 	args.elem = (Element *) Tcl_GetHashValue(hPtr);
 	(*args.elem->typePtr->undefProc)(&args);
 	hPtr = Tcl_NextHashEntry(&search);
@@ -7207,7 +6854,8 @@ TreeStyle_Init(
     TreeCtrl *tree		/* Widget info. */
     )
 {
-    tree->styleOptionTable = Tk_CreateOptionTable(tree->interp, styleOptionSpecs); 
+    tree->styleOptionTable = Tk_CreateOptionTable(tree->interp,
+	styleOptionSpecs); 
     return TCL_OK;
 }
 
@@ -7237,8 +6885,7 @@ TreeStyle_Free(
     Element *elem;
     TreeStyle style;
 
-    while (1)
-    {
+    while (1) {
 	hPtr = Tcl_FirstHashEntry(&tree->styleHash, &search);
 	if (hPtr == NULL)
 	    break;
@@ -7246,8 +6893,7 @@ TreeStyle_Free(
 	TreeStyle_FreeResources(tree, style);
     }
 
-    while (1)
-    {
+    while (1) {
 	hPtr = Tcl_FirstHashEntry(&tree->elementHash, &search);
 	if (hPtr == NULL)
 	    break;
diff --git a/generic/tkTreeTheme.c b/generic/tkTreeTheme.c
index b573c11..bfa8734 100644
--- a/generic/tkTreeTheme.c
+++ b/generic/tkTreeTheme.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeTheme.c,v 1.18 2006/12/04 00:20:38 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeTheme.c,v 1.19 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #ifdef WIN32
@@ -146,8 +146,7 @@ LoadXPThemeProcs(HINSTANCE *phlib)
 	 */
 	HINSTANCE handle;
 	*phlib = handle = LoadLibrary("uxtheme.dll");
-	if (handle != 0)
-	{
+	if (handle != 0) {
 	    /*
 	     * We have successfully loaded the library. Proceed in storing the
 	     * addresses of the functions we want to use.
@@ -171,8 +170,7 @@ LoadXPThemeProcs(HINSTANCE *phlib)
 		&& LOADPROC(IsThemeActive)
 		&& LOADPROC(IsThemePartDefined)
 		&& LOADPROC(IsThemeBackgroundPartiallyTransparent)
-	    )
-	    {
+	    ) {
 		return procs;
 	    }
 #undef LOADPROC
@@ -194,8 +192,7 @@ int TreeTheme_DrawHeaderItem(TreeCtrl *tree, Drawable drawable, int state,
     int iPartId = HP_HEADERITEM;
     int iStateId = HIS_NORMAL;
 
-    switch (state)
-    {
+    switch (state) {
 	case COLUMN_STATE_ACTIVE:  iStateId = HIS_HOT; break;
 	case COLUMN_STATE_PRESSED: iStateId = HIS_PRESSED; break;
     }
@@ -211,8 +208,7 @@ int TreeTheme_DrawHeaderItem(TreeCtrl *tree, Drawable drawable, int state,
     if (!procs->IsThemePartDefined(
 	hTheme,
 	iPartId,
-	iStateId))
-    {
+	iStateId)) {
 	return TCL_ERROR;
     }
 #endif
@@ -226,8 +222,7 @@ int TreeTheme_DrawHeaderItem(TreeCtrl *tree, Drawable drawable, int state,
     if (procs->IsThemeBackgroundPartiallyTransparent(
 	hTheme,
 	iPartId,
-	iStateId))
-    {
+	iStateId)) {
 #if 1
 	/* What color should I use? */
 	Tk_Fill3DRectangle(tree->tkwin, drawable, tree->border, x, y, width, height, 0, TK_RELIEF_FLAT);
@@ -302,8 +297,7 @@ int TreeTheme_GetHeaderContentMargins(TreeCtrl *tree, int state, int arrow, int
     int iPartId = HP_HEADERITEM;
     int iStateId = HIS_NORMAL;
 
-    switch (state)
-    {
+    switch (state) {
 	case COLUMN_STATE_ACTIVE:  iStateId = HIS_HOT; break;
 	case COLUMN_STATE_PRESSED: iStateId = HIS_PRESSED; break;
     }
@@ -397,8 +391,7 @@ int TreeTheme_DrawHeaderArrow(TreeCtrl *tree, Drawable drawable, int up,
     if (!procs->IsThemePartDefined(
 	hTheme,
 	iPartId,
-	iStateId))
-    {
+	iStateId)) {
 	return TCL_ERROR;
     }
 
@@ -446,8 +439,7 @@ int TreeTheme_DrawButton(TreeCtrl *tree, Drawable drawable, int open,
     if (!procs->IsThemePartDefined(
 	hTheme,
 	iPartId,
-	iStateId))
-    {
+	iStateId)) {
 	return TCL_ERROR;
     }
 #endif
@@ -506,8 +498,7 @@ int TreeTheme_GetButtonSize(TreeCtrl *tree, Drawable drawable, int open,
     if (!procs->IsThemePartDefined(
 	hTheme,
 	iPartId,
-	iStateId))
-    {
+	iStateId)) {
 	return TCL_ERROR;
     }
 #endif
@@ -715,8 +706,7 @@ int TreeTheme_InitInterp(Tcl_Interp *interp)
     Tcl_MutexLock(&themeMutex);
 
     /* This is done once per-application */
-    if (appThemeData == NULL)
-    {
+    if (appThemeData == NULL) {
 	appThemeData = (XPThemeData *) ckalloc(sizeof(XPThemeData));
 	appThemeData->procs = LoadXPThemeProcs(&appThemeData->hlibrary);
 	appThemeData->registered = FALSE;
@@ -1092,8 +1082,7 @@ int TreeTheme_DrawHeaderItem(TreeCtrl *tree, Drawable drawable, int state, int a
 
     box = Ttk_MakeBox(x, y, width, height);
 
-    switch (state)
-    {
+    switch (state) {
 	case COLUMN_STATE_ACTIVE:  ttk_state = TTK_STATE_ACTIVE; break;
 	case COLUMN_STATE_PRESSED: ttk_state = TTK_STATE_PRESSED; break;
     }
diff --git a/generic/tkTreeUtils.c b/generic/tkTreeUtils.c
index b19a2ac..3645e9b 100644
--- a/generic/tkTreeUtils.c
+++ b/generic/tkTreeUtils.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2002-2006 Tim Baker
  *
- * RCS: @(#) $Id: tkTreeUtils.c,v 1.60 2006/12/06 01:24:30 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeUtils.c,v 1.61 2006/12/22 22:33:00 treectrl Exp $
  */
 
 #include "tkTreeCtrl.h"
@@ -159,14 +159,12 @@ Ellipsis(
 	&pixels);
 
     /* The whole string fits. No ellipsis needed (unless forced) */
-    if ((bytesThatFit == numBytes) && !force)
-    {
+    if ((bytesThatFit == numBytes) && !force) {
 	(*maxPixels) = pixels;
 	return numBytes;
     }
 
-    if (bytesThatFit <= 1)
-    {
+    if (bytesThatFit <= 1) {
 	(*maxPixels) = pixels;
 	return -bytesThatFit;
     }
@@ -179,14 +177,12 @@ Ellipsis(
     if (bytesTest + ellipsisNumBytes > sizeof(staticStr))
 	tmpStr = ckalloc(bytesTest + ellipsisNumBytes);
     memcpy(tmpStr, string, bytesTest);
-    while (bytesTest > 0)
-    {
+    while (bytesTest > 0) {
 	memcpy(tmpStr + bytesTest, ellipsis, ellipsisNumBytes);
 	numBytes = Tk_MeasureChars(tkfont, tmpStr,
 	    bytesTest + ellipsisNumBytes,
 	    *maxPixels, 0, &pixelsTest);
-	if (numBytes == bytesTest + ellipsisNumBytes)
-	{
+	if (numBytes == bytesTest + ellipsisNumBytes) {
 	    (*maxPixels) = pixelsTest;
 	    if (tmpStr != staticStr)
 		ckfree(tmpStr);
@@ -242,8 +238,7 @@ HDotLine(
     oldPen = SelectObject(dc, pen);
 
     nw = !(wx & 1) == !(wy & 1);
-    for (x1 += !nw; x1 < x2; x1 += 2)
-    {
+    for (x1 += !nw; x1 < x2; x1 += 2) {
 	MoveToEx(dc, x1, y1, NULL);
 	LineTo(dc, x1 + 1, y1);
     }
@@ -258,8 +253,7 @@ HDotLine(
     int wy = y1 + tree->drawableYOrigin;
 
     nw = !(wx & 1) == !(wy & 1);
-    for (x1 += !nw; x1 < x2; x1 += 2)
-    {
+    for (x1 += !nw; x1 < x2; x1 += 2) {
 	XDrawPoint(tree->display, drawable, gc, x1, y1);
     }
 #endif
@@ -303,8 +297,7 @@ VDotLine(
     oldPen = SelectObject(dc, pen);
 
     nw = !(wx & 1) == !(wy & 1);
-    for (y1 += !nw; y1 < y2; y1 += 2)
-    {
+    for (y1 += !nw; y1 < y2; y1 += 2) {
 	MoveToEx(dc, x1, y1, NULL);
 	LineTo(dc, x1 + 1, y1);
     }
@@ -319,8 +312,7 @@ VDotLine(
     int wy = y1 + tree->drawableYOrigin;
 
     nw = !(wx & 1) == !(wy & 1);
-    for (y1 += !nw; y1 < y2; y1 += 2)
-    {
+    for (y1 += !nw; y1 < y2; y1 += 2) {
 	XDrawPoint(tree->display, drawable, gc, x1, y1);
     }
 #endif
@@ -380,32 +372,28 @@ DrawActiveOutline(
 
     if (w) /* left */
     {
-	for (i = !nw; i < height; i += 2)
-	{
+	for (i = !nw; i < height; i += 2) {
 	    MoveToEx(dc, x, y + i, NULL);
 	    LineTo(dc, x + 1, y + i);
 	}
     }
     if (n) /* top */
     {
-	for (i = nw ? w * 2 : 1; i < width; i += 2)
-	{
+	for (i = nw ? w * 2 : 1; i < width; i += 2) {
 	    MoveToEx(dc, x + i, y, NULL);
 	    LineTo(dc, x + i + 1, y);
 	}
     }
     if (e) /* right */
     {
-	for (i = ne ? n * 2 : 1; i < height; i += 2)
-	{
+	for (i = ne ? n * 2 : 1; i < height; i += 2) {
 	    MoveToEx(dc, x + width - 1, y + i, NULL);
 	    LineTo(dc, x + width, y + i);
 	}
     }
     if (s) /* bottom */
     {
-	for (i = sw ? w * 2 : 1; i < width - (se && e); i += 2)
-	{
+	for (i = sw ? w * 2 : 1; i < width - (se && e); i += 2) {
 	    MoveToEx(dc, x + i, y + height - 1, NULL);
 	    LineTo(dc, x + i + 1, y + height - 1);
 	}
@@ -441,29 +429,25 @@ DrawActiveOutline(
 
     if (w) /* left */
     {
-	for (i = !nw; i < height; i += 2)
-	{
+	for (i = !nw; i < height; i += 2) {
 	    XDrawPoint(tree->display, drawable, gc, x, y + i);
 	}
     }
     if (n) /* top */
     {
-	for (i = nw ? w * 2 : 1; i < width; i += 2)
-	{
+	for (i = nw ? w * 2 : 1; i < width; i += 2) {
 	    XDrawPoint(tree->display, drawable, gc, x + i, y);
 	}
     }
     if (e) /* right */
     {
-	for (i = ne ? n * 2 : 1; i < height; i += 2)
-	{
+	for (i = ne ? n * 2 : 1; i < height; i += 2) {
 	    XDrawPoint(tree->display, drawable, gc, x + width - 1, y + i);
 	}
     }
     if (s) /* bottom */
     {
-	for (i = sw ? w * 2 : 1; i < width - (se && e); i += 2)
-	{
+	for (i = sw ? w * 2 : 1; i < width - (se && e); i += 2) {
 	    XDrawPoint(tree->display, drawable, gc, x + i, y + height - 1);
 	}
     }
@@ -646,23 +630,19 @@ DotRect_Draw(
     sw = !(wx & 1) == !((wy + height - 1) & 1);
     se = !((wx + width - 1) & 1) == !((wy + height - 1) & 1);
 
-    for (i = !nw; i < height; i += 2)
-    {
+    for (i = !nw; i < height; i += 2) {
 	MoveToEx(dc, x, y + i, NULL);
 	LineTo(dc, x + 1, y + i);
     }
-    for (i = nw ? 2 : 1; i < width; i += 2)
-    {
+    for (i = nw ? 2 : 1; i < width; i += 2) {
 	MoveToEx(dc, x + i, y, NULL);
 	LineTo(dc, x + i + 1, y);
     }
-    for (i = ne ? 2 : 1; i < height; i += 2)
-    {
+    for (i = ne ? 2 : 1; i < height; i += 2) {
 	MoveToEx(dc, x + width - 1, y + i, NULL);
 	LineTo(dc, x + width, y + i);
     }
-    for (i = sw ? 2 : 1; i < width - se; i += 2)
-    {
+    for (i = sw ? 2 : 1; i < width - se; i += 2) {
 	MoveToEx(dc, x + i, y + height - 1, NULL);
 	LineTo(dc, x + i + 1, y + height - 1);
     }
@@ -683,23 +663,19 @@ DotRect_Draw(
     x += macWin->xOff;
     y += macWin->yOff;
 
-    for (i = !nw; i < height; i += 2)
-    {
+    for (i = !nw; i < height; i += 2) {
 	MoveTo(x, y + i);
 	LineTo(x, y + i);
     }
-    for (i = nw ? 2 : 1; i < width; i += 2)
-    {
+    for (i = nw ? 2 : 1; i < width; i += 2) {
 	MoveTo(x + i, y);
 	LineTo(x + i, y);
     }
-    for (i = ne ? 2 : 1; i < height; i += 2)
-    {
+    for (i = ne ? 2 : 1; i < height; i += 2) {
 	MoveTo(x + width, y + i);
 	LineTo(x + width, y + i);
     }
-    for (i = sw ? 2 : 1; i < width - se; i += 2)
-    {
+    for (i = sw ? 2 : 1; i < width - se; i += 2) {
 	MoveTo(x + i, y + height - 1);
 	LineTo(x + i, y + height - 1);
     }
@@ -1483,8 +1459,7 @@ static LayoutChunk *NewChunk(LayoutInfo **layoutPtrPtr, int *maxPtr,
 
     layoutPtr = *layoutPtrPtr;
 #ifdef TEXTLAYOUT_ALLOCHAX
-    if (layoutPtr->numChunks == layoutPtr->maxChunks)
-    {
+    if (layoutPtr->numChunks == layoutPtr->maxChunks) {
 	layoutPtr->maxChunks *= 2;
 	s = sizeof(LayoutInfo) + ((layoutPtr->maxChunks - 1) * sizeof(LayoutChunk));
 	layoutPtr = (LayoutInfo *) ckrealloc((char *) layoutPtr, s);
@@ -1493,8 +1468,7 @@ static LayoutChunk *NewChunk(LayoutInfo **layoutPtrPtr, int *maxPtr,
     }
 #else
     maxChunks = *maxPtr;
-    if (layoutPtr->numChunks == maxChunks)
-    {
+    if (layoutPtr->numChunks == maxChunks) {
 	maxChunks *= 2;
 	s = sizeof(LayoutInfo) + ((maxChunks - 1) * sizeof(LayoutChunk));
 	layoutPtr = (LayoutInfo *) ckrealloc((char *) layoutPtr, s);
@@ -1560,8 +1534,7 @@ TextLayout TextLayout_Compute(
 
 #ifdef TEXTLAYOUT_ALLOCHAX
     Tcl_MutexLock(&textLayoutMutex);
-    if (freeLayoutInfo != NULL)
-    {
+    if (freeLayoutInfo != NULL) {
 	layoutPtr = freeLayoutInfo;
 	freeLayoutInfo = layoutPtr->nextFree;
     }
@@ -1594,19 +1567,14 @@ TextLayout TextLayout_Compute(
 
     flags &= TK_WHOLE_WORDS | TK_IGNORE_TABS | TK_IGNORE_NEWLINES;
     flags |= TK_AT_LEAST_ONE;
-    for (start = string; start < end;)
-    {
-	if (start >= special)
-	{
-	    for (special = start; special < end; special++)
-	    {
-		if (!(flags & TK_IGNORE_NEWLINES))
-		{
+    for (start = string; start < end;) {
+	if (start >= special) {
+	    for (special = start; special < end; special++) {
+		if (!(flags & TK_IGNORE_NEWLINES)) {
 		    if ((*special == '\n') || (*special == '\r'))
 			break;
 		}
-		if (!(flags & TK_IGNORE_TABS))
-		{
+		if (!(flags & TK_IGNORE_TABS)) {
 		    if (*special == '\t')
 			break;
 		}
@@ -1614,14 +1582,12 @@ TextLayout TextLayout_Compute(
 	}
 
 	chunkPtr = NULL;
-	if (start < special)
-	{
+	if (start < special) {
 	    bytesThisChunk = Tk_MeasureChars(tkfont, start, special - start,
 		wrapLength - curX, flags, &newX);
 	    newX += curX;
 	    flags &= ~TK_AT_LEAST_ONE;
-	    if (bytesThisChunk > 0)
-	    {
+	    if (bytesThisChunk > 0) {
 #ifdef TEXTLAYOUT_ALLOCHAX
 		chunkPtr = NewChunk(&layoutPtr, start,
 #else
@@ -1633,11 +1599,9 @@ TextLayout TextLayout_Compute(
 	    }
 	}
 
-	if ((start == special) && (special < end))
-	{
+	if ((start == special) && (special < end)) {
 	    chunkPtr = NULL;
-	    if (*special == '\t')
-	    {
+	    if (*special == '\t') {
 		newX = curX + tabWidth;
 		newX -= newX % tabWidth;
 #ifdef TEXTLAYOUT_ALLOCHAX
@@ -1648,8 +1612,7 @@ TextLayout TextLayout_Compute(
 		    baseline)->numDisplayChars = -1;
 		start++;
 		if ((start < end) && ((wrapLength <= 0) ||
-		    (newX <= wrapLength)))
-		{
+		    (newX <= wrapLength))) {
 		    curX = newX;
 		    flags &= ~TK_AT_LEAST_ONE;
 		    continue;
@@ -1668,28 +1631,23 @@ TextLayout TextLayout_Compute(
 	    }
 	}
 
-	while ((start < end) && isspace(UCHAR(*start)))
-	{
-	    if (!(flags & TK_IGNORE_NEWLINES))
-	    {
+	while ((start < end) && isspace(UCHAR(*start))) {
+	    if (!(flags & TK_IGNORE_NEWLINES)) {
 		if ((*start == '\n') || (*start == '\r'))
 		    break;
 	    }
-	    if (!(flags & TK_IGNORE_TABS))
-	    {
+	    if (!(flags & TK_IGNORE_TABS)) {
 		if (*start == '\t')
 		    break;
 	    }
 	    start++;
 	}
-	if (chunkPtr != NULL)
-	{
+	if (chunkPtr != NULL) {
 	    CONST char *end;
 
 	    end = chunkPtr->start + chunkPtr->numBytes;
 	    bytesThisChunk = start - end;
-	    if (bytesThisChunk > 0)
-	    {
+	    if (bytesThisChunk > 0) {
 		bytesThisChunk =
 		    Tk_MeasureChars(tkfont, end, bytesThisChunk, -1, 0,
 		    &chunkPtr->totalWidth);
@@ -1716,10 +1674,8 @@ wrapLine:
     }
 
     if (start >= end)
-    if ((layoutPtr->numChunks > 0) && !(flags & TK_IGNORE_NEWLINES))
-    {
-	if (layoutPtr->chunks[layoutPtr->numChunks - 1].start[0] == '\n')
-	{
+    if ((layoutPtr->numChunks > 0) && !(flags & TK_IGNORE_NEWLINES)) {
+	if (layoutPtr->chunks[layoutPtr->numChunks - 1].start[0] == '\n') {
 	    chunkPtr =
 #ifdef TEXTLAYOUT_ALLOCHAX
 		NewChunk(&layoutPtr, start, 0, curX, curX,
@@ -1736,18 +1692,15 @@ wrapLine:
 #ifdef TEXTLAYOUT_ELLIPSIS
     /* Fiddle with chunks on the last line to add ellipsis if there is some
      * text remaining */
-    if ((start < end) && (layoutPtr->numChunks > 0))
-    {
+    if ((start < end) && (layoutPtr->numChunks > 0)) {
 	char *ellipsis = "...";
 	int ellipsisLen = strlen(ellipsis);
 	char staticStr[256], *buf = staticStr;
 
 	chunkPtr = &layoutPtr->chunks[layoutPtr->numChunks - 1];
-	if (wrapLength > 0)
-	{
+	if (wrapLength > 0) {
 	    y = chunkPtr->y;
-	    for (n = layoutPtr->numChunks - 1; n >= 0; n--)
-	    {
+	    for (n = layoutPtr->numChunks - 1; n >= 0; n--) {
 		chunkPtr = &layoutPtr->chunks[n];
 
 		/* Only consider the last line */
@@ -1762,8 +1715,7 @@ wrapLine:
 		    newX = wrapLength - chunkPtr->x;
 		bytesThisChunk = Ellipsis(tkfont, (char *) chunkPtr->start,
 		    chunkPtr->numBytes, &newX, ellipsis, TRUE);
-		if (bytesThisChunk > 0)
-		{
+		if (bytesThisChunk > 0) {
 		    chunkPtr->numBytes = bytesThisChunk;
 		    chunkPtr->numChars = Tcl_NumUtfChars(chunkPtr->start, bytesThisChunk);
 		    chunkPtr->numDisplayChars = chunkPtr->numChars;
@@ -1780,8 +1732,7 @@ wrapLine:
 	}
 	else
 	{
-	    if (chunkPtr->start[0] == '\n')
-	    {
+	    if (chunkPtr->start[0] == '\n') {
 		if (layoutPtr->numChunks == 1)
 		    goto finish;
 		if (layoutPtr->chunks[layoutPtr->numChunks - 2].y != chunkPtr->y)
@@ -1812,8 +1763,7 @@ finish:
     layoutPtr->width = maxWidth;
     layoutPtr->height = baseline - fm.ascent;
 layoutPtr->totalWidth = 0;
-    if (layoutPtr->numChunks == 0)
-    {
+    if (layoutPtr->numChunks == 0) {
 	layoutPtr->height = height;
 
 	layoutPtr->numChunks = 1;
@@ -1832,22 +1782,18 @@ layoutPtr->totalWidth = 0;
 	chunkPtr = layoutPtr->chunks;
 	y = chunkPtr->y;
 	lineLengths = (int *) Tcl_DStringValue(&lineBuffer);
-	for (n = 0; n < layoutPtr->numChunks; n++)
-	{
+	for (n = 0; n < layoutPtr->numChunks; n++) {
 	    int extra;
 
-	    if (chunkPtr->y != y)
-	    {
+	    if (chunkPtr->y != y) {
 		curLine++;
 		y = chunkPtr->y;
 	    }
 	    extra = maxWidth - lineLengths[curLine];
-	    if (justify == TK_JUSTIFY_CENTER)
-	    {
+	    if (justify == TK_JUSTIFY_CENTER) {
 		chunkPtr->x += extra / 2;
 	    }
-	    else if (justify == TK_JUSTIFY_RIGHT)
-	    {
+	    else if (justify == TK_JUSTIFY_RIGHT) {
 		chunkPtr->x += extra;
 	    }
 if (chunkPtr->x + chunkPtr->totalWidth > layoutPtr->totalWidth)
@@ -1923,13 +1869,10 @@ void TextLayout_Draw(
     if (lastChar < 0)
 	lastChar = 100000000;
     chunkPtr = layoutPtr->chunks;
-    for (i = 0; i < layoutPtr->numChunks; i++)
-    {
+    for (i = 0; i < layoutPtr->numChunks; i++) {
 	numDisplayChars = chunkPtr->numDisplayChars;
-	if ((numDisplayChars > 0) && (firstChar < numDisplayChars))
-	{
-	    if (firstChar <= 0)
-	    {
+	if ((numDisplayChars > 0) && (firstChar < numDisplayChars)) {
+	    if (firstChar <= 0) {
 		drawX = 0;
 		firstChar = 0;
 		firstByte = chunkPtr->start;
@@ -1944,8 +1887,7 @@ void TextLayout_Draw(
 		numDisplayChars = lastChar;
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
 #ifdef TEXTLAYOUT_ELLIPSIS
-	    if (chunkPtr->ellipsis)
-	    {
+	    if (chunkPtr->ellipsis) {
 		char staticStr[256], *buf = staticStr;
 		char *ellipsis = "...";
 		int ellipsisLen = strlen(ellipsis);
@@ -1966,8 +1908,7 @@ void TextLayout_Draw(
 		firstByte, lastByte - firstByte, x + chunkPtr->x + drawX,
 		y + chunkPtr->y);
 #if 1
-	    if (underline >= firstChar && underline < numDisplayChars)
-	    {
+	    if (underline >= firstChar && underline < numDisplayChars) {
 		CONST char *fstBytePtr = Tcl_UtfAtIndex(chunkPtr->start, underline);
 		CONST char *sndBytePtr = Tcl_UtfNext(fstBytePtr);
 		Tk_UnderlineChars(display, drawable, gc,