diff options
author | Karl Berry <karl@freefriends.org> | 2014-12-16 19:03:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-12-16 19:03:03 +0000 |
commit | 1abeb648c1e8b4983df4b25b61c87b4bba4b5e1d (patch) | |
tree | 043406a0da8b291c0cad57bf6d0652614725b759 /Master/texmf-dist/scripts/texlive/tlmgrgui.pl | |
parent | 97f8439b082e70bd39e12bb467dcc934a0342cbb (diff) |
remove taxonomy support, since the data is no longer being updated (but do not remove the actual texcatalogue.keywords file yet, until some testing is done)
git-svn-id: svn://tug.org/texlive/trunk@35840 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/texlive/tlmgrgui.pl')
-rw-r--r-- | Master/texmf-dist/scripts/texlive/tlmgrgui.pl | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl index 85e9c4d7092..6a469c5c37f 100644 --- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl @@ -88,7 +88,6 @@ my @htype = qw/-relief ridge/; # the list of packages as shown by TixGrid # my %Packages; -my $taxonomy; my $mw; my $tlmgrrev; my $menu; @@ -126,7 +125,6 @@ my $show_collections = 1; my $show_schemes = 1; my $match_descriptions = 1; my $match_filenames = 1; -my $match_taxonomies = 1; my $match_text = ""; my $selection_value = 0; @@ -217,10 +215,6 @@ sub guimain { chomp($tlmgrrev); setup_menu_system(); - $taxonomy = load_taxonomy_datafile(); - if (!defined($taxonomy)) { - info(__("Cannot load taxonomy file") . "\n"); - } do_rest_of_gui(); $bgcolor = $loaded_text->cget('-background'); @@ -341,10 +335,6 @@ sub do_rest_of_gui { $filter_match->Checkbutton(-text => __("descriptions"), -command => \&update_grid, -variable => \$match_descriptions)->pack(@a_w); - $filter_match->Checkbutton(-text => __("taxonomies"), - -command => \&update_grid, - -state => (defined($taxonomy) ? "normal" : "disabled"), - -variable => \$match_taxonomies)->pack(@a_w); $filter_match->Checkbutton(-text => __("filenames"), -command => \&update_grid, -variable => \$match_filenames)->pack(@a_w); @@ -354,13 +344,11 @@ sub do_rest_of_gui { my ($new_val, undef, $old_val) = @_; # if (!$new_val) { # $match_descriptions = 0; - # $match_taxonomies = 0; # $match_filenames = 0; # } else { # # if something is already in the search field don't change selection # if (!$old_val) { # $match_descriptions = 1; - # $match_taxonomies = 1 if (defined($taxonomy)); # $match_filenames = 1; # } # } @@ -394,7 +382,6 @@ sub do_rest_of_gui { $show_schemes = 1; $selection_value = 0; $match_descriptions = 1; - $match_taxonomies = 1; $match_filenames = 1; update_grid(); })->pack(@x_x, @a_c); @@ -947,7 +934,7 @@ sub MatchesFilters { # + no search target selected # -> show empty list (maybe show warning "select something") # - if ($match_descriptions || $match_taxonomies || $match_filenames) { + if ($match_descriptions || $match_filenames) { my $found = 0; my $r = $match_text; if ($r eq "") { @@ -963,14 +950,7 @@ sub MatchesFilters { $found = 1; } } - if (!$found) { - if (defined($taxonomy) && $match_taxonomies) { - if ($Packages{$p}{'taxonomy'} =~ m/$r/i) { - $found = 1; - } - } - } - # if we already dound, don't check the next condition! + # if we already found something, don't check the next condition! if (!$found) { if ($match_filenames) { if ($Packages{$p}{'match_files'} =~ m/$r/i) { @@ -2060,35 +2040,6 @@ sub populate_Packages { $Packages{$p}{'match_desc'} .= "\n"; $Packages{$p}{'match_desc'} .= ($tlp->longdesc || ""); # - # taxonomy matching - if (defined($taxonomy)) { - $Packages{$p}{'taxonomy'} = ""; - if (defined($taxonomy->{'by-package'}{'keyword'}{$p})) { - $Packages{$p}{'keyword'} = - join(", ", @{$taxonomy->{'by-package'}{'keyword'}{$p}}); - $Packages{$p}{'taxonomy'} .= - join('\n', @{$taxonomy->{'by-package'}{'keyword'}{$p}}); - $Packages{$p}{'taxonomy'} .= '\n'; - } - if (defined($taxonomy->{'by-package'}{'functionality'}{$p})) { - $Packages{$p}{'functionality'} = - join(' > ', @{$taxonomy->{'by-package'}{'functionality'}{$p}}); - $Packages{$p}{'taxonomy'} .= - join('\n', @{$taxonomy->{'by-package'}{'functionality'}{$p}}); - $Packages{$p}{'taxonomy'} .= '\n'; - } - if (defined($taxonomy->{'by-package'}{'primary'}{$p})) { - $Packages{$p}{'primary'} = $taxonomy->{'by-package'}{'primary'}{$p}; - $Packages{$p}{'taxonomy'} .= $taxonomy->{'by-package'}{'primary'}{$p}; - $Packages{$p}{'taxonomy'} .= "\n"; - } - if (defined($taxonomy->{'by-package'}{'secondary'}{$p})) { - $Packages{$p}{'secondary'} = $taxonomy->{'by-package'}{'secondary'}{$p}; - $Packages{$p}{'taxonomy'} .= $taxonomy->{'by-package'}{'secondary'}{$p}; - $Packages{$p}{'taxonomy'} .= "\n"; - } - } - # # file matching my @all_f = $tlp->all_files; if ($tlp->relocated) { for (@all_f) { s:^$RelocPrefix/:$RelocTree/:; } } |