luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wrong pdfmarks in hierarchical pdf export, after changes to handle generated sch/sym

This commit is contained in:
stefan schippers 2023-04-26 18:50:39 +02:00
parent 07fcdfbde4
commit 3e320b56d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.c
View File

@ -1211,8 +1211,8 @@ const char *get_sym_name(int inst, int ext)
{
const char *sym, *sch;
/* instance based symbol selection */
sch = get_tok_value(xctx->inst[inst].prop_ptr, "schematic", 0);
if(!sch[0]) sch = get_tok_value((xctx->inst[inst].ptr + xctx->sym)->prop_ptr, "schematic", 0);
if(xctx->tok_size) { /* token exists */
if(ext) sym = get_cell_w_ext(add_ext(rel_sym_path(sch), ".sym"), 0);
else sym = skip_dir(add_ext(rel_sym_path(sch), ".sym"));

4
src/psprint.c
View File

@ -795,7 +795,9 @@ static void ps_draw_symbol(int n,int layer, int what, short tmp_flip, short rot,
/* pdfmarks, only if doing hierarchy print and if symbol has a subcircuit */
if(what != 7) {
char fname[PATH_MAX];
if(!strcmp(get_tok_value((xctx->inst[n].ptr+ xctx->sym)->prop_ptr, "type", 0), "subcircuit")) {
get_sch_from_sym(fname, xctx->inst[n].ptr+ xctx->sym, n);
fprintf(fd,
"[ "
"/Rect [ %g %g %g %g ] "
@ -804,7 +806,7 @@ static void ps_draw_symbol(int n,int layer, int what, short tmp_flip, short rot,
"/Subtype /Link "
"/ANN pdfmark\n",
x1, y1, x2, y2,
sanitize(get_sym_name(n, 0)));
sanitize(get_cell_w_ext(fname, 0)));
}
}
}