Passage en Tcl_Objs et compilation conditionnelle de GPC

1 files changed, 2218 insertions, 2155 deletions

diff --git a/generic/tkZinc.c b/generic/tkZinc.c
index 9909b4b..452e80a 100644
--- a/generic/tkZinc.c
+++ b/generic/tkZinc.c
@@ -50,7 +50,9 @@ static const char compile_id[]="$Compile: " __FILE__ " " __DATE__ " " __TIME__ "
 #include "Track.h"
 #include "Transfo.h"
 #include "Image.h"
+#ifdef GPC
 #include "gpc/gpc.h"
+#endif
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -232,16 +234,66 @@ static void	Bind _ANSI_ARGS_((ClientData client_data, XEvent *eventPtr));
 static int	FetchSelection _ANSI_ARGS_((ClientData clientData, int offset,
 					    char *buffer, int maxBytes));
 static void	SelectTo _ANSI_ARGS_((Item item, int index));
-static int	WidgetCmd _ANSI_ARGS_((ClientData client_data,
-				       Tcl_Interp *, int argc, Arg *args));
+static int	WidgetObjCmd _ANSI_ARGS_((ClientData client_data,
+					  Tcl_Interp *, int argc, Tcl_Obj *CONST args[]));
 static int	Configure _ANSI_ARGS_((Tcl_Interp *interp, WidgetInfo *wi,
-				       int argc, Arg *args, int flags));
+				       int argc, Tcl_Obj *CONST args[], int flags));
 static void	Redisplay _ANSI_ARGS_((ClientData client_data));
 static void	Destroy _ANSI_ARGS_((char *mem_ptr));
 static void	InitZinc _ANSI_ARGS_((Tcl_Interp *interp));
 static void	Focus _ANSI_ARGS_((WidgetInfo *wi, ZnBool got_focus));
 
 
+#ifdef PTK
+Tcl_Obj *
+NewLongObj(long	val)
+{
+  Tcl_Obj	*obj = Tcl_NewIntObj(0);
+  Tcl_SetLongObj(obj, val);
+  return obj;
+}
+#endif
+
+#ifdef PTK
+Tcl_Obj *
+NewBooleanObj(ZnBool	val)
+{
+  Tcl_Obj	*obj = Tcl_NewIntObj(0);
+  Tcl_SetBooleanObj(obj, val);
+  return obj;
+}
+#endif
+
+#ifdef PTK
+Tcl_Obj *
+NewDoubleObj(ZnReal	val)
+{
+  Tcl_Obj	*obj = Tcl_NewIntObj(0);
+  Tcl_SetDoubleObj(obj, val);
+  return obj;
+}
+#endif
+
+Tcl_Obj *
+NewStringObj(char	*str) {
+  return Tcl_NewStringObj(str, strlen(str));
+}
+
+void
+SetStringObj(Tcl_Obj	*o,
+	     char	*str) {
+  return Tcl_SetStringObj(o, str, strlen(str));
+}
+
+#if 1
+char *
+Tcl_GetString(Tcl_Obj	*obj)
+{
+  return Tcl_GetStringFromObj(obj, NULL);
+}
+#endif
+
+
 /*
  *----------------------------------------------------------------------
  *
@@ -296,7 +348,7 @@ ZnNeedRedisplay(WidgetInfo	*wi)
 /*
  *----------------------------------------------------------------------
  *
- * ZincCmd --
+ * ZincObjCmd --
  *
  *	This procedure is invoked to process the "zinc" Tcl
  *	command.  It creates a new "zinc" widget.
@@ -305,18 +357,18 @@ ZnNeedRedisplay(WidgetInfo	*wi)
  */
 
 int
-ZincCmd(ClientData	client_data,	/* Main window associated with
-					 * interpreter. */
-	Tcl_Interp	*interp,	/* Current interpreter. */
-	int		argc,		/* Number of arguments. */
-	Arg		*args)		/* Argument strings. */
+ZincObjCmd(ClientData		client_data,	/* Main window associated with
+						 * interpreter. */
+	   Tcl_Interp		*interp,	/* Current interpreter. */
+	   int			argc,		/* Number of arguments. */
+	   Tcl_Obj	*CONST	args[])		/* Argument strings. */
 {
   Tk_Window	top_w = (Tk_Window) client_data;
   WidgetInfo	*wi;
   Tk_Window	tkwin;
   unsigned int	num;
   int		major_op, first_err, first_evt;
-
+  
   if (!inited) {
     InitZinc(interp);
   }
@@ -326,12 +378,11 @@ ZincCmd(ClientData	client_data,	/* Main window associated with
     return TCL_OK;
   }
   if (argc < 2) {
-    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		     LangString(args[0]), " pathName ?options?\"", NULL);
+    Tcl_WrongNumArgs(interp, 1, args, "pathName ?options?");
     return ZN_ERROR;
   }
   
-  tkwin = Tk_CreateWindowFromPath(interp, top_w, LangString(args[1]), NULL);
+  tkwin = Tk_CreateWindowFromPath(interp, top_w, Tcl_GetString(args[1]), NULL);
   if (tkwin == NULL) {
     return ZN_ERROR;
   }
@@ -358,13 +409,14 @@ ZincCmd(ClientData	client_data,	/* Main window associated with
   wi->reshape = wi->full_reshape = True;
   wi->real_top = None;
 
-#ifndef PTK
-  wi->cmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin), WidgetCmd,
+#ifdef PTK
+  wi->cmd = Lang_CreateWidget(interp, tkwin, (Tcl_CmdProc *) WidgetObjCmd,
 			      (ClientData) wi, CmdDeleted);
-#else 
-  wi->cmd = Lang_CreateWidget(interp,tkwin, WidgetCmd, (ClientData) wi, CmdDeleted);
 
-#endif
+#else
+  wi->cmd = Tcl_CreateObjCommand(interp, Tk_PathName(tkwin), WidgetObjCmd,
+				 (ClientData) wi, CmdDeleted);
+#endif  
   wi->binding_table = 0;
   wi->realized = False;
   wi->update_pending = 0;
@@ -479,12 +531,12 @@ ZincCmd(ClientData	client_data,	/* Main window associated with
 				  wi->width, wi->height,
 				  DefaultDepthOfScreen(wi->screen));
   
-#ifndef PTK
-  Tcl_SetResult(interp, Tk_PathName(tkwin), TCL_STATIC);
+#ifdef PTK
+  Tcl_SetObjResult(interp, LangWidgetArg(interp, tkwin));
 #else
-  Tcl_ArgResult(interp, LangWidgetArg(interp, tkwin));
+  Tcl_SetObjResult(interp, NewStringObj(Tk_PathName(tkwin)));
 #endif
-
+  
   return TCL_OK;
 }
 
@@ -549,13 +601,14 @@ EncodeItemPart(Item	item,
  */
 static Item
 ZnSearchWithTagOrId(WidgetInfo	*wi,
-		    char	*tag,
+		    Tcl_Obj	*tag,	/* NULL is the same as 'all' */
 		    Item	group,
 		    TagSearch	*tag_search)
 {
   Tk_Uid	uid, *tags;
-  int		id, i, num_tags;
-  char		*end;
+  long		id;
+  char		*str = NULL;
+  int		i, num_tags;
   Tcl_HashEntry	*entry;
   Item		item = ZN_NO_ITEM;
   
@@ -566,26 +619,35 @@ ZnSearchWithTagOrId(WidgetInfo	*wi,
   tag_search->over = False;
   tag_search->item_stack = ZnListNew(16, sizeof(Item));
   tag_search->group = (GroupItem) group;
-  
+
   /*
    * Try to consider the tag as an item id.
    */
-  if (isdigit(*tag)) {
-    id = strtoul(tag, &end, 0);
-    if (*end == 0) {
-      entry = Tcl_FindHashEntry(wi->id_table, (char *) id);
-      if (entry != NULL) {
-	item = (Item) Tcl_GetHashValue(entry);
+  if (tag) {
+    str = Tcl_GetString(tag);
+    if (isdigit(str[0])) {
+      if (Tcl_GetLongFromObj(wi->interp, tag, &id) == ZN_OK) {
+	entry = Tcl_FindHashEntry(wi->id_table, (char *) id);
+	if (entry != NULL) {
+	  item = (Item) Tcl_GetHashValue(entry);
+	}
+	Tcl_ResetResult(wi->interp);
+	tag_search->over = True;
+	return item;
       }
-      tag_search->over = True;
-      return item;
     }
   }
-
-  /*
+  
+    /*
    * Now look for a tag.
    */
-  tag_search->tag = uid = Tk_GetUid(tag);
+  if (!tag) {
+    tag_search->tag = uid = all_uid;
+  }
+  else {
+    tag_search->tag = uid = Tk_GetUid(str);
+  }
+  
   if (uid == all_uid) {
     tag_search->current = tag_search->group->head;
     tag_search->previous = ZN_NO_ITEM;
@@ -799,24 +861,24 @@ ZnDoneWithSearch(TagSearch	*tag_search)
  */
 int
 ZnItemsWithTagOrId(WidgetInfo	*wi,
-		   char		*tag_or_id,
+		   Tcl_Obj	*tag_or_id,
 		   Item		*item,
 		   Item		**item_list)
 {
   unsigned long	id;
-  char		*end;
   Tcl_HashEntry	*entry;
   Tk_Uid	tag_uid;
   ZnList	items;
   int		num_items;
-  
-  if (isdigit(*tag_or_id)) {
-    id = strtoul(tag_or_id, &end, 0);
-    if (*end == 0) {
+  char		*str;
+
+  str = Tcl_GetString(tag_or_id);
+  if (isdigit(str[0])) {
+    if (Tcl_GetLongFromObj(wi->interp, tag_or_id, &id) == ZN_OK) {
+      Tcl_ResetResult(wi->interp);
       entry = Tcl_FindHashEntry(wi->id_table, (char *) id);
       if (entry == NULL) {
-	Tcl_AppendResult(wi->interp,
-			 "item \"", tag_or_id, "\" doesn't exist", NULL);
+	Tcl_AppendResult(wi->interp, "item \"", str, "\" doesn't exist", NULL);
 	return 0;
       }
       *item = (Item) Tcl_GetHashValue(entry);
@@ -830,7 +892,7 @@ ZnItemsWithTagOrId(WidgetInfo	*wi,
   /*
    * It is a tag, try to find it and return the whole list.
    */    
-  tag_uid = Tk_GetUid(tag_or_id);
+  tag_uid = Tk_GetUid(str);
   
   /*
    * If it is 'all' then build a list of all the items
@@ -849,7 +911,7 @@ ZnItemsWithTagOrId(WidgetInfo	*wi,
     else {
       wi->work_item_list = ZnListNew(128, sizeof(Item));
     }
-    for (current = ZnSearchWithTagOrId(wi, all_uid, wi->top_group, &ts);
+    for (current = ZnSearchWithTagOrId(wi, NULL, wi->top_group, &ts);
 	 current != NULL; current = ZnNextWithTagOrId(&ts)) {
       ZnListAdd(wi->work_item_list, &current, ZnListTail);
     }
@@ -881,8 +943,7 @@ ZnItemsWithTagOrId(WidgetInfo	*wi,
     return num_items;
   }
   else {
-    Tcl_AppendResult(wi->interp,
-		     "unknown tag \"", tag_or_id, "\"", NULL);
+    Tcl_AppendResult(wi->interp, "unknown tag \"", tag_uid, "\"", NULL);
     return 0;
   }
 }
@@ -907,12 +968,11 @@ DoItem(Tcl_Interp	*interp,
        Tk_Uid		tag_uid)
 {
   if (tag_uid == NULL) {
-    char	msg[INTEGER_SPACE];
-    sprintf(msg, "%d", item->id);
-    Tcl_AppendElement(interp, msg);
+    Tcl_ListObjAppendElement(interp, Tcl_GetObjResult(interp),
+			     NewLongObj(item->id));
     if (part != ZN_NO_PART) {
-      sprintf(msg, "%d", part);
-      Tcl_AppendElement(interp, msg);      
+      Tcl_ListObjAppendElement(interp, Tcl_GetObjResult(interp),
+			       Tcl_NewIntObj(part));
     }
   }
   else {
@@ -960,9 +1020,8 @@ IsHeirOf(Item	item,
  *----------------------------------------------------------------------
  */
 static int
-FindArea(Tcl_Interp	*interp,
-	 WidgetInfo	*wi,
-	 Arg		*args,
+FindArea(WidgetInfo	*wi,
+	 Tcl_Obj *CONST args[],
 	 Tk_Uid		tag_uid,
 	 Item		group,
 	 int		enclosed)
@@ -970,16 +1029,16 @@ FindArea(Tcl_Interp	*interp,
   ZnPos	pos;
   ZnBBox	area;
   
-  if (Tcl_GetDouble(interp, args[0], &area.orig.x) == ZN_ERROR) {
+  if (Tcl_GetDoubleFromObj(wi->interp, args[0], &area.orig.x) == ZN_ERROR) {
     return ZN_ERROR;
   }
-  if (Tcl_GetDouble(interp, args[1], &area.orig.y) == ZN_ERROR) {
+  if (Tcl_GetDoubleFromObj(wi->interp, args[1], &area.orig.y) == ZN_ERROR) {
     return ZN_ERROR;
   }
-  if (Tcl_GetDouble(interp, args[2], &area.corner.x) == ZN_ERROR) {
+  if (Tcl_GetDoubleFromObj(wi->interp, args[2], &area.corner.x) == ZN_ERROR) {
     return ZN_ERROR;
   }
-  if (Tcl_GetDouble(interp, args[3], &area.corner.y) == ZN_ERROR) {
+  if (Tcl_GetDoubleFromObj(wi->interp, args[3], &area.corner.y) == ZN_ERROR) {
     return ZN_ERROR;
   }
   if (area.corner.x < area.orig.x) {
@@ -1024,291 +1083,296 @@ FindArea(Tcl_Interp	*interp,
  *----------------------------------------------------------------------
  */
 static int
-FindItems(Tcl_Interp	*interp,
-	  WidgetInfo	*wi,
+FindItems(WidgetInfo	*wi,
 	  int		argc,
-	  Arg		*args,
-	  char		*new_tag,	/* NULL to search or tag string to add tag. */
-	  char		*cmd_name,	/* To report errors */
-	  char		*option)	/* Also to report errors meaningfully */
+	  Tcl_Obj *CONST args[],
+	  Tcl_Obj	*tag,		/* NULL to search or tag to add tag. */
+	  int		first)		/* First arg to process in args */
 {
   Tk_Uid	tag_uid = NULL;
   TagSearch	ts;
-  char		c;
-  int		length, num_items;
+  int		index, num_items;
   Item		item, group = wi->top_group;
+  static char	*search_cmd_strings[] = {
+    "above", "all", "atpoint", "atpriority", "below", "enclosed",
+    "overlapping", "withtag", "withtype", NULL
+  };
+  enum		search_cmds {
+    ZN_S_ABOVE, ZN_S_ALL, ZN_S_ATPOINT, ZN_S_ATPRIORITY, ZN_S_BELOW,
+    ZN_S_ENCLOSED, ZN_S_OVERLAPPING, ZN_S_WITHTAG, ZN_S_WITHTYPE
+  };
   
-  if (new_tag != NULL) {
-    tag_uid = Tk_GetUid(new_tag);
+  if (Tcl_GetIndexFromObj(wi->interp, args[first], search_cmd_strings,
+			  "search command", 0, &index) != ZN_OK) {
+    return ZN_ERROR;
   }
   
-  c = LangString(args[0])[0];
-  length = strlen(LangString(args[0]));
-
-  /*
-   * above
-   */
-  if ((c == 'a') && (strncmp(LangString(args[0]), "above", length) == 0)) {
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " above tagOrId ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 3) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[2]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
-	return ZN_ERROR;
-      }
-    }
-    item = ZnSearchWithTagOrId(wi, LangString(args[1]), group, &ts);
-    if ((item != ZN_NO_ITEM) && (item->previous != ZN_NO_ITEM)) {
-      DoItem(interp, item->previous, ZN_NO_PART, tag_uid);
-    }
+  if (tag) {
+    tag_uid = Tk_GetUid(Tcl_GetString(tag));
   }
   
-  /*
-   * all
-   */
-  else if ((c == 'a') && (strncmp(LangString(args[0]), "all", length) == 0)) {
-    if ((argc != 1) && (argc != 2)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " all ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 2) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[1]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
-	return ZN_ERROR;
-      }
-    }
-
+  switch((enum search_cmds) index) {
     /*
-     * Go through the item list and collect all item ids. They
-     * are sorted from most visible to least visible.
+     * above
      */
-    for (item = ZnSearchWithTagOrId(wi, all_uid, group, &ts);
-	 item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
-      DoItem(interp, item, ZN_NO_PART, tag_uid);
-    }
-  }
-
-  /*
-   * atpoint
-   */
-  else if ((c == 'a') && (strncmp(LangString(args[0]), "atpoint", length) == 0)) {
-    int		halo = 1;
-    ZnPoint	p;
-    int		part = ZN_NO_PART;
-    Item	start_item = ZN_NO_ITEM;
-      
-    if ((argc < 3) || (argc > 5)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
- 		       cmd_name, option, " atpoint x y ?halo? ?start?", NULL);
-      return ZN_ERROR;      
-    }
-    if (Tcl_GetDouble(interp, args[1], &p.x) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetDouble(interp, args[2], &p.y) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    p.x -= wi->inset;
-    p.y -= wi->inset;
-    if (argc > 3) {
-      if (Tcl_GetInt(interp, args[3], &halo) == ZN_ERROR) {
+  case ZN_S_ABOVE:
+    {
+      if ((argc != first+2) && (argc != first+3)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "tagOrId ?inGroup?");
 	return ZN_ERROR;
       }
-      if (halo < 0) {
- 	halo = 0;
+      if (argc == first+3) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+2], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
       }
-    }
-    if (argc > 4) {
-      start_item = ZnSearchWithTagOrId(wi, LangString(args[4]), group, &ts);
-      if (start_item != ZN_NO_ITEM) {
-	start_item = start_item->next;
+      item = ZnSearchWithTagOrId(wi, args[first+1], group, &ts);
+      if ((item != ZN_NO_ITEM) && (item->previous != ZN_NO_ITEM)) {
+	DoItem(wi->interp, item->previous, ZN_NO_PART, tag_uid);
       }
     }
+    break;
     /*
-     * We always start the search at the top group to use the
-     * transform and clip machinery of the group item. The items
-     * are not required to cache the device coords, etc. So we need
-     * to setup the correct context before calling the Pick method
-     * for each item.
+     * all
      */
-    wi->top_group->class->Pick(wi->top_group, &p, start_item, halo, &item, &part);
-    
-    if (item != ZN_NO_ITEM) {
-      DoItem(interp, item, part, tag_uid);
-      /*printf("first %d %d\n", item->id, part);*/
-      return TCL_OK;
-    }
-  }
-  
-  /*
-   * atpriority
-   */
-  else if ((c == 'a') && (strncmp(LangString(args[0]), "atpriority", length) == 0)) {
-    int		pri;
-
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " atpriority pri ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[1], &pri) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (argc == 3) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[2]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+  case ZN_S_ALL:
+    {
+      if ((argc != first+1) && (argc != first+2)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "?inGroup?");
 	return ZN_ERROR;
       }
+      if (argc == first+2) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+1], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      
+      /*
+       * Go through the item list and collect all item ids. They
+       * are sorted from most visible to least visible.
+       */
+      for (item = ZnSearchWithTagOrId(wi, NULL, group, &ts);
+	   item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
+	DoItem(wi->interp, item, ZN_NO_PART, tag_uid);
+      }
     }
-     
+    break;
     /*
-     * Go through the item table and collect all items with
-     * the given priority.
+     * atpoint
      */
-    for (item = ZnSearchWithTagOrId(wi, all_uid, group, &ts);
-	 item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
-      if (item->priority == pri) {
-	DoItem(interp, item, ZN_NO_PART, tag_uid);
+    case ZN_S_ATPOINT:
+      {
+	int	halo = 1;
+	ZnPoint	p;
+	int	part = ZN_NO_PART;
+	Item	start_item = ZN_NO_ITEM;
+	
+	if ((argc < first+3) || (argc > first+5)) {
+	  Tcl_WrongNumArgs(wi->interp, first+1, args, "x y ?halo? ?start?");
+	  return ZN_ERROR;      
+	}
+	if (Tcl_GetDoubleFromObj(wi->interp, args[first+1], &p.x) == ZN_ERROR) {
+	  return ZN_ERROR;
+	}
+	if (Tcl_GetDoubleFromObj(wi->interp, args[first+2], &p.y) == ZN_ERROR) {
+	  return ZN_ERROR;
+	}
+	p.x -= wi->inset;
+	p.y -= wi->inset;
+	if (argc > first+3) {
+	  if (Tcl_GetIntFromObj(wi->interp, args[first+3], &halo) == ZN_ERROR) {
+	    return ZN_ERROR;
+	  }
+	  if (halo < 0) {
+	    halo = 0;
+	  }
+	}
+	if (argc > first+4) {
+	  start_item = ZnSearchWithTagOrId(wi, args[first+4], group, &ts);
+	  if (start_item != ZN_NO_ITEM) {
+	    start_item = start_item->next;
+	  }
+	}
+	/*
+	 * We always start the search at the top group to use the
+	 * transform and clip machinery of the group item. The items
+	 * are not required to cache the device coords, etc. So we need
+	 * to setup the correct context before calling the Pick method
+	 * for each item.
+	 */
+	wi->top_group->class->Pick(wi->top_group, &p, start_item, halo,
+				   &item, &part);
+	
+	if (item != ZN_NO_ITEM) {
+	  DoItem(wi->interp, item, part, tag_uid);
+	  /*printf("first %d %d\n", item->id, part);*/
+	  return TCL_OK;
+	}
       }
-    }
-  }
-  
-  /*
-   * below
-   */
-  else if ((c == 'b') && (strncmp(LangString(args[0]), "below", length) == 0)) {
-    Item	next;
-
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " below tagOrId $inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 3) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[2]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+      break;
+      /*
+       * atpriority
+       */
+  case ZN_S_ATPRIORITY:
+    {
+      int		pri;
+      
+      if ((argc != first+2) && (argc != first+3)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "pri ?inGroup?");
 	return ZN_ERROR;
       }
-    }
-    item = ZN_NO_ITEM;
-    for (next = ZnSearchWithTagOrId(wi, LangString(args[1]), group, &ts);
-	 next != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
-      item = next;
-    }
-    if ((item != ZN_NO_ITEM) && (item->next != ZN_NO_ITEM)) {
-      DoItem(interp, item->next, ZN_NO_PART, tag_uid);
-    }
-  }  
-  
-  /*
-   * enclosed
-   */
-  else if ((c == 'e') && (strncmp(LangString(args[0]), "enclosed", length) == 0)) {
-    if ((argc != 5) && (argc != 6)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " enclosed x1 y1 x2 y2 ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 6) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[5]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+      if (Tcl_GetIntFromObj(wi->interp, args[first+1], &pri) == ZN_ERROR) {
 	return ZN_ERROR;
       }
+      if (argc == first+3) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+2], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      
+      /*
+       * Go through the item table and collect all items with
+       * the given priority.
+       */
+      for (item = ZnSearchWithTagOrId(wi, NULL, group, &ts);
+	   item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
+	if (item->priority == pri) {
+	  DoItem(wi->interp, item, ZN_NO_PART, tag_uid);
+	}
+      }
     }
-    return FindArea(interp, wi, args+1, tag_uid, group, True);
-  }
-  
-  /*
-   * overlapping
-   */
-  else if ((c == 'o') && (strncmp(LangString(args[0]), "overlapping", length) == 0)) {
-    if ((argc != 5) && (argc != 6)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " overlapping x1 y1 x2 y2 ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 6) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[5]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+    break;
+    /*
+     * below
+     */
+  case ZN_S_BELOW:
+    {
+      Item	next;
+      
+      if ((argc != first+2) && (argc != first+3)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "tagOrId $inGroup?");
 	return ZN_ERROR;
       }
+      if (argc == first+3) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+2], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      item = ZN_NO_ITEM;
+      for (next = ZnSearchWithTagOrId(wi, args[first+1], group, &ts);
+	   next != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
+	item = next;
+      }
+      if ((item != ZN_NO_ITEM) && (item->next != ZN_NO_ITEM)) {
+	DoItem(wi->interp, item->next, ZN_NO_PART, tag_uid);
+      }
     }
-    return FindArea(interp, wi, args+1, tag_uid, group, False);
-  }
-  
-  /*
-   * withtag
-   */
-  else if ((c == 'w') && (strncmp(LangString(args[0]), "withtag", length) == 0)) {
-    Item	*items;
-    int		i;
-    
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " withtag tagOrId ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    if (argc == 3) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[2]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+    break;
+    /*
+     * enclosed
+     */
+  case ZN_S_ENCLOSED:
+    {
+      if ((argc != first+5) && (argc != first+6)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "x1 y1 x2 y2 ?inGroup?");
 	return ZN_ERROR;
       }
-    }
-    num_items = ZnItemsWithTagOrId(wi, LangString(args[1]), &item, &items);
-    if (num_items == 0) {
-      Tcl_SetResult(interp, "", TCL_STATIC);
-    }
-    for (i = 0; i < num_items; i++) {
-      if (IsHeirOf(items[i], group)) {
-	DoItem(interp, items[i], ZN_NO_PART, tag_uid);
+      if (argc == first+6) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+5], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
       }
+      return FindArea(wi, args+first+1, tag_uid, group, True);
     }
-  }
-  
-  /*
-   * withtype
-   */
-  else if ((c == 'w') && (strncmp(LangString(args[0]), "withtype", length) == 0)) {
-    ItemClass	cls;
-
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"",
-		       cmd_name, option, " withtype itemType ?inGroup?", NULL);
-      return ZN_ERROR;
-    }
-    cls = (ItemClass) ITEM_P.LookupItemClass(LangString(args[1]));
-    if (!cls) {
-      Tcl_AppendResult(interp, "unknown item type \"",
-		       LangString(args[1]), "\"", NULL);
-      return ZN_ERROR;
+    break;
+    /*
+     * overlapping
+     */
+  case ZN_S_OVERLAPPING:
+    {
+      if ((argc != first+5) && (argc != first+6)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "x1 y1 x2 y2 ?inGroup?");
+	return ZN_ERROR;
+      }
+      if (argc == first+6) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+5], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      return FindArea(wi, args+first+1, tag_uid, group, False);
     }
-    if (argc == 3) {
-      num_items = ZnItemsWithTagOrId(wi, LangString(args[2]), &group, NULL);
-      if ((num_items == 0) || (group->class != ZnGroup)) {
+    break;
+    /*
+     * withtag
+     */
+  case ZN_S_WITHTAG:
+    {
+      Item	*items;
+      int	i;
+      
+      if ((argc != first+2) && (argc != first+3)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "tagOrId ?inGroup?");
 	return ZN_ERROR;
       }
+      if (argc == first+3) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+2], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      num_items = ZnItemsWithTagOrId(wi, args[first+1], &item, &items);
+      if (num_items == 0) {
+	Tcl_SetObjResult(wi->interp, NewStringObj(""));
+      }
+      for (i = 0; i < num_items; i++) {
+	if (IsHeirOf(items[i], group)) {
+	  DoItem(wi->interp, items[i], ZN_NO_PART, tag_uid);
+	}
+      }
     }
-     
+    break;
     /*
-     * Go through the item table and collect all items with
-     * the given item type.
+     * withtype
      */
-    for (item = ZnSearchWithTagOrId(wi, all_uid, group, &ts);
-	 item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
-      if (item->class == cls) {
-	DoItem(interp, item, ZN_NO_PART, tag_uid);
+  case ZN_S_WITHTYPE:
+    {
+      ItemClass	cls;
+      
+      if ((argc != first+2) && (argc != first+3)) {
+	Tcl_WrongNumArgs(wi->interp, first+1, args, "itemType ?inGroup?");
+	return ZN_ERROR;
+      }
+      cls = (ItemClass) ITEM_P.LookupItemClass(Tcl_GetString(args[first+1]));
+      if (!cls) {
+	Tcl_AppendResult(wi->interp, "unknown item type \"",
+			 Tcl_GetString(args[first+1]), "\"", NULL);
+	return ZN_ERROR;
+      }
+      if (argc == first+3) {
+	num_items = ZnItemsWithTagOrId(wi, args[first+2], &group, NULL);
+	if ((num_items == 0) || (group->class != ZnGroup)) {
+	  return ZN_ERROR;
+	}
+      }
+      
+      /*
+       * Go through the item table and collect all items with
+       * the given item type.
+       */
+      for (item = ZnSearchWithTagOrId(wi, NULL, group, &ts);
+	   item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&ts)) {
+	if (item->class == cls) {
+	  DoItem(wi->interp, item, ZN_NO_PART, tag_uid);
+	}
       }
     }
-  }
-  else {
-    Tcl_AppendResult(interp, "bad search command \"", LangString(args[0]),
-		     "\": must be above, all, atpoint, atpriority, below, "
-		     "enclosed, overlapping, withtag or withtype", NULL);
-    return ZN_ERROR;
+    break;
   }
   
   return TCL_OK;
@@ -1324,52 +1388,33 @@ FindItems(Tcl_Interp	*interp,
  */
 int
 ParseCoordList(WidgetInfo	*wi,
-	       Arg		arg,
+	       Tcl_Obj		*arg,
 	       ZnPoint		**pts,
 	       int		*num_pts)
 {
-  Arg		*elems;
+  Tcl_Obj	**elems;
   int		i, result, num_elems;
   ZnPoint	*p;
-#ifdef PTK
-  LangFreeProc *freeProc = NULL;
-#endif
-
-  result = Lang_SplitList(wi->interp, arg, &num_elems, &elems, &freeProc);
+  
+  result = Tcl_ListObjGetElements(wi->interp, arg, &num_elems, &elems);
   if ((result == ZN_ERROR) || ((num_elems%2) != 0)) {
   coord_error:
-#ifdef PTK
-    if (elems != NULL && freeProc) {
-      (*freeProc)(num_elems, elems);
-    }
-#endif
     Tcl_AppendResult(wi->interp, " malformed coord list", NULL);
     return ZN_ERROR;
   }
-
+  
   *num_pts = num_elems/2;
   ZnListAssertSize(wi->work_pts, *num_pts);
   *pts = p = (ZnPoint *) ZnListArray(wi->work_pts);
   for (i = 0; i < num_elems; i += 2, p++) {
-    if (Tcl_GetDouble(wi->interp, elems[i], &p->x) == ZN_ERROR) {
-    coord_error2:
-#ifndef PTK
-      Tcl_Free((char *) elems);
-#endif
+    if (Tcl_GetDoubleFromObj(wi->interp, elems[i], &p->x) == ZN_ERROR) {
       goto coord_error;
     }
-    if (Tcl_GetDouble(wi->interp, elems[i+1], &p->y) == ZN_ERROR) {
-      goto coord_error2;
+    if (Tcl_GetDoubleFromObj(wi->interp, elems[i+1], &p->y) == ZN_ERROR) {
+      goto coord_error;
     }
   }
-#ifndef PTK
-  Tcl_Free((char *) elems);
-#else
-  if (freeProc) {
-    (*freeProc)(num_elems, elems);
-  }
-#endif
-
+  
   return ZN_OK;
 }
 
@@ -1381,22 +1426,29 @@ ParseCoordList(WidgetInfo	*wi,
  *
  *----------------------------------------------------------------------
  */
+#ifdef GPC
 static int
 Contour(WidgetInfo	*wi,
 	int		argc,
-	Arg		*args)
+	Tcl_Obj	*CONST	args[])
 {
   ZnPoint	*points;
   ZnPoint	p[4], xp[4];
   Item		item, shape;
   int		cmd, num_points, num, i;
-  ZnBool	simple;
+  ZnBool	simple=False;
   ZnPoly	poly;
-  char		c;
+  int		index;
   ZnTransfo	t, inv;
   ZnContour	*contours;
+  static char	*op_strings[] = {
+    "diff", "inter", "union", "xor", NULL
+  };
+  int		ops[] = {
+    GPC_DIFF, GPC_INT, GPC_UNION, GPC_XOR
+  };
   
-  num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
+  num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
   if (num == 0) {
     return ZN_ERROR;
   }
@@ -1406,27 +1458,13 @@ Contour(WidgetInfo	*wi,
     return ZN_ERROR;
   }
 
-  c = LangString(args[3])[0];
-  if ((c == 'd') && (strcmp(LangString(args[3]), "diff") == 0)) {
-    cmd = GPC_DIFF;
-  }
-  else if ((c == 'i') && (strcmp(LangString(args[3]), "inter") == 0)) {
-    cmd = GPC_INT;
-  }
-  else if ((c == 'u') && (strcmp(LangString(args[3]), "union") == 0)) {
-    cmd = GPC_UNION;
-  }
-  else if ((c == 'x') && (strcmp(LangString(args[3]), "xor") == 0)) {
-    cmd = GPC_XOR;
-  }
-  else {
-    Tcl_AppendResult(wi->interp, "unknown contour operation: \"",
-		     LangString(args[3]),
-		     "\" should be diff/inter/union/xor", NULL);
+  if (Tcl_GetIndexFromObj(wi->interp, args[3], op_strings,
+			  "polygon operator", 0, &index) != ZN_OK) {
     return ZN_ERROR;
   }
+  cmd = ops[index];
   
-  num = ZnItemsWithTagOrId(wi, LangString(args[4]), &shape, NULL);
+  num = ZnItemsWithTagOrId(wi, args[4], &shape, NULL);
   if (num == 0) {
     Tcl_ResetResult(wi->interp);
     if (ParseCoordList(wi, args[4], &points, &num_points) == ZN_ERROR) {
@@ -1496,6 +1534,7 @@ Contour(WidgetInfo	*wi,
   
   return ZN_OK;
 }
+#endif
 
 
 /*
@@ -1508,32 +1547,36 @@ Contour(WidgetInfo	*wi,
 static int
 Coords(WidgetInfo	*wi,
        int		argc,
-       Arg		*args)
+       Tcl_Obj	*CONST	args[])
 {
   ZnPoint	*points;
   Item		item;
   int		num_points, num = 0, i;
   int		cmd = COORDS_READ;
   long		index, contour = 0;
-  char		*end, c;
-  char		msg[INTEGER_SPACE];
+  char		*str;
+  Tcl_Obj	*l;
   
-  num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
+  num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
   if (num == 0) {
     return ZN_ERROR;
   }
   num_points = 0;
+  /*  printf("  coords: argc=%d, item %d class: %s\n",
+      argc, item->id, item->class->name);*/
   if (argc == 3) {
     /* Get all coords of default contour (0). */
-    if (item->class->Coords(item, 0, 0, COORDS_READ_ALL, &points, &num_points) == ZN_ERROR) {
+    if (item->class->Coords(item, 0, 0, COORDS_READ_ALL,
+			    &points, &num_points) == ZN_ERROR) {
       return ZN_ERROR;
     }
   coords_read:
+    /*printf("  coords: read %d points, first is %g@%g\n",
+      num_points, points->x, points->y);*/
+    l = Tcl_GetObjResult(wi->interp);
     for (i = 0; i < num_points; i++, points++) {
-      sprintf(msg, "%g", points->x);
-      Tcl_AppendElement(wi->interp, msg);
-      sprintf(msg, "%g", points->y);
-      Tcl_AppendElement(wi->interp, msg);
+      Tcl_ListObjAppendElement(wi->interp, l, NewDoubleObj(points->x));
+      Tcl_ListObjAppendElement(wi->interp, l, NewDoubleObj(points->y));
     }
     return ZN_OK;
   }
@@ -1542,41 +1585,41 @@ Coords(WidgetInfo	*wi,
    * See if it is an ADD or REMOVE op.
    */
   i = 3;
-  c = LangString(args[i])[0];
-  if ((c == 'a') && (strcmp(LangString(args[i]), "add") == 0)) {
+  str = Tcl_GetString(args[3]);
+  if ((str[0] == 'a') && (strcmp(str, "add") == 0)) {
     if ((argc < 5) || (argc > 7)) {
-      Tcl_AppendResult(wi->interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" coords tagOrId add ?contour? ?index? coordList", NULL);
+      Tcl_WrongNumArgs(wi->interp, 1, args,
+		       "coords tagOrId add ?contour? ?index? coordList");
       return ZN_ERROR;
     }
     cmd = COORDS_ADD;
     i++;
   }
-  else if ((c == 'r') && (strcmp(LangString(args[i]), "remove") == 0)) {
+  else if ((str[0] == 'r') && (strcmp(str, "remove") == 0)) {
     if ((argc != 5) && (argc != 6)) {
-      Tcl_AppendResult(wi->interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" coords tagOrId remove ?contour? index", NULL);
+      Tcl_WrongNumArgs(wi->interp, 1, args,
+		       "coords tagOrId remove ?contour? index");
       return ZN_ERROR;
     }
     cmd = COORDS_REMOVE;
     i++;
   }
-
+  
   /*
    * Try to see if the next param is a vertex index,
    * a contour index or a coord list.
    */
-  contour = index = strtol(LangString(args[i]), &end, 10);
-  if (*end != '\0') {
+  /*printf("  coords: arg %d is %s\n", i, Tcl_GetString(args[i]));*/
+  if (Tcl_GetLongFromObj(wi->interp, args[i], &index) != ZN_OK) {
     if (((argc == 5) && (cmd != COORDS_ADD) && (cmd != COORDS_REMOVE)) ||
 	(argc == 6) || (argc == 7)) {
       Tcl_AppendResult(wi->interp, " incorrect contour index \"",
-		       args[i], "\"", NULL);
+		       Tcl_GetString(args[i]), "\"", NULL);
       return ZN_ERROR;
     }
     else if ((argc == 5) && (cmd != COORDS_ADD)) {
       Tcl_AppendResult(wi->interp, " incorrect coord index \"",
-		       args[i], "\"", NULL);
+		       Tcl_GetString(args[i]), "\"", NULL);
       return ZN_ERROR;
     }
     else if (ParseCoordList(wi, args[i], &points, &num_points) == ZN_ERROR) {
@@ -1598,6 +1641,7 @@ Coords(WidgetInfo	*wi,
     }
     return ZN_OK;
   }
+  contour = index;
   if (argc == 4) {
     /* Get all coords of contour. */
     if (item->class->Coords(item, contour, 0, COORDS_READ_ALL,
@@ -1619,11 +1663,11 @@ Coords(WidgetInfo	*wi,
    * Try to see if the next param is a vertex index or a coord list.
    */
   i++;
-  index = strtol(LangString(args[i]), &end, 10);
-  if (*end != '\0') {
+  /*printf("  coords: arg %d is %s\n", i, Tcl_GetString(args[i]));*/
+  if (Tcl_GetLongFromObj(wi->interp, args[i], &index) != ZN_OK) {
     if ((argc == 7) || ((argc == 6) && (cmd != COORDS_ADD))) {
       Tcl_AppendResult(wi->interp, " incorrect coord index \"",
-		       args[i], "\"", NULL);
+		       Tcl_GetString(args[i]), "\"", NULL);
       return ZN_ERROR;
     }
     else if (ParseCoordList(wi, args[i], &points, &num_points) == ZN_ERROR) {
@@ -1670,7 +1714,8 @@ Coords(WidgetInfo	*wi,
     num_points = 1;
     cmd = COORDS_REPLACE;
   }
-  if (item->class->Coords(item, contour, index, cmd, &points, &num_points) == ZN_ERROR) {
+  if (item->class->Coords(item, contour, index, cmd,
+			  &points, &num_points) == ZN_ERROR) {
     return ZN_ERROR;
   }
 
@@ -1681,7 +1726,7 @@ Coords(WidgetInfo	*wi,
 /*
  *----------------------------------------------------------------------
  *
- * WidgetCmd --
+ * WidgetObjCmd --
  *
  *	This procedure is invoked to process the Tcl command
  *	that corresponds to a widget managed by this module.
@@ -1696,68 +1741,103 @@ Coords(WidgetInfo	*wi,
  *----------------------------------------------------------------------
  */
 static int
-WidgetCmd(ClientData	client_data,	/* Information about the widget. */
-	  Tcl_Interp	*interp,	/* Current interpreter. */
-	  int		argc,		/* Number of arguments. */
-	  Arg		*args)		/* Argument strings. */
+WidgetObjCmd(ClientData		client_data,	/* Information about the widget. */
+	     Tcl_Interp		*interp,	/* Current interpreter. */
+	     int		argc,		/* Number of arguments. */
+	     Tcl_Obj *CONST	args[])		/* Argument strings. */
 {
   WidgetInfo	*wi = (WidgetInfo *) client_data;
-  char		c;
-  int		result;
-  int		length;
+  int		result, cmd_index, index;
   Item		item, *items;
   ZnList	item_list;
   int		num = 0, i, j;
-  char		msg[INTEGER_SPACE];
-  char		*end, *end2;
+  char		*end, *end2, *str;
   ZnTransfo	*t = NULL;
+  Tcl_Obj	*l, *lobjs[4];
+  static char	*sub_cmd_strings[] = {
+    "add", "addtag", "anchorxy", "bbox", "becomes", "bind",
+    "cget", "chggroup", "clone", "configure", "contour",
+    "coords", "currentpart", "cursor", "dchars", "dtag",
+    "find", "fit", "focus", "gettags", "group",
+    "hasanchors", "hasfields", "hasparts", "hastag",
+    "index", "insert", "itemcget", "itemconfigure",
+    "lower", "monitor", "postscript", "raise", "remove",
+    "rotate", "scale", "select", "smooth", "tapply",
+    "tdelete", "transform", "translate", "treset",
+    "trestore", "tsave", "type", NULL
+  };
+  enum		sub_cmds {
+    ZN_W_ADD, ZN_W_ADDTAG, ZN_W_ANCHORXY, ZN_W_BBOX, ZN_W_BECOMES, ZN_W_BIND,
+    ZN_W_CGET, ZN_W_CHGGROUP, ZN_W_CLONE, ZN_W_CONFIGURE, ZN_W_CONTOUR,
+    ZN_W_COORDS, ZN_W_CURRENTPART, ZN_W_CURSOR, ZN_W_DCHARS, ZN_W_DTAG,
+    ZN_W_FIND, ZN_W_FIT, ZN_W_FOCUS, ZN_W_GETTAGS, ZN_W_GROUP,
+    ZN_W_HASANCHORS, ZN_W_HASFIELDS, ZN_W_HASPARTS, ZN_W_HASTAG,
+    ZN_W_INDEX, ZN_W_INSERT, ZN_W_ITEMCGET, ZN_W_ITEMCONFIGURE,
+    ZN_W_LOWER, ZN_W_MONITOR, ZN_W_POSTSCRIPT, ZN_W_RAISE, ZN_W_REMOVE,
+    ZN_W_ROTATE, ZN_W_SCALE, ZN_W_SELECT, ZN_W_SMOOTH, ZN_W_TAPPLY,
+    ZN_W_TDELETE, ZN_W_TRANSFORM, ZN_W_TRANSLATE, ZN_W_TRESET,
+    ZN_W_TRESTORE, ZN_W_TSAVE, ZN_W_TYPE
+  };
+  static char	*sel_cmd_strings[] = {
+    "adjust", "clear", "from", "item", "to", NULL
+  };
+  enum		sel_cmds {
+    ZN_SEL_ADJUST, ZN_SEL_CLEAR, ZN_SEL_FROM, ZN_SEL_ITEM, ZN_SEL_TO
+  };
+
   
   if (argc < 2) {
-    Tcl_AppendResult(interp, "wrong # of args: \"",
-		     LangString(args[0]), " subcommand ?args?.\"", NULL);
+    Tcl_WrongNumArgs(interp, 1, args, "subcommand ?args?");
     return ZN_ERROR;
   }
 
   Tcl_Preserve((ClientData) wi);
   
-  c = LangString(args[1])[0];
-  length = strlen(LangString(args[1]));
-  result = TCL_OK;
-
-  /*
-   * add
-   */
-  if ((c == 'a') && (strcmp(LangString(args[1]), "add") == 0)) {
-    Item group;
-    
-    if (argc == 2) { /* create subcommand alone, return the list of known
-		      * object types. */
-      ItemClass	*classes = ZnListArray(ITEM_P.ItemClassList());
+  if (Tcl_GetIndexFromObj(interp, args[1], sub_cmd_strings,
+			  "subcommand", 0, &cmd_index) != ZN_OK) {
+    goto error;
+  }
+  result = ZN_OK;
 
-      num = ZnListSize(ITEM_P.ItemClassList());
-      for (i = 0; i < num; i++) {
-	Tcl_AppendElement(interp, classes[i]->name);
-      }
-      goto done;
-    }
-    if ((argc < 4) || (LangString(args[2])[0] == '-')) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" add type group ?args?", NULL);
-      goto error;
-    }
+  printf("executing command \"%s\", argc=%d\n", Tcl_GetString(args[1]), argc);
+  switch((enum sub_cmds) cmd_index) {
+    /*
+     * add
+     */
+  case ZN_W_ADD:
     {
+      Item	group;
       ItemClass	cls;
       
-      cls = ITEM_P.LookupItemClass(LangString(args[2]));
+      if (argc == 2) { /* create subcommand alone, return the list of known
+			* object types. */
+	ItemClass	*classes = ZnListArray(ITEM_P.ItemClassList());
+	
+	num = ZnListSize(ITEM_P.ItemClassList());
+	l = Tcl_GetObjResult(interp);
+	for (i = 0; i < num; i++) {
+	  Tcl_ListObjAppendElement(interp, l, NewStringObj(classes[i]->name));
+	}
+	goto done;
+      }
+      if ((argc < 4)) {
+      add_err:
+	Tcl_WrongNumArgs(interp, 1, args, "add type group ?args?");
+	goto error;
+      }
+      str = Tcl_GetString(args[2]);
+      if (str[0] == '-') {
+	goto add_err;
+      }
+      cls = ITEM_P.LookupItemClass(str);
       if (!cls) {
-	Tcl_AppendResult(interp, "unknown item type \"", LangString(args[2]),
-			 "\"", NULL);
+	Tcl_AppendResult(interp, "unknown item type \"", str, "\"", NULL);
 	goto error;
       }
-      num = ZnItemsWithTagOrId(wi, LangString(args[3]), &group, NULL);
+      num = ZnItemsWithTagOrId(wi, args[3], &group, NULL);
       if (!num || (group->class != ZnGroup)) {
 	Tcl_AppendResult(interp, ", group item expected, got \"",
-			 LangString(args[3]), "\"", NULL);
+			 Tcl_GetString(args[3]), "\"", NULL);
 	goto error;
       }
       
@@ -1771,1480 +1851,1428 @@ WidgetCmd(ClientData	client_data,	/* Information about the widget. */
       if (ITEM.ConfigureItem(item, -1, argc, args, True) == ZN_ERROR) {
 	goto error;
       }
-      sprintf(msg, "%d", item->id);
-      Tcl_SetResult(interp, msg, TCL_VOLATILE);
-    }
-  }
-
-  /*
-   * addtag
-   */
-  else if ((c == 'a') && (strcmp(LangString(args[1]), "addtag") == 0)) {
-    if (argc < 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" addtag tag searchCommand ?arg arg ...?", NULL);
-      goto error;
-    }
-    result = FindItems(interp, wi, argc-3, args+3, LangString(args[2]),
-		       LangString(args[0]), " addtag tag");
-  }
-
-  /*
-   * anchorxy
-   */
-  else if ((c == 'a') && (strcmp(LangString(args[1]), "anchorxy") == 0)) {
-    Tk_Anchor	anchor;
-    ZnPoint	p;
-    
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" anchorxy tagOrId anchor", NULL);
-      goto error;
+      Tcl_SetObjResult(interp, NewLongObj(item->id));
     }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if ((num == 0) || !item->class->has_anchors) {
-      Tcl_AppendResult(interp, "unkown item or doesn't support anchors \"",
-		       LangString(args[2]), NULL);
-      goto error;
+    break;
+    /*
+     * addtag
+     */
+  case ZN_W_ADDTAG:
+    {
+      if (argc < 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "addtag tag searchCommand ?arg arg ...?");
+	goto error;
+      }
+      result = FindItems(wi, argc, args, args[2], 3);
     }
-    if (Tk_GetAnchor(interp, LangString(args[3]), &anchor)) {
-      goto error;
+    break;
+    /*
+     * anchorxy
+     */
+  case ZN_W_ANCHORXY:
+    {
+      Tk_Anchor	anchor;
+      ZnPoint	p;
+      
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "anchorxy tagOrId anchor");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if ((num == 0) || !item->class->has_anchors) {
+	Tcl_AppendResult(interp, "unknown item or doesn't support anchors \"",
+			 Tcl_GetString(args[2]), NULL);
+	goto error;
+      }
+      if (Tk_GetAnchor(interp, Tcl_GetString(args[3]), &anchor)) {
+	goto error;
+      }
+      /*
+       * If something has changed in the geometry we need to
+       * update or the anchor location will be erroneous.
+       */
+      ITEM_P.Update(wi);
+      item->class->GetAnchor(item, anchor, &p);
+      l = Tcl_GetObjResult(wi->interp);
+      Tcl_ListObjAppendElement(wi->interp, l, NewDoubleObj(p.x));
+      Tcl_ListObjAppendElement(wi->interp, l, NewDoubleObj(p.y));
     }
+    break;
     /*
-     * If something has changed in the geometry we need to
-     * update or the anchor location will be erroneous.
+     * becomes
      */
-    ITEM_P.Update(wi);
-    item->class->GetAnchor(item, anchor, &p);
-    sprintf(msg, "%g", p.x);
-    Tcl_AppendElement(interp, msg);
-    sprintf(msg, "%g", p.y);
-    Tcl_AppendElement(interp, msg);
-  }
-
-  /*
-   * becomes
-   */
-  else if ((c == 'b') && (strncmp(LangString(args[1]), "becomes", length) == 0)) {
-    Tcl_AppendResult(interp, "Command not yet implemented", NULL);
-    goto error;
-  }
-  
-  /*
-   * bbox
-   */
-  else if ((c == 'b') && (strncmp(LangString(args[1]), "bbox", length) == 0)) {
-    ZnBBox	bbox;
-    int		i;
-    ZnBool	found = False;
-    
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" bbox tagOrId ?tagOrId ...?", NULL);
+  case ZN_W_BECOMES:
+    {
+      Tcl_AppendResult(interp, "Command not yet implemented", NULL);
       goto error;
     }
-    argc -= 2;
-    args += 2;
-    
-    ITEM_P.Update(wi);
-    ResetBBox(&bbox);
-    for (i = 0; i < argc; i++) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[i]), &item, &items);
-      found |= (num != 0);
-      for (j = 0; j < num; j++) {
-	AddBBoxToBBox(&bbox, &items[j]->item_bounding_box);
+    break;
+    /*
+     * bbox
+     */
+  case ZN_W_BBOX:
+    {
+      ZnBBox	bbox;
+      int	i;
+      ZnBool	found = False;
+      
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "bbox tagOrId ?tagOrId ...?");
+	goto error;
+      }
+      argc -= 2;
+      args += 2;
+      
+      ITEM_P.Update(wi);
+      ResetBBox(&bbox);
+      for (i = 0; i < argc; i++) {
+	num = ZnItemsWithTagOrId(wi, args[i], &item, &items);
+	found |= (num != 0);
+	for (j = 0; j < num; j++) {
+	  AddBBoxToBBox(&bbox, &items[j]->item_bounding_box);
+	}
+      }
+      if (found && !IsEmptyBBox(&bbox)) {
+	lobjs[0] = NewDoubleObj(bbox.orig.x+wi->inset);
+	lobjs[1] = NewDoubleObj(bbox.orig.y+wi->inset);
+	lobjs[2] = NewDoubleObj(bbox.corner.x+wi->inset);
+	lobjs[3] = NewDoubleObj(bbox.corner.y+wi->inset);
+	Tcl_SetObjResult(interp, Tcl_NewListObj(4, lobjs));
       }
     }
-    if (found && !IsEmptyBBox(&bbox)) {
-      sprintf(msg, "%g", bbox.orig.x+wi->inset);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%g", bbox.orig.y+wi->inset);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%g", bbox.corner.x+wi->inset);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%g", bbox.corner.y+wi->inset);
-      Tcl_AppendElement(interp, msg);
-    }
-  }
-
-  /*
-   * bind
-   */
-  else if ((c == 'b') && (strncmp(LangString(args[1]), "bind", length) == 0)) {
-    ClientData    elem = 0;
-    int	          part = ZN_NO_PART;
-    
-    if ((argc < 3) || (argc > 5)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" bind tagOrId ?sequence? ?command?", NULL);
-      goto error;
-    }
+    break;
     /*
-     * Test if (a) an itemid or (b) an itemid:part or (c) a tag is provided.
+     * bind
      */
-    if (isdigit(LangString(args[2])[0])) {
-      Tcl_HashEntry *entry;
-      int	    id;
+  case ZN_W_BIND:
+    {
+      ClientData    elem = 0;
+      int          part = ZN_NO_PART;
       
-      id = strtoul(LangString(args[2]), &end, 0);
-      if (*end == ':') {
-	part = strtoul(end+1, &end2, 0);
-	if (*end2 != 0) {
+      if ((argc < 3) || (argc > 5)) {
+	Tcl_WrongNumArgs(interp, 1, args, "bind tagOrId ?sequence? ?command?");
+	goto error;
+      }
+      /*
+       * Test if (a) an itemid or (b) an itemid:part or (c) a tag is provided.
+       */
+      str = Tcl_GetString(args[2]);
+      if (isdigit(str[0])) {
+	Tcl_HashEntry *entry;
+	int	    id;
+	
+	id = strtoul(str, &end, 0);
+	if (*end == ':') {
+	  part = strtoul(end+1, &end2, 0);
+	  if (*end2 != 0) {
+	    goto bind_a_tag;
+	  }
+	}
+	else if (*end != 0) {
 	  goto bind_a_tag;
 	}
+	entry = Tcl_FindHashEntry(wi->id_table, (char *) id);
+	if (entry == NULL) {
+	  Tcl_AppendResult(interp, "item \"", str, "\" doesn't exist", NULL);
+	  goto error;
+	}
+	item = elem = Tcl_GetHashValue(entry);
+	if (!elem) {
+	  goto error;
+	}
+	if (*end == ':') {
+	  elem = EncodeItemPart((Item) elem, part);
+	}
+	/*printf("adding element 0x%X to the binding table of item 0x%X\n", elem, item);*/
       }
-      else if (*end != 0) {
-	goto bind_a_tag;
+      else {
+      bind_a_tag:
+	elem = (ClientData) Tk_GetUid(str);
       }
-      entry = Tcl_FindHashEntry(wi->id_table, (char *) id);
-      if (entry == NULL) {
-	Tcl_AppendResult(interp,
-			 "item \"", id, "\" doesn't exist", NULL);
-	goto error;
+      
+      /*
+       * Make a binding table if the widget doesn't already have one.
+       */ 
+      if (wi->binding_table == NULL) {
+	wi->binding_table = Tk_CreateBindingTable(interp);
       }
-      item = elem = Tcl_GetHashValue(entry);
-      if (!elem) {
-	goto error;
+      
+      if (argc == 5) {
+	int	    append = 0;
+	unsigned long mask;
+
+	str = Tcl_GetString(args[4]);
+	if (str[0] == 0) {
+	  result = Tk_DeleteBinding(interp, wi->binding_table, elem,
+				    Tcl_GetString(args[3]));
+	  goto done;
+	}
+	if (str[0] == '+') {
+	  str++;
+	  append = 1;
+	}
+#ifdef PTK
+	mask = Tk_CreateBinding(interp, wi->binding_table,
+				elem, Tcl_GetString(args[3]), args[4], append);
+#else
+	mask = Tk_CreateBinding(interp, wi->binding_table,
+				elem, Tcl_GetString(args[3]), str, append);
+#endif
+	if (mask == 0) {
+	  goto error;
+	}
+	if (mask & (unsigned) ~(ButtonMotionMask | Button1MotionMask |
+				Button2MotionMask | Button3MotionMask |
+				Button4MotionMask | Button5MotionMask | 
+				ButtonPressMask | ButtonReleaseMask |
+				EnterWindowMask | LeaveWindowMask |
+				KeyPressMask | KeyReleaseMask |
+				PointerMotionMask)) {
+	  Tk_DeleteBinding(interp, wi->binding_table, elem, Tcl_GetString(args[3]));
+	  Tcl_ResetResult(interp);
+	  Tcl_AppendResult(interp, "requested illegal events; ",
+			   "only key, button, motion, and enter/leave ",
+			   "events may be used", NULL);
+	  goto error;
+	}
+      }
+      else if (argc == 4) {
+#ifdef PTK
+	Tcl_Obj	*command;
+#else
+	char	*command;
+#endif
+	command = Tk_GetBinding(interp, wi->binding_table, elem, Tcl_GetString(args[3]));
+	if (command == NULL) {
+	  goto error;
+	}
+#ifdef PTK
+	Tcl_SetObjResult(interp, command);
+	Tcl_DecrRefCount(command);
+#else
+	Tcl_SetObjResult(interp, NewStringObj(command));
+#endif
       }
-      if (*end == ':') {
-	elem = EncodeItemPart((Item) elem, part);
+      else {
+	Tk_GetAllBindings(interp, wi->binding_table, elem);
       }
-      /*printf("adding element 0x%X to the binding table of item 0x%X\n", elem, item);*/
-    }
-    else {
-    bind_a_tag:
-      elem = (ClientData) Tk_GetUid(LangString(args[2]));
     }
-    
+    break;
     /*
-     * Make a binding table if the widget doesn't already have one.
-     */ 
-    if (wi->binding_table == NULL) {
-      wi->binding_table = Tk_CreateBindingTable(interp);
+     * cget
+     */
+  case ZN_W_CGET:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "cget option");
+	goto error;
+      }
+      result = Tk_ConfigureValue(interp, wi->win, config_specs,
+				 (char *) wi, Tcl_GetString(args[2]), 0);
     }
-    
-    if (argc == 5) {
-      int	    append = 0;
-      unsigned long mask;
+    break;
+    /*
+     * chggroup
+     */
+  case ZN_W_CHGGROUP:
+    {
+      Item grp;
+      int	 adjust=0;
+      ZnTransfo inv, t, t2, *this_one=NULL;
       
-      if (LangString(args[4])[0] == 0) {
-	result = Tk_DeleteBinding(interp, wi->binding_table, elem, LangString(args[3]));
-	goto done;
-      }
-      if (LangString(args[4])[0] == '+') {
-	args[4] = LangStringArg(LangString(args[4])+1);
-	append = 1;
+      if ((argc != 4) && (argc != 5)) {
+	Tcl_WrongNumArgs(interp, 1, args, "chggroup tagOrIg group ?adjustTransform?");
+	goto error;
       }
-      mask = Tk_CreateBinding(interp, wi->binding_table,
-			      elem, LangString(args[3]), args[4], append);
-      if (mask == 0) {
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
 	goto error;
       }
-      if (mask & (unsigned) ~(ButtonMotionMask | Button1MotionMask |
-			      Button2MotionMask | Button3MotionMask |
-			      Button4MotionMask | Button5MotionMask | 
-			      ButtonPressMask | ButtonReleaseMask |
-			      EnterWindowMask | LeaveWindowMask |
-			      KeyPressMask | KeyReleaseMask |
-			      PointerMotionMask)) {
-	Tk_DeleteBinding(interp, wi->binding_table, elem, LangString(args[3]));
-	Tcl_ResetResult(interp);
-	Tcl_AppendResult(interp, "requested illegal events; ",
-			 "only key, button, motion, and enter/leave ",
-			 "events may be used", NULL);
+      num = ZnItemsWithTagOrId(wi, args[3], &grp, NULL);
+      if (num == 0) {
 	goto error;
       }
+      if (argc == 5) {
+	if (Tcl_GetBooleanFromObj(interp, args[4], &adjust) != ZN_OK) {
+	  goto error;
+	}
+      }
+      if ((item->parent == grp) || (item->parent == ZN_NO_ITEM)) {
+	goto done;
+      }
+      if (adjust) {
+	ITEM.GetItemTransform(grp, &t);
+	ZnTransfoInvert(&t, &inv);
+	ITEM.GetItemTransform(item->parent, &t);
+	ZnTransfoCompose(&t2, &t, &inv);
+	this_one = &t2;
+	if (item->transfo) {
+	  ZnTransfoCompose(&t, item->transfo, &t2);
+	  this_one = &t;
+	}
+      }
+      ITEM.RemoveItem(item);
+      ITEM.InsertItem(item, grp, ZN_NO_ITEM, True);
+      ITEM.Invalidate(item, ZN_COORDS_FLAG);
+      if (adjust) {
+	ITEM.SetTransfo(item, this_one);
+      }
     }
-    else if (argc == 4) {
-      Arg command;
-      
-      command = Tk_GetBinding(interp, wi->binding_table, elem, LangString(args[3]));
-      if (command == NULL) {
+    break;
+    /*
+     * clone
+     */
+  case ZN_W_CLONE:
+    {
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "clone tagOrId ?option value ...?");
 	goto error;
       }
-#ifndef PTK
-      Tcl_SetResult(interp, command, TCL_STATIC);
-#else
-      Tcl_ArgResult(interp, command);
-#endif
-    }
-    else {
-      Tk_GetAllBindings(interp, wi->binding_table, elem);
-    }
-  }
-
-  /*
-   * cget
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "cget", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" cget option", NULL);
-      goto error;
-    }
-    result = Tk_ConfigureValue(interp, wi->win, config_specs,
-			       (char *) wi, LangString(args[2]), 0);
-  }
-  
-  /*
-   * chggroup
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "chggroup", length) == 0)) {
-    Item grp;
-    int	 adjust=0;
-    ZnTransfo inv, t, t2, *this_one;
-    
-    if ((argc != 4) && (argc != 5)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" chggroup tagOrIg group ?adjustTransform?", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[3]), &grp, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    if (argc == 5) {
-      if (Tcl_GetBoolean(interp, args[4], &adjust) != ZN_OK) {
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      if (num == 0) {
 	goto error;
       }
-    }
-    if ((item->parent == grp) || (item->parent == ZN_NO_ITEM)) {
-      goto done;
-    }
-    if (adjust) {
-      ITEM.GetItemTransform(grp, &t);
-      ZnTransfoInvert(&t, &inv);
-      ITEM.GetItemTransform(item->parent, &t);
-      ZnTransfoCompose(&t2, &t, &inv);
-      this_one = &t2;
-      if (item->transfo) {
-	ZnTransfoCompose(&t, item->transfo, &t2);
-	this_one = &t;
+      argc -= 3;
+      args += 3;
+      l = Tcl_GetObjResult(interp);
+      for (i = 0; i < num; i++) {
+	item = ITEM.CloneItem(items[i]);
+	ITEM.InsertItem(item, items[i]->parent, ZN_NO_ITEM, True);
+	if (ITEM.ConfigureItem(item, -1, argc, args, False) == ZN_ERROR) {
+	  goto error;
+	}
+	Tcl_ListObjAppendElement(interp, l, NewLongObj(item->id));
       }
     }
-    ITEM.RemoveItem(item);
-    ITEM.InsertItem(item, grp, ZN_NO_ITEM, True);
-    ITEM.Invalidate(item, ZN_COORDS_FLAG);
-    if (adjust) {
-      ITEM.SetTransfo(item, this_one);
-    }
-  }
-
-  /*
-   * clone
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "clone", length) == 0)) {
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" clone tagOrId ?option value ...?", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    if (num == 0) {
-      goto error;
+    break;
+    /*
+     * configure
+     */
+  case ZN_W_CONFIGURE:
+    {
+      if (argc == 2) {
+	result = Tk_ConfigureInfo(interp, wi->win, config_specs,
+				  (char *) wi, (char *) NULL, 0);
+      }
+      else if (argc == 3) {
+	result = Tk_ConfigureInfo(interp, wi->win, config_specs,
+				  (char *) wi, Tcl_GetString(args[2]), 0);
+      }
+      else {
+	result = Configure(interp, wi, argc-2, args+2, TK_CONFIG_ARGV_ONLY);
+      }
     }
-    argc -= 3;
-    args += 3;
-    for (i = 0; i < num; i++) {
-      item = ITEM.CloneItem(items[i]);
-      ITEM.InsertItem(item, items[i]->parent, ZN_NO_ITEM, True);
-      if (ITEM.ConfigureItem(item, -1, argc, args, False) == ZN_ERROR) {
+    break;
+    /*
+     * contour
+     */
+  case ZN_W_CONTOUR:
+    {
+#ifdef GPC
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args,
+			 "contour tagOrId operator coordListOrTagOrId");
 	goto error;
       }
-      sprintf(msg, "%d", item->id);
-      Tcl_AppendElement(interp, msg);
-    }
-  }
-  
-  /*
-   * configure
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "configure", length) == 0)) {
-    if (argc == 2) {
-      result = Tk_ConfigureInfo(interp, wi->win, config_specs,
-				(char *) wi, (char *) NULL, 0);
-    }
-    else if (argc == 3) {
-      result = Tk_ConfigureInfo(interp, wi->win, config_specs,
-				(char *) wi, LangString(args[2]), 0);
-    }
-    else {
-      result = Configure(interp, wi, argc-2, args+2, TK_CONFIG_ARGV_ONLY);
-    }
-  }
-
-  /*
-   * contour
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "contour", length) == 0)) {
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" contour tagOrId diff/inter/union/xor coordListOrTagOrId",
-		       NULL);
-      goto error;
-    }
-    if (Contour(wi, argc, args) == ZN_ERROR) {
-      goto error;
-    }
-  }
-  
-  /*
-   * coords
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "coords", length) == 0)) {
-    if ((argc < 3) || (argc > 6)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" coords tagOrId ?add/remove? ?contour? ?index? ?coordList?",
+      if (Contour(wi, argc, args) == ZN_ERROR) {
+	goto error;
+      }
+      break;
+#else
+      Tcl_AppendResult(interp, "Command \"", Tcl_GetString(args[1]),
+		       "\" not available (compile Zinc with GPC).",
 		       NULL);
       goto error;
+#endif
     }
-    if (Coords(wi, argc, args) == ZN_ERROR) {
-      goto error;
-    }
-  }
-  
-  /*
-   * currentpart
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "currentpart", length) == 0)) {
-    if (argc != 2) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" currentpart", NULL);
-      goto error;
-    }
-    sprintf(msg, "%d", wi->current_part);
-    Tcl_AppendResult(interp, msg, NULL);
-  }
-  
-  /*
-   * cursor
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[1]), "cursor", length) == 0)) {
-    int index;
-    if (argc != 4) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" cursor tagOrId index", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    for (i = 0; i < num; i++) {
-      if ((items[i]->class->Cursor == NULL) ||
-	  (items[i]->class->Index == NULL)) {
-	continue;
-      }
-      result = (*items[i]->class->Index)(items[i], LangString(args[3]), &index);
-      if (result != ZN_OK) {
+    /*
+     * coords
+     */
+  case ZN_W_COORDS:
+    {
+      if ((argc < 3) || (argc > 6)) {
+	Tcl_WrongNumArgs(interp, 1, args,
+			 "coords tagOrId ?add/remove? ?contour? ?index? ?coordList?");
 	goto error;
       }
-
-      (*items[i]->class->Cursor)(items[i], index);
-      if ((items[i] == wi->text_info.focus_item) && wi->text_info.cursor_on) {
-	ITEM.Invalidate(items[i], ZN_COORDS_FLAG);
+      if (Coords(wi, argc, args) == ZN_ERROR) {
+	goto error;
       }
     }
-  }
-  
-  /*
-   * dchars
-   */
-  else if ((c == 'd') && (strncmp(LangString(args[1]), "dchars", length) == 0)) {
-    int	first, last;
-    
-    if ((argc != 4) && (argc != 5)) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" dchars tagOrId first ?last?", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    for (i = 0; i < num; i++) {
-      if ((items[i]->class->Index == NULL) ||
-	  (items[i]->class->DeleteChars == NULL)) {
-	continue;
+    break;
+    /*
+     * currentpart
+     */
+  case ZN_W_CURRENTPART:
+    {
+      if (argc != 2) {
+	Tcl_WrongNumArgs(interp, 1, args, "currentpart");
+	goto error;
       }
-      result = (*items[i]->class->Index)(items[i], LangString(args[3]), &first);
-      if (result != ZN_OK) {
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(wi->current_part));
+    }
+    break;
+    /*
+     * cursor
+     */
+  case ZN_W_CURSOR:
+    {
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "cursor tagOrId index");
 	goto error;
       }
-      if (argc == 5) {
-	result = (*items[i]->class->Index)(items[i], LangString(args[4]), &last);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      for (i = 0; i < num; i++) {
+	if ((items[i]->class->Cursor == NULL) ||
+	    (items[i]->class->Index == NULL)) {
+	  continue;
+	}
+	result = (*items[i]->class->Index)(items[i], args[3], &index);
 	if (result != ZN_OK) {
 	  goto error;
 	}
+	
+	(*items[i]->class->Cursor)(items[i], index);
+	if ((items[i] == wi->text_info.focus_item) && wi->text_info.cursor_on) {
+	  ITEM.Invalidate(items[i], ZN_COORDS_FLAG);
+	}
       }
-      else {
-	last = first;
-      }
-      (*items[i]->class->DeleteChars)(items[i], first, last);
-    }
-  }
-  
-  /*
-   * dtag
-   */
-  else if ((c == 'd') && (strncmp(LangString(args[1]), "dtag", length) == 0)) {
-    Tk_Uid		tag;
-    Tcl_HashEntry	*entry;
-    
-    if ((argc != 3) && (argc != 4)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" dtag tagOrId ?tagToDelete?", NULL);
-      goto error;
-    }
-    if (argc == 4) {
-      tag = Tk_GetUid(LangString(args[3]));
-    } else {
-      tag = Tk_GetUid(LangString(args[2]));
-    }
-    entry = Tcl_FindHashEntry(wi->tag_table, tag);
-    item_list = (ZnList) Tcl_GetHashValue(entry);
-    items = (Item *) ZnListArray(item_list);
-    for (i = ZnListSize(item_list)-1; i >= 0; i++) {
-      ITEM.RemoveTag(items[i], (char *) tag);
     }
+    break;
     /*
-     * The RemoveTag method *must* remove the tag table
-     * entry when it gets empty. Otherwise a tag probe
-     * we bring back an empty item list and this would
-     * not be reported as an error by ZnItemsWithTagOrId.
+     * dchars
      */
-  }
-  
-  /*
-   * find
-   */
-  else if ((c == 'f') && (strncmp(LangString(args[1]), "find", length) == 0)) {
-    if (argc < 3) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" find searchCommand ?arg arg ...?", NULL);
-      goto error;
-    }
-    result = FindItems(interp, wi, argc-2, args+2, NULL, LangString(args[0]), " find");
-  }
-  
-  /*
-   * fit
-   */
-  else if ((c == 'f') && (strncmp(LangString(args[1]), "fit", length) == 0)) {
-    ZnPoint	*points;
-    int		num_points;
-    ZnReal	error;
-    ZnList	to_points;
-    
-    if (argc != 4) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" fit coordList error", NULL);
-      goto error;
-    }
-    if (ParseCoordList(wi, args[2], &points, &num_points) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetDouble(interp, args[3], &error) == ZN_ERROR) {
-      goto error;
-    }
-    to_points = ZnListNew(32, sizeof(ZnPoint));
-    FitBezier(points, num_points, error, to_points);
-    points = (ZnPoint *) ZnListArray(to_points);
-    num_points = ZnListSize(to_points);
-    for (i = 0; i < num_points; i++, points++) {
-      sprintf(msg, "%g", points->x);
-      Tcl_AppendElement(wi->interp, msg);
-      sprintf(msg, "%g", points->y);
-      Tcl_AppendElement(wi->interp, msg);
-    }
-    ZnListFree(to_points);
-  }
-
-  /*
-   * focus
-   */
-  else if ((c == 'f') && (strncmp(LangString(args[1]), "focus", length) == 0)) {
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" focus ?tagOrId?", NULL);
-      goto error;
-    }
-    item = wi->text_info.focus_item;
-    if (argc == 2) {
-      if (item != ZN_NO_ITEM) {
-	sprintf(msg, "%d", item->id);
-	Tcl_SetResult(wi->interp, msg, TCL_VOLATILE);
-      }
-      goto done;
-    }
-    if ((item != ZN_NO_ITEM) && (wi->text_info.got_focus)) {
-      ITEM.Invalidate(item, ZN_COORDS_FLAG);
-    }
-    if (LangString(args[2])[0] == 0) {
-      wi->text_info.focus_item = ZN_NO_ITEM;
-      goto done;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    item = ZN_NO_ITEM;
-    for (i = 0; i < num; i++) {
-      if (items[i]->class->Cursor != NULL) {
-	break;
+  case ZN_W_DCHARS:
+    {
+      int	first, last;
+      
+      if ((argc != 4) && (argc != 5)) {
+	Tcl_WrongNumArgs(interp, 1, args, "dchars tagOrId first ?last?");
+	goto error;
       }
-    }
-    if (num == 0) {
-      goto done;
-    }
-    wi->text_info.focus_item = items[i];
-    if (wi->text_info.got_focus) {
-      ITEM.Invalidate(wi->text_info.focus_item, ZN_COORDS_FLAG);
-    }
-  }
-  
-  /*
-   * gettags
-   */
-  else if ((c == 'g') && (strncmp(LangString(args[1]), "gettags", length) == 0)) {
-    Tk_Uid	*tags;
-
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" gettags tagOrId", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    if (!item->tags || !ZnListSize(item->tags)) {
-      goto done;
-    }
-    else {
-      num = ZnListSize(item->tags);
-      tags = (Tk_Uid *) ZnListArray(item->tags);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
       for (i = 0; i < num; i++) {
-	Tcl_AppendElement(interp, tags[i]);
+	if ((items[i]->class->Index == NULL) ||
+	    (items[i]->class->DeleteChars == NULL)) {
+	  continue;
+	}
+	result = (*items[i]->class->Index)(items[i], args[3], &first);
+	if (result != ZN_OK) {
+	  goto error;
+	}
+	if (argc == 5) {
+	  result = (*items[i]->class->Index)(items[i], args[4], &last);
+	  if (result != ZN_OK) {
+	    goto error;
+	  }
+	}
+	else {
+	  last = first;
+	}
+	(*items[i]->class->DeleteChars)(items[i], first, last);
       }
     }
-  }
-
-  /*
-   * group
-   */
-  else if ((c == 'g') && (strncmp(LangString(args[1]), "group", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" group tagOrId", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    if (item->parent != ZN_NO_ITEM) {
-      sprintf(msg, "%d", item->parent->id);
-    }
-    else {
+    break;
+    /*
+     * dtag
+     */
+  case ZN_W_DTAG:
+    {
+      Tk_Uid		tag;
+      Tcl_HashEntry	*entry;
+      
+      if ((argc != 3) && (argc != 4)) {
+	Tcl_WrongNumArgs(interp, 1, args, "dtag tagOrId ?tagToDelete?");
+	goto error;
+      }
+      if (argc == 4) {
+	tag = Tk_GetUid(Tcl_GetString(args[3]));
+      }
+      else {
+	tag = Tk_GetUid(Tcl_GetString(args[2]));
+      }
+      entry = Tcl_FindHashEntry(wi->tag_table, tag);
+      item_list = (ZnList) Tcl_GetHashValue(entry);
+      items = (Item *) ZnListArray(item_list);
+      for (i = ZnListSize(item_list)-1; i >= 0; i++) {
+	ITEM.RemoveTag(items[i], (char *) tag);
+      }
       /*
-       * Top group is its own parent.
+       * The RemoveTag method *must* remove the tag table
+       * entry when it gets empty. Otherwise a tag probe
+       * we bring back an empty item list and this would
+       * not be reported as an error by ZnItemsWithTagOrId.
        */
-      sprintf(msg, "%d", item->id);
-    }
-    Tcl_SetResult(interp, msg, TCL_VOLATILE);
-  }
-  
-  /*
-   * hasanchors
-   */
-  else if ((c == 'h') && (strncmp(LangString(args[1]), "hasanchors", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" hasanchors tagOrId", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    Tcl_SetResult(interp, item->class->has_anchors ? "1" : "0", TCL_STATIC);
-  }
-  
-  /*
-   * hasfields
-   */
-  else if ((c == 'h') && (strncmp(LangString(args[1]), "hasfields", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" hasfields tagOrId", NULL);
-      goto error;
     }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    Tcl_SetResult(interp, item->class->has_fields ? "1" : "0", TCL_STATIC);
-  }
-  
-  /*
-   * hasparts
-   */
-  else if ((c == 'h') && (strncmp(LangString(args[1]), "hasparts", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" hasparts tagOrId", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    Tcl_SetResult(interp, item->class->has_parts ? "1" : "0", TCL_STATIC);
-  }
-  
-  /*
-   * hastag
-   */
-  else if ((c == 'h') && (strncmp(LangString(args[1]), "hastag", length) == 0)) {
-    Tk_Uid	tag_uid;
-    Tk_Uid	*tags;
-    
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" hastag tagOrId tag", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
+    break;
+    /*
+     * find
+     */
+  case ZN_W_FIND:
+    {
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "find searchCommand ?arg arg ...?");
+	goto error;
+      }
+      result = FindItems(wi, argc, args, NULL, 2);
     }
-    if (!item->tags || !ZnListSize(item->tags)) {
-      Tcl_AppendResult(interp, "0", NULL);
+    break;
+    /*
+     * fit
+     */
+  case ZN_W_FIT:
+    {
+      ZnPoint	*points;
+      int	num_points;
+      ZnReal	error;
+      ZnList	to_points;
+      
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "fit coordList error");
+	goto error;
+      }
+      if (ParseCoordList(wi, args[2], &points, &num_points) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      if (Tcl_GetDoubleFromObj(interp, args[3], &error) == ZN_ERROR) {
+	goto error;
+      }
+      to_points = ZnListNew(32, sizeof(ZnPoint));
+      FitBezier(points, num_points, error, to_points);
+      points = (ZnPoint *) ZnListArray(to_points);
+      num_points = ZnListSize(to_points);
+      l = Tcl_GetObjResult(interp);
+      for (i = 0; i < num_points; i++, points++) {
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(points->x));
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(points->y));
+      }
+      ZnListFree(to_points);
     }
-    else {
-      num = ZnListSize(item->tags);
-      tag_uid = Tk_GetUid(LangString(args[3]));
-      tags = (Tk_Uid *) ZnListArray(item->tags);
-      for (i = 0; i < num; i++) {
-	if (tags[i] == tag_uid) {
-	  Tcl_SetResult(interp, "1", TCL_STATIC);
-	  goto done;
+    break;
+    /*
+     * focus
+     */
+  case ZN_W_FOCUS:
+    {
+      if ((argc != 2) && (argc != 3)) {
+	Tcl_WrongNumArgs(interp, 1, args, "focus ?tagOrId?");
+	goto error;
+      }
+      item = wi->text_info.focus_item;
+      if (argc == 2) {
+	if (item != ZN_NO_ITEM) {
+	  Tcl_SetObjResult(interp, NewLongObj(item->id));
 	}
+	goto done;
       }
-      Tcl_SetResult(interp, "0", TCL_STATIC);
-    }
-  }
-
-  /*
-   * index
-   */
-  else if ((c == 'i') && (strncmp(LangString(args[1]), "index", length) == 0)) {
-    int index;
-
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" index tagOrId string", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    for (i = 0; i < num; i++) {
-      if (items[i]->class->Index != NULL) {
-	result = (*items[i]->class->Index)(items[i], LangString(args[3]), &index);
-	if (result != ZN_OK) {
-	  goto error;
+      if ((item != ZN_NO_ITEM) && (wi->text_info.got_focus)) {
+	ITEM.Invalidate(item, ZN_COORDS_FLAG);
+      }
+      if (Tcl_GetString(args[2])[0] == 0) {
+	wi->text_info.focus_item = ZN_NO_ITEM;
+	goto done;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      item = ZN_NO_ITEM;
+      for (i = 0; i < num; i++) {
+	if (items[i]->class->Cursor != NULL) {
+	  break;
 	}
-	sprintf(msg, "%d", index);
-	Tcl_SetResult(interp, msg, TCL_VOLATILE);
+      }
+      if (num == 0) {
 	goto done;
       }
+      wi->text_info.focus_item = items[i];
+      if (wi->text_info.got_focus) {
+	ITEM.Invalidate(wi->text_info.focus_item, ZN_COORDS_FLAG);
+      }
     }
-    Tcl_AppendResult(interp, "can't find an indexable item \"",
-		     LangString(args[2]), "\"", NULL);
-    goto error;
-  }
-  
-  /*
-   * insert
-   */
-  else if ((c == 'i') && (strncmp(LangString(args[1]), "insert", length) == 0)) {
-    int	index;
-
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" insert tagOrId before string", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    for (i = 0; i < num; i++) {
-      if ((items[i]->class->Index == NULL) ||
-	  (items[i]->class->InsertChars == NULL)) {
-	continue;
+    break;
+    /*
+     * gettags
+     */
+  case ZN_W_GETTAGS:
+    {
+      Tk_Uid	*tags;
+      
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "gettags tagOrId");
+	goto error;
       }
-      result = (*items[i]->class->Index)(items[i], LangString(args[3]), &index);
-      if (result != ZN_OK) {
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
 	goto error;
       }
-      (*items[i]->class->InsertChars)(items[i], index, LangString(args[4]));
-    }
-  }
-  
-  /*
-   * itemcget
-   */
-  else if ((c == 'i') && (strncmp(LangString(args[1]), "itemcget", length) == 0)) {
-    int  field = -1;
-#ifndef PTK
-    char *largv[1];
-#else
-    Arg *largv = LangAllocVec(1);
-#endif
-    if (argc < 4) {
-    itemcget_syntax:
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" itemcget tagOrId ?field? option", NULL);
-      goto error;
-    }    
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
+      if (!item->tags || !ZnListSize(item->tags)) {
+	goto done;
+      }
+      else {
+	num = ZnListSize(item->tags);
+	tags = (Tk_Uid *) ZnListArray(item->tags);
+	l = Tcl_GetObjResult(interp);
+	for (i = 0; i < num; i++) {
+	  Tcl_ListObjAppendElement(interp, l, NewStringObj(tags[i]));
+	}
+      }
     }
-    if (LangString(args[3])[0] != '-') {
-      char	*end;
-      if (argc != 5) {
-	goto itemcget_syntax;
+    break;
+    /*
+     * group
+     */
+  case ZN_W_GROUP:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "group tagOrId");
+	goto error;
       }
-      field = strtoul(LangString(args[3]), &end, 0);
-      if (*end == 0) {
-	argc--;
-	args++;
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
+	goto error;
+      }
+      if (item->parent != ZN_NO_ITEM) {
+	Tcl_SetObjResult(interp, NewLongObj(item->parent->id));
       }
       else {
-	Tcl_AppendResult(interp, "invalid field index \"", LangString(args[3]),
-			 "\", should be a positive integer", NULL);
-	goto error;
+	/*
+	 * Top group is its own parent.
+	 */
+	Tcl_SetObjResult(interp, NewLongObj(item->id));
       }
     }
-    if (argc != 4) {
-      goto itemcget_syntax;	  
-    }
-    largv[0] = LangCopyArg(args[3]);
-    if (ITEM.QueryItem(item, field, 1, largv) != ZN_OK) {
-#ifdef PTK
-      LangFreeVec(1, largv);
-#endif
-      goto error;
-    }
-#ifdef PTK
-    LangFreeVec(1, largv);
-#endif
-  }
-
-  /*
-   * itemconfigure
-   */
-  else if ((c == 'i') && (strncmp(LangString(args[1]), "itemconfigure", length) == 0)) {
-    int field = -1;
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" itemconfigure tagOrId ?field? option value ?option value? ...",
-		       NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    if (num == 0) {
-      goto error;
-    }
-    if ((argc > 3) && (LangString(args[3])[0] != '-')) {
-      char  *end;
-      field = strtoul(LangString(args[3]), &end, 0);
-      if (*end == 0) {
-	argc--;
-	args++;
+    break;
+    /*
+     * hasanchors
+     */
+  case ZN_W_HASANCHORS:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "hasanchors tagOrId");
+	goto error;
       }
-      else {
-	Tcl_AppendResult(interp, "invalid field index \"", LangString(args[3]),
-			 "\", should be a positive integer", NULL);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
 	goto error;
       }
+      Tcl_SetObjResult(interp, NewBooleanObj(item->class->has_anchors?1:0));
     }
-    argc -= 3;
-    args += 3;
-    if (argc < 2) {
-      if (ITEM.AttributesInfo(item, field, argc, args) == ZN_ERROR) {
+    break;
+    /*
+     * hasfields
+     */
+  case ZN_W_HASFIELDS:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "hasfields tagOrId");
 	goto error;
       }
-      goto done;
-    }
-    for (i = 0; i < num; i++) {
-      result = ITEM.ConfigureItem(items[i], field, argc, args, False);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
+	goto error;
+      }
+      Tcl_SetObjResult(interp, NewBooleanObj(item->class->has_fields?1:0));
     }
+    break;
     /*
-     * Don't report errors when configuring many items/fields. All
-     * options are not supported by all item types.
+     * hasparts
      */
-    if ((num == 1) && (result == ZN_ERROR)) {
-      goto error;
-    }
-  }
-
-  /*
-   * lower
-   */
-  else if ((c == 'l') && (strncmp(LangString(args[1]), "lower", length) == 0)) {
-    Item      mark = ZN_NO_ITEM;
-    TagSearch search;
-    
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" lower tagOrId ?belowThis?", NULL);
-      goto error;
+  case ZN_W_HASPARTS:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "hasparts tagOrId");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
+	goto error;
+      }
+      Tcl_SetObjResult(interp, NewBooleanObj(item->class->has_parts?1:0));
     }
-    if (argc == 4) {
-      for (item = ZnSearchWithTagOrId(wi, LangString(args[3]), wi->top_group, &search);
-	   item != ZN_NO_ITEM;
-	   item = ZnNextWithTagOrId(&search)) {
-	mark = item;
+    break;
+    /*
+     * hastag
+     */
+  case ZN_W_HASTAG:
+    {
+      Tk_Uid	tag_uid;
+      Tk_Uid	*tags;
+      
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "hastag tagOrId tag");
+	goto error;
       }
-      if (mark == ZN_NO_ITEM) {
-	Tcl_AppendResult(interp, "unkown tag or item \"",
-			 LangString(args[3]), "\"", NULL);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
 	goto error;
       }
+      if (!item->tags || !ZnListSize(item->tags)) {
+	Tcl_SetObjResult(interp, NewBooleanObj(0));
+      }
+      else {
+	num = ZnListSize(item->tags);
+	tag_uid = Tk_GetUid(Tcl_GetString(args[3]));
+	tags = (Tk_Uid *) ZnListArray(item->tags);
+	for (i = 0; i < num; i++) {
+	  if (tags[i] == tag_uid) {
+	    Tcl_SetObjResult(interp, NewBooleanObj(1));
+	    goto done;
+	  }
+	}
+	Tcl_SetObjResult(interp, NewBooleanObj(0));
+      }
     }
-    item = ZnSearchWithTagOrId(wi, LangString(args[2]), wi->top_group, &search);
-    if (item == ZN_NO_ITEM) {
-      Tcl_AppendResult(interp, "unkown tag or item \"",
-		       LangString(args[2]), "\"", NULL);
+    break;
+    /*
+     * index
+     */
+  case ZN_W_INDEX:
+    {
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "index tagOrId string");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      for (i = 0; i < num; i++) {
+	if (items[i]->class->Index != NULL) {
+	  result = (*items[i]->class->Index)(items[i], args[3], &index);
+	  if (result != ZN_OK) {
+	    goto error;
+	  }
+	  Tcl_SetObjResult(interp, Tcl_NewIntObj(index));
+	  goto done;
+	}
+      }
+      Tcl_AppendResult(interp, "can't find an indexable item \"",
+		       Tcl_GetString(args[2]), "\"", NULL);
       goto error;
     }
-    if (mark == ZN_NO_ITEM) {
-      mark = ((GroupItem) item->parent)->tail;
-    }
-    for (; item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&search)) {
-      if (item != mark) {
-	ITEM.UpdateItemPriority(item, mark, False);
-	mark = item;
+    break;
+    /*
+     * insert
+     */
+  case ZN_W_INSERT:
+    {
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "insert tagOrId before string");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      for (i = 0; i < num; i++) {
+	if ((items[i]->class->Index == NULL) ||
+	    (items[i]->class->InsertChars == NULL)) {
+	  continue;
+	}
+	result = (*items[i]->class->Index)(items[i], args[3], &index);
+	if (result != ZN_OK) {
+	  goto error;
+	}
+	(*items[i]->class->InsertChars)(items[i], index, Tcl_GetString(args[4]));
       }
     }
-  }
+    break;
+    /*
+     * itemcget
+     */
+  case ZN_W_ITEMCGET:
+    {
+      int  field = -1;
 
-  /*
-   * monitor
-   */
-  else if ((c == 'm') && (strncmp(LangString(args[1]), "monitor", length) == 0)) {
-    ZnBool  on_off;
-    
-    if ((argc != 2) && (argc != 3)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" monitor ?onOff?", NULL);
-      goto error;
-    }
-    if (argc == 3) {
-      if (Tcl_GetBoolean(interp, args[2], &on_off) != ZN_OK) {
+      if (argc < 4) {
+      itemcget_syntax:
+	Tcl_WrongNumArgs(interp, 1, args, "itemcget tagOrId ?field? option");
+	goto error;
+      }    
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
 	goto error;
       }
-      wi->monitoring = on_off;
-      if (on_off == True) {
-	wi->num_updates = 0;
-	wi->last_time = wi->total_time = 0;
+      if (argc == 5) {
+	if (Tcl_GetIntFromObj(interp, args[3], &field) != ZN_OK) {
+	  Tcl_AppendResult(interp, "invalid field index \"", Tcl_GetString(args[3]),
+			   "\", should be a positive integer", NULL);
+	  goto error;
+	}
+	argc--;
+	args++;
+      }
+      if (argc != 4) {
+	goto itemcget_syntax;	  
+      }
+      if (ITEM.QueryItem(item, field, 1, &args[3]) != ZN_OK) {
+	goto error;
       }
     }
-    if ((argc == 2) || (on_off == False)) {
-      sprintf(msg, "%d", wi->num_updates);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", wi->last_time);
-      Tcl_AppendElement(interp, msg);
-      /*      sprintf(msg, "%d", wi->num_updates!=0?wi->total_time/wi->num_updates:0);*/
-      sprintf(msg, "%d", wi->total_time);
-      Tcl_AppendElement(interp, msg);
-    }
-  }
-  
-  /*
-   * postscript
-   */
-  else if ((c == 'p') && (strncmp(LangString(args[1]), "postscript", length) == 0)) {
-    Tcl_AppendResult(interp, "Command not yet implemented", NULL);
-    goto error;
-  }
-  
-  /*
-   * raise
-   */
-  else if ((c == 'r') && (strncmp(LangString(args[1]), "raise", length) == 0)) {
-    Item      mark = ZN_NO_ITEM;
-    TagSearch search;
-    
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" raise tagOrId ?aboveThis?", NULL);
-      goto error;
-    }
-    if (argc == 4) {
+    break;
+    /*
+     * itemconfigure
+     */
+  case ZN_W_ITEMCONFIGURE:
+    {
+      int field = -1;
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args,
+			 "itemconfigure tagOrId ?field? option value ?option value? ...");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      if (num == 0) {
+	goto error;
+      }
+      if ((argc > 3) && (Tcl_GetString(args[3])[0] != '-')) {
+	if (Tcl_GetIntFromObj(interp, args[3], &field) != ZN_OK) {
+	  Tcl_AppendResult(interp, "invalid field index \"",
+			   Tcl_GetString(args[3]),
+			   "\", should be a positive integer", NULL);
+	  goto error;
+	}
+	argc--;
+	args++;
+      }
+      argc -= 3;
+      args += 3;
+      if (argc < 2) {
+	if (ITEM.AttributesInfo(item, field, argc, args) == ZN_ERROR) {
+	  goto error;
+	}
+	goto done;
+      }
+      for (i = 0; i < num; i++) {
+	result = ITEM.ConfigureItem(items[i], field, argc, args, False);
+      }
       /*
-       * Find the topmost item with the tag.
+       * Don't report errors when configuring many items/fields. All
+       * options are not supported by all item types.
        */
-      mark = ZnSearchWithTagOrId(wi, LangString(args[3]), wi->top_group, &search);
-      if (mark == ZN_NO_ITEM) {
-	Tcl_AppendResult(interp, "unkown tag or item \"",
-			 LangString(args[3]), "\"", NULL);
+      if ((num == 1) && (result == ZN_ERROR)) {
 	goto error;
       }
-      ZnDoneWithSearch(&search);
     }
-    item = ZnSearchWithTagOrId(wi, LangString(args[2]), wi->top_group, &search);
-    if (item == ZN_NO_ITEM) {
-      Tcl_AppendResult(interp, "unkown tag or item \"",
-		       LangString(args[2]), "\"", NULL);
-      goto error;
-    }
-    if (mark == ZN_NO_ITEM) {
-      mark = ((GroupItem) item->parent)->head;
-    }
-    for (; item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&search)) {
-      if (item != mark) {
-	ITEM.UpdateItemPriority(item, mark, True);
+    break;
+    /*
+     * lower
+     */
+  case ZN_W_LOWER:
+    {
+      Item      mark = ZN_NO_ITEM;
+      TagSearch search;
+      
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "lower tagOrId ?belowThis?");
+	goto error;
+      }
+      if (argc == 4) {
+	for (item = ZnSearchWithTagOrId(wi, args[3], wi->top_group, &search);
+	     item != ZN_NO_ITEM;
+	     item = ZnNextWithTagOrId(&search)) {
+	  mark = item;
+	}
+	if (mark == ZN_NO_ITEM) {
+	  Tcl_AppendResult(interp, "unknown tag or item \"",
+			   Tcl_GetString(args[3]), "\"", NULL);
+	  goto error;
+	}
+      }
+      item = ZnSearchWithTagOrId(wi, args[2], wi->top_group, &search);
+      if (item == ZN_NO_ITEM) {
+	Tcl_AppendResult(interp, "unknown tag or item \"",
+			 Tcl_GetString(args[2]), "\"", NULL);
+	goto error;
+      }
+      if (mark == ZN_NO_ITEM) {
+	mark = ((GroupItem) item->parent)->tail;
+      }
+      for (; item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&search)) {
+	if (item != mark) {
+	  ITEM.UpdateItemPriority(item, mark, False);
+	  mark = item;
+	}
       }
     }
-  }
-  
-  /*
-   * remove
-   */
-  else if ((c == 'r') && (strncmp(LangString(args[1]), "remove", length) == 0)) {
-    if (argc < 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" remove tagOrId ?tagOrId ...?", NULL);
-      goto error;
-    }
-    argc -= 2;
-    args += 2;
-    for (j = 0; j < argc; j++) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[j]), &item, &items);
-      if (num == 0) {
+    break;
+    /*
+     * monitor
+     */
+  case ZN_W_MONITOR:
+    {
+      ZnBool  on_off;
+      
+      if ((argc != 2) && (argc != 3)) {
+	Tcl_WrongNumArgs(interp, 1, args, "monitor ?onOff?");
 	goto error;
       }
-      for (i = num-1; i >= 0; i--) {
-	if (items[i] == wi->top_group) {
-	  continue;
+      if (argc == 3) {
+	if (Tcl_GetBooleanFromObj(interp, args[2], &on_off) != ZN_OK) {
+	  goto error;
 	}
-	if (wi->binding_table != NULL) {
-	  /*
-	   * BUG: we can't actually destroy all the item's bindings
-	   * if there are field bindings registered.
-	   */
-	  Tk_DeleteAllBindings(wi->binding_table, (ClientData) items[i]);
+	wi->monitoring = on_off;
+	if (on_off == True) {
+	  wi->num_updates = 0;
+	  wi->last_time = wi->total_time = 0;
 	}
-	ITEM.DestroyItem(items[i]);
+      }
+      if ((argc == 2) || (on_off == False)) {
+	lobjs[0] = Tcl_NewIntObj(wi->num_updates);
+	lobjs[1] = Tcl_NewIntObj(wi->last_time);
+	lobjs[2] = Tcl_NewIntObj(wi->total_time);
+	Tcl_SetObjResult(interp, Tcl_NewListObj(3, lobjs));
       }
     }
-  }
-
-  /*
-   * rotate
-   */
-  else if ((c == 'r') && (strncmp(LangString(args[1]), "rotate", length) == 0)) {
-    ZnReal	angle;
-    ZnPoint	p;
-    
-    if ((argc != 4) && (argc != 6)) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" rotate tagOrId angle ?centerX centerY?", (char *) NULL);
+    break;
+    /*
+     * postscript
+     */
+  case ZN_W_POSTSCRIPT:
+    {
+      Tcl_AppendResult(interp, "Command not yet implemented", NULL);
       goto error;
     }
-
-    if (argc == 6) {
-      if (Tcl_GetDouble(interp, args[4], &p.x) == ZN_ERROR) {
+    break;
+    /*
+     * raise
+     */
+  case ZN_W_RAISE:
+    {
+      Item      mark = ZN_NO_ITEM;
+      TagSearch search;
+      
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "raise tagOrId ?aboveThis?");
 	goto error;
       }
-      if (Tcl_GetDouble(interp, args[5], &p.y) == ZN_ERROR) {
+      if (argc == 4) {
+	/*
+	 * Find the topmost item with the tag.
+	 */
+	mark = ZnSearchWithTagOrId(wi, args[3], wi->top_group, &search);
+	if (mark == ZN_NO_ITEM) {
+	  Tcl_AppendResult(interp, "unknown tag or item \"",
+			   Tcl_GetString(args[3]), "\"", NULL);
+	  goto error;
+	}
+	ZnDoneWithSearch(&search);
+      }
+      item = ZnSearchWithTagOrId(wi, args[2], wi->top_group, &search);
+      if (item == ZN_NO_ITEM) {
+	Tcl_AppendResult(interp, "unknown tag or item \"",
+			 Tcl_GetString(args[2]), "\"", NULL);
 	goto error;
       }
+      if (mark == ZN_NO_ITEM) {
+	mark = ((GroupItem) item->parent)->head;
+      }
+      for (; item != ZN_NO_ITEM; item = ZnNextWithTagOrId(&search)) {
+	if (item != mark) {
+	  ITEM.UpdateItemPriority(item, mark, True);
+	}
+      }
     }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    if (num == 0) {
-      Tcl_HashEntry	*e;
-      e = Tcl_FindHashEntry(wi->t_table, LangString(args[2]));
-      if (e == NULL) {
-	Tcl_FreeResult(interp);
-	Tcl_AppendResult(interp,
-			 "\"", LangString(args[2]), "\" must be either a tag or ",
-			 "an id or a transform name", (char *) NULL);
+    break;
+    /*
+     * remove
+     */
+  case ZN_W_REMOVE:
+    {
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "remove tagOrId ?tagOrId ...?");
 	goto error;
       }
-      t = (ZnTransfo *) Tcl_GetHashValue(e);
-    }
-
-    if (Tcl_GetDouble(interp, args[3], &angle) == ZN_ERROR) {
-      goto error;
+      argc -= 2;
+      args += 2;
+      for (j = 0; j < argc; j++) {
+	num = ZnItemsWithTagOrId(wi, args[j], &item, &items);
+	if (num == 0) {
+	  goto error;
+	}
+	for (i = num-1; i >= 0; i--) {
+	  if (items[i] == wi->top_group) {
+	    continue;
+	  }
+	  if (wi->binding_table != NULL) {
+	    /*
+	     * BUG: we can't actually destroy all the item's bindings
+	     * if there are field bindings registered.
+	     */
+	    Tk_DeleteAllBindings(wi->binding_table, (ClientData) items[i]);
+	  }
+	  ITEM.DestroyItem(items[i]);
+	}
+      }
     }
-    if (t) {
-      if (argc == 6) {
-	ZnTranslate(t, -p.x, -p.y);
+    break;
+    /*
+     * rotate
+     */
+  case ZN_W_ROTATE:
+    {
+      ZnReal	angle;
+      ZnPoint	p;
+      
+      if ((argc != 4) && (argc != 6)) {
+	Tcl_WrongNumArgs(interp, 1, args, "rotate tagOrId angle ?centerX centerY?");
+	goto error;
       }
-      ZnRotateRad(t, angle);
+      
       if (argc == 6) {
-	ZnTranslate(t, p.x, p.y);
-      }
-    }
-    if (num != 0) {
-      for (i = 0; i < num; i++) {
-	ITEM.RotateItem(items[i], angle, (argc == 6) ? &p : NULL);
+	if (Tcl_GetDoubleFromObj(interp, args[4], &p.x) == ZN_ERROR) {
+	  goto error;
+	}
+	if (Tcl_GetDoubleFromObj(interp, args[5], &p.y) == ZN_ERROR) {
+	  goto error;
+	}
       }
-    }
-  }
-  
-  /*
-   * scale
-   */
-  else if ((c == 's') && (strncmp(LangString(args[1]), "scale", length) == 0)) {
-    ZnPoint   scale;
-    
-    if (argc != 5) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" scale tagOrId xFactor yFactor", (char *) NULL);
-      goto error;
-    }
-    if (argc == 5) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
       if (num == 0) {
 	Tcl_HashEntry	*e;
-	e = Tcl_FindHashEntry(wi->t_table, LangString(args[2]));
+	e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[2]));
 	if (e == NULL) {
-	  Tcl_FreeResult(interp);
-	  Tcl_AppendResult(interp, "\"", LangString(args[2]),
-			   "\" must be either a tag or ",
+	  Tcl_ResetResult(interp);
+	  Tcl_AppendResult(interp,
+			   "\"", Tcl_GetString(args[2]), "\" must be either a tag or ",
 			   "an id or a transform name", (char *) NULL);
 	  goto error;
 	}
 	t = (ZnTransfo *) Tcl_GetHashValue(e);
       }
-    }
-    if (Tcl_GetDouble(interp, args[argc-2], &scale.x) == ZN_ERROR) {
-      goto error;
-    }
-    if (Tcl_GetDouble(interp, args[argc-1], &scale.y) == ZN_ERROR) {
-      goto error;
-    }
-    if (t) {
-      ZnScale(t, scale.x, scale.y);
-    }
-    if (num != 0) {
-      for (i = 0; i < num; i++) {
-	ITEM.ScaleItem(items[i], scale.x, scale.y);
+      
+      if (Tcl_GetDoubleFromObj(interp, args[3], &angle) == ZN_ERROR) {
+	goto error;
       }
-    }
-  }
-  
-  /*
-   * select
-   */
-  else if ((c == 's') && (strncmp(LangString(args[1]), "select", length) == 0)) {
-    int	index;
-    
-    if (argc < 3) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" select option ?tagOrId? ?arg?", NULL);
-      goto error;
-    }
-    if (argc >= 4) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[3]), &item, &items);
-      if (num == 0) {
-	goto done;
+      if (t) {
+	if (argc == 6) {
+	  ZnTranslate(t, -p.x, -p.y);
+	}
+	ZnRotateRad(t, angle);
+	if (argc == 6) {
+	  ZnTranslate(t, p.x, p.y);
+	}
       }
-      item = ZN_NO_ITEM;
-      for (i = 0; i < num; i++) {
-	if ((items[i]->class->Index != NULL) &&
-	    (items[i]->class->Selection != NULL)) {
-	  item = items[i];
-	  break;
+      if (num != 0) {
+	for (i = 0; i < num; i++) {
+	  ITEM.RotateItem(items[i], angle, (argc == 6) ? &p : NULL);
 	}
       }
-      if (item == ZN_NO_ITEM) {
-	Tcl_AppendResult(interp, "can't find an indexable item \"",
-			 LangString(args[3]), "\"", NULL);
+    }
+    break;
+    /*
+     * scale
+     */
+  case ZN_W_SCALE:
+    {
+      ZnPoint   scale;
+      
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "scale tagOrId xFactor yFactor");
 	goto error;
       }
-    }
-    if (argc == 5) {
-      result = item->class->Index(item, LangString(args[4]), &index);
-      if (result != ZN_OK) {
+      if (argc == 5) {
+	num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+	if (num == 0) {
+	  Tcl_HashEntry	*e;
+	  e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[2]));
+	  if (e == NULL) {
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, "\"", Tcl_GetString(args[2]),
+			     "\" must be either a tag or ",
+			     "an id or a transform name", (char *) NULL);
+	    goto error;
+	  }
+	  t = (ZnTransfo *) Tcl_GetHashValue(e);
+	}
+      }
+      if (Tcl_GetDoubleFromObj(interp, args[argc-2], &scale.x) == ZN_ERROR) {
 	goto error;
       }
-    }
-    c = LangString(args[2])[0];
-    length = strlen(LangString(args[2]));
-    if ((c == 'a') && (strncmp(LangString(args[2]), "adjust", length) == 0)) {
-      if (argc != 5) {
-	Tcl_AppendResult(interp,
-			 "wrong # args: should be \"", LangString(args[0]),
-			 "\" select adjust tagOrId index", NULL);
+      if (Tcl_GetDoubleFromObj(interp, args[argc-1], &scale.y) == ZN_ERROR) {
 	goto error;
       }
-      if (wi->text_info.sel_item == item) {
-	if (index < (wi->text_info.sel_first + wi->text_info.sel_last)/2) {
-	  wi->text_info.sel_anchor = wi->text_info.sel_last+1;
-	}
-	else {
-	  wi->text_info.sel_anchor = wi->text_info.sel_first;
+      if (t) {
+	ZnScale(t, scale.x, scale.y);
+      }
+      if (num != 0) {
+	for (i = 0; i < num; i++) {
+	  ITEM.ScaleItem(items[i], scale.x, scale.y);
 	}
       }
-      SelectTo(item, index);
     }
-    else if ((c == 'c') && (strncmp(LangString(args[2]), "clear", length) == 0)) {
-      if (argc != 3) {
-	Tcl_AppendResult(interp,
-			 "wrong # args: should be \"", LangString(args[0]),
-			 "\" select clear", NULL);
+    break;
+    /*
+     * select
+     */
+  case ZN_W_SELECT:
+    {
+      if (argc < 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "select option ?tagOrId? ?arg?");
 	goto error;
       }
-      if (wi->text_info.sel_item != ZN_NO_ITEM) {
-	ITEM.Invalidate(wi->text_info.sel_item, ZN_DRAW_FLAG);
-	wi->text_info.sel_item = ZN_NO_ITEM;
+      if (argc >= 4) {
+	num = ZnItemsWithTagOrId(wi, args[3], &item, &items);
+	if (num == 0) {
+	  goto done;
+	}
+	item = ZN_NO_ITEM;
+	for (i = 0; i < num; i++) {
+	  if ((items[i]->class->Index != NULL) &&
+	      (items[i]->class->Selection != NULL)) {
+	    item = items[i];
+	    break;
+	  }
+	}
+	if (item == ZN_NO_ITEM) {
+	  Tcl_AppendResult(interp, "can't find an indexable item \"",
+			   Tcl_GetString(args[3]), "\"", NULL);
+	  goto error;
+	}
       }
-    }
-    else if ((c == 'f') && (strncmp(LangString(args[2]), "from", length) == 0)) {
-      if (argc != 5) {
-	Tcl_AppendResult(interp,
-			 "wrong # args: should be \"", LangString(args[0]),
-			 "\" select from tagOrId index", NULL);
+      if (argc == 5) {
+	result = item->class->Index(item, args[4], &index);
+	if (result != ZN_OK) {
+	  goto error;
+	}
+      }
+      if (Tcl_GetIndexFromObj(interp, args[2], sel_cmd_strings,
+			      "selection option", 0, &cmd_index) != ZN_OK) {
 	goto error;
       }
-      wi->text_info.anchor_item = item;
-      wi->text_info.sel_anchor = index;
+      switch ((enum sel_cmds) cmd_index) {
+      case ZN_SEL_ADJUST:
+	if (argc != 5) {
+	  Tcl_WrongNumArgs(interp, 1, args, "select adjust tagOrId index");
+	  goto error;
+	}
+	if (wi->text_info.sel_item == item) {
+	  if (index < (wi->text_info.sel_first + wi->text_info.sel_last)/2) {
+	    wi->text_info.sel_anchor = wi->text_info.sel_last+1;
+	  }
+	  else {
+	    wi->text_info.sel_anchor = wi->text_info.sel_first;
+	  }
+	}
+	SelectTo(item, index);
+	break;
+      case ZN_SEL_CLEAR:
+	if (argc != 3) {
+	  Tcl_WrongNumArgs(interp, 1, args, "select clear");
+	  goto error;
+	}
+	if (wi->text_info.sel_item != ZN_NO_ITEM) {
+	  ITEM.Invalidate(wi->text_info.sel_item, ZN_DRAW_FLAG);
+	  wi->text_info.sel_item = ZN_NO_ITEM;
+	}
+	break;
+      case ZN_SEL_FROM:
+	if (argc != 5) {
+	  Tcl_WrongNumArgs(interp, 1, args, "select from tagOrId index");
+	  goto error;
+	}
+	wi->text_info.anchor_item = item;
+	wi->text_info.sel_anchor = index;
+	break;
+      case ZN_SEL_ITEM:
+	if (argc != 3) {
+	  Tcl_WrongNumArgs(interp, 1, args, "select item");
+	  goto error;
+	}
+	if (wi->text_info.sel_item != ZN_NO_ITEM) {
+	  Tcl_SetObjResult(interp, NewLongObj(wi->text_info.sel_item->id));
+	}
+	break;
+      case ZN_SEL_TO:
+	if (argc != 5) {
+	  Tcl_WrongNumArgs(interp, 1, args, "select to tagOrId index");
+	  goto error;
+	}
+	SelectTo(item, index);
+	break;
+      }
     }
-    else if ((c == 'i') && (strncmp(LangString(args[2]), "item", length) == 0)) {
+    break;
+    /*
+     * smooth
+     */
+  case ZN_W_SMOOTH:
+    {
+      ZnPoint	*points;
+      int	num_points;
+      ZnList	to_points;
+      
       if (argc != 3) {
-	Tcl_AppendResult(interp,
-			 "wrong # args: should be \"", LangString(args[0]),
-			 "\" select item", NULL);
+	Tcl_WrongNumArgs(interp, 1, args, "smooth coordList");
 	goto error;
       }
-      if (wi->text_info.sel_item != ZN_NO_ITEM) {
-	sprintf(msg, "%d", wi->text_info.sel_item->id);
-	Tcl_SetResult(interp, msg, TCL_VOLATILE);
+      if (ParseCoordList(wi, args[2], &points, &num_points) == ZN_ERROR) {
+	return ZN_ERROR;
       }
-    }
-    else if ((c == 't') && (strncmp(LangString(args[2]), "to", length) == 0)) {
-      if (argc != 5) {
-	Tcl_AppendResult(interp,
-			 "wrong # args: should be \"", LangString(args[0]),
-			 "\" select to tagOrId index", NULL);
-	goto error;
+      to_points = ZnListNew(32, sizeof(ZnPoint));
+      SmoothPathWithBezier(points, num_points, to_points);
+      points = (ZnPoint *) ZnListArray(to_points);
+      num_points = ZnListSize(to_points);
+      l = Tcl_GetObjResult(interp);
+      for (i = 0; i < num_points; i++, points++) {
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(points->x));
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(points->y));
       }
-      SelectTo(item, index);
-    }
-  }
-
-  /*
-   * smooth
-   */
-  else if ((c == 's') && (strncmp(LangString(args[1]), "smooth", length) == 0)) {
-    ZnPoint	*points;
-    int		num_points;
-    ZnList	to_points;
-    
-    if (argc != 3) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" smooth coordList", NULL);
-      goto error;
-    }
-    if (ParseCoordList(wi, args[2], &points, &num_points) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    to_points = ZnListNew(32, sizeof(ZnPoint));
-    SmoothPathWithBezier(points, num_points, to_points);
-    points = (ZnPoint *) ZnListArray(to_points);
-    num_points = ZnListSize(to_points);
-    for (i = 0; i < num_points; i++, points++) {
-      sprintf(msg, "%g", points->x);
-      Tcl_AppendElement(wi->interp, msg);
-      sprintf(msg, "%g", points->y);
-      Tcl_AppendElement(wi->interp, msg);
-    }
-    ZnListFree(to_points);
-  }
-
-  /*
-   * tapply
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "tapply", length) == 0)) {
-    Tcl_AppendResult(interp, "Command not yet implemented", NULL);
-    goto error;
-  }
-  
-  /*
-   * tdelete
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "tdelete", length) == 0)) {
-    Tcl_HashEntry	*e;
-    if (argc != 3) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" tdelete tName", NULL);
-      goto error;
-    }
-    e = Tcl_FindHashEntry(wi->t_table, LangString(args[2]));
-    if (e == NULL) {
-      Tcl_AppendResult(interp, "\"", LangString(args[2]),
-		       "\" must be a transform name", (char *) NULL);
-      goto error;
+      ZnListFree(to_points);
     }
-    t = (ZnTransfo *) Tcl_GetHashValue(e);
-    ZnTransfoFree(t);
-    Tcl_DeleteHashEntry(e);
-  }
-  
-  /*
-   * transform
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "transform", length) == 0)) {
-    int          num_points;
-    ZnPoint	*p, xp;
-    ZnTransfo	t, t2, inv, *this_one;
-    Item	from, to;
-    
-    if ((argc != 4) && (argc != 5)) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" transform ?tagOrIdFrom? tagOrIdTo coordlist", NULL);
+    break;
+    /*
+     * tapply
+     */
+  case ZN_W_TAPPLY:
+    {
+      Tcl_AppendResult(interp, "Command not yet implemented", NULL);
       goto error;
     }
-
-    if (argc == 5) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[2]), &from, &items);
-      if (num == 0) {
+    break;
+    /*
+     * tdelete
+     */
+  case ZN_W_TDELETE:
+    {
+      Tcl_HashEntry	*e;
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "tdelete tName");
 	goto error;
       }
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[argc-2]), &to, &items);
-    if (num == 0) {
-      Tcl_HashEntry	*e;
-      /*
-       * Try to find a named transform.
-       */
-      e = Tcl_FindHashEntry(wi->t_table, LangString(args[argc-2]));
+      e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[2]));
       if (e == NULL) {
-	Tcl_FreeResult(interp);
-	Tcl_AppendResult(interp, "\"", LangString(args[argc-2]),
-			 "\" must be either a tag or ",
-			 "an id or a transform name", (char *) NULL);
+	Tcl_AppendResult(interp, "\"", Tcl_GetString(args[2]),
+			 "\" must be a transform name", (char *) NULL);
 	goto error;
       }
-      inv = *((ZnTransfo *) Tcl_GetHashValue(e));
-    }
-    else {
-      ITEM.GetItemTransform(to, &t);
-      ZnTransfoInvert(&t, &inv);
-    }
-    this_one = &inv;
-    if (argc == 5) {
-      ITEM.GetItemTransform(from, &t);
-      ZnTransfoCompose(&t2, &t, &inv);
-      this_one = &t2;
-    }
-    /*ZnPrintTransfo(&t);
-      ZnPrintTransfo(&inv);*/
-    
-    if (ParseCoordList(wi, args[argc-1], &p, &num_points) == ZN_ERROR) {
-      Tcl_AppendResult(interp,
-		       " invalid coord list \"", args[argc-1], "\"", NULL);
-      goto error;
+      t = (ZnTransfo *) Tcl_GetHashValue(e);
+      ZnTransfoFree(t);
+      Tcl_DeleteHashEntry(e);
     }
-    for (i = 0; i < num_points; i++, p++) {
-      /*
-       * Need to adjust for the border.
-       */
-      if (argc != 5) {
-	p->x -= wi->inset;
-	p->y -= wi->inset;
+    break;
+    /*
+     * transform
+     */
+  case ZN_W_TRANSFORM:
+    {
+      int          num_points;
+      ZnPoint	*p, xp;
+      ZnTransfo	t, t2, inv, *this_one;
+      Item	from, to;
+      
+      if ((argc != 4) && (argc != 5)) {
+	Tcl_WrongNumArgs(interp, 1, args, "transform ?tagOrIdFrom? tagOrIdTo coordlist");
+	goto error;
       }
-      ZnTransformPoint(this_one, p, &xp);
-      /*printf("p->x=%g, p->y=%g, xp.x=%g, xp.y=%g\n", p->x, p->y, xp.x, xp.y);*/
-      sprintf(msg, "%g", xp.x);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%g", xp.y);
-      Tcl_AppendElement(interp, msg);
-    }
-  }
-  
-  /*
-   * translate
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "translate", length) == 0)) {
-    ZnPoint trans;
-    
-    if (argc != 5) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" translate tagOrId xAmount yAmount", NULL);
-      goto error;
-    }
-    num = 0;
-    if (argc == 5) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
+      
+      if (argc == 5) {
+	num = ZnItemsWithTagOrId(wi, args[2], &from, &items);
+	if (num == 0) {
+	  goto error;
+	}
+      }
+      num = ZnItemsWithTagOrId(wi, args[argc-2], &to, &items);
       if (num == 0) {
 	Tcl_HashEntry	*e;
-	e = Tcl_FindHashEntry(wi->t_table, LangString(args[2]));
+	/*
+	 * Try to find a named transform.
+	 */
+	e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[argc-2]));
 	if (e == NULL) {
-	  Tcl_FreeResult(interp);
-	  Tcl_AppendResult(interp, "\"", LangString(args[2]),
+	  Tcl_ResetResult(interp);
+	  Tcl_AppendResult(interp, "\"", Tcl_GetString(args[argc-2]),
 			   "\" must be either a tag or ",
 			   "an id or a transform name", (char *) NULL);
 	  goto error;
 	}
-	t = (ZnTransfo *) Tcl_GetHashValue(e);
+	inv = *((ZnTransfo *) Tcl_GetHashValue(e));
+      }
+      else {
+	ITEM.GetItemTransform(to, &t);
+	ZnTransfoInvert(&t, &inv);
+      }
+      this_one = &inv;
+      if (argc == 5) {
+	ITEM.GetItemTransform(from, &t);
+	ZnTransfoCompose(&t2, &t, &inv);
+	this_one = &t2;
+      }
+      /*ZnPrintTransfo(&t);
+	ZnPrintTransfo(&inv);*/
+      
+      if (ParseCoordList(wi, args[argc-1], &p, &num_points) == ZN_ERROR) {
+	Tcl_AppendResult(interp, " invalid coord list \"",
+			 Tcl_GetString(args[argc-1]), "\"", NULL);
+	goto error;
+      }
+      l = Tcl_GetObjResult(interp);
+      for (i = 0; i < num_points; i++, p++) {
+	/*
+	 * Need to adjust for the border.
+	 */
+	if (argc != 5) {
+	  p->x -= wi->inset;
+	  p->y -= wi->inset;
+	}
+	ZnTransformPoint(this_one, p, &xp);
+	/*printf("p->x=%g, p->y=%g, xp.x=%g, xp.y=%g\n", p->x, p->y, xp.x, xp.y);*/
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(xp.x));
+	Tcl_ListObjAppendElement(interp, l, NewDoubleObj(xp.y));
       }
     }
-    if (Tcl_GetDouble(interp, args[argc-2], &trans.x) == ZN_ERROR) {
-      goto error;
-    }
-    if (Tcl_GetDouble(interp, args[argc-1], &trans.y) == ZN_ERROR) {
-      goto error;
+    break;
+    /*
+     * translate
+     */
+  case ZN_W_TRANSLATE:
+    {
+      ZnPoint trans;
+      
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "translate tagOrId xAmount yAmount");
+	goto error;
+      }
+      num = 0;
+      if (argc == 5) {
+	num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+	if (num == 0) {
+	  Tcl_HashEntry	*e;
+	  e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[2]));
+	  if (e == NULL) {
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, "\"", Tcl_GetString(args[2]),
+			     "\" must be either a tag or ",
+			     "an id or a transform name", (char *) NULL);
+	    goto error;
+	  }
+	  t = (ZnTransfo *) Tcl_GetHashValue(e);
+	}
+      }
+      if (Tcl_GetDoubleFromObj(interp, args[argc-2], &trans.x) == ZN_ERROR) {
+	goto error;
+      }
+      if (Tcl_GetDoubleFromObj(interp, args[argc-1], &trans.y) == ZN_ERROR) {
+	goto error;
+      }
+      if (t) {
+	ZnTranslate(t, trans.x, trans.y);
+      }
+      if (num != 0) {
+	for (i = 0; i < num; i++) {
+	  ITEM.TranslateItem(items[i], trans.x, trans.y);
+	}
+      }
     }
-    if (t) {
-      ZnTranslate(t, trans.x, trans.y);
+    break;
+    /*
+     * treset
+     */
+  case ZN_W_TRESET:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "treset tagOrId");
+	goto error;
+      }
+      if (argc == 3) {
+	num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+	if (num == 0) {
+	  Tcl_HashEntry	*e;
+	  e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[2]));
+	  if (e == NULL) {
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, "\"", Tcl_GetString(args[2]),
+			     "\" must be either a tag or ",
+			     "an id or a transform name", (char *) NULL);
+	    goto error;
+	}
+	  t = (ZnTransfo *) Tcl_GetHashValue(e);
+	}
+      }
+      if (t) {
+	ZnTransfoSetIdentity(t);
+      }
+      if (num != 0) {
+	for (i = 0; i < num; i++) {
+	  ITEM.ResetTransfo(items[i]);
+	}
+      }
     }
-    if (num != 0) {
+    break;
+    /*
+     * trestore
+     */
+  case ZN_W_TRESTORE:
+    {
+      Tcl_HashEntry	*e;
+      
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "trestore tagOrId tName");
+	goto error;
+      }
+      e = Tcl_FindHashEntry(wi->t_table, Tcl_GetString(args[argc-1]));
+      if (e == NULL) {
+	Tcl_AppendResult(interp, "\"", Tcl_GetString(args[argc-1]),
+			 "\" must be a transform name", (char *) NULL);
+	goto error;
+      }
+      t = (ZnTransfo *) Tcl_GetHashValue(e);
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
+      if (num == 0) {
+	goto error;
+      }
       for (i = 0; i < num; i++) {
-	ITEM.TranslateItem(items[i], trans.x, trans.y);
+	ITEM.SetTransfo(items[i], t);
       }
     }
-  }
-
-  /*
-   * treset
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "treset", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" treset tagOrId", NULL);
-      goto error;
-    }
-    if (argc == 3) {
-      num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
+    break;
+    /*
+     * tsave
+     */
+  case ZN_W_TSAVE:
+    {
+      Tcl_HashEntry *e;
+      int		new, invert=0;
+      ZnTransfo	*inv;
+      
+      if ((argc != 4) && (argc != 5)) {
+	Tcl_WrongNumArgs(interp, 1, args, "tsave tagOrId tName ?invert?");
+	goto error;
+      }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, &items);
       if (num == 0) {
-	Tcl_HashEntry	*e;
-	e = Tcl_FindHashEntry(wi->t_table, LangString(args[2]));
-	if (e == NULL) {
-	  Tcl_FreeResult(interp);
-	  Tcl_AppendResult(interp,
-			   "\"", LangString(args[2]), "\" must be either a tag or ",
-			   "an id or a transform name", (char *) NULL);
+	goto error;
+      }
+      if (argc == 5) {
+	if (Tcl_GetBooleanFromObj(interp, args[4], &invert) != ZN_OK) {
 	  goto error;
 	}
-	t = (ZnTransfo *) Tcl_GetHashValue(e);
       }
-    }
-    if (t) {
-      ZnTransfoSetIdentity(t);
-    }
-    if (num != 0) {
-      for (i = 0; i < num; i++) {
-	ITEM.ResetTransfo(items[i]);
+      t = item->transfo;
+      e = Tcl_CreateHashEntry(wi->t_table, Tcl_GetString(args[argc-1]), &new);
+      if (!new) {
+	ZnTransfoFree((ZnTransfo *) Tcl_GetHashValue(e));
       }
+      if (invert) {
+	inv = ZnTransfoNew();
+	ZnTransfoInvert(t, inv);
+      }
+      else {
+	inv = ZnTransfoDuplicate(t);
+      }
+      Tcl_SetHashValue(e, inv);
     }
-  }
-  
-  /*
-   * trestore
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "trestore", length) == 0)) {
-    Tcl_HashEntry	*e;
-    
-    if (argc != 4) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" trestore tagOrId tName", NULL);
-      goto error;
-    }
-    e = Tcl_FindHashEntry(wi->t_table, LangString(args[argc-1]));
-    if (e == NULL) {
-      Tcl_AppendResult(interp, "\"", LangString(args[argc-1]),
-		       "\" must be a transform name", (char *) NULL);
-      goto error;
-    }
-    t = (ZnTransfo *) Tcl_GetHashValue(e);
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    if (num == 0) {
-      goto error;
-    }
-    for (i = 0; i < num; i++) {
-      ITEM.SetTransfo(items[i], t);
-    }
-  }
-  
-  /*
-   * tsave
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "tsave", length) == 0)) {
-    Tcl_HashEntry *e;
-    int		new, invert=0;
-    ZnTransfo	*inv;
-    
-    if ((argc != 4) && (argc != 5)) {
-      Tcl_AppendResult(interp,
-		       "wrong # args: should be \"", LangString(args[0]),
-		       "\" tsave tagOrId tName ?invert?", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, &items);
-    if (num == 0) {
-      goto error;
-    }
-    if (argc == 5) {
-      if (Tcl_GetBoolean(interp, args[4], &invert) != ZN_OK) {
+    break;
+    /*
+     * type
+     */
+  case ZN_W_TYPE:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "type tagOrId");
 	goto error;
       }
+      num = ZnItemsWithTagOrId(wi, args[2], &item, NULL);
+      if (num == 0) {
+	goto error;
+      }
+      Tcl_SetObjResult(interp, NewStringObj(item->class->name));      
     }
-    t = item->transfo;
-    e = Tcl_CreateHashEntry(wi->t_table, LangString(args[argc-1]), &new);
-    if (!new) {
-      ZnTransfoFree((ZnTransfo *) Tcl_GetHashValue(e));
-    }
-    if (invert) {
-      inv = ZnTransfoNew();
-      ZnTransfoInvert(t, inv);
-    }
-    else {
-      inv = ZnTransfoDuplicate(t);
-    }
-    Tcl_SetHashValue(e, inv);
+    break;
   }
   
-  /*
-   * type
-   */
-  else if ((c == 't') && (strncmp(LangString(args[1]), "type", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" type tagOrId", NULL);
-      goto error;
-    }
-    num = ZnItemsWithTagOrId(wi, LangString(args[2]), &item, NULL);
-    if (num == 0) {
-      goto error;
-    }
-    Tcl_SetResult(interp, item->class->name, TCL_STATIC);      
-  }
-
-  else {
-    Tcl_AppendResult(interp, "invalid command \"", LangString(args[1]),
-		     "\": must be "
-		     "add, addtag, anchorxy, bbox, becomes, bind, cget, "
-		     "chggroup, clone, configure, contour, coords, currentpart, "
-		     "cursor, chars, dtag, find, fit, focus, gettags, group, "
-		     "hasanchors, hasfields, hasparts, hastag, index, insert, "
-		     "itemcget, itemconfigure, lower, monitor, postscript, raise, "
-                     "remove, rotate, scale, select, smooth, tapply, tdelete, "
-		     "transform, translate, treset, trestore, tsave, type", NULL);
-    goto error;
-  }
  done:
   if (wi->work_item_list) {
     ZnListFree(wi->work_item_list);
@@ -3252,7 +3280,7 @@ WidgetCmd(ClientData	client_data,	/* Information about the widget. */
   }
   Tcl_Release((ClientData) wi);
   return result;
-    
+  
  error:
   if (wi->work_item_list) {
     ZnListFree(wi->work_item_list);
@@ -3312,18 +3340,22 @@ TileChange(ClientData	client_data,
  *----------------------------------------------------------------------
  */
 static int
-Configure(Tcl_Interp	*interp,	/* Used for error reporting. */
-	  WidgetInfo	*wi,		/* Information about widget. */
-	  int		argc,		/* Number of valid entries in args. */
-	  Arg		*args,		/* Arguments. */
-	  int		flags)		/* Flags to pass to Tk_ConfigureWidget. */
+Configure(Tcl_Interp		*interp,/* Used for error reporting. */
+	  WidgetInfo		*wi,	/* Information about widget. */
+	  int			argc,	/* Number of valid entries in args. */
+	  Tcl_Obj	*CONST	args[],	/* Arguments. */
+	  int			flags)	/* Flags to pass to Tk_ConfigureWidget. */
 {
 #define CONFIG_PROBE(offset) (ISSET(config_specs[offset].specFlags, \
                                     TK_CONFIG_OPTION_SPECIFIED))
   ZnBBox  bbox;
 
-  if (Tk_ConfigureWidget(interp, wi->win, config_specs,
-			 argc, args, (char *) wi, flags) != TCL_OK) {
+  if (Tk_ConfigureWidget(interp, wi->win, config_specs, argc,
+#ifdef PTK
+			 (Tcl_Obj **) args, (char *) wi, flags) != TCL_OK) {
+#else
+			 (char **) args, (char *) wi, flags|TK_CONFIG_OBJS) != TCL_OK) {
+#endif
     return ZN_ERROR;
   }
 
@@ -3654,11 +3686,7 @@ Event(ClientData client_data,	/* Information about widget. */
     if (wi->win != NULL) {
       wi->win = NULL;
       wi->realized = False;
-#ifndef PTK
-      Tcl_DeleteCommand(wi->interp, Tcl_GetCommandName(wi->interp, wi->cmd));
-#else
-      Lang_DeleteWidget(wi->interp, wi->cmd);
-#endif
+      Tcl_DeleteCommandFromToken(wi->interp, wi->cmd);
     }
     if (wi->update_pending) {
       Tcl_CancelIdleCall(Redisplay, (ClientData) wi);
@@ -4867,443 +4895,468 @@ MapInfoTextStyleFromString(Tcl_Interp		*interp,
 }
 
 int
-MapInfoCmd(ClientData	client_data,
-	   Tcl_Interp	*interp,	/* Current interpreter. */
-	   int		argc,		/* Number of arguments. */
-	   Arg		*args)
+MapInfoObjCmd(ClientData	client_data,
+	      Tcl_Interp	*interp,	/* Current interpreter. */
+	      int		argc,		/* Number of arguments. */
+	      Tcl_Obj	*CONST	args[])
 {
-  char		c, c2;
-  int		length, result;
+  int		index, index2, result;
   MapInfoMaster	*master;
-  char		msg[INTEGER_SPACE*7];
+  Tcl_Obj	*lobjs[7];
+  static char	*sub_cmd_strings[] = {
+    "add", "count", "create", "delete", "duplicate",
+    "get", "remove", "replace", "scale", "translate", NULL
+  };
+  static char	*e_type_strings[] = {
+    "arc", "line", "symbol", "text", NULL
+  };
+  enum		sub_cmds {
+    ZN_MI_ADD, ZN_MI_COUNT, ZN_MI_CREATE, ZN_MI_DELETE, ZN_MI_DUPLICATE,
+    ZN_MI_GET, ZN_MI_REMOVE, ZN_MI_REPLACE, ZN_MI_SCALE, ZN_MI_TRANSLATE
+  };
+  enum		e_types {
+    ZN_E_ARC, ZN_E_LINE, ZN_E_SYMBOL, ZN_E_TEXT
+  };
   
   if (!inited) {
     InitZinc(interp);
   }
   
-  if (argc < 2) {
-    Tcl_AppendResult(interp, "wrong # of args: \"",
-		     LangString(args[0]), " subcommand ?args?.\"", NULL);
+  if (argc < 3) {
+    Tcl_WrongNumArgs(interp, 1, args, "mapInfo/name subCmd ?args?");
     return ZN_ERROR;
   }
 
-  c = LangString(args[2])[0];
-  length = strlen(LangString(args[2]));
-  result = TCL_OK;
-
-  /*
-   * create
-   */
-  if ((c == 'c') && (strncmp(LangString(args[2]), "create", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       " name create\"", NULL);
-      return ZN_ERROR;
-    }
-    if (ZnCreateMapInfo(interp, LangString(args[1]), NULL) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-  }
-  
-  /*
-   * delete
-   */
-  else if ((c == 'd') && (strncmp(LangString(args[2]), "delete", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo delete", NULL);
-      return ZN_ERROR;
-    }
-    if (ZnDeleteMapInfo(interp, LangString(args[1])) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-  }
-  
-  /*
-   * duplicate
-   */
-  else if ((c == 'd') && (strncmp(LangString(args[2]), "duplicate", length) == 0)) {
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo duplicate name", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
-    }
-    if (ZnDuplicateMapInfo(interp, LangString(args[3]), master->map_info) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
+  if (Tcl_GetIndexFromObj(interp, args[2], sub_cmd_strings,
+			  "subCmd", 0, &index) != ZN_OK) {
+    return ZN_ERROR;
   }
+  result = TCL_OK;
 
-  /*
-   * add/replace
-   */
-  else if (((c == 'a') && (strncmp(LangString(args[2]), "add", length) == 0)) ||
-	   ((c == 'r') && (strncmp(LangString(args[2]), "replace", length) == 0))) {
-    MapInfoLineStyle	line_style;
-    MapInfoTextStyle	text_style;
-    char		*imsg = (c == 'a') ? "" : " index";
-    int			i, index, num_param=4;
-    int			coords[6];
-
-    if (c != 'a') {
-      num_param++;
-    }
-    if (argc < num_param) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo ", LangString(args[2]), " type", imsg,
-		       " ?args?", NULL);
-      return ZN_ERROR;
+  switch((enum sub_cmds) index) {
+    /*
+     * create
+     */
+  case ZN_MI_CREATE:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "name create");
+	return ZN_ERROR;
+      }
+      if (ZnCreateMapInfo(interp, Tcl_GetString(args[1]), NULL) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
     }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
+    break;
+    /*
+     * delete
+     */
+  case ZN_MI_DELETE:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo delete");
+	return ZN_ERROR;
+      }
+      if (ZnDeleteMapInfo(interp, Tcl_GetString(args[1])) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
     }
-    if (c != 'a') {
-      if (Tcl_GetInt(interp, args[4], &index) == ZN_ERROR) {
+    break;
+    /*
+     * duplicate
+     */
+  case ZN_MI_DUPLICATE:
+    {
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo duplicate name");
 	return ZN_ERROR;
       }
-      if (index < 0) {
-	index = 0;
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
+	return ZN_ERROR;
+      }
+      if (ZnDuplicateMapInfo(interp, Tcl_GetString(args[3]),
+			     master->map_info) == ZN_ERROR) {
+	return ZN_ERROR;
       }
     }
-    c2 = LangString(args[3])[0];
-    length = strlen(LangString(args[3]));
-    if ((c2 == 'l') && (strncmp(LangString(args[3]), "line", length) == 0)) {
-      if (argc != (num_param+6)) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-			 "\" mapInfo ", LangString(args[2]), " line", imsg,
-			 " style width x1 y1 x2 y2", NULL);
+    break;
+    /*
+     * add/replace
+     */
+  case ZN_MI_ADD:
+  case ZN_MI_REPLACE:
+    {
+      MapInfoLineStyle	line_style;
+      MapInfoTextStyle	text_style;
+      int		i, index;
+      int		coords[6];
+      ZnBool		add_cmd = (enum sub_cmds) index == ZN_MI_ADD;
+      int		num_param = add_cmd ? 4 : 5;
+      
+      if (argc < num_param) {
+	Tcl_WrongNumArgs(interp, 3, args,
+			 add_cmd ? "elementType ?args?" : "elementType index ?args?");
 	return ZN_ERROR;
       }
-      if (MapInfoLineStyleFromString(interp, LangString(args[num_param]),
-				     &line_style) == ZN_ERROR) {
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
 	return ZN_ERROR;
       }
-      for (i = 0; i < 5; i++) {
-	if (Tcl_GetInt(interp, args[num_param+i+1], &coords[i]) == ZN_ERROR) {
+      if (!add_cmd) {
+	if (Tcl_GetIntFromObj(interp, args[4], &index) == ZN_ERROR) {
 	  return ZN_ERROR;
 	}
+	if (index < 0) {
+	  index = 0;
+	}
       }
-      if (coords[0] < 0) {
-	coords[0] = 0;
-      }
-      if (c == 'a') {
-	MapInfoAddLine(master->map_info, ZnListTail, NULL, line_style,
-		       coords[0], coords[1], coords[2], coords[3], coords[4]);
+      if (Tcl_GetIndexFromObj(interp, args[0], e_type_strings,
+			      "elementType", 0, &index2) != ZN_OK) {
+	return ZN_ERROR;
       }
-      else {
-	MapInfoReplaceLine(master->map_info, index, NULL, line_style,
+      switch ((enum e_types) index2) {
+      case ZN_E_LINE:
+	{
+	  if (argc != (num_param+6)) {
+	    Tcl_WrongNumArgs(interp, 4, args,
+			     add_cmd ? "style width x1 y1 x2 y2" : "index style width x1 y1 x2 y2");
+	    return ZN_ERROR;
+	  }
+	  if (MapInfoLineStyleFromString(interp, Tcl_GetString(args[num_param]),
+					 &line_style) == ZN_ERROR) {
+	    return ZN_ERROR;
+	  }
+	  for (i = 0; i < 5; i++) {
+	    if (Tcl_GetIntFromObj(interp, args[num_param+i+1], &coords[i]) == ZN_ERROR) {
+	      return ZN_ERROR;
+	    }
+	  }
+	  if (coords[0] < 0) {
+	    coords[0] = 0;
+	  }
+	  if (add_cmd) {
+	    MapInfoAddLine(master->map_info, ZnListTail, NULL, line_style,
 			   coords[0], coords[1], coords[2], coords[3], coords[4]);
+	  }
+	  else {
+	    MapInfoReplaceLine(master->map_info, index, NULL, line_style,
+			       coords[0], coords[1], coords[2], coords[3], coords[4]);
+	  }
+	}
+	break;
+      case ZN_E_SYMBOL:
+	{
+	  if (argc != (num_param+3)) {
+	    Tcl_WrongNumArgs(interp, 4, args,
+			     add_cmd ? "x y intVal" : "index x y intVal");
+	    return ZN_ERROR;
+	  }
+	  for (i = 0; i < 3; i++) {
+	    if (Tcl_GetIntFromObj(interp, args[num_param+i], &coords[i]) == ZN_ERROR) {
+	      return ZN_ERROR;
+	    }
+	  }
+	  if (coords[2] < 0) {
+	    coords[2] = 0;
+	  }
+	  if (add_cmd) {
+	    MapInfoAddSymbol(master->map_info, ZnListTail, NULL, coords[0],
+			     coords[1], coords[2]);
+	  }
+	  else {
+	    MapInfoReplaceSymbol(master->map_info, index, NULL, coords[0],
+				 coords[1], coords[2]);
+	  }
+	}
+      case ZN_E_TEXT:
+	{
+	  if (argc != (num_param+5)) {
+	    Tcl_WrongNumArgs(interp, 4, args,
+			     add_cmd ? "textStyle lineStyle x y string" : "index textStyle lineStyle x y string");
+	    return ZN_ERROR;
+	  }
+	  if (MapInfoTextStyleFromString(interp, Tcl_GetString(args[num_param]),
+					 &text_style) == ZN_ERROR) {
+	    return ZN_ERROR;
+	  }
+	  if (MapInfoLineStyleFromString(interp, Tcl_GetString(args[num_param+1]),
+					 &line_style) == ZN_ERROR) {
+	    return ZN_ERROR;
+	  }
+	  for (i = 0; i < 2; i++) {
+	    if (Tcl_GetIntFromObj(interp, args[num_param+i+2], &coords[i]) == ZN_ERROR) {
+	      return ZN_ERROR;
+	    }
+	  }
+	  if (add_cmd) {
+	    MapInfoAddText(master->map_info, ZnListTail, NULL, text_style,
+			   line_style, coords[0], coords[1],
+			   Tcl_GetString(args[num_param+4]));
+	  }
+	  else {
+	    /*printf("replace text ts %d ls %d %d %d %s\n", text_style,
+	      line_style, coords[0], coords[1], Tcl_GetString(args[num_param+4]));*/
+	    MapInfoReplaceText(master->map_info, index, NULL, text_style,
+			       line_style, coords[0], coords[1],
+			       Tcl_GetString(args[num_param+4]));
+	  }
+	}
+	break;
+      case ZN_E_ARC:
+	{
+	  if (argc != (num_param+7)) {
+	    Tcl_WrongNumArgs(interp, 4, args,
+			     add_cmd ? "style width cx cy radius start extent" : "index style width cx cy radius start extent");
+	    return ZN_ERROR;
+	  }
+	  if (MapInfoLineStyleFromString(interp, Tcl_GetString(args[num_param]),
+					 &line_style) == ZN_ERROR) {
+	    return ZN_ERROR;
+	  }
+	  for (i = 0; i < 6; i++) {
+	    if (Tcl_GetIntFromObj(interp, args[num_param+i+1], &coords[i]) == ZN_ERROR) {
+	      return ZN_ERROR;
+	    }
+	  }
+	  if (coords[0] < 0) {
+	    coords[0] = 0;
+	  }
+	  if (add_cmd) {
+	    MapInfoAddArc(master->map_info, ZnListTail, NULL, line_style,
+			  coords[0], coords[1], coords[2], coords[3], coords[4],
+			  coords[5]);
+	  }
+	  else {
+	    MapInfoReplaceArc(master->map_info, index, NULL, line_style, coords[0],
+			      coords[1], coords[2], coords[3], coords[4], coords[5]);
+	  }
+	}
+	break;
       }
+      UpdateMapInfoClients(master);
     }
-    else if ((c2 == 's') && (strncmp(LangString(args[3]), "symbol", length) == 0)) {
-      if (argc != (num_param+3)) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-			 "\" mapInfo ", LangString(args[2]), " symbol", imsg,
-			 " x y intVal", NULL);
+    break;
+    /*
+     * count
+     */
+  case ZN_MI_COUNT:
+    {
+      int	count = 0;
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo count type");
 	return ZN_ERROR;
       }
-      for (i = 0; i < 3; i++) {
-	if (Tcl_GetInt(interp, args[num_param+i], &coords[i]) == ZN_ERROR) {
-	  return ZN_ERROR;
-	}
-      }
-      if (coords[2] < 0) {
-	coords[2] = 0;
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
+	return ZN_ERROR;
       }
-      if (c == 'a') {
-	MapInfoAddSymbol(master->map_info, ZnListTail, NULL, coords[0],
-			 coords[1], coords[2]);
+      args += 3;
+      argc -= 3;
+      if (Tcl_GetIndexFromObj(interp, args[0], e_type_strings,
+			      "elementType", 0, &index2) != ZN_OK) {
+	return ZN_ERROR;
       }
-      else {
-	MapInfoReplaceSymbol(master->map_info, index, NULL, coords[0],
-			     coords[1], coords[2]);
+      switch ((enum e_types) index2) {
+      case ZN_E_LINE:
+	count = MapInfoNumLines(master->map_info);
+	break;
+      case ZN_E_SYMBOL:
+	count = MapInfoNumSymbols(master->map_info);
+	break;
+      case ZN_E_TEXT:
+	count = MapInfoNumTexts(master->map_info);
+	break;
+      case ZN_E_ARC:
+	count = MapInfoNumArcs(master->map_info);
+	break;
       }
+      Tcl_SetObjResult(interp, Tcl_NewIntObj(count));
     }
-    else if ((c2 == 't') && (strncmp(LangString(args[3]), "text", length) == 0)) {
-      if (argc != (num_param+5)) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-			 "\" mapInfo ", LangString(args[2]), " text", imsg,
-			 " textStyle lineStyle x y string", NULL);
+    break;
+    /*
+     * get
+     */
+  case ZN_MI_GET:
+    {
+      int	index;
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo get type index");
 	return ZN_ERROR;
       }
-      if (MapInfoTextStyleFromString(interp, LangString(args[num_param]),
-				     &text_style) == ZN_ERROR) {
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
 	return ZN_ERROR;
       }
-      if (MapInfoLineStyleFromString(interp, LangString(args[num_param+1]),
-				     &line_style) == ZN_ERROR) {
+      if (Tcl_GetIntFromObj(interp, args[4], &index) == ZN_ERROR) {
 	return ZN_ERROR;
       }
-      for (i = 0; i < 2; i++) {
-	if (Tcl_GetInt(interp, args[num_param+i+2], &coords[i]) == ZN_ERROR) {
-	  return ZN_ERROR;
-	}
+      if (index < 0) {
+	index = 0;
       }
-      if (c == 'a') {
-	MapInfoAddText(master->map_info, ZnListTail, NULL, text_style,
-		       line_style, coords[0], coords[1], LangString(args[num_param+4]));
+      args += 3;
+      argc -= 3;
+      if (Tcl_GetIndexFromObj(interp, args[0], e_type_strings,
+			      "elementType", 0, &index2) != ZN_OK) {
+	return ZN_ERROR;
       }
-      else {
-	/*printf("replace text ts %d ls %d %d %d %s\n", text_style,
-	  line_style, coords[0], coords[1], LangString(args[num_param+4]));*/
-	MapInfoReplaceText(master->map_info, index, NULL, text_style,
-			   line_style, coords[0], coords[1], LangString(args[num_param+4]));
+      switch ((enum e_types) index2) {
+      case ZN_E_LINE:
+	{
+	  MapInfoLineStyle	line_style;
+	  int			line_width;
+	  int			x_from, y_from, x_to, y_to;
+	  MapInfoGetLine(master->map_info, index, NULL, &line_style,
+			 &line_width, &x_from, &y_from, &x_to, &y_to);
+	  lobjs[0] = NewStringObj(MapInfoLineStyleToString(line_style));
+	  lobjs[1] = Tcl_NewIntObj(line_width);
+	  lobjs[2] = Tcl_NewIntObj(x_from);
+	  lobjs[3] = Tcl_NewIntObj(y_from);
+	  lobjs[4] = Tcl_NewIntObj(x_to);
+	  lobjs[5] = Tcl_NewIntObj(y_to);
+	  Tcl_SetObjResult(interp, Tcl_NewListObj(6, lobjs));
+	}
+	break;
+      case ZN_E_SYMBOL:
+	{
+	  int	x, y;
+	  char	symbol;
+	  MapInfoGetSymbol(master->map_info, index, NULL, &x, &y, &symbol);
+	  lobjs[0] = Tcl_NewIntObj(x);
+	  lobjs[1] = Tcl_NewIntObj(y);
+	  lobjs[2] = Tcl_NewIntObj(symbol);
+	  Tcl_SetObjResult(interp, Tcl_NewListObj(3, lobjs));
+	}
+	break;
+      case ZN_E_TEXT:
+	{
+	  int		x, y;
+	  char		*text;
+	  MapInfoTextStyle	text_style;
+	  MapInfoLineStyle	line_style;
+	  MapInfoGetText(master->map_info, index, NULL, &text_style, &line_style,
+			 &x, &y, &text);
+	  lobjs[0] = Tcl_NewIntObj(x);
+	  lobjs[1] = Tcl_NewIntObj(y);
+	  lobjs[2] = NewStringObj(MapInfoTextStyleToString(text_style));
+	  lobjs[3] = NewStringObj(MapInfoLineStyleToString(line_style));
+	  lobjs[4] = NewStringObj(text);
+	  Tcl_SetObjResult(interp, Tcl_NewListObj(5, lobjs));
+	}
+	break;
+      case ZN_E_ARC:
+	{
+	  MapInfoLineStyle	line_style;
+	  int		line_width;
+	  int		center_x, center_y, start, extent;
+	  unsigned int	radius;
+	  MapInfoGetArc(master->map_info, index, NULL, &line_style, &line_width,
+			&center_x, &center_y, &radius, &start, &extent);
+	  lobjs[0] = NewStringObj(MapInfoLineStyleToString(line_style));
+	  lobjs[1] = Tcl_NewIntObj(line_width);
+	  lobjs[2] = Tcl_NewIntObj(center_x);
+	  lobjs[3] = Tcl_NewIntObj(center_y);
+	  lobjs[4] = Tcl_NewIntObj(radius);
+	  lobjs[5] = Tcl_NewIntObj(start);
+	  lobjs[6] = Tcl_NewIntObj(extent);
+	  Tcl_SetObjResult(interp, Tcl_NewListObj(7, lobjs));      
+	}
+	break;
       }
     }
-    else if ((c2 == 'a') && (strncmp(LangString(args[3]), "arc", length) == 0)) {
-      if (argc != (num_param+7)) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-			 "\" mapInfo ", LangString(args[2]), " arc", imsg,
-			 " style width cx cy radius start extent", NULL);
+    break;
+    /*
+     * remove
+     */
+  case ZN_MI_REMOVE:
+    {
+      int	index;
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo remove type index");
 	return ZN_ERROR;
       }
-      if (MapInfoLineStyleFromString(interp, LangString(args[num_param]),
-				     &line_style) == ZN_ERROR) {
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
 	return ZN_ERROR;
       }
-      for (i = 0; i < 6; i++) {
-	if (Tcl_GetInt(interp, args[num_param+i+1], &coords[i]) == ZN_ERROR) {
-	  return ZN_ERROR;
-	}
+      if (Tcl_GetIntFromObj(interp, args[4], &index) == ZN_ERROR) {
+	return ZN_ERROR;
       }
-      if (coords[0] < 0) {
-	coords[0] = 0;
+      if (index < 0) {
+	index = 0;
       }
-      if (c == 'a') {
-	MapInfoAddArc(master->map_info, ZnListTail, NULL, line_style,
-		      coords[0], coords[1], coords[2], coords[3], coords[4],
-		      coords[5]);
+      args += 3;
+      argc -= 3;
+      if (Tcl_GetIndexFromObj(interp, args[0], e_type_strings,
+			      "elementType", 0, &index2) != ZN_OK) {
+	return ZN_ERROR;
       }
-      else {
-	MapInfoReplaceArc(master->map_info, index, NULL, line_style, coords[0],
-			  coords[1], coords[2], coords[3], coords[4], coords[5]);
+      switch ((enum e_types) index2) {
+      case ZN_E_LINE:
+	MapInfoRemoveLine(master->map_info, index);
+	break;
+      case ZN_E_SYMBOL:
+	MapInfoRemoveSymbol(master->map_info, index);
+	break;
+      case ZN_E_TEXT:
+	MapInfoRemoveText(master->map_info, index);
+	break;
+      case ZN_E_ARC:
+	MapInfoRemoveArc(master->map_info, index);
+	break;
       }
+      UpdateMapInfoClients(master);
     }
-    UpdateMapInfoClients(master);
-  }
-
-  /*
-   * count
-   */
-  else if ((c == 'c') && (strncmp(LangString(args[2]), "count", length) == 0)) {
-    int	count = 0;
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo count type", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
-    }
-    args += 3;
-    argc -= 3;
-    c2 = LangString(args[0])[0];
-    length = strlen(LangString(args[0]));
-    if ((c2 == 'l') && (strncmp(LangString(args[0]), "line", length) == 0)) {
-      count = MapInfoNumLines(master->map_info);
-    }
-    else if ((c2 == 's') && (strncmp(LangString(args[0]), "symbol", length) == 0)) {
-      count = MapInfoNumSymbols(master->map_info);
-    }
-    else if ((c2 == 't') && (strncmp(LangString(args[0]), "text", length) == 0)) {
-      count = MapInfoNumTexts(master->map_info);
-    }
-    else if ((c2 == 'a') && (strncmp(LangString(args[0]), "arc", length) == 0)) {
-      count = MapInfoNumArcs(master->map_info);
-    }
-    sprintf(msg, "%d", count);
-    Tcl_SetResult(interp, msg, TCL_VOLATILE);
-  }
-
-  /*
-   * get
-   */
-  else if ((c == 'g') && (strncmp(LangString(args[2]), "get", length) == 0)) {
-    int	index;
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo get type index", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[4], &index) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (index < 0) {
-      index = 0;
-    }
-    args += 3;
-    argc -= 3;
-    c2 = LangString(args[0])[0];
-    length = strlen(LangString(args[0]));
-    if ((c2 == 'l') && (strncmp(LangString(args[0]), "line", length) == 0)) {
-      MapInfoLineStyle	line_style;
-      int		line_width;
-      int		x_from, y_from, x_to, y_to;
-      MapInfoGetLine(master->map_info, index, NULL, &line_style,
-		     &line_width, &x_from, &y_from, &x_to, &y_to);
-      Tcl_AppendElement(interp, MapInfoLineStyleToString(line_style));
-      sprintf(msg, "%d", line_width);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", x_from);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", y_from);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", x_to);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", y_to);
-      Tcl_AppendElement(interp, msg);
-    }
-    else if ((c2 == 's') && (strncmp(LangString(args[0]), "symbol", length) == 0)) {
-      int	x, y;
-      char	symbol;
-      MapInfoGetSymbol(master->map_info, index, NULL, &x, &y, &symbol);
-      sprintf(msg, "%d", x);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", y);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", symbol);
-      Tcl_AppendElement(interp, msg);
-    }
-    else if ((c2 == 't') && (strncmp(LangString(args[0]), "text", length) == 0)) {
-      int		x, y;
-      char		*text;
-      MapInfoTextStyle	text_style;
-      MapInfoLineStyle	line_style;
-      MapInfoGetText(master->map_info, index, NULL, &text_style, &line_style,
-		     &x, &y, &text);
-      sprintf(msg, "%d", x);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", y);
-      Tcl_AppendElement(interp, msg);
-      Tcl_AppendElement(interp, MapInfoTextStyleToString(text_style));
-      Tcl_AppendElement(interp, MapInfoLineStyleToString(line_style));
-      Tcl_AppendElement(interp, text);
-    }
-    else if ((c2 == 'a') && (strncmp(LangString(args[0]), "arc", length) == 0)) {
-      MapInfoLineStyle	line_style;
-      int		line_width;
-      int		center_x, center_y, start, extent;
-      unsigned int	radius;
-      MapInfoGetArc(master->map_info, index, NULL, &line_style, &line_width,
-		    &center_x, &center_y, &radius, &start, &extent);
-      Tcl_AppendElement(interp, MapInfoLineStyleToString(line_style));
-      sprintf(msg, "%d", line_width);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", center_x);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", center_y);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", radius);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", start);
-      Tcl_AppendElement(interp, msg);
-      sprintf(msg, "%d", extent);
-      Tcl_AppendElement(interp, msg);
-    }
-  }
-
-  /*
-   * remove
-   */
-  else if ((c == 'r') && (strncmp(LangString(args[2]), "remove", length) == 0)) {
-    int	index;
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo remove type index", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[4], &index) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (index < 0) {
-      index = 0;
-    }
-    args += 3;
-    argc -= 3;
-    c2 = LangString(args[0])[0];
-    length = strlen(LangString(args[0]));
-    if ((c2 == 'l') && (strncmp(LangString(args[0]), "line", length) == 0)) {
-      MapInfoRemoveLine(master->map_info, index);
-    }
-    else if ((c2 == 's') && (strncmp(LangString(args[0]), "symbol", length) == 0)) {
-      MapInfoRemoveSymbol(master->map_info, index);
-    }
-    else if ((c2 == 't') && (strncmp(LangString(args[0]), "text", length) == 0)) {
-      MapInfoRemoveText(master->map_info, index);
-    }
-    else if ((c2 == 'a') && (strncmp(LangString(args[0]), "arc", length) == 0)) {
-      MapInfoRemoveArc(master->map_info, index);
-    }
-    UpdateMapInfoClients(master);
-  }
-
-  /*
-   * scale
-   */
-  else if ((c == 's') && (strncmp(LangString(args[2]), "scale", length) == 0)) {
-    double factor;
-    
-    if (argc != 4) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo scale factor", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
+    break;
+    /*
+     * scale
+     */
+  case ZN_MI_SCALE:
+    {
+      double factor;
+      
+      if (argc != 4) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo scale factor");
+	return ZN_ERROR;
+      }
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
+	return ZN_ERROR;
+      }
+      if (Tcl_GetDoubleFromObj(interp, args[3], &factor) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      MapInfoScale(master->map_info, factor);
+      UpdateMapInfoClients(master);
     }
-    if (Tcl_GetDouble(interp, args[3], &factor) == ZN_ERROR) {
-      return ZN_ERROR;
+    break;
+    /*
+     * translate
+     */
+  case ZN_MI_TRANSLATE:
+    {
+      int x, y;
+      
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "mapInfo translate xAmount yAmount");
+	return ZN_ERROR;
+      }
+      master = LookupMapInfoMaster(interp, Tcl_GetString(args[1]));
+      if (master == NULL) {
+	return ZN_ERROR;
+      }
+      if (Tcl_GetIntFromObj(interp, args[3], &x) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      if (Tcl_GetIntFromObj(interp, args[4], &y) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      MapInfoTranslate(master->map_info, x, y);
+      UpdateMapInfoClients(master);
     }
-    MapInfoScale(master->map_info, factor);
-    UpdateMapInfoClients(master);
+    break;
   }
 
-  /*
-   * translate
-   */
-  else if ((c == 't') && (strncmp(LangString(args[2]), "translate", length) == 0)) {
-    int x, y;
-    
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" mapInfo translate xAmount yAmount", NULL);
-      return ZN_ERROR;
-    }
-    master = LookupMapInfoMaster(interp, LangString(args[1]));
-    if (master == NULL) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[3], &x) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[4], &y) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    MapInfoTranslate(master->map_info, x, y);
-    UpdateMapInfoClients(master);
-  }
-  
-  else {
-    Tcl_AppendResult(interp, "invalid command \"", LangString(args[2]),
-		     "\": must be create, delete, duplicate, add, count, "
-		     "get, replace, remove, scale, translate", NULL);
-    return ZN_ERROR;
-  }
-  
   return TCL_OK;
 }
 
@@ -5311,87 +5364,97 @@ MapInfoCmd(ClientData	client_data,
 /*
  *----------------------------------------------------------------------
  *
- * VideomapCmd --
+ * VideomapObjCmd --
  *
  *
  *----------------------------------------------------------------------
  */
 int
-VideomapCmd(ClientData	client_data,
-	    Tcl_Interp	*interp,	/* Current interpreter. */
-	    int		argc,		/* Number of arguments. */
-	    Arg		*args)
+VideomapObjCmd(ClientData	client_data,
+	       Tcl_Interp	*interp,	/* Current interpreter. */
+	       int		argc,		/* Number of arguments. */
+	       Tcl_Obj	*CONST	args[])
 {
   ZnList	ids;
-  char		c;
-  int		length;
+  int		index;
   int		*id_array, id_num, i;
-  char		num_str[INTEGER_SPACE];
-
+  Tcl_Obj	*l;
+  static char	*sub_cmd_strings[] = {
+    "ids", "load", NULL
+  };
+  enum		sub_cmds {
+    ZN_V_IDS, ZN_V_LOAD
+  };
+  
   if (!inited) {
     InitZinc(interp);
   }
   
   if (argc < 2) {
-    Tcl_AppendResult(interp, "wrong # args: should be \"",
-		     LangString(args[0]), " filename\"", NULL);
+    Tcl_WrongNumArgs(interp, 1, args, "?subCmd? filename $args?");
     return ZN_ERROR;
   }
 
-  c = LangString(args[1])[0];
-  length = strlen(LangString(args[1]));
-
-  /*
-   * ids
-   */
-  if ((c == 'i') && (strncmp(LangString(args[1]), "ids", length) == 0)) {
-    if (argc != 3) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       " ids filename\"", NULL);
-      return ZN_ERROR;
-    }
-    ids = MapInfoVideomapIds(LangString(args[2]));
-    if (ids == NULL) {
-      Tcl_AppendResult(interp, "unable to look at videomap file \"",
-		       LangString(args[2]), "\"", NULL);
-      return ZN_ERROR;
-    }
-    id_array = (int *) ZnListArray(ids);
-    id_num = ZnListSize(ids);
-    for (i = 0; i < id_num; i++) {
-      sprintf(num_str, "%d", id_array[i]);
-      Tcl_AppendElement(interp, num_str);
-    }
-    ZnListFree(ids);
+  if (Tcl_GetIndexFromObj(interp, args[1], sub_cmd_strings,
+			  "subCmd", 0, &index) != ZN_OK) {
+    return ZN_ERROR;
   }
 
-  /*
-   * load
-   */
-  else if ((c == 'l') && (strncmp(LangString(args[1]), "load", length) == 0)) {
-    MapInfoId	map_info;
-    int		index;
-    
-    if (argc != 5) {
-      Tcl_AppendResult(interp, "wrong # args: should be \"", LangString(args[0]),
-		       "\" load filename index mapInfo", NULL);
-      return ZN_ERROR;
-    }
-    if (Tcl_GetInt(interp, args[3], &index) == ZN_ERROR) {
-      return ZN_ERROR;
-    }
-    if (index < 0) {
-      index = 0;
-    }
-    if (ZnCreateMapInfo(interp, LangString(args[4]), &map_info) == ZN_ERROR) {
-      return ZN_ERROR;
+  switch((enum sub_cmds) index) {
+    /*
+     * ids
+     */
+  case ZN_V_IDS:
+    {
+      if (argc != 3) {
+	Tcl_WrongNumArgs(interp, 1, args,"ids filename");
+	return ZN_ERROR;
+      }
+      ids = MapInfoVideomapIds(Tcl_GetString(args[2]));
+      if (ids == NULL) {
+	Tcl_AppendResult(interp, "unable to look at videomap file \"",
+			 Tcl_GetString(args[2]), "\"", NULL);
+	return ZN_ERROR;
+      }
+      id_array = (int *) ZnListArray(ids);
+      id_num = ZnListSize(ids);
+      l = Tcl_GetObjResult(interp);
+      for (i = 0; i < id_num; i++) {
+	Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(id_array[i]));
+      }
+      ZnListFree(ids);
     }
-    if (MapInfoGetVideomap(map_info, LangString(args[2]), index) == ZN_ERROR) {
-      Tcl_AppendResult(interp, "unable to load videomap file \"", LangString(args[2]), ":",
-		       LangString(args[3]), "\"", NULL);
-      return ZN_ERROR;
+    break;
+    /*
+     * load
+     */
+  case ZN_V_LOAD:
+    {
+      MapInfoId	map_info;
+      int		index;
+      
+      if (argc != 5) {
+	Tcl_WrongNumArgs(interp, 1, args, "load filename index mapInfo");
+	return ZN_ERROR;
+      }
+      if (Tcl_GetIntFromObj(interp, args[3], &index) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      if (index < 0) {
+	index = 0;
+      }
+      if (ZnCreateMapInfo(interp, Tcl_GetString(args[4]), &map_info) == ZN_ERROR) {
+	return ZN_ERROR;
+      }
+      if (MapInfoGetVideomap(map_info, Tcl_GetString(args[2]), index) == ZN_ERROR) {
+	Tcl_AppendResult(interp, "unable to load videomap file \"",
+			 Tcl_GetString(args[2]), ":",
+			 Tcl_GetString(args[3]), "\"", NULL);
+	return ZN_ERROR;
+      }
+      ZnUpdateMapInfoClients(map_info);
     }
-    ZnUpdateMapInfoClients(map_info);
+    break;
   }
   
   return TCL_OK;
@@ -5474,12 +5537,12 @@ Tkzinc_Init(Tcl_Interp *interp)	/* Used for error reporting. */
     return ZN_ERROR;
   }
 
-  Tcl_CreateCommand(interp, "zinc", ZincCmd,
-		    (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
-  Tcl_CreateCommand(interp, "mapinfo", MapInfoCmd,
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
-  Tcl_CreateCommand(interp, "videomap", VideomapCmd,
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+  Tcl_CreateObjCommand(interp, "zinc", ZincObjCmd,
+		       (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL);
+  Tcl_CreateObjCommand(interp, "mapinfo", MapInfoObjCmd,
+		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+  Tcl_CreateObjCommand(interp, "videomap", VideomapObjCmd,
+		       (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
     
   return TCL_OK;
 }