← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/tk/lib/tk/itemfont.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2010-07-31 17:08:39 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100731170839-j034dmpdqt1cc4p6
Tags: 1.9.2~svn28788-1
http://bugs.debian.org/580852
http://bugs.debian.org/590002
http://bugs.debian.org/543805
http://bugs.debian.org/542927
* New release based on upstream snapshot from the 1.9.2 branch,
  after 1.9.2 RC2. That branch is (supposed to be) binary-compatible
  with the 1.9.1 branch.
  + Builds fine on i386. Closes: #580852.
* Upgrade to Standards-Version: 3.9.1. No changes needed.
* Updated generated incs.
* Patches that still need work:
  + Unclear status, need more investigation:
   090729_fix_Makefile_deps.dpatch
   090803_exclude_rdoc.dpatch
   203_adjust_base_of_search_path.dpatch
   902_define_YAML_in_yaml_stringio.rb.dpatch
   919_common.mk_tweaks.dpatch
   931_libruby_suffix.dpatch
   940_test_thread_mutex_sync_shorter.dpatch
  + Maybe not needed anymore, keeping but not applying.
   102_skip_test_copy_stream.dpatch (test doesn't block anymore?)
   104_skip_btest_io.dpatch (test doesn't block anymore?)
   201_gem_prelude.dpatch (we don't use that rubygems anyway?)
   202_gem_default_dir.dpatch (we don't use that rubygems anyway?)
   940_test_file_exhaustive_fails_as_root.dpatch
   940_test_priority_fails.dpatch
   100518_load_libc_libm.dpatch
* Add disable-tests.diff: disable some tests that cause failures on FreeBSD.
  Closes: #590002, #543805, #542927.
* However, many new failures on FreeBSD. Since that version is still an
  improvement, add the check that makes test suite failures non-fatal on
  FreeBSD again. That still needs to be investigated.
* Re-add 903_skip_base_ruby_check.dpatch
* Add build-dependency on ruby1.8 and drop all pre-generated files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/tk/lib/tk/itemfont.rb
32
32
 
33
33
    if key
34
34
      pathname = [win, tag, key].join(';')
35
 
      TkFont.used_on(pathname) || 
36
 
        TkFont.init_widget_font(pathname, 
 
35
      TkFont.used_on(pathname) ||
 
36
        TkFont.init_widget_font(pathname,
37
37
                                *(__item_confinfo_cmd(tagid(tagOrId))))
38
38
    elsif optkeys.size == 1
39
39
      pathname = [win, tag, optkeys[0]].join(';')
40
 
      TkFont.used_on(pathname) || 
41
 
        TkFont.init_widget_font(pathname, 
 
40
      TkFont.used_on(pathname) ||
 
41
        TkFont.init_widget_font(pathname,
42
42
                                *(__item_confinfo_cmd(tagid(tagOrId))))
43
43
    else
44
44
      fonts = {}
45
45
      optkeys.each{|key|
46
46
        key = key.to_s
47
47
        pathname = [win, tag, key].join(';')
48
 
        fonts[key] = 
49
 
          TkFont.used_on(pathname) || 
50
 
          TkFont.init_widget_font(pathname, 
 
48
        fonts[key] =
 
49
          TkFont.used_on(pathname) ||
 
50
          TkFont.init_widget_font(pathname,
51
51
                                  *(__item_confinfo_cmd(tagid(tagOrId))))
52
52
      }
53
53
      fonts
73
73
          slot.delete(a_optkey)
74
74
          slot.delete(k_optkey)
75
75
 
76
 
          fnt.call_font_configure([pathname, optkey], 
 
76
          fnt.call_font_configure([pathname, optkey],
77
77
                                  *(__item_config_cmd(tagid(tagOrId)) << {}))
78
78
          next
79
79
        else
80
80
          if fnt
81
 
            if (slot.key?(l_optkey) || 
82
 
                slot.key?(a_optkey) || 
 
81
            if (slot.key?(l_optkey) ||
 
82
                slot.key?(a_optkey) ||
83
83
                slot.key?(k_optkey))
84
84
              fnt = TkFont.new(fnt)
85
85
 
90
90
              fnt.latin_replace(lfnt) if lfnt
91
91
              fnt.kanji_replace(kfnt) if kfnt
92
92
 
93
 
              fnt.call_font_configure([pathname, optkey], 
 
93
              fnt.call_font_configure([pathname, optkey],
94
94
                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
95
95
              next
96
96
            else
115
115
      kfnt = slot.delete(k_optkey)
116
116
 
117
117
      if lfnt && kfnt
118
 
        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey], 
 
118
        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
119
119
                                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
120
120
      elsif lfnt
121
121
        latintagfont_configure([lfnt, optkey])
264
264
    end
265
265
 
266
266
    if targetkey
267
 
      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
 
267
      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
268
268
                              *(__item_config_cmd(tagid(tagOrId)) << {}))
269
269
    else
270
 
      fnt.call_font_configure(__item_pathname(tagid(tagOrId)), 
 
270
      fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
271
271
                              *(__item_config_cmd(tagid(tagOrId)) << {}))
272
272
    end
273
273
    self
276
276
 
277
277
  def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
278
278
    if targetkey
279
 
      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
 
279
      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
280
280
                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
281
281
    else
282
 
      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
 
282
      fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
283
283
                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
284
284
    end
285
285
 
302
302
 
303
303
  def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
304
304
    if targetkey
305
 
      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey], 
 
305
      fontobj(targetkey).dup.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
306
306
                                                 *(__item_config_cmd(tagid(tagOrId)) << {}))
307
307
    else
308
 
        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)), 
 
308
        fontobj.dup.call_font_configure(__item_pathname(tagid(tagOrId)),
309
309
                                        *(__item_config_cmd(tagid(tagOrId)) << {}))
310
310
    end
311
311