summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-10 17:49:37 +0000
committerKarl Berry <karl@freefriends.org>2013-05-10 17:49:37 +0000
commitc57f4ad104711b6374cc0c4d41bc044519e04a91 (patch)
tree5783c30effa127132852028fa5761349ccbb2ff3 /Master/tlpkg/installer/install-menu-text.pl
parent650b657b19832c68d26e14726af630f1bc52b0f5 (diff)
merge collection-documentation-* into collection-lang*
git-svn-id: svn://tug.org/texlive/trunk@30372 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl32
1 files changed, 3 insertions, 29 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 18d2fa66a0b..e963add563d 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -2,7 +2,7 @@
# $Id$
# install-menu-txt.pl
#
-# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Karl Berry
+# Copyright 2007-2013 Norbert Preining, Karl Berry
# Copyright 2007, 2008 Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -18,7 +18,6 @@ our $media;
our $previoustlpdb;
our @collections_std;
our @collections_lang;
-our @collections_lang_doc;
our $texlive_release;
my $MENU_CONTINUE = -1;
@@ -473,18 +472,14 @@ sub language_menu {
);
my @languages;
- my @lang_docs;
my @lang_keys=string_to_list "abcdefghijklmnopstuvwxyz0123456789";
- my @lang_doc_keys=string_to_list "ABCDEFGHIJKLMNOPSTUVWXYZ";
my %keyval;
my $lang_index=0;
- my $lang_doc_index=0;
my $lines;
menu_head 'Language support:';
@languages=sort @collections_lang;
- @lang_docs=sort @collections_lang_doc;
$lines=@languages/2;
++$lines if (@languages%2);
@@ -505,27 +500,6 @@ sub language_menu {
}
}
- print "\nLanguage-specific documentation:\n\n";
-
- $lines=@lang_docs/2;
- ++$lines if (@lang_docs%2);
- for my $index (0..$lines-1) {
- my $lang_doc=$lang_docs[$index];
- my $tlpobj = $tlpdb->get_package("$lang_doc");
- $keyval{$lang_doc_keys[$index]}="$lang_doc";
- printf " %s %s %-33s", $lang_doc_keys[$index], button($vars{"$lang_doc"}),
- substr($tlpobj->shortdesc,0,33);
- if (defined $lang_docs[$index+$lines]) {
- my $lang_doc=$lang_docs[$index+$lines];
- my $tlpobj = $tlpdb->get_package("$lang_doc");
- $keyval{$lang_doc_keys[$index+$lines]}="$lang_doc";
- printf " %s %s %-32s\n", $lang_doc_keys[$index+$lines],
- button($vars{"$lang_doc"}), substr($tlpobj->shortdesc,0,32);
- } else {
- print "\n";
- }
- }
-
other_options qw (+ - R Q diskspace);
my $answer = prompt 'Enter letter(s) to select language(s)';
@@ -533,12 +507,12 @@ sub language_menu {
foreach my $keystroke (@keystrokes) {
if ($keystroke eq '-') {
- for my $collection (@languages,@lang_docs) {
+ for my $collection (@languages) {
$vars{"$collection"}=0 if defined $vars{"$collection"};
}
}
if ($keystroke eq '+') {
- for my $collection (@languages,@lang_docs) {
+ for my $collection (@languages) {
$vars{"$collection"}=1 if defined $vars{"$collection"};
}
}