Index: trunk/src/examples/psu.lht
===================================================================
--- trunk/src/examples/psu.lht	(revision 3260)
+++ trunk/src/examples/psu.lht	(revision 3261)
@@ -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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; 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.name%; floater=1; }
+							ha:text.2 { x1=-3000; y1=0; dyntext=1; stroke=term-primary; text=%../a.display/pinnum%; floater=1; }
 						}
 						ha:attrib {
 							name=1