diff --git a/src/draw.c b/src/draw.c index 81880e36..d61aee69 100644 --- a/src/draw.c +++ b/src/draw.c @@ -766,13 +766,13 @@ void draw_symbol(int what,int c, int n,int layer,short tmp_flip, short rot, cairo_font_face_destroy(xctx->cairo_font); } #endif - dbg(1, "drawing string: before translate(): text.txt_ptr=%s\n", text.txt_ptr); + dbg(1, "draw_symbol(): drawing string: before translate(): text.txt_ptr=%s\n", text.txt_ptr); my_strdup2(_ALLOC_ID_, &txtptr, translate(n, text.txt_ptr)); /* do another round of substitutions if some @var are found, but if not found leave @var as is */ - dbg(1, "drawing string: str=%s prop=%s\n", txtptr, text.prop_ptr ? text.prop_ptr : "NULL"); + dbg(1, "draw_symbol(): drawing string: str=%s prop=%s\n", txtptr, text.prop_ptr ? text.prop_ptr : "NULL"); my_strdup2(_ALLOC_ID_, &txtptr, translate3(txtptr, 1, xctx->inst[n].prop_ptr, xctx->sym[xctx->inst[n].ptr].templ, NULL )); - dbg(1, "after translate3: str=%s\n", txtptr); + dbg(1, "draw_symbol(): after translate3: str=%s\n", txtptr); draw_string(textlayer, what, txtptr, (text.rot + ( (flip && (text.rot & 1) ) ? rot+2 : rot) ) & 0x3, flip^text.flip, text.hcenter, text.vcenter, @@ -940,8 +940,9 @@ void draw_temp_symbol(int what, GC gc, int n,int layer,short tmp_flip, short rot #endif my_strdup2(_ALLOC_ID_, &txtptr, translate(n, text.txt_ptr)); /* do another round of substitutions if some @var are found, but if not found leave @var as is */ - my_strdup2(_ALLOC_ID_, &txtptr, translate3(txtptr, 0, xctx->inst[n].prop_ptr, + my_strdup2(_ALLOC_ID_, &txtptr, translate3(txtptr, 1, xctx->inst[n].prop_ptr, xctx->sym[xctx->inst[n].ptr].templ, NULL )); + dbg(1, "draw_temp_symbol(): after translate3: str=%s\n", txtptr); if(txtptr[0]) draw_temp_string(gc, what, txtptr, (text.rot + ( (flip && (text.rot & 1) ) ? rot+2 : rot) ) & 0x3, flip^text.flip, text.hcenter, text.vcenter, x0+x1, y0+y1, xscale, yscale);