Index: funcmap/symbol/attiny24.bs
===================================================================
--- funcmap/symbol/attiny24.bs	(revision 9353)
+++ funcmap/symbol/attiny24.bs	(revision 9354)
@@ -3,6 +3,7 @@
 pinalign left center
 pinalign right center
 attr device attiny24
+attr funcmap attiny24
 text_size_mult 0.7
 
 shape box
@@ -15,31 +16,37 @@
 begin pin PB0
 	num 2
 	loc left
+	funcmap
 end pin
 
 begin pin PB1
 	num 3
 	loc left
+	funcmap
 end pin
 
 begin pin PB3
 	num 4
 	loc left
+	funcmap
 end pin
 
 begin pin PB2
 	num 5
 	loc left
+	funcmap
 end pin
 
 begin pin PB7
 	num 6
 	loc left
+	funcmap
 end pin
 
 begin pin PB6
 	num 7
 	loc left
+	funcmap
 end pin
 
 
@@ -52,30 +59,36 @@
 begin pin PA0
 	num 13
 	loc right
+	funcmap
 end pin
 
 begin pin PA1
 	num 12
 	loc right
+	funcmap
 end pin
 
 begin pin PA2
 	num 11
 	loc right
+	funcmap
 end pin
 
 begin pin PA3
 	num 10
 	loc right
+	funcmap
 end pin
 
 begin pin PA4
 	num 9
 	loc right
+	funcmap
 end pin
 
 begin pin PA5
 	num 8
 	loc right
+	funcmap
 end pin
 
Index: funcmap/symbol/attiny24.ry
===================================================================
--- funcmap/symbol/attiny24.ry	(revision 9353)
+++ funcmap/symbol/attiny24.ry	(revision 9354)
@@ -1,6 +1,6 @@
 ha:cschem-group-v1 {
 	ha:group.1 {
-		uuid=RSuLolzje3jfCK4oCZ8AAAAP;
+		uuid=39wCeHrJAKAVyPyQU3EAAAAP;
 		li:objects {
 			ha:text.1 { x1=-8000; y1=-4000; rot=0; stroke=sym-primary; dyntext=1; floater=1; text={%../A.name%}; }
 			ha:polygon.2 {
@@ -13,13 +13,13 @@
 				stroke=sym-decor
 			}
 			ha:group.3 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAB;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAB;
 				x=0; y=28000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -28,13 +28,13 @@
 				}
 			}
 			ha:group.4 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAC;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAC;
 				x=0; y=24000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -43,13 +43,13 @@
 				}
 			}
 			ha:group.5 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAD;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAD;
 				x=0; y=20000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -58,13 +58,13 @@
 				}
 			}
 			ha:group.6 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAE;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAE;
 				x=0; y=16000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -73,13 +73,13 @@
 				}
 			}
 			ha:group.7 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAF;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAF;
 				x=0; y=12000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -88,13 +88,13 @@
 				}
 			}
 			ha:group.8 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAG;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAG;
 				x=0; y=8000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -103,13 +103,13 @@
 				}
 			}
 			ha:group.9 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAH;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAH;
 				x=0; y=4000;
 				rot=0; mirx=1; miry=0;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -118,12 +118,12 @@
 				}
 			}
 			ha:group.10 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAI;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAI;
 				x=16000; y=28000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -132,12 +132,12 @@
 				}
 			}
 			ha:group.11 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAJ;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAJ;
 				x=16000; y=24000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -146,12 +146,12 @@
 				}
 			}
 			ha:group.12 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAK;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAK;
 				x=16000; y=20000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -160,12 +160,12 @@
 				}
 			}
 			ha:group.13 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAL;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAL;
 				x=16000; y=16000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -174,12 +174,12 @@
 				}
 			}
 			ha:group.14 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAM;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAM;
 				x=16000; y=12000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -188,12 +188,12 @@
 				}
 			}
 			ha:group.15 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAN;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAN;
 				x=16000; y=8000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -202,12 +202,12 @@
 				}
 			}
 			ha:group.16 {
-				uuid=RSuLolzje3jfCK4oCZ8AAAAO;
+				uuid=39wCeHrJAKAVyPyQU3EAAAAO;
 				x=16000; y=4000;
 				li:objects {
 					ha:line.1 { x1=0; y1=0; x2=4000; y2=0; stroke=term-decor; }
 					ha:text.2 { x1=1000; y1=0; rot=0; stroke=term-primary; dyntext=1; text={%../a.display/name%}; }
-					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1term-secondary; stroke=term-secondary; dyntext=1; text={%../A.name%}; }
+					ha:text.3 { x1=-500; y1=-2000; rot=0; mirx=1; stroke=term-secondary; dyntext=1; text={%../a.funcmap/name%}; }
 				}
 				ha:attrib {
 					role=terminal;
@@ -215,12 +215,14 @@
 					name=PA5;
 				}
 			}
-			ha:text.17 { x1=-8000; y1=-8000; rot=0; stroke=sym-secondary; dyntext=1; floater=1; text={%../A.device%}; }
+			ha:text.17 { x1=-8000; y1=-8000; rot=0; stroke=sym-secondary; dyntext=1; floater=1; text={%../A.funcmap%}; }
+			ha:text.18 { x1=-8000; y1=-12000; rot=0; stroke=sym-secondary; dyntext=1; floater=1; text={%../A.device%}; }
 		}
 		ha:attrib {
 			role=symbol;
 			name={U?};
 			-symbol-generator=boxsym-rnd;
+			funcmap=attiny24;
 			device=attiny24;
 		}
 	}