Index: trunk/src/font.c
===================================================================
--- trunk/src/font.c	(revision 4784)
+++ trunk/src/font.c	(revision 4785)
@@ -64,7 +64,7 @@
 void SetFontInfo(pcb_font_t *Ptr)
 {
 	pcb_cardinal_t i, j;
-	SymbolTypePtr symbol;
+	pcb_symbol_t *symbol;
 	pcb_line_t *line;
 	Coord totalminy = MAX_COORD;
 
@@ -123,7 +123,7 @@
 }
 
 /* creates a new line in a symbol */
-pcb_line_t *CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness)
+pcb_line_t *CreateNewLineInSymbol(pcb_symbol_t *Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness)
 {
 	pcb_line_t *line = Symbol->Line;
 
Index: trunk/src/font.h
===================================================================
--- trunk/src/font.h	(revision 4784)
+++ trunk/src/font.h	(revision 4785)
@@ -33,18 +33,18 @@
 /* ---------------------------------------------------------------------------
  * symbol and font related stuff
  */
-typedef struct symbol_st {     /* a single symbol */
+typedef struct symbol_s {     /* a single symbol */
 	pcb_line_t *Line;
 	pcb_bool Valid;
 	pcb_cardinal_t LineN;       /* number of lines */
 	pcb_cardinal_t LineMax;     /* lines allocated */
 	Coord Width, Height, Delta; /* size of cell, distance to next symbol */
-} SymbolType, *SymbolTypePtr;
+} pcb_symbol_t;
 
 struct pcb_font_s {          /* complete set of symbols */
 	Coord MaxHeight, MaxWidth; /* maximum cell width and height */
 	pcb_box_t DefaultSymbol;     /* the default symbol is a filled box */
-	SymbolType Symbol[MAX_FONTPOSITION + 1];
+	pcb_symbol_t Symbol[MAX_FONTPOSITION + 1];
 	pcb_bool Valid;
 };
 
@@ -51,7 +51,7 @@
 void CreateDefaultFont(pcb_board_t *pcb);
 void SetFontInfo(pcb_font_t *Ptr);
 
-pcb_line_t *CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness);
+pcb_line_t *CreateNewLineInSymbol(pcb_symbol_t *Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness);
 
 #endif
 
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4784)
+++ trunk/src/obj_text.c	(revision 4785)
@@ -106,7 +106,7 @@
 /* creates the bounding box of a text object */
 void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text)
 {
-	SymbolTypePtr symbol = FontPtr->Symbol;
+	pcb_symbol_t *symbol = FontPtr->Symbol;
 	unsigned char *s = (unsigned char *) Text->TextString;
 	int i;
 	int space;
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 4784)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 4785)
@@ -69,7 +69,7 @@
 static int FontEdit(int argc, const char **argv, Coord Ux, Coord Uy)
 {
 	pcb_font_t *font;
-	SymbolType *symbol;
+	pcb_symbol_t *symbol;
 	pcb_layer_t *lfont, *lorig, *lwidth, *lgrid;
 	int s, l;
 
@@ -158,7 +158,7 @@
 static int FontSave(int argc, const char **argv, Coord Ux, Coord Uy)
 {
 	pcb_font_t *font;
-	SymbolTypePtr symbol;
+	pcb_symbol_t *symbol;
 	int i;
 	pcb_line_t *l;
 	gdl_iterator_t it;
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 4784)
+++ trunk/src_plugins/io_lihata/read.c	(revision 4785)
@@ -737,7 +737,7 @@
 	return dt;
 }
 
-static int parse_symbol(SymbolType *sym, lht_node_t *nd)
+static int parse_symbol(pcb_symbol_t *sym, lht_node_t *nd)
 {
 	lht_node_t *grp, *obj;
 	lht_dom_iterator_t it;
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 4784)
+++ trunk/src_plugins/io_lihata/write.c	(revision 4785)
@@ -510,7 +510,7 @@
 	return ndt;
 }
 
-static lht_node_t *build_symbol(SymbolType *sym, const char *name)
+static lht_node_t *build_symbol(pcb_symbol_t *sym, const char *name)
 {
 	lht_node_t *lst, *ndt;
 	pcb_line_t *li;
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 4784)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 4785)
@@ -122,7 +122,7 @@
 
 static	pcb_layer_t *Layer;
 static	pcb_polygon_t *Polygon;
-static	SymbolTypePtr	Symbol;
+static	pcb_symbol_t *Symbol;
 static	int		pin_num;
 static	LibraryMenuTypePtr	Menu;
 static	pcb_bool			LayerFlag[MAX_LAYER + 2];
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 4784)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 4785)
@@ -59,7 +59,7 @@
 
 static	pcb_layer_t *Layer;
 static	pcb_polygon_t *Polygon;
-static	SymbolTypePtr	Symbol;
+static	pcb_symbol_t *Symbol;
 static	int		pin_num;
 static	LibraryMenuTypePtr	Menu;
 static	pcb_bool			LayerFlag[MAX_LAYER + 2];