Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 4762) +++ trunk/src/board.h (revision 4763) @@ -94,7 +94,7 @@ double Zoom, /* zoom factor */ IsleArea, /* minimum poly island to retain */ ThermScale; /* scale factor used with thermals */ - FontType Font; + pcb_font_t Font; pcb_layer_group_t LayerGroups; vtroutestyle_t RouteStyle; LibraryType NetlistLib[NUM_NETLISTS]; Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 4762) +++ trunk/src/font.c (revision 4763) @@ -61,7 +61,7 @@ /* transforms symbol coordinates so that the left edge of each symbol * is at the zero position. The y coordinates are moved so that min(y) = 0 */ -void SetFontInfo(FontTypePtr Ptr) +void SetFontInfo(pcb_font_t *Ptr) { pcb_cardinal_t i, j; SymbolTypePtr symbol; Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 4762) +++ trunk/src/font.h (revision 4763) @@ -49,7 +49,7 @@ }; void CreateDefaultFont(pcb_board_t *pcb); -void SetFontInfo(FontTypePtr Ptr); +void SetFontInfo(pcb_font_t *Ptr); LineTypePtr CreateNewLineInSymbol(SymbolTypePtr Symbol, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); Index: trunk/src/global_typedefs.h =================================================================== --- trunk/src/global_typedefs.h (revision 4762) +++ trunk/src/global_typedefs.h (revision 4763) @@ -33,7 +33,7 @@ typedef struct pcb_connection_s pcb_connection_t; typedef struct pcb_box_s pcb_box_t; typedef struct pcb_box_list_s pcb_box_list_t; -typedef struct pcb_font_s FontType, *FontTypePtr; +typedef struct pcb_font_s pcb_font_t; typedef struct pcb_line_s LineType, *LineTypePtr; typedef struct pcb_arc_s ArcType, *ArcTypePtr; typedef struct pcb_point_s PointType, *PointTypePtr; Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4762) +++ trunk/src/obj_elem.c (revision 4763) @@ -563,7 +563,7 @@ /* creates an new element; memory is allocated if needed */ ElementTypePtr CreateNewElement(pcb_data_t *Data, ElementTypePtr Element, - FontTypePtr PCBFont, FlagType Flags, char *Description, char *NameOnPCB, + pcb_font_t *PCBFont, FlagType Flags, char *Description, char *NameOnPCB, char *Value, Coord TextX, Coord TextY, pcb_uint8_t Direction, int TextScale, FlagType TextFlags, pcb_bool uniqueName) { @@ -645,7 +645,7 @@ /* creates a new textobject as part of an element copies the values to the appropriate text object */ -void AddTextToElement(TextTypePtr Text, FontTypePtr PCBFont, Coord X, Coord Y, +void AddTextToElement(TextTypePtr Text, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, char *TextString, int Scale, FlagType Flags) { free(Text->TextString); @@ -716,7 +716,7 @@ } /* sets the bounding box of an elements */ -void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, FontTypePtr Font) +void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, pcb_font_t *Font) { pcb_box_t *box, *vbox; Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 4762) +++ trunk/src/obj_elem.h (revision 4763) @@ -63,7 +63,7 @@ pcb_bool ChangeElementSide(ElementTypePtr Element, Coord yoff); pcb_bool ChangeSelectedElementSide(void); ElementTypePtr CopyElementLowLevel(pcb_data_t *Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy); -void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, FontTypePtr Font); +void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, pcb_font_t *Font); char *UniqueElementName(pcb_data_t *Data, char *Name); void r_delete_element(pcb_data_t * data, ElementType * element); @@ -77,7 +77,7 @@ void MirrorElementCoordinates(pcb_data_t *Data, ElementTypePtr Element, Coord yoff); ElementTypePtr CreateNewElement(pcb_data_t *Data, ElementTypePtr Element, - FontTypePtr PCBFont, FlagType Flags, char *Description, char *NameOnPCB, + pcb_font_t *PCBFont, FlagType Flags, char *Description, char *NameOnPCB, char *Value, Coord TextX, Coord TextY, pcb_uint8_t Direction, int TextScale, FlagType TextFlags, pcb_bool uniqueName); @@ -86,7 +86,7 @@ LineTypePtr CreateNewLineInElement(ElementTypePtr Element, Coord X1, Coord Y1, Coord X2, Coord Y2, Coord Thickness); -void AddTextToElement(TextTypePtr Text, FontTypePtr PCBFont, Coord X, Coord Y, +void AddTextToElement(TextTypePtr Text, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, char *TextString, int Scale, FlagType Flags); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4762) +++ trunk/src/obj_text.c (revision 4763) @@ -67,7 +67,7 @@ /*** utility ***/ /* creates a new text on a layer */ -TextTypePtr CreateNewText(pcb_layer_t *Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) +TextTypePtr CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags) { TextType *text; @@ -93,7 +93,7 @@ return (text); } -void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, FontType *PCBFont) +void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, pcb_font_t *PCBFont) { /* calculate size of the bounding box */ SetTextBoundingBox(PCBFont, text); @@ -104,7 +104,7 @@ } /* creates the bounding box of a text object */ -void SetTextBoundingBox(FontTypePtr FontPtr, TextTypePtr Text) +void SetTextBoundingBox(pcb_font_t *FontPtr, TextTypePtr Text) { SymbolTypePtr symbol = FontPtr->Symbol; unsigned char *s = (unsigned char *) Text->TextString; @@ -473,7 +473,7 @@ Coord x = 0; unsigned char *string = (unsigned char *) Text->TextString; pcb_cardinal_t n; - FontTypePtr font = &PCB->Font; + pcb_font_t *font = &PCB->Font; while (string && *string) { /* draw lines if symbol is valid and data is present */ Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4762) +++ trunk/src/obj_text.h (revision 4763) @@ -45,12 +45,12 @@ TextTypePtr GetTextMemory(pcb_layer_t * layer); void RemoveFreeText(TextType * data); -TextTypePtr CreateNewText(pcb_layer_t *Layer, FontTypePtr PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); +TextTypePtr CreateNewText(pcb_layer_t *Layer, pcb_font_t *PCBFont, Coord X, Coord Y, unsigned Direction, int Scale, char *TextString, FlagType Flags); /* Add objects without creating them or making any "sanity modifications" to them */ -void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, FontType *PCBFont); +void pcb_add_text_on_layer(pcb_layer_t *Layer, TextType *text, pcb_font_t *PCBFont); -void SetTextBoundingBox(FontTypePtr FontPtr, TextTypePtr Text); +void SetTextBoundingBox(pcb_font_t *FontPtr, TextTypePtr Text); void *RemoveText(pcb_layer_t *Layer, TextTypePtr Text); void RotateTextLowLevel(TextTypePtr Text, Coord X, Coord Y, unsigned Number); Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 4762) +++ trunk/src/plug_io.c (revision 4763) @@ -154,7 +154,7 @@ return res; } -int ParseFont(FontTypePtr Ptr, char *Filename) +int ParseFont(pcb_font_t *Ptr, char *Filename) { int res = -1; HOOK_CALL(plug_io_t, plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename)); Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 4762) +++ trunk/src/plug_io.h (revision 4763) @@ -65,7 +65,7 @@ int (*parse_element)(plug_io_t *ctx, pcb_data_t *Ptr, const char *name); /* Attempt to load fonts from a file. Return 0 on success. */ - int (*parse_font)(plug_io_t *ctx, FontTypePtr Ptr, const char *Filename); + int (*parse_font)(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename); /* Write the buffer to a file. Return 0 on success. */ @@ -93,7 +93,7 @@ /********** hook wrappers **********/ int ParsePCB(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings); int ParseElement(pcb_data_t *Ptr, const char *name); -int ParseFont(FontTypePtr Ptr, char *Filename); +int ParseFont(pcb_font_t *Ptr, char *Filename); int WriteBuffer(FILE *f, pcb_buffer_t *buff, const char *fmt); int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt); Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 4762) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 4763) @@ -68,7 +68,7 @@ int w = 0, i; TextType t; va_list a; - FontTypePtr font = &PCB->Font; + pcb_font_t *font = &PCB->Font; va_start(a, fmt); vsprintf(tmp, fmt, a); va_end(a); Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4762) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4763) @@ -68,7 +68,7 @@ static int FontEdit(int argc, const char **argv, Coord Ux, Coord Uy) { - FontType *font; + pcb_font_t *font; SymbolType *symbol; pcb_layer_t *lfont, *lorig, *lwidth, *lgrid; int s, l; @@ -157,7 +157,7 @@ static int FontSave(int argc, const char **argv, Coord Ux, Coord Uy) { - FontTypePtr font; + pcb_font_t *font; SymbolTypePtr symbol; int i; LineType *l; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4762) +++ trunk/src_plugins/io_kicad/write.c (revision 4763) @@ -672,7 +672,7 @@ int write_kicad_layout_text(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation) { - FontType *myfont = &PCB->Font; + pcb_font_t *myfont = &PCB->Font; Coord mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */ Coord defaultStrokeThickness = 100*2540; /* use 100 mil as default 100% stroked font line thickness */ int kicadMirrored = 1; /* 1 is not mirrored, 0 is mirrored */ Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4762) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4763) @@ -636,7 +636,7 @@ int write_kicad_legacy_layout_text(FILE * FP, pcb_cardinal_t number, pcb_layer_t *layer, Coord xOffset, Coord yOffset) { - FontType *myfont = &PCB->Font; + pcb_font_t *myfont = &PCB->Font; Coord mWidth = myfont->MaxWidth; /* kicad needs the width of the widest letter */ Coord defaultStrokeThickness = 100*2540; /* use 100 mil as default 100% stroked font line thickness */ int kicadMirrored = 1; /* 1 is not mirrored, 0 is mirrored */ Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4762) +++ trunk/src_plugins/io_lihata/read.c (revision 4763) @@ -761,7 +761,7 @@ return 0; } -static int parse_font(FontType *font, lht_node_t *nd) +static int parse_font(pcb_font_t *font, lht_node_t *nd) { lht_node_t *grp, *sym; lht_dom_iterator_t it; Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 4762) +++ trunk/src_plugins/io_lihata/write.c (revision 4763) @@ -530,7 +530,7 @@ return ndt; } -static lht_node_t *build_font(FontType *font) +static lht_node_t *build_font(pcb_font_t *font) { lht_node_t *syms, *ndt, *frt; int n; Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 4762) +++ trunk/src_plugins/io_pcb/file.c (revision 4763) @@ -270,7 +270,7 @@ { pcb_cardinal_t i, j; LineTypePtr line; - FontTypePtr font; + pcb_font_t *font; for (font = &PCB->Font, i = 0; i <= MAX_FONTPOSITION; i++) { if (!font->Symbol[i].Valid) @@ -542,7 +542,7 @@ extern pcb_board_t *yyPCB; extern pcb_data_t *yyData; -extern FontTypePtr yyFont; +extern pcb_font_t *yyFont; void PreLoadElementPCB() { Index: trunk/src_plugins/io_pcb/parse_common.h =================================================================== --- trunk/src_plugins/io_pcb/parse_common.h (revision 4762) +++ trunk/src_plugins/io_pcb/parse_common.h (revision 4763) @@ -36,6 +36,6 @@ int io_pcb_ParsePCB(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest); int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *, const char *); -int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr, const char *); +int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *, const char *); #endif Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 4762) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 4763) @@ -710,7 +710,7 @@ pcb_board_t * yyPCB; /* used by parser */ pcb_data_t * yyData; ElementTypePtr yyElement; -FontTypePtr yyFont; +pcb_font_t * yyFont; conf_role_t yy_settings_dest; FlagType yy_pcb_flags; @@ -2575,7 +2575,7 @@ /* --------------------------------------------------------------------------- * initializes LEX and calls parser for a font */ -int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr Ptr, const char *Filename) +int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename) { int r = 0; yyPCB = NULL; Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 4762) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 4763) @@ -76,7 +76,7 @@ pcb_board_t * yyPCB; /* used by parser */ pcb_data_t * yyData; ElementTypePtr yyElement; -FontTypePtr yyFont; +pcb_font_t * yyFont; conf_role_t yy_settings_dest; FlagType yy_pcb_flags; @@ -434,7 +434,7 @@ /* --------------------------------------------------------------------------- * initializes LEX and calls parser for a font */ -int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr Ptr, const char *Filename) +int io_pcb_ParseFont(plug_io_t *ctx, pcb_font_t *Ptr, const char *Filename) { int r = 0; yyPCB = NULL; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4762) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4763) @@ -131,7 +131,7 @@ extern pcb_board_t * yyPCB; extern pcb_data_t * yyData; extern ElementTypePtr yyElement; -extern FontTypePtr yyFont; +extern pcb_font_t * yyFont; extern int pcb_lineno; /* linenumber */ extern char *yyfilename; /* in this file */ extern conf_role_t yy_settings_dest; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4762) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4763) @@ -68,7 +68,7 @@ extern pcb_board_t * yyPCB; extern pcb_data_t * yyData; extern ElementTypePtr yyElement; -extern FontTypePtr yyFont; +extern pcb_font_t * yyFont; extern int pcb_lineno; /* linenumber */ extern char *yyfilename; /* in this file */ extern conf_role_t yy_settings_dest;