Index: trunk/tests/RTT/ref/comp1.dsn
===================================================================
--- trunk/tests/RTT/ref/comp1.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/comp1.dsn	(revision 16931)
@@ -38,13 +38,6 @@
     )
   )
   (library
-    (image 31
-      (pin Th_round_3215894 1 0 0)
-    )
-    (padstack Th_round_3215894
-      (shape (circle signal 3.215894))
-      (attach off)
-    )
     (padstack via_685800_381000
       (shape (circle signal 0.685800))
       (attach off)
Index: trunk/tests/RTT/ref/elem_pads.dsn
===================================================================
--- trunk/tests/RTT/ref/elem_pads.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/elem_pads.dsn	(revision 16931)
@@ -33,37 +33,92 @@
     )
   )
   (placement
-    (component 8
+    (component 5
       (place "R1" 6.350000 10.160000 front 0 (PN 0))
     )
-    (component 16
-      (place "U1" 6.339840 4.241800 front 0 (PN 0))
+    (component 27
+      (place "U1" 5.689600 3.175000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Smd_rect_1299972x1899920 "1" -1.499870 0.000000)
-      (pin Smd_rect_1299972x1899920 "2" 1.499870 0.000000)
+    (image 5
+      (pin Pstk_shape_7 "1" -1.499870 0.000000)
+      (pin Pstk_shape_8 "2" 1.499870 0.000000)
     )
-    (image 16
-      (pin Smd_rect_381000x889000 "1" -0.650240 -1.066800)
-      (pin Smd_rect_381000x889000 "2" 0.645160 -1.066800)
-      (pin Smd_rect_381000x889000 "3" 0.645160 0.711200)
-      (pin Smd_rect_381000x889000 "4" 0.010160 0.711200)
-      (pin Smd_rect_381000x889000 "5" -0.650240 0.711200)
+    (image 27
+      (pin Pstk_shape_29 "1" 0.000000 0.000000)
+      (pin Pstk_shape_30 "2" 1.295400 0.000000)
+      (pin Pstk_shape_31 "3" 1.295400 1.778000)
+      (pin Pstk_shape_32 "4" 0.660400 1.778000)
+      (pin Pstk_shape_33 "5" 0.000000 1.778000)
     )
-    (padstack Smd_rect_1299972x1899920
-      (shape (rect "comp1" -0.649986 -0.949960 0.649986 0.949960))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Smd_rect_381000x889000
-      (shape (rect "comp1" -0.190500 -0.444500 0.190500 0.444500))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
       (attach off)
     )
+    (padstack Pstk_shape_29
+      (shape
+        (polygon "comp1" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_30
+      (shape
+        (polygon "comp1" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_31
+      (shape
+        (polygon "comp1" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_32
+      (shape
+        (polygon "comp1" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_33
+      (shape
+        (polygon "comp1" 0
+        0.190500 0.444500 -0.190500 0.444500 -0.190500 -0.444500
+        0.190500 -0.444500
+        )
+      )
+      (attach off)
+    )
   )
   (network
     (class geda_default
Index: trunk/tests/RTT/ref/elem_pads_ds.dsn
===================================================================
--- trunk/tests/RTT/ref/elem_pads_ds.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/elem_pads_ds.dsn	(revision 16931)
@@ -33,25 +33,35 @@
     )
   )
   (placement
-    (component 8
-      (place "E1" 6.191250 8.096250 front 0 (PN 0))
+    (component 5
+      (place "E1" 4.445000 8.890000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Smd_rect_2159000x254000 "1" -0.793750 0.793750)
-      (pin Smd_rect_254000x2159000 "2" 0.793750 -0.793750)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.952500 0.000000)
+      (pin Pstk_shape_8 "2" 2.540000 -1.587500)
     )
-    (padstack Smd_rect_2159000x254000
-      (shape (rect "comp1" -1.079500 -0.127000 1.079500 0.127000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Smd_rect_254000x2159000
-      (shape (rect "comp1" -0.127000 -1.079500 0.127000 1.079500))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
+        1.079500 -0.127000
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "solder1" 0
+        -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
+        -0.127000 -1.079500
+        )
+      )
       (attach off)
     )
   )
Index: trunk/tests/RTT/ref/elem_pins.dsn
===================================================================
--- trunk/tests/RTT/ref/elem_pins.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/elem_pins.dsn	(revision 16931)
@@ -33,34 +33,106 @@
     )
   )
   (placement
-    (component 8
-      (place "U1" 5.715000 9.525000 front 0 (PN 0))
+    (component 5
+      (place "U1" 1.905000 9.525000 front 0 (PN 0))
     )
-    (component 20
-      (place "U2" 5.715000 4.445000 front 0 (PN 0))
+    (component 37
+      (place "U2" 1.905000 4.445000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Th_square_2032000 "1" -3.810000 0.000000)
-      (pin Th_round_2032000 "2" 3.810000 0.000000)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "2" 7.620000 0.000000)
     )
-    (image 20
-      (pin Th_square_2032000 "1" -3.810000 0.000000)
-      (pin Th_square_2032000 "2" 3.810000 0.000000)
+    (image 37
+      (pin Pstk_shape_39 "1" 0.000000 0.000000)
+      (pin Pstk_shape_40 "2" 7.620000 0.000000)
     )
-    (padstack Th_square_2032000
-      (shape (rect signal -1.016000 -1.016000 1.016000 1.016000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Th_round_2032000
-      (shape (circle signal 2.032000))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner2" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "solder1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
       (attach off)
     )
+    (padstack Pstk_shape_39
+      (shape
+        (polygon "comp1" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "inner1" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "inner2" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "solder1" 0
+        2.032000 0.420841 0.841682 1.016000 -0.420841 1.016000
+        -1.016000 0.420841 -1.016000 -0.420841 -0.420841 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_40
+      (shape
+        (polygon "comp1" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "inner1" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "inner2" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+        (polygon "solder1" 0
+        2.032000 0.841682 0.841682 2.032000 -0.841682 2.032000
+        -2.032000 0.841682 -2.032000 -0.420841 -0.841682 -1.016000
+        0.841682 -1.016000 2.032000 -0.420841
+        )
+      )
+      (attach off)
+    )
   )
   (network
     (class geda_default
Index: trunk/tests/RTT/ref/elem_sides_smd.dsn
===================================================================
--- trunk/tests/RTT/ref/elem_sides_smd.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/elem_sides_smd.dsn	(revision 16931)
@@ -33,30 +33,62 @@
     )
   )
   (placement
-    (component 8
+    (component 5
       (place "R1" 5.715000 9.525000 front 0 (PN 0))
     )
-    (component 16
+    (component 27
       (place "R2" 5.715000 3.810000 back 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Smd_rect_1299972x1899920 "1" -1.499870 0.000000)
-      (pin Smd_rect_1299972x1899920 "2" 1.499870 0.000000)
+    (image 5
+      (pin Pstk_shape_7 "1" -1.499870 0.000000)
+      (pin Pstk_shape_8 "2" 1.499870 0.000000)
     )
-    (image 16
-      (pin Smd_rect_1299972x1899920 "1" 1.499870 0.000000)
-      (pin Smd_rect_1299972x1899920 "2" -1.499870 0.000000)
+    (image 27
+      (pin Pstk_shape_29 "1" 1.499870 0.000000)
+      (pin Pstk_shape_30 "2" -1.499870 0.000000)
     )
-    (padstack Smd_rect_1299972x1899920
-      (shape (rect "comp1" -0.649986 -0.949960 0.649986 0.949960))
-      (attach off)
-    )
     (padstack via_685800_381000
       (shape (circle signal 0.685800))
       (attach off)
     )
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_8
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_29
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_30
+      (shape
+        (polygon "comp1" 0
+        0.649986 0.949960 -0.649986 0.949960 -0.649986 -0.949960
+        0.649986 -0.949960
+        )
+      )
+      (attach off)
+    )
   )
   (network
     (class geda_default
Index: trunk/tests/RTT/ref/elem_sides_trh.dsn
===================================================================
--- trunk/tests/RTT/ref/elem_sides_trh.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/elem_sides_trh.dsn	(revision 16931)
@@ -33,34 +33,86 @@
     )
   )
   (placement
-    (component 8
-      (place "U1" 6.350000 8.890000 front 0 (PN 0))
+    (component 5
+      (place "U1" 2.540000 8.890000 front 0 (PN 0))
     )
-    (component 20
-      (place "U2" 6.350000 3.810000 back 0 (PN 0))
+    (component 37
+      (place "U2" 2.540000 3.810000 back 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Th_square_2032000 "1" -3.810000 0.000000)
-      (pin Th_round_2032000 "2" 3.810000 0.000000)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "2" 7.620000 0.000000)
     )
-    (image 20
-      (pin Th_square_2032000 "1" 3.810000 0.000000)
-      (pin Th_round_2032000 "2" -3.810000 0.000000)
+    (image 37
+      (pin Pstk_shape_39 "1" 0.000000 0.000000)
+      (pin Pstk_shape_40 "2" -7.620000 0.000000)
     )
-    (padstack Th_square_2032000
-      (shape (rect signal -1.016000 -1.016000 1.016000 1.016000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Th_round_2032000
-      (shape (circle signal 2.032000))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner2" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "solder1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
       (attach off)
     )
+    (padstack Pstk_shape_39
+      (shape
+        (polygon "solder1" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "outline" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "inner2" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+        (polygon "comp1" 0
+        1.016000 -1.016000 -1.016000 -1.016000 -1.016000 1.016000
+        1.016000 1.016000
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_40
+      (shape
+        (circle "solder1" 2.032000)
+        (circle "outline" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "comp1" 2.032000)
+      )
+      (attach off)
+    )
   )
   (network
     (class geda_default
Index: trunk/tests/RTT/ref/netlist.dsn
===================================================================
--- trunk/tests/RTT/ref/netlist.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/netlist.dsn	(revision 16931)
@@ -33,29 +33,69 @@
     )
   )
   (placement
-    (component 8
-      (place "U1" 6.350000 6.985000 front 0 (PN 0))
+    (component 5
+      (place "U1" 2.540000 8.255000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Th_square_2032000 "1" -3.810000 1.270000)
-      (pin Th_round_2032000 "4" 3.810000 1.270000)
-      (pin Th_round_2032000 "2" -3.810000 -1.270000)
-      (pin Th_round_2032000 "3" 3.810000 -1.270000)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "4" 7.620000 0.000000)
+      (pin Pstk_shape_9 "2" 0.000000 -2.540000)
+      (pin Pstk_shape_10 "3" 7.620000 -2.540000)
     )
-    (padstack Th_square_2032000
-      (shape (rect signal -1.016000 -1.016000 1.016000 1.016000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Th_round_2032000
-      (shape (circle signal 2.032000))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner2" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "solder1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
       (attach off)
     )
+    (padstack Pstk_shape_9
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_10
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
+      (attach off)
+    )
   )
   (network
     (net "bar"
Index: trunk/tests/RTT/ref/netlist_ba.dsn
===================================================================
--- trunk/tests/RTT/ref/netlist_ba.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/netlist_ba.dsn	(revision 16931)
@@ -33,29 +33,69 @@
     )
   )
   (placement
-    (component 8
-      (place "U1" 6.350000 6.985000 front 0 (PN 0))
+    (component 5
+      (place "U1" 2.540000 8.255000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Th_square_2032000 "1" -3.810000 1.270000)
-      (pin Th_round_2032000 "4" 3.810000 1.270000)
-      (pin Th_round_2032000 "2" -3.810000 -1.270000)
-      (pin Th_round_2032000 "3" 3.810000 -1.270000)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.000000 0.000000)
+      (pin Pstk_shape_8 "4" 7.620000 0.000000)
+      (pin Pstk_shape_9 "2" 0.000000 -2.540000)
+      (pin Pstk_shape_10 "3" 7.620000 -2.540000)
     )
-    (padstack Th_square_2032000
-      (shape (rect signal -1.016000 -1.016000 1.016000 1.016000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Th_round_2032000
-      (shape (circle signal 2.032000))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "inner2" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+        (polygon "solder1" 0
+        -1.016000 1.016000 1.016000 1.016000 1.016000 -1.016000
+        -1.016000 -1.016000
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_8
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
       (attach off)
     )
+    (padstack Pstk_shape_9
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_10
+      (shape
+        (circle "comp1" 2.032000)
+        (circle "inner1" 2.032000)
+        (circle "inner2" 2.032000)
+        (circle "solder1" 2.032000)
+      )
+      (attach off)
+    )
   )
   (network
     (net "bar"
Index: trunk/tests/RTT/ref/padrot.dsn
===================================================================
--- trunk/tests/RTT/ref/padrot.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/padrot.dsn	(revision 16931)
@@ -33,76 +33,132 @@
     )
   )
   (placement
-    (component 8
-      (place "R1" 2.222500 11.430000 front 0 (PN 0))
+    (component 5
+      (place "R1" 1.270000 11.430000 front 0 (PN 0))
     )
-    (component 17
-      (place "R3" 1.270000 8.572500 front 0 (PN 0))
+    (component 32
+      (place "R3" 1.270000 7.620000 front 0 (PN 0))
     )
-    (component 26
-      (place "R2" 6.032500 11.430000 front 0 (PN 0))
+    (component 59
+      (place "R2" 5.080000 11.430000 front 0 (PN 0))
     )
-    (component 35
-      (place "R6" 1.270000 4.762500 front 0 (PN 0))
+    (component 86
+      (place "R6" 1.270000 5.715000 front 0 (PN 0))
     )
-    (component 44
-      (place "R4" 3.848481 8.216519 front 0 (PN 0))
+    (component 113
+      (place "R4" 3.175000 8.890000 front 0 (PN 0))
     )
-    (component 53
-      (place "R5" 6.388481 8.216519 front 0 (PN 0))
+    (component 140
+      (place "R5" 5.715000 8.890000 front 0 (PN 0))
     )
-    (component 62
-      (place "R7" 4.056761 4.719828 front 0 (PN 0))
+    (component 167
+      (place "R7" 3.175000 5.080000 front 0 (PN 0))
     )
-    (component 71
-      (place "R8" 7.866761 4.719828 front 0 (PN 0))
+    (component 194
+      (place "R8" 6.985000 5.080000 front 0 (PN 0))
     )
   )
   (library
-    (image 8
-      (pin Smd_rect_2159000x254000 "1" 0.000000 0.000000)
+    (image 5
+      (pin Pstk_shape_7 "1" 0.952500 0.000000)
     )
-    (image 17
-      (pin Smd_rect_254000x2159000 "1" 0.000000 0.000000)
+    (image 32
+      (pin Pstk_shape_34 "1" 0.000000 0.952500)
     )
-    (image 26
-      (pin Smd_rect_2159000x254000 "1" 0.000000 0.000000)
+    (image 59
+      (pin Pstk_shape_61 "1" 0.952500 0.000000)
     )
-    (image 35
-      (pin Smd_rect_254000x2159000 "1" 0.000000 0.000000)
+    (image 86
+      (pin Pstk_shape_88 "1" 0.000000 -0.952500)
     )
-    (image 44
-      (pin Smd_rect_1600962x254000 "1" 0.000000 0.000000)
+    (image 113
+      (pin Pstk_shape_115 "1" 0.673481 -0.673481)
     )
-    (image 53
-      (pin Smd_rect_1600962x254000 "1" 0.000000 0.000000)
+    (image 140
+      (pin Pstk_shape_142 "1" 0.673481 -0.673481)
     )
-    (image 62
-      (pin Smd_rect_2017522x254000 "1" 0.000000 0.000000)
+    (image 167
+      (pin Pstk_shape_169 "1" 0.881761 -0.360172)
     )
-    (image 71
-      (pin Smd_rect_2017522x254000 "1" 0.000000 0.000000)
+    (image 194
+      (pin Pstk_shape_196 "1" 0.881761 -0.360172)
     )
-    (padstack Smd_rect_2159000x254000
-      (shape (rect "comp1" -1.079500 -0.127000 1.079500 0.127000))
+    (padstack via_685800_381000
+      (shape (circle signal 0.685800))
       (attach off)
     )
-    (padstack Smd_rect_254000x2159000
-      (shape (rect "comp1" -0.127000 -1.079500 0.127000 1.079500))
+    (padstack Pstk_shape_7
+      (shape
+        (polygon "comp1" 0
+        -1.079500 -0.127000 -1.079500 0.127000 1.079500 0.127000
+        1.079500 -0.127000
+        )
+      )
       (attach off)
     )
-    (padstack Smd_rect_1600962x254000
-      (shape (rect "comp1" -0.800481 -0.127000 0.800481 0.127000))
+    (padstack Pstk_shape_34
+      (shape
+        (polygon "comp1" 0
+        -0.127000 1.079500 0.127000 1.079500 0.127000 -1.079500
+        -0.127000 -1.079500
+        )
+      )
       (attach off)
     )
-    (padstack Smd_rect_2017522x254000
-      (shape (rect "comp1" -1.008761 -0.127000 1.008761 0.127000))
+    (padstack Pstk_shape_61
+      (shape
+        (polygon "comp1" 0
+        -1.079499 0.126999 -1.079499 -0.126999 1.079499 -0.126999
+        1.079499 0.126999
+        )
+      )
       (attach off)
     )
-    (padstack via_685800_381000
-      (shape (circle signal 0.685800))
+    (padstack Pstk_shape_88
+      (shape
+        (polygon "comp1" 0
+        0.126999 1.079499 -0.126999 1.079499 -0.126999 -1.079499
+        0.126999 -1.079499
+        )
+      )
       (attach off)
     )
+    (padstack Pstk_shape_115
+      (shape
+        (polygon "comp1" 0
+        -0.853086 0.673481 -0.673481 0.853086 0.853086 -0.673481
+        0.673481 -0.853086
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_142
+      (shape
+        (polygon "comp1" 0
+        -0.673481 0.853085 -0.853085 0.673481 0.673481 -0.853085
+        0.853085 -0.673481
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_169
+      (shape
+        (polygon "comp1" 0
+        -1.047355 0.290626 -0.951307 0.525766 1.047355 -0.290626
+        0.951307 -0.525766
+        )
+      )
+      (attach off)
+    )
+    (padstack Pstk_shape_196
+      (shape
+        (polygon "comp1" 0
+        -0.951308 0.525765 -1.047354 0.290625 0.951308 -0.525765
+        1.047354 -0.290625
+        )
+      )
+      (attach off)
+    )
   )
   (network
     (class geda_default
Index: trunk/tests/RTT/ref/padstack.dsn
===================================================================
--- trunk/tests/RTT/ref/padstack.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/padstack.dsn	(revision 16931)
@@ -33,6 +33,18 @@
     )
   )
   (placement
+    (component 60
+      (place 60 1.905000 10.160000 front 0 (PN 0))
+    )
+    (component 62
+      (place 62 9.525000 10.160000 front 0 (PN 0))
+    )
+    (component 63
+      (place 63 1.905000 4.445000 front 0 (PN 0))
+    )
+    (component 64
+      (place 64 5.715000 4.445000 front 0 (PN 0))
+    )
   )
   (library
     (padstack via_685800_381000
Index: trunk/tests/RTT/ref/thermal_last.dsn
===================================================================
--- trunk/tests/RTT/ref/thermal_last.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/thermal_last.dsn	(revision 16931)
@@ -38,13 +38,6 @@
     )
   )
   (library
-    (image 5
-      (pin Th_round_3015995 1 0 0)
-    )
-    (padstack Th_round_3015995
-      (shape (circle signal 3.015995))
-      (attach off)
-    )
     (padstack via_685800_381000
       (shape (circle signal 0.685800))
       (attach off)
Index: trunk/tests/RTT/ref/thermal_layer.dsn
===================================================================
--- trunk/tests/RTT/ref/thermal_layer.dsn	(revision 16930)
+++ trunk/tests/RTT/ref/thermal_layer.dsn	(revision 16931)
@@ -47,22 +47,6 @@
     )
   )
   (library
-    (image 5
-      (pin Th_round_3015995 1 0 0)
-    )
-    (image 6
-      (pin Th_round_3015995 1 0 0)
-    )
-    (image 7
-      (pin Th_round_3015995 1 0 0)
-    )
-    (image 8
-      (pin Th_round_3015995 1 0 0)
-    )
-    (padstack Th_round_3015995
-      (shape (circle signal 3.015995))
-      (attach off)
-    )
     (padstack via_685800_381000
       (shape (circle signal 0.685800))
       (attach off)