Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7217
Modified Files: Tag: devel_0_37 m_atom.c u_main.tk Log Message: fixed_bug_in_shell
Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.12 retrieving revision 1.1.1.4.2.13 diff -C2 -d -r1.1.1.4.2.12 -r1.1.1.4.2.13 *** u_main.tk 23 Jul 2004 08:46:40 -0000 1.1.1.4.2.12 --- u_main.tk 12 Aug 2004 06:45:36 -0000 1.1.1.4.2.13 *************** *** 268,272 **** set name [format ".help%d" $doc_number] toplevel $name ! text $name.text -relief raised -bd 2 -font -*-courier-bold--normal--12-* \ -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" --- 268,272 ---- set name [format ".help%d" $doc_number] toplevel $name ! text $name.text -relief raised -bd 2 -font -*-tahoma---normal--12-* \ -yscrollcommand "$name.scroll set" -background white scrollbar $name.scroll -command "$name.text yview" *************** *** 1856,1860 **** set $var_iemgui_gn_f [expr [eval concat $$var_iemgui_gn_f] + 1] if {[eval concat $$var_iemgui_gn_f] > 2} {set $var_iemgui_gn_f 0} ! if {[eval concat $$var_iemgui_gn_f] == 0} {$id.gnfs.fb configure -text "courier" -font {courier 10 bold}} if {[eval concat $$var_iemgui_gn_f] == 1} {$id.gnfs.fb configure -text "helvetica" -font {helvetica 10 bold}} if {[eval concat $$var_iemgui_gn_f] == 2} {$id.gnfs.fb configure -text "times" -font {times 10 bold}} --- 1856,1860 ---- set $var_iemgui_gn_f [expr [eval concat $$var_iemgui_gn_f] + 1] if {[eval concat $$var_iemgui_gn_f] > 2} {set $var_iemgui_gn_f 0} ! if {[eval concat $$var_iemgui_gn_f] == 0} {$id.gnfs.fb configure -text "tahoma" -font {courier 10 bold}} if {[eval concat $$var_iemgui_gn_f] == 1} {$id.gnfs.fb configure -text "helvetica" -font {helvetica 10 bold}} if {[eval concat $$var_iemgui_gn_f] == 2} {$id.gnfs.fb configure -text "times" -font {times 10 bold}} *************** *** 2196,2200 **** label $id.gnfs.f_lab -text "font:" -width 6 if {[eval concat $$var_iemgui_gn_f] == 0} { ! button $id.gnfs.fb -text "courier" -font {courier 10 bold} -width 7 -command "iemgui_toggle_font $id" } if {[eval concat $$var_iemgui_gn_f] == 1} { button $id.gnfs.fb -text "helvetica" -font {helvetica 10 bold} -width 7 -command "iemgui_toggle_font $id" } --- 2196,2200 ---- label $id.gnfs.f_lab -text "font:" -width 6 if {[eval concat $$var_iemgui_gn_f] == 0} { ! button $id.gnfs.fb -text "tahoma" -font {courier 10 bold} -width 7 -command "iemgui_toggle_font $id" } if {[eval concat $$var_iemgui_gn_f] == 1} { button $id.gnfs.fb -text "helvetica" -font {helvetica 10 bold} -width 7 -command "iemgui_toggle_font $id" } *************** *** 2257,2261 **** button $id.bcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.bcol.c0 $id.bcol.c1 $id.bcol.c2 $id.bcol.c3 $id.bcol.c4 \ --- 2257,2261 ---- button $id.bcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {tahoma 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.bcol.c0 $id.bcol.c1 $id.bcol.c2 $id.bcol.c3 $id.bcol.c4 \ *************** *** 2268,2272 **** button $id.fcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.fcol.c0 $id.fcol.c1 $id.fcol.c2 $id.fcol.c3 $id.fcol.c4 \ --- 2268,2272 ---- button $id.fcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {tahoma 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.fcol.c0 $id.fcol.c1 $id.fcol.c2 $id.fcol.c3 $id.fcol.c4 \ *************** *** 2279,2283 **** button $id.lcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {courier 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.lcol.c0 $id.lcol.c1 $id.lcol.c2 $id.lcol.c3 $id.lcol.c4 \ --- 2279,2283 ---- button $id.lcol.c$i -background [format "#%6.6x" $hexcol] \ -activebackground [format "#%6.6x" $hexcol] \ ! -font {tahoma 2 normal} -padx 7 -pady 6 \ -command [format "iemgui_preset_col %s %d" $id $hexcol] } pack $id.lcol.c0 $id.lcol.c1 $id.lcol.c2 $id.lcol.c3 $id.lcol.c4 \ *************** *** 2572,2576 ****
text $name.text -relief raised -bd 2 -height 40 -width 60 \ ! -yscrollcommand "$name.scroll set" -font -*-courier-bold--normal--12-* scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y --- 2572,2576 ----
text $name.text -relief raised -bd 2 -height 40 -width 60 \ ! -yscrollcommand "$name.scroll set" -font -*-tahoma---normal--12-* scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y *************** *** 2595,2602 **** ############ 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 -*-courier-bold----%d-* $font]} ! # if {$font >= 13} {set fontname [format -*-courier-----%d-* $font]} $canvasname create text $x $y \ ! -font [format -*-courier-bold--normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw # pd [concat $myname size [$canvasname bbox $myname] ;] --- 2595,2602 ---- ############ 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 -*-tahoma-----%d-* $font]} ! # if {$font >= 13} {set fontname [format -*-tahoma-----%d-* $font]} $canvasname create text $x $y \ ! -font [format -*-tahoma---normal--%d-* $font] \ -tags $myname -text $text -fill $color -anchor nw # pd [concat $myname size [$canvasname bbox $myname] ;] *************** *** 2634,2657 **** set pd_apilist $apilist
! set width1 [font measure -*-courier-bold--normal--8-* x] ! set height1 [lindex [font metrics -*-courier-bold--normal--8-*] 5]
! set width2 [font measure -*-courier-bold--normal--10-* x] ! set height2 [lindex [font metrics -*-courier-bold--normal--10-*] 5]
! set width3 [font measure -*-courier-bold--normal--12-* x] ! set height3 [lindex [font metrics -*-courier-bold--normal--12-*] 5]
! set width4 [font measure -*-courier-bold--normal--14-* x] ! set height4 [lindex [font metrics -*-courier-bold--normal--14-*] 5]
! set width5 [font measure -*-courier-bold--normal--16-* x] ! set height5 [lindex [font metrics -*-courier-bold--normal--16-*] 5]
! set width6 [font measure -*-courier-bold--normal--24-* x] ! set height6 [lindex [font metrics -*-courier-bold--normal--24-*] 5]
! set width7 [font measure -*-courier-bold--normal--36-* x] ! set height7 [lindex [font metrics -*-courier-bold--normal--36-*] 5]
set tclpatch [info patchlevel] --- 2634,2657 ---- set pd_apilist $apilist
! set width1 [font measure -*-tahoma---normal--8-* x] ! set height1 [lindex [font metrics -*-tahoma---normal--8-*] 5]
! set width2 [font measure -*-tahoma---normal--10-* x] ! set height2 [lindex [font metrics -*-tahoma---normal--10-*] 5]
! set width3 [font measure -*-tahoma---normal--12-* x] ! set height3 [lindex [font metrics -*-tahoma---normal--12-*] 5]
! set width4 [font measure -*-tahoma---normal--14-* x] ! set height4 [lindex [font metrics -*-tahoma---normal--14-*] 5]
! set width5 [font measure -*-tahoma---normal--16-* x] ! set height5 [lindex [font metrics -*-tahoma---normal--16-*] 5]
! set width6 [font measure -*-tahoma---normal--24-* x] ! set height6 [lindex [font metrics -*-tahoma---normal--24-*] 5]
! set width7 [font measure -*-tahoma---normal--36-* x] ! set height7 [lindex [font metrics -*-tahoma---normal--36-*] 5]
set tclpatch [info patchlevel] *************** *** 2754,2758 ****
text $name.text -relief raised -bd 2 -height 12 -width 60 \ ! -yscrollcommand "$name.scroll set" -font -*-courier-bold--normal--12-* scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y --- 2754,2758 ----
text $name.text -relief raised -bd 2 -height 12 -width 60 \ ! -yscrollcommand "$name.scroll set" -font -*-tahoma---normal--12-* scrollbar $name.scroll -command "$name.text yview" pack $name.scroll -side right -fill y
Index: m_atom.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_atom.c,v retrieving revision 1.1.1.2.2.3 retrieving revision 1.1.1.2.2.4 diff -C2 -d -r1.1.1.2.2.3 -r1.1.1.2.2.4 *** m_atom.c 12 Sep 2003 20:55:31 -0000 1.1.1.2.2.3 --- m_atom.c 12 Aug 2004 06:45:36 -0000 1.1.1.2.2.4 *************** *** 24,28 **** t_symbol *atom_getsymbol(t_atom *a) /* LATER think about this more carefully */ { - char buf[30]; if (a->a_type == A_SYMBOL) return (a->a_w.w_symbol); else return (&s_float); --- 24,27 ---- *************** *** 88,92 **** int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if (*sp == ' ' || *sp == ';' || *sp == ',' || *sp == '\' || /* GG: quoting for whitespace */ (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) --- 87,91 ---- int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if (*sp == ';' || *sp == ',' || *sp == '\' || (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) *************** *** 98,102 **** while (bp < ep && *sp) { ! if (*sp == ' ' || *sp == ';' || *sp == ',' || *sp == '\' || /* GG: quoting for whitespace */ (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\'; --- 97,101 ---- while (bp < ep && *sp) { ! if (*sp == ';' || *sp == ',' || *sp == '\' || (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\';