Index: trunk/library/symbol/analog/comparator-1.sym =================================================================== --- trunk/library/symbol/analog/comparator-1.sym (revision 3336) +++ trunk/library/symbol/analog/comparator-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=-8000; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in+ @@ -16,7 +16,7 @@ x=-8000; y=-4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in- @@ -27,7 +27,7 @@ x=12000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=out @@ -44,7 +44,7 @@ x=0; y=-8000; rot=270.000000; mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V- @@ -55,7 +55,7 @@ x=0; y=8000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V+ Index: trunk/library/symbol/analog/opamp-1.sym =================================================================== --- trunk/library/symbol/analog/opamp-1.sym (revision 3336) +++ trunk/library/symbol/analog/opamp-1.sym (revision 3337) @@ -6,7 +6,7 @@ x=-20000; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in+ @@ -17,7 +17,7 @@ x=-20000; y=-4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in- @@ -27,7 +27,7 @@ ha:group.3 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=out @@ -44,7 +44,7 @@ x=-12000; y=-8000; rot=270.000000; mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V- @@ -55,7 +55,7 @@ x=-12000; y=8000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V+ Index: trunk/library/symbol/common_sym.awk =================================================================== --- trunk/library/symbol/common_sym.awk (revision 3336) +++ trunk/library/symbol/common_sym.awk (revision 3337) @@ -337,7 +337,7 @@ if (name2 != "") { grp_attr_append(TERM, "pinnum", name) grp_attr_append(TERM, "name", name2) - sym_text_attr(TERM, -(3/4 + slen(name)) * pin_grid, 0, "a.display/pinnum", 0, "term-primary") + sym_text_attr(TERM, -(3/4 + slen(name)) * pin_grid, 0, "a.display/name", 0, "term-primary") sym_text_attr(TERM, tx, -0.5 * pin_grid, "name", 0, "term-secondary") } else { Index: trunk/library/symbol/diode/diode-1.sym =================================================================== --- trunk/library/symbol/diode/diode-1.sym (revision 3336) +++ trunk/library/symbol/diode/diode-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=16000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=A Index: trunk/library/symbol/diode/led-1.sym =================================================================== --- trunk/library/symbol/diode/led-1.sym (revision 3336) +++ trunk/library/symbol/diode/led-1.sym (revision 3337) @@ -4,7 +4,7 @@ ha:group.1 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -15,7 +15,7 @@ x=-16000; y=0; mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=A Index: trunk/library/symbol/diode/schottky-1.sym =================================================================== --- trunk/library/symbol/diode/schottky-1.sym (revision 3336) +++ trunk/library/symbol/diode/schottky-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=16000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=A Index: trunk/library/symbol/diode/zener-1.sym =================================================================== --- trunk/library/symbol/diode/zener-1.sym (revision 3336) +++ trunk/library/symbol/diode/zener-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=16000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=A Index: trunk/library/symbol/diode/zener-2.sym =================================================================== --- trunk/library/symbol/diode/zener-2.sym (revision 3336) +++ trunk/library/symbol/diode/zener-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=16000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=A Index: trunk/library/symbol/mech/testpoint.sym =================================================================== --- trunk/library/symbol/mech/testpoint.sym (revision 3336) +++ trunk/library/symbol/mech/testpoint.sym (revision 3337) @@ -5,7 +5,7 @@ x=0; y=4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/capacitor-1.sym =================================================================== --- trunk/library/symbol/passive/capacitor-1.sym (revision 3336) +++ trunk/library/symbol/passive/capacitor-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/capacitor-2.sym =================================================================== --- trunk/library/symbol/passive/capacitor-2.sym (revision 3336) +++ trunk/library/symbol/passive/capacitor-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/passive/capacitor-3.sym =================================================================== --- trunk/library/symbol/passive/capacitor-3.sym (revision 3336) +++ trunk/library/symbol/passive/capacitor-3.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/passive/capacitor-var-1.sym =================================================================== --- trunk/library/symbol/passive/capacitor-var-1.sym (revision 3336) +++ trunk/library/symbol/passive/capacitor-var-1.sym (revision 3337) @@ -15,7 +15,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -26,7 +26,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-1.sym =================================================================== --- trunk/library/symbol/passive/coil-1.sym (revision 3336) +++ trunk/library/symbol/passive/coil-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-2.sym =================================================================== --- trunk/library/symbol/passive/coil-2.sym (revision 3336) +++ trunk/library/symbol/passive/coil-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-var-1.sym =================================================================== --- trunk/library/symbol/passive/coil-var-1.sym (revision 3336) +++ trunk/library/symbol/passive/coil-var-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=8000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=1000; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V @@ -25,7 +25,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -36,7 +36,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-var-2.sym =================================================================== --- trunk/library/symbol/passive/coil-var-2.sym (revision 3336) +++ trunk/library/symbol/passive/coil-var-2.sym (revision 3337) @@ -14,7 +14,7 @@ x=8000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V @@ -25,7 +25,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -36,7 +36,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-var-3.sym =================================================================== --- trunk/library/symbol/passive/coil-var-3.sym (revision 3336) +++ trunk/library/symbol/passive/coil-var-3.sym (revision 3337) @@ -7,7 +7,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -18,7 +18,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/coil-var-4.sym =================================================================== --- trunk/library/symbol/passive/coil-var-4.sym (revision 3336) +++ trunk/library/symbol/passive/coil-var-4.sym (revision 3337) @@ -15,7 +15,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -26,7 +26,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-1.sym =================================================================== --- trunk/library/symbol/passive/resistor-1.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-2.sym =================================================================== --- trunk/library/symbol/passive/resistor-2.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-3.sym =================================================================== --- trunk/library/symbol/passive/resistor-3.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-3.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-var-1.sym =================================================================== --- trunk/library/symbol/passive/resistor-var-1.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-var-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=8000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V @@ -25,7 +25,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -36,7 +36,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-var-2.sym =================================================================== --- trunk/library/symbol/passive/resistor-var-2.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-var-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=8000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V @@ -25,7 +25,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -36,7 +36,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/passive/resistor-var-3.sym =================================================================== --- trunk/library/symbol/passive/resistor-var-3.sym (revision 3336) +++ trunk/library/symbol/passive/resistor-var-3.sym (revision 3337) @@ -5,7 +5,7 @@ x=8000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V @@ -25,7 +25,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -36,7 +36,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/power/battery-1.sym =================================================================== --- trunk/library/symbol/power/battery-1.sym (revision 3336) +++ trunk/library/symbol/power/battery-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/battery-2.sym =================================================================== --- trunk/library/symbol/power/battery-2.sym (revision 3336) +++ trunk/library/symbol/power/battery-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=24000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/battery-3.sym =================================================================== --- trunk/library/symbol/power/battery-3.sym (revision 3336) +++ trunk/library/symbol/power/battery-3.sym (revision 3337) @@ -8,7 +8,7 @@ x=24000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -19,7 +19,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/fuse-1.sym =================================================================== --- trunk/library/symbol/power/fuse-1.sym (revision 3336) +++ trunk/library/symbol/power/fuse-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/power/fuse-2.sym =================================================================== --- trunk/library/symbol/power/fuse-2.sym (revision 3336) +++ trunk/library/symbol/power/fuse-2.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/library/symbol/power/meter.sym =================================================================== --- trunk/library/symbol/power/meter.sym (revision 3336) +++ trunk/library/symbol/power/meter.sym (revision 3337) @@ -6,7 +6,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -17,7 +17,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/source-ac.sym =================================================================== --- trunk/library/symbol/power/source-ac.sym (revision 3336) +++ trunk/library/symbol/power/source-ac.sym (revision 3337) @@ -8,7 +8,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -19,7 +19,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/source-dc.sym =================================================================== --- trunk/library/symbol/power/source-dc.sym (revision 3336) +++ trunk/library/symbol/power/source-dc.sym (revision 3337) @@ -5,7 +5,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/power/source.sym =================================================================== --- trunk/library/symbol/power/source.sym (revision 3336) +++ trunk/library/symbol/power/source.sym (revision 3337) @@ -6,7 +6,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -17,7 +17,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P Index: trunk/library/symbol/transistor/mosfet-n-1.sym =================================================================== --- trunk/library/symbol/transistor/mosfet-n-1.sym (revision 3336) +++ trunk/library/symbol/transistor/mosfet-n-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=12000; y=12000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=D @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=G @@ -55,7 +55,7 @@ x=12000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=S Index: trunk/library/symbol/transistor/mosfet-p-1.sym =================================================================== --- trunk/library/symbol/transistor/mosfet-p-1.sym (revision 3336) +++ trunk/library/symbol/transistor/mosfet-p-1.sym (revision 3337) @@ -5,7 +5,7 @@ x=12000; y=12000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=S @@ -16,7 +16,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=G @@ -42,7 +42,7 @@ x=12000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=D Index: trunk/library/symbol/transistor/npn-1.sym =================================================================== --- trunk/library/symbol/transistor/npn-1.sym (revision 3336) +++ trunk/library/symbol/transistor/npn-1.sym (revision 3337) @@ -14,7 +14,7 @@ x=12000; y=8000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -25,7 +25,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=B @@ -36,7 +36,7 @@ x=12000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=E Index: trunk/library/symbol/transistor/pnp-1.sym =================================================================== --- trunk/library/symbol/transistor/pnp-1.sym (revision 3336) +++ trunk/library/symbol/transistor/pnp-1.sym (revision 3337) @@ -7,7 +7,7 @@ x=12000; y=4000; rot=90.000000; miry=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-1000; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-1000; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=E @@ -32,7 +32,7 @@ x=12000; y=-8000; rot=90.000000; miry=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-1000; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-1000; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=C @@ -43,7 +43,7 @@ mirx=1; miry=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=-3000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=-3000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=B Index: trunk/src/examples/devmap.lht =================================================================== --- trunk/src/examples/devmap.lht (revision 3336) +++ trunk/src/examples/devmap.lht (revision 3337) @@ -30,7 +30,7 @@ x=12000; y=12000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=D @@ -41,7 +41,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=G @@ -80,7 +80,7 @@ x=12000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=S @@ -267,7 +267,7 @@ x=12000; y=12000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=D @@ -278,7 +278,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=G @@ -317,7 +317,7 @@ x=12000; y=-4000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=S Index: trunk/src/examples/psu.lht =================================================================== --- trunk/src/examples/psu.lht (revision 3336) +++ trunk/src/examples/psu.lht (revision 3337) @@ -59,7 +59,7 @@ ha:group.2 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 @@ -70,7 +70,7 @@ x=0; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -213,7 +213,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -224,7 +224,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 @@ -256,7 +256,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=N @@ -267,7 +267,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=P @@ -305,7 +305,7 @@ ha:group.2 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 @@ -316,7 +316,7 @@ x=0; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -453,7 +453,7 @@ x=20000; y=0; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=2 @@ -464,7 +464,7 @@ mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=1 Index: trunk/src/examples/slot.lht =================================================================== --- trunk/src/examples/slot.lht (revision 3336) +++ trunk/src/examples/slot.lht (revision 3337) @@ -59,7 +59,7 @@ x=-20000; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in+ @@ -70,7 +70,7 @@ x=-20000; y=-4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in- @@ -80,7 +80,7 @@ ha:group.3 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=out @@ -97,7 +97,7 @@ x=-12000; y=-8000; rot=270.000000; mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V- @@ -108,7 +108,7 @@ x=-12000; y=8000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V+ @@ -136,7 +136,7 @@ x=-20000; y=4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in+ @@ -147,7 +147,7 @@ x=-20000; y=-4000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=in- @@ -157,7 +157,7 @@ ha:group.3 { li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=out @@ -174,7 +174,7 @@ x=-12000; y=-8000; rot=270.000000; mirx=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=0; y1=-1000; rot=180.000000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V- @@ -185,7 +185,7 @@ x=-12000; y=8000; rot=90.000000; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=-4000; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } } ha:attrib { name=V+ Index: trunk/src/examples/slot2.lht =================================================================== --- trunk/src/examples/slot2.lht (revision 3336) +++ trunk/src/examples/slot2.lht (revision 3337) @@ -77,7 +77,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -98,7 +98,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -120,7 +120,7 @@ stroke=sym-decor; } ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -171,7 +171,7 @@ x=4000; y=24000; rot=90.000000; miry=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-4000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.3 { x1=0; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -184,7 +184,7 @@ x=4000; y=0; rot=-90.000000; miry=1; li:objects { ha:line.1 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.3 { x1=0; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -225,7 +225,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -246,7 +246,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -268,7 +268,7 @@ stroke=sym-decor; } ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -327,7 +327,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -348,7 +348,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -370,7 +370,7 @@ stroke=sym-decor; } ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -429,7 +429,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -450,7 +450,7 @@ stroke=sym-decor; } ha:line.2 { x1=0; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.3 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.4 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { @@ -472,7 +472,7 @@ stroke=sym-decor; } ha:line.3 { x1=-1000; y1=0; x2=-4000; y2=0; stroke=term-decor; } - ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; } + ha:text.4 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/name%; floater=1; } ha:text.5 { x1=1000; y1=-2000; dyntext=1; stroke=term-secondary; text=%../A.name%; floater=1; } } ha:attrib { Index: trunk/src/libcschem/util_grp.c =================================================================== --- trunk/src/libcschem/util_grp.c (revision 3336) +++ trunk/src/libcschem/util_grp.c (revision 3337) @@ -237,7 +237,7 @@ break; case CSCH_ROLE_TERMINAL: csch_auto_attr_create(sheet, grp, "role", "terminal", NULL, NULL); - csch_auto_attr_create(sheet, grp, "name", "PINNAME", "term-primary", "%../a.display/pinnum%"); + csch_auto_attr_create(sheet, grp, "name", "PINNAME", "term-primary", "%../a.display/name%"); grp_pen_rename(sheet, grp, "^sheet-", "term-"); break; Index: trunk/src/plugins/target_none/target_none.c =================================================================== --- trunk/src/plugins/target_none/target_none.c (revision 3336) +++ trunk/src/plugins/target_none/target_none.c (revision 3337) @@ -53,7 +53,7 @@ assert(port->hdr.type == CSCH_ATYPE_PORT); if (port->name != NULL) - csch_attrib_set(&port->hdr.attr, eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "display/pinnum", port->name, target_none_src, NULL); + csch_attrib_set(&port->hdr.attr, eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "display/name", port->name, target_none_src, NULL); return 0; } Index: trunk/src/plugins/target_pcb/target_pcb.c =================================================================== --- trunk/src/plugins/target_pcb/target_pcb.c (revision 3336) +++ trunk/src/plugins/target_pcb/target_pcb.c (revision 3337) @@ -61,7 +61,7 @@ if (pinnum == NULL) pinnum = port->name; if (pinnum != NULL) - csch_attrib_set(&port->hdr.attr, eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "display/pinnum", pinnum, target_pcb_src, NULL); + csch_attrib_set(&port->hdr.attr, eng->eprio + CSCH_PRI_PLUGIN_NORMAL, "display/name", pinnum, target_pcb_src, NULL); return 0; }