Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4886) +++ trunk/doc-rnd/hacking/renames (revision 4887) @@ -333,3 +333,6 @@ string_to_pcbflags -> pcb_strflg_board_s2f string_to_flags -> pcb_strflg_s2f flags_to_string -> pcb_strflg_f2s +CreateDefaultFont -> pcb_font_create_default +SetFontInfo -> pcb_font_set_info +CreateNewLineInSymbol -> pcb_font_new_line_in_sym Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 4886) +++ trunk/src/board.c (revision 4887) @@ -101,7 +101,7 @@ for (i = 0; i < MAX_LAYER; i++) ptr->Data->Layer[i].Name = pcb_strdup(conf_core.design.default_layer_name[i]); - CreateDefaultFont(ptr); + pcb_font_create_default(ptr); return (ptr); } Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 4886) +++ trunk/src/font.c (revision 4887) @@ -43,7 +43,7 @@ /* parses a file with font information and installs it into the provided PCB * checks directories given as colon separated list by resource fontPath * if the fonts filename doesn't contain a directory component */ -void CreateDefaultFont(pcb_board_t *pcb) +void pcb_font_create_default(pcb_board_t *pcb) { int res = -1; pcb_io_err_inhibit_inc(); @@ -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(pcb_font_t *Ptr) +void pcb_font_set_info(pcb_font_t *Ptr) { pcb_cardinal_t i, j; pcb_symbol_t *symbol; @@ -123,7 +123,7 @@ } /* creates a new line in a symbol */ -pcb_line_t *CreateNewLineInSymbol(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness) +pcb_line_t *pcb_font_new_line_in_sym(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness) { pcb_line_t *line = Symbol->Line; Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 4886) +++ trunk/src/font.h (revision 4887) @@ -48,10 +48,10 @@ pcb_bool Valid; }; -void CreateDefaultFont(pcb_board_t *pcb); -void SetFontInfo(pcb_font_t *Ptr); +void pcb_font_create_default(pcb_board_t *pcb); +void pcb_font_set_info(pcb_font_t *Ptr); -pcb_line_t *CreateNewLineInSymbol(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness); +pcb_line_t *pcb_font_new_line_in_sym(pcb_symbol_t *Symbol, pcb_coord_t X1, pcb_coord_t Y1, pcb_coord_t X2, pcb_coord_t Y2, pcb_coord_t Thickness); #endif Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 4886) +++ trunk/src_plugins/fontmode/fontmode.c (revision 4887) @@ -197,7 +197,7 @@ symbol->Width = x2; symbol->Valid = 1; - CreateNewLineInSymbol(symbol, x1, y1, x2, y2, l->Thickness); + pcb_font_new_line_in_sym(symbol, x1, y1, x2, y2, l->Thickness); } linelist_foreach(&lwidth->Line, &it, l) { @@ -214,7 +214,7 @@ symbol->Delta = x1 - symbol->Width; } - SetFontInfo(font); + pcb_font_set_info(font); return 0; } Index: trunk/src_plugins/hid_gtk/ghid-propedit.c =================================================================== --- trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4886) +++ trunk/src_plugins/hid_gtk/ghid-propedit.c (revision 4887) @@ -316,7 +316,7 @@ preview_pcb.Data = pcb_buffer_new(); preview_pcb.MaxWidth = preview_pcb.MaxHeight = PCB_MIL_TO_COORD(2000); pcb_colors_from_settings(&preview_pcb); - CreateDefaultFont(&preview_pcb); + pcb_font_create_default(&preview_pcb); preview_pcb.ViaOn = 1; for(n = 0; n < max_copper_layer+2; n++) { Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 4886) +++ trunk/src_plugins/io_kicad/read.c (revision 4887) @@ -297,7 +297,7 @@ required = BV(0) | BV(1) | BV(2) | BV(3); if ((tally & required) == required) { /* has location, layer, size and stroke thickness at a minimum */ if (&st->PCB->Font == NULL) { - CreateDefaultFont(st->PCB); + pcb_font_create_default(st->PCB); } if (mirrored != 0) { @@ -1231,7 +1231,7 @@ required = BV(0) | BV(1) | BV(4) | BV(7) | BV(8); if ((tally & required) == required) { /* has location, layer, size and stroke thickness at a minimum */ if (&st->PCB->Font == NULL) { - CreateDefaultFont(st->PCB); + pcb_font_create_default(st->PCB); } X = refdesX; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4886) +++ trunk/src_plugins/io_lihata/read.c (revision 4887) @@ -754,7 +754,7 @@ parse_coord(&x2, lht_dom_hash_get(obj, "x2")); parse_coord(&y2, lht_dom_hash_get(obj, "y2")); parse_coord(&th, lht_dom_hash_get(obj, "thickness")); - CreateNewLineInSymbol(sym, x1, y1, x2, y2, th); + pcb_font_new_line_in_sym(sym, x1, y1, x2, y2, th); } sym->Valid = 1; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4886) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4887) @@ -1897,7 +1897,7 @@ #line 272 "parse_y.y" /* yacc.c:1646 */ { yyFont->Valid = pcb_true; - SetFontInfo(yyFont); + pcb_font_set_info(yyFont); } #line 1903 "parse_y.c" /* yacc.c:1646 */ break; @@ -2808,7 +2808,7 @@ case 174: #line 1803 "parse_y.y" /* yacc.c:1646 */ { - CreateNewLineInSymbol(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); + pcb_font_new_line_in_sym(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } #line 2814 "parse_y.c" /* yacc.c:1646 */ break; @@ -2816,7 +2816,7 @@ case 175: #line 1810 "parse_y.y" /* yacc.c:1646 */ { - CreateNewLineInSymbol(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); + pcb_font_new_line_in_sym(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } #line 2822 "parse_y.c" /* yacc.c:1646 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4886) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4887) @@ -271,7 +271,7 @@ symbols { yyFont->Valid = pcb_true; - SetFontInfo(yyFont); + pcb_font_set_info(yyFont); } ; @@ -1801,7 +1801,7 @@ /* x1, y1, x2, y2, thickness */ : T_SYMBOLLINE '(' measure measure measure measure measure ')' { - CreateNewLineInSymbol(Symbol, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7)); + pcb_font_new_line_in_sym(Symbol, OU ($3), OU ($4), OU ($5), OU ($6), OU ($7)); } ; hiressymbol @@ -1808,7 +1808,7 @@ /* x1, y1, x2, y2, thickness */ : T_SYMBOLLINE '[' measure measure measure measure measure ']' { - CreateNewLineInSymbol(Symbol, NU ($3), NU ($4), NU ($5), NU ($6), NU ($7)); + pcb_font_new_line_in_sym(Symbol, NU ($3), NU ($4), NU ($5), NU ($6), NU ($7)); } ;