Commit 1f5a6157 authored by Emden R. Gansner's avatar Emden R. Gansner

Merge branch 'master' of https://github.com/ellson/graphviz

parents a2c73f0b 1b54b401
......@@ -286,7 +286,7 @@ TYPEDEF_HIDES_STRUCT = NO
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
SYMBOL_CACHE_SIZE = 0
# SYMBOL_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
......@@ -1386,7 +1386,7 @@ HAVE_DOT = YES
# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
# containing the font.
DOT_FONTNAME = FreeSans
#DOT_FONTNAME = FreeSans
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
......
......@@ -57,58 +57,58 @@ static void tkgen_print_tags(GVJ_t *job)
char *ObjType;
unsigned int ObjId;
obj_state_t *obj = job->obj;
int ObjFlag;
void *ObjFlag;
switch (obj->emit_state) {
case EMIT_NDRAW:
ObjType = "node";
ObjFlag = 1;
ObjId = AGSEQ(obj->u.n);
ObjId = obj->u.n;
break;
case EMIT_NLABEL:
ObjType = "node";
ObjFlag = 0;
ObjId = AGSEQ(obj->u.n);
ObjId = obj->u.n;
break;
case EMIT_EDRAW:
case EMIT_TDRAW:
case EMIT_HDRAW:
ObjType = "edge";
ObjFlag = 1;
ObjId = AGSEQ(obj->u.e);
ObjId = obj->u.e;
break;
case EMIT_ELABEL:
case EMIT_TLABEL:
case EMIT_HLABEL:
ObjType = "edge";
ObjFlag = 0;
ObjId = AGSEQ(obj->u.e);
ObjId = obj->u.e;
break;
case EMIT_GDRAW:
ObjType = "graph";
ObjFlag = 1;
ObjId = -1; /* hack! */
ObjId = obj->u.g;
break;
case EMIT_GLABEL:
ObjFlag = 0;
ObjType = "graph label";
ObjId = -1; /* hack! */
ObjId = obj->u.g;
break;
case EMIT_CDRAW:
ObjType = "graph";
ObjFlag = 1;
ObjId = AGSEQ(obj->u.sg);
ObjId = obj->u.sg;
break;
case EMIT_CLABEL:
ObjType = "graph";
ObjFlag = 0;
ObjId = AGSEQ(obj->u.sg);
ObjId = obj->u.sg;
break;
default:
assert (0);
break;
}
gvprintf(job, " -tags {%d%s%d}", ObjFlag, ObjType, ObjId);
gvprintf(job, " -tags {%d%s%p}", ObjFlag, ObjType, ObjId);
}
static void tkgen_canvas(GVJ_t * job)
......
......@@ -64,7 +64,7 @@ int graphcmd(ClientData clientData, Tcl_Interp * interp,
Tcl_AppendResult(interp, "Tail node ", argv[2], " is not in the graph.", NULL);
return TCL_ERROR;
}
head = cmd2n(argv[2]);
head = cmd2n(argv[3]);
if (!head) {
if (!(head = agfindnode(g, argv[3]))) {
Tcl_AppendResult(interp, "Head node \"", argv[3], "\" not found.", NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment