pd/src u_main.tk,1.17.2.18,1.17.2.19 - Pd-cvs

9 Jul 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24801
Modified Files:
      Tag: branch-v0-39-2-extended
    u_main.tk 
Log Message:
hack to make the 12pt font work on GNU/Linux
Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.17.2.18
retrieving revision 1.17.2.19
diff -C2 -d -r1.17.2.18 -r1.17.2.19
*** u_main.tk	9 Jul 2007 17:09:25 -0000	1.17.2.18
--- u_main.tk	9 Jul 2007 18:40:26 -0000	1.17.2.19
***************
*** 3357,3361 ****
  proc pdtk_pd_startup {apilist midiapilist fontname_from_pd fontweight_from_pd} {
  #    puts stderr [concat $apilist $midiapilist $fontname]
!     global pd_apilist pd_midiapilist 
      set pd_apilist $apilist
      set pd_midiapilist $midiapilist
--- 3357,3361 ----
  proc pdtk_pd_startup {apilist midiapilist fontname_from_pd fontweight_from_pd} {
  #    puts stderr [concat $apilist $midiapilist $fontname]
!     global pd_apilist pd_midiapilist pd_nt
      set pd_apilist $apilist
      set pd_midiapilist $midiapilist
***************
*** 3367,3371 ****
      set pd_font1 [format {{%s} -8 %s} $fontname $fontweight]
      set pd_font2 [format {{%s} -10 %s} $fontname $fontweight]
!     set pd_font3 [format {{%s} -12 %s} $fontname $fontweight]
     set pd_font4 [format {{%s} -14 %s} $fontname $fontweight]
      set pd_font5 [format {{%s} -16 %s} $fontname $fontweight]
--- 3367,3376 ----
      set pd_font1 [format {{%s} -8 %s} $fontname $fontweight]
      set pd_font2 [format {{%s} -10 %s} $fontname $fontweight]
! # GNU/Linux picks a larger font for the same value, but only on this size. arg.
!     if { $pd_nt == 0 } {
!         set pd_font3 [format {{%s} -11 %s} $fontname $fontweight]
!     } else {
!         set pd_font3 [format {{%s} -12 %s} $fontname $fontweight]
!     }
     set pd_font4 [format {{%s} -14 %s} $fontname $fontweight]
      set pd_font5 [format {{%s} -16 %s} $fontname $fontweight]