Index: trunk/src_3rd/libuhpgl/parse.c =================================================================== --- trunk/src_3rd/libuhpgl/parse.c (revision 11221) +++ trunk/src_3rd/libuhpgl/parse.c (revision 11222) @@ -195,10 +195,10 @@ case inst2num('S','P'): case inst2num('C','T'): case inst2num('C','I'): + case inst2num('A','A'): + case inst2num('A','R'): /* case inst2num('L','T'): - case inst2num('A','A'): - case inst2num('A','R'): case inst2num('F','T'): case inst2num('P','T'): case inst2num('W','G'): @@ -244,13 +244,6 @@ ctx->state.at.y = p->num[1]; } return 0; - case inst2num('C','I'): - if ((p->nums == 2) || (is_last)) { - p->state = ST_INST_END; - if (draw_circ(ctx, ctx->state.at.x, ctx->state.at.y, p->num[0], (p->nums == 2 ? p->num[1] : -1)) < 0) - return -1; - } - return 0; case inst2num('P','R'): if (p->nums == 2) { p->state = ST_INST_END; @@ -261,6 +254,17 @@ ctx->state.at.y += p->num[1]; } return 0; + case inst2num('C','I'): + if ((p->nums == 2) || (is_last)) { + p->state = ST_INST_END; + if (draw_circ(ctx, ctx->state.at.x, ctx->state.at.y, p->num[0], (p->nums == 2 ? p->num[1] : -1)) < 0) + return -1; + } + return 0; +/* + case inst2num('A','A'): + case inst2num('A','R'): +*/ } return error(ctx, "unimplemented coord instruction"); }