Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26206
Modified Files: Tag: branch-v0-39-2-extended u_main.tk s_main.c Log Message: switched from DejaVu to Bitstream Vera since it renders much better on GNU/Linux and hopefully as good on the other two. On GNU/Linux with GNOME, DejaVu Sans Mono renders very low in the text boxes for some reason
Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.20.2.5 retrieving revision 1.20.2.6 diff -C2 -d -r1.20.2.5 -r1.20.2.6 *** s_main.c 28 Jan 2007 21:50:54 -0000 1.20.2.5 --- s_main.c 15 May 2007 04:58:58 -0000 1.20.2.6 *************** *** 58,62 **** int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
! char sys_font[] = "DejaVu Sans Mono"; /* tb: font name */ static int sys_main_srate; static int sys_main_advance; --- 58,62 ---- int sys_midioutdevlist[MAXMIDIOUTDEV] = {1};
! char sys_font[] = "Bitstream Vera Sans Mono"; /* tb: font name */ static int sys_main_srate; static int sys_main_advance;
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.17.2.9 retrieving revision 1.17.2.10 diff -C2 -d -r1.17.2.9 -r1.17.2.10 *** u_main.tk 15 May 2007 01:45:47 -0000 1.17.2.9 --- u_main.tk 15 May 2007 04:58:58 -0000 1.17.2.10 *************** *** 184,188 ****
frame .printout ! text .printout.text -relief raised -bd 2 -font {{DejaVu Sans Mono} 12 normal} \ -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" --- 184,188 ----
frame .printout ! text .printout.text -relief raised -bd 2 -font {{Bitstream Vera Sans Mono} 12 normal} \ -yscrollcommand ".printout.scroll set" -width 80 # .printout.text insert end "\n\n\n\n\n\n\n\n\n\n" *************** *** 1290,1294 **** -selectmode extended \ -relief solid -background white -borderwidth 1 \ ! -font [format {{DejaVu Sans Mono} %d normal} \ $font] \ -yscrollcommand "$windowName.lb.sb set"] --- 1290,1294 ---- -selectmode extended \ -relief solid -background white -borderwidth 1 \ ! -font [format {{Bitstream Vera Sans Mono} %d normal} \ $font] \ -yscrollcommand "$windowName.lb.sb set"] *************** *** 1406,1410 **** set y [expr [lindex $bbox 1] - 4] set $lbName.entry [entry $lbName.entry \ ! -font [format {{DejaVu Sans Mono} %d normal} $font]] $lbName.entry insert 0 [] place configure $lbName.entry -relx 0 -y $y -relwidth 1 --- 1406,1410 ---- set y [expr [lindex $bbox 1] - 4] set $lbName.entry [entry $lbName.entry \ ! -font [format {{Bitstream Vera Sans Mono} %d normal} $font]] $lbName.entry insert 0 [] place configure $lbName.entry -relx 0 -y $y -relwidth 1 *************** *** 1938,1942 ****
labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.limits -side top -fill x frame $id.limits.lower --- 1938,1942 ----
labelframe $id.limits -text "limits" -padx 15 -pady 4 -borderwidth 1 \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.limits -side top -fill x frame $id.limits.lower *************** *** 1957,1961 ****
labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.label -side top -fill x frame $id.label.name --- 1957,1961 ----
labelframe $id.label -text "label" -padx 5 -pady 4 -borderwidth 1 \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.label -side top -fill x frame $id.label.name *************** *** 1986,1990 ****
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.s_r -side top -fill x frame $id.s_r.paramsymto --- 1986,1990 ----
labelframe $id.s_r -text "messages" -padx 5 -pady 4 -borderwidth 1 \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.s_r -side top -fill x frame $id.s_r.paramsymto *************** *** 2289,2293 ****
switch -- $gn_f { ! 0 { set current_font "DejaVu Sans Mono"} 1 { set current_font "Helvetica" } 2 { set current_font "Times" } --- 2289,2293 ----
switch -- $gn_f { ! 0 { set current_font "Bitstream Vera Sans Mono"} 1 { set current_font "Helvetica" } 2 { set current_font "Times" } *************** *** 2602,2606 ****
labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.s_r -side top -fill x -ipadx 5 frame $id.s_r.send --- 2602,2606 ----
labelframe $id.s_r -borderwidth 1 -pady 4 -text "messages" \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.s_r -side top -fill x -ipadx 5 frame $id.s_r.send *************** *** 2619,2623 ****
# get the current font name from the int given from C-space (gn_f) ! set current_font "DejaVu Sans Mono" if {[eval concat $$var_iemgui_gn_f] == 1} \ { set current_font "Helvetica" } --- 2619,2623 ----
# get the current font name from the int given from C-space (gn_f) ! set current_font "Bitstream Vera Sans Mono" if {[eval concat $$var_iemgui_gn_f] == 1} \ { set current_font "Helvetica" } *************** *** 2629,2633 ****
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.label -side top -fill x entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ --- 2629,2633 ----
labelframe $id.label -borderwidth 1 -text "label" -pady 4 \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.label -side top -fill x entry $id.label.name_entry -textvariable $var_iemgui_gui_nam -width 30 \ *************** *** 2654,2659 **** menu $id.popup $id.popup add command \ ! -label "DejaVu Sans Mono" \ ! -font {{DejaVu Sans Mono} 12 normal} \ -command "iemgui_toggle_font $id 0" $id.popup add command \ --- 2654,2659 ---- menu $id.popup $id.popup add command \ ! -label "Bitstream Vera Sans Mono" \ ! -font {{Bitstream Vera Sans Mono} 12 normal} \ -command "iemgui_toggle_font $id 0" $id.popup add command \ *************** *** 2672,2676 ****
labelframe $id.colors -borderwidth 1 -text "colors" \ ! -font {{DejaVu Sans Mono} 12 bold} pack $id.colors -fill x -ipadx 5 -ipady 4
--- 2672,2676 ----
labelframe $id.colors -borderwidth 1 -text "colors" \ ! -font {{Bitstream Vera Sans Mono} 12 bold} pack $id.colors -fill x -ipadx 5 -ipady 4
*************** *** 3291,3296 **** ############ pdtk_text_new -- create a new text object #2########### proc pdtk_text_new {canvasname myname x y text font color} { ! # if {$font < 13} {set fontname [format {{DejaVu Sans Mono} %d normal} $font]} ! # if {$font >= 13} {set fontname [format {{DejaVu Sans Mono} %d normal} $font]}
global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 --- 3291,3296 ---- ############ pdtk_text_new -- create a new text object #2########### proc pdtk_text_new {canvasname myname x y text font color} { ! # if {$font < 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]} ! # if {$font >= 13} {set fontname [format {{Bitstream Vera Sans Mono} %d normal} $font]}
global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7