install-tl.p: collection and languages menu added.

git-svn-id: svn://tug.org/texlive/trunk@5250 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 573 insertions, 406 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 42de4acb40c..0efec7cd6b8 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -21,8 +21,11 @@ use TeXLive::TLUtils qw(initialize_installer media platform platform_desc
 use TeXLive::TLPOBJ;
 use TeXLive::TLPDB;
 
-###$texlive_url="http://localhost/texlive/Contents/inst";
-$texlive_url="http://tug.org/svn/texlive/trunk/Master";
+
+$default_scheme='scheme-full';
+
+###$texlive_url='http://localhost/texlive/Contents/inst';
+$texlive_url='http://tug.org/svn/texlive/trunk/Master';
 
 # The maximum number of binary systems on the CD.  This number must be
 # smaller than the number of binaries available from the network.
@@ -44,12 +47,12 @@ print "Directory for Temporary Files: '", get_system_tmpdir, "\'\n";
 my %vars;
 
 sub dump_vars {
-   open VARS, ">./vars";
-   foreach $key (keys %vars) {
-      print VARS "$key $vars{$key}\n";
-   }
-   close VARS;
-   print "\n%vars dumped to ./vars.\n";
+  open VARS, ">./vars";
+  foreach $key (keys %vars) {
+    print VARS "$key $vars{$key}\n";
+  }
+  close VARS;
+  print "\n%vars dumped to ./vars.\n";
 }
 
 
@@ -57,26 +60,26 @@ sub dump_vars {
 # revised later.
 $trynet=0;
 sub set_platforms_supported {
-   $vars{'n_systems_available'}=0;
-   if (media=~/(CD|DVD)/) {
-      my @binaries=binaries_available_from_disk;
-      for my $binary (@binaries) {
-         unless (defined $vars{"diskbin_$binary"}) {
-            $vars{"diskbin_$binary"}=0;
-            ++$vars{'n_systems_available'};
-         }
+  $vars{'n_systems_available'}=0;
+  if (media=~/(CD|DVD)/) {
+    my @binaries=binaries_available_from_disk;
+    for my $binary (@binaries) {
+      unless (defined $vars{"diskbin_$binary"}) {
+        $vars{"diskbin_$binary"}=0;
+        ++$vars{'n_systems_available'};
       }
-   }
-   if (media eq 'NET' or $trynet==1) {
-      print "\n\nLoading '$texlive_url/texlive.tlpdb' ...\n";
-      my @binaries=binaries_available_from_net;
-      for my $binary (@binaries) {
-         unless (defined $vars{"diskbin_$binary"}) {
-            $vars{"netbin_$binary"}=0; 
-            ++$vars{'n_systems_available'};
-         }
+    }
+  }
+  if (media eq 'NET' or $trynet==1) {
+    print "\n\nLoading '$texlive_url/texlive.tlpdb' ...\n";
+    my @binaries=binaries_available_from_net;
+    for my $binary (@binaries) {
+      unless (defined $vars{"diskbin_$binary"}) {
+        $vars{"netbin_$binary"}=0; 
+        ++$vars{'n_systems_available'};
       }
-   }
+    }
+  }
 }
 
 # Environment variables and default values on UNIX:
@@ -87,38 +90,38 @@ sub set_platforms_supported {
 #   TEXLIVE_INSTALL_TEXMFHOME      '$HOME/texmf'
 
 sub set_texlive_default_dirs {
-   my $tex_prefix;
-   my $texmfsysvar;
-   my $texmflocal;
-   my $texmfhome;
-   
-   $tex_prefix=getenv('TEXLIVE_INSTALL_PREFIX');
-   if (win32) {
-      if (-w getenv('CommonProgramFiles')) {
-         $tex_prefix||=getenv('CommonProgramFiles') . '/texlive';
-      } else {
-         $tex_prefix||=getenv('ProgramFiles') . '/texlive';
-      }
-   } else {
-      $tex_prefix||='/usr/local/texlive';
-   }
-   $vars{'TEXDIR'}="$tex_prefix/$texlive_release";
-
-   $texmfsysvar=getenv('TEXLIVE_INSTALL_TEXMFSYSVAR');
-   $texmfsysvar||=$vars{'TEXDIR'} . '/texmf-var';
-   $vars{'TEXMFSYSVAR'}="$texmfsysvar";
-
-   $texmflocal=getenv('TEXLIVE_INSTALL_TEXMFLOCAL');
-   $texmflocal||="$tex_prefix/texmf-local";
-   $vars{'TEXMFLOCAL'}="$texmflocal";
-
-   $texmfhome=getenv('TEXLIVE_INSTALL_TEXMFHOME');
-   if (win32) {
-      $texmfhome||=getenv('USERPROFILE');
-   } else {
-      $texmfhome||=getenv('HOME');
-   }
-   $vars{'TEXMFHOME'}="$texmfhome/texmf";
+  my $tex_prefix;
+  my $texmfsysvar;
+  my $texmflocal;
+  my $texmfhome;
+  
+  $tex_prefix=getenv('TEXLIVE_INSTALL_PREFIX');
+  if (win32) {
+    if (-w getenv('CommonProgramFiles')) {
+      $tex_prefix||=getenv('CommonProgramFiles') . '/texlive';
+    } else {
+      $tex_prefix||=getenv('ProgramFiles') . '/texlive';
+    }
+  } else {
+    $tex_prefix||='/usr/local/texlive';
+  }
+  $vars{'TEXDIR'}="$tex_prefix/$texlive_release";
+
+  $texmfsysvar=getenv('TEXLIVE_INSTALL_TEXMFSYSVAR');
+  $texmfsysvar||=$vars{'TEXDIR'} . '/texmf-var';
+  $vars{'TEXMFSYSVAR'}="$texmfsysvar";
+
+  $texmflocal=getenv('TEXLIVE_INSTALL_TEXMFLOCAL');
+  $texmflocal||="$tex_prefix/texmf-local";
+  $vars{'TEXMFLOCAL'}="$texmflocal";
+
+  $texmfhome=getenv('TEXLIVE_INSTALL_TEXMFHOME');
+  if (win32) {
+    $texmfhome||=getenv('USERPROFILE');
+  } else {
+    $texmfhome||=getenv('HOME');
+  }
+  $vars{'TEXMFHOME'}="$texmfhome/texmf";
 }
 
 
@@ -137,65 +140,111 @@ sub set_texlive_default_dirs {
         'sys_info' => '/usr/local/info',
         'o_doc' => 1,
         'o_src' => 1,
-        'selected_scheme' => 'scheme-full',
+        'selected_scheme' => $default_scheme,
     );
 
 
 sub clear_screen {
 #   return 0;
-   (unix)? system 'clear':system 'cls';
+  (unix)? system 'clear':system 'cls';
 }
 
 sub string_to_list {
-   my $string=shift;
-   return split(//, $string);
+  my $string=shift;
+  return split(//, $string);
 }
 
 sub button {
-   my $val=shift;
-   return ($val)? '[X]':'[ ]';
+  my $val=shift;
+  return ($val)? '[X]':'[ ]';
 }
 
 sub hbar {
-   return '=' x79, "\n";
+  return '=' x79, "\n";
 }
 
 sub toggle {
-   my $var=shift;
-   my $val=$vars{$var};
-   ++$val;
-   $vars{$var}=$val%2;;
+  my $var=shift;
+  my $val=$vars{$var};
+  ++$val;
+  $vars{$var}=$val%2;;
 }
 
 sub menu_head {
-   my $text=shift;
-   clear_screen;
-   print "$text\n", hbar, "\n";
+  my $text=shift;
+  clear_screen;
+  print "$text\n", hbar, "\n";
 }
 
 sub other_options {
-   print "\nOther options:\n", hbar, " <R> return to main menu\n <Q> quit\n\n";
+  my @options=@_;
+  my %opts=(
+    '-' => 'deselect all',
+    '+' => 'select all',
+    'N' => 'add binaries from net',
+    'R' => 'return to main menu',
+    'Q' => 'quit'
+      );
+
+  print "\nOther options:\n", hbar;
+  for my $option (@options) {
+    if (defined $opts{"$option"}) {
+      printf " <%s> %s\n", $option, $opts{$option};
+    } else {
+      die "other_options: $opts{$option} undefined.\n";
+    }
+  }
+  print "\n";
 }
 
 sub prompt {
-   my $prompt=shift;
-   print "\n$prompt: ";
-   chomp(my $answer=<STDIN>);
-   return "$answer";
+  my $prompt=shift;
+  print "\n$prompt: ";
+  chomp(my $answer=<STDIN>);
+  return "$answer";
 }
 
 sub load_tlpdb {
-   my $database;
-   if (media eq 'NET') {
-      $database='http://www.tug.org/svn/texlive/trunk/Master/texlive.tlpdb';
-   } else {
-      $database='./texlive.tlpdb';
-   }
-   print "Loading $database ...\n";
-   $::tlpdb=TeXLive::TLPDB->new(location => "$database");
+  my $database;
+  if (media eq 'NET') {
+    $database='http://www.tug.org/svn/texlive/trunk/Master/texlive.tlpdb';
+  } else {
+    $database='./texlive.tlpdb';
+  }
+  print "Loading $database ...\n";
+  $::tlpdb=TeXLive::TLPDB->new(location => "$database");
 }
 
 
+sub initialize_collections {
+  foreach my $pkg ($tlpdb->list_packages) {
+    my $tlpobj = $tlpdb->{'tlps'}{$pkg};
+    if ($tlpobj->category eq "Collection") {
+      $vars{"$pkg"}=0;
+      ++$vars{'n_collections_available'};
+      if ($pkg=~/collection-lang/) {
+        push @collections_lang, $pkg;
+      } elsif ($pkg=~/documentation/) {
+        if ($pkg=~/documentation-base/) {
+          push @collections_std, $pkg;
+        } else {
+          push @collections_lang_doc, $pkg;
+        }
+      } else {
+        push @collections_std, $pkg;
+      }
+    }
+    my $scheme_tlpobj = $tlpdb->get_package($default_scheme);
+    if (defined ($scheme_tlpobj)) {
+      foreach my $dependent ($scheme_tlpobj->depends) {
+        if ($dependent=~/.*(collection-.*)/) {
+          $vars{"$1"}=1;
+        }
+      }
+    }
+  }
+}
+
 # If we are on the CD and we want to download binaries for additional
 # platforms, we need a second database which provides information
 # about binary systems which can be downloaded from net but are not on
@@ -210,199 +259,311 @@ sub load_tlpdb {
 # The menu loop. A menu is a function.  Its return value is a
 # reference to another menu or to itself.
 sub run_menu {
-   my $menu=\&main_menu;
-   while (1) {
-      $menu=$menu->();
-   }
+  my $menu=\&main_menu;
+  while (1) {
+    $menu=$menu->();
+  }
 }
 
 
 # Not yet implemented.  Will probably go away.
 sub platform_menu {
-   my %command=(
-      'self' => \&platform_menu,
-      'R' => \&main_menu,
-      'Q' => \&quit
-       );
-   print "<<<<< PLATFORM MENU >>>>>>\n";
-
-   return $command{'R'}->();    
+  my %command=(
+    'self' => \&platform_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+  print "<<<<< PLATFORM MENU >>>>>>\n";
+
+  return $command{'R'}->();    
 }
 
 
 sub binary_menu {
-   my %command=(
-      'self' => \&binary_menu,
-      'R' => \&main_menu,
-      'Q' => \&quit
-       );
-
-   my @diskbins;
-   my @netbins;
-   my %from_net;
-   my @keys=string_to_list "abcdefghijklmopstuvwxyz";
-   my $index=0;
-   my $diskbin='';
-   my %keyval; 
-   my $selected_platform;
-
-   menu_head "Available sets of binaries:";
-
-   foreach my $key (keys %vars) {
-      if ($key=~/diskbin_(.*)/) {
-         push @diskbins, $1;
-         $from_net{"$1"}=0;
-      }
-      if ($key=~/netbin_(.*)/) {
-         push @netbins, $1;
-         $from_net{"$1"}=1;
-      }
-   }
-   my @binaries=sort(@diskbins,@netbins);
+  my %command=(
+    'self' => \&binary_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  my @diskbins;
+  my @netbins;
+  my %from_net;
+  my @keys=string_to_list "abcdefghijklmopstuvwxyz";
+  my $index=0;
+  my $diskbin='';
+  my %keyval; 
+  my $selected_platform;
+
+  menu_head "Available sets of binaries:";
+
+  foreach my $key (keys %vars) {
+    if ($key=~/diskbin_(.*)/) {
+      push @diskbins, $1;
+      $from_net{"$1"}=0;
+    }
+    if ($key=~/netbin_(.*)/) {
+      push @netbins, $1;
+      $from_net{"$1"}=1;
+    }
+  }
+  my @binaries=sort(@diskbins,@netbins);
 
-   $diskbin='  ' 
-       if (media eq 'CD' and $vars{'n_systems_available'}>$max_bins_on_CD);
+  $diskbin='  ' 
+      if (media eq 'CD' and $vars{'n_systems_available'}>$max_bins_on_CD);
 
-   foreach my $binary (@binaries) {
-      if (media eq 'CD' and $vars{'n_systems_available'}>$max_bins_on_CD) {
-         $diskbin=$from_net{"$binary"}? "* ":"  ";
-      }
-      printf " %s %s %s%-16s %s\n", $keys[$index], 
-      button($from_net{"$binary"}? 
-             $vars{"netbin_$binary"}:$vars{"diskbin_$binary"}),
-          $diskbin, "$binary" . ":",
-          platform_desc "$binary";
-      $keyval{"$keys[$index]"}=$from_net{"$binary"}?
-          "netbin_$binary":"diskbin_$binary";
-      ++$index;
-   }
-   if ($vars{'n_systems_available'}<=$max_bins_on_CD ) {
-      print "\n Binaries for additional systems are available on the DVD.\n" .
-          " If you have network access, try option <N>.\n" .
-          "\nOther Options:\n", hbar, " <-> deselect all\n" . 
-          " <+> select all\n <N> add binaries from net\n" .
-          " <R> return to main menu\n <Q> quit\n";
-   } else {
-      print "\n Network access is required to install binary systems " .
-          "marked with '*'.\n" if (media eq 'CD');
-      print    "\nOther Options:\n", hbar, " <-> deselect all\n". 
-          " <+> select all\n <R> return to main menu\n <Q> quit\n";
-   }
-
-   print "\n Press key to select/deselect binary systems: ";
-      
-   chomp(my $answer=<STDIN>);
-   my @keystrokes=string_to_list $answer;
-   
-   foreach my $keystroke (@keystrokes) {
-      if ($keystroke eq '-') {
-         for my $binary (@binaries) {
-            $vars{"netbin_$binary"}=0 if defined $vars{"netbin_$binary"};
-            $vars{"diskbin_$binary"}=0 if defined $vars{"diskbin_$binary"};
-         }
-      }
-      if ($keystroke eq '+') {
-         for my $binary (@binaries) {
-            $vars{"netbin_$binary"}=1 if defined $vars{"netbin_$binary"};
-            $vars{"diskbin_$binary"}=1 if defined $vars{"diskbin_$binary"};
-         }
+  foreach my $binary (@binaries) {
+    if (media eq 'CD' and $vars{'n_systems_available'}>$max_bins_on_CD) {
+      $diskbin=$from_net{"$binary"}? "* ":"  ";
+    }
+    printf " %s %s %s%-16s %s\n", $keys[$index], 
+    button($from_net{"$binary"}? 
+           $vars{"netbin_$binary"}:$vars{"diskbin_$binary"}),
+        $diskbin, "$binary" . ":",
+        platform_desc "$binary";
+    $keyval{"$keys[$index]"}=$from_net{"$binary"}?
+        "netbin_$binary":"diskbin_$binary";
+    ++$index;
+  }
+  if ($vars{'n_systems_available'}<=$max_bins_on_CD ) {
+    print "\n Binaries for additional systems are available on the DVD.\n" .
+        " If you have network access, try option <N>.\n" .
+        "\nOther Options:\n", hbar, " <-> deselect all\n" . 
+        " <+> select all\n <N> add binaries from net\n" .
+        " <R> return to main menu\n <Q> quit\n";
+  } else {
+    print "\n Network access is required to install binary systems " .
+        "marked with '*'.\n" if (media eq 'CD');
+    print    "\nOther Options:\n", hbar, " <-> deselect all\n". 
+        " <+> select all\n <R> return to main menu\n <Q> quit\n";
+  }
+
+  my $answer=prompt 'Press key to select/deselect binary systems';
+  
+  my @keystrokes=string_to_list $answer;
+  
+  foreach my $keystroke (@keystrokes) {
+    if ($keystroke eq '-') {
+      for my $binary (@binaries) {
+        $vars{"netbin_$binary"}=0 if defined $vars{"netbin_$binary"};
+        $vars{"diskbin_$binary"}=0 if defined $vars{"diskbin_$binary"};
       }
-      if (defined $keyval{$keystroke}) {
-         toggle "$keyval{$keystroke}";
+    }
+    if ($keystroke eq '+') {
+      for my $binary (@binaries) {
+        $vars{"netbin_$binary"}=1 if defined $vars{"netbin_$binary"};
+        $vars{"diskbin_$binary"}=1 if defined $vars{"diskbin_$binary"};
       }
-   }
-   if ("\u$answer" eq 'N' and media eq 'CD') {
-      $trynet=1;
-      set_platforms_supported;
-      $trynet=0;
-      return $command{'self'};
-   }
-   if (defined $command{"\u$answer"}) {
-      return $command{"\u$answer"}->();
-   } else {
-      return $command{'self'}->();
-   }
+    }
+    if (defined $keyval{$keystroke}) {
+      toggle "$keyval{$keystroke}";
+    }
+  }
+  if ("\u$answer" eq 'N' and media eq 'CD') {
+    $trynet=1;
+    set_platforms_supported;
+    $trynet=0;
+    return $command{'self'};
+  }
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"}->();
+  } else {
+    return $command{'self'}->();
+  }
 }
 
 
 sub scheme_menu {
-   my %command=(
-      'self' => \&scheme_menu,
-      'R' => \&main_menu,
-      'Q' => \&quit
-       );
-
-   my @schemes;
-   my @keys=string_to_list "abcdefghijklmopstuvwxyz";
-   my %keyval;
-   my $index=0;
-
-   menu_head 'Select a scheme:';
-
-   foreach my $pkg ($tlpdb->list_packages) {
-      my $tlpobj = $tlpdb->{'tlps'}{$pkg};
-      if ($tlpobj->category eq "Scheme") {
-         push @schemes, $pkg;
-         $vars{"$pkg"}=($vars{'selected_scheme'} eq $pkg)? 1:0;
-      }
-   }
-   @schemes=sort @schemes;
-
-   foreach my $scheme (@schemes) {
-      $keyval{$keys[$index]}="$scheme";
-      printf " %s %s %s\n", $keys[$index], button($vars{"$scheme"}),
-      $scheme;
-      ++$index;
-   }
-
-   foreach $entry (keys %vars) {
-      if ($entry=~/^inst-(Documentation|Package|TLCore)/) {
-         $vars{"$entry"}=0;
-      }
-   }
+  my %command=(
+    'self' => \&scheme_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  my @schemes;
+  my @keys=string_to_list "abcdefghijklmnopstuvwxyz";
+  my %keyval;
+  my $index=0;
+
+  menu_head 'Select a scheme:';
+
+  foreach my $pkg ($tlpdb->list_packages) {
+    my $tlpobj = $tlpdb->{'tlps'}{$pkg};
+    if ($tlpobj->category eq "Scheme") {
+      push @schemes, $pkg;
+      $vars{"$pkg"}=($vars{'selected_scheme'} eq $pkg)? 1:0;
+    }
+  }
+  @schemes=sort @schemes;
+
+  foreach my $scheme (@schemes) {
+    $keyval{$keys[$index]}="$scheme";
+    printf " %s %s %s\n", $keys[$index], button($vars{"$scheme"}),
+    $scheme;
+    ++$index;
+  }
+
+  foreach $entry (keys %vars) {
+    if ($entry=~/^(collection-.*)/) {
+      $vars{"$1"}=0;
+    }
+  }
 
-   my $scheme_tlpobj = $tlpdb->get_package($vars{'selected_scheme'});
-   if (defined ($scheme_tlpobj)) {
-      foreach my $dependent ($scheme_tlpobj->depends) {
-         $vars{"inst-$dependent"}=1;
+  my $scheme_tlpobj = $tlpdb->get_package($vars{'selected_scheme'});
+  if (defined ($scheme_tlpobj)) {
+    foreach my $dependent ($scheme_tlpobj->depends) {
+      if ($dependent=~/.*(collection-.*)/) {
+        $vars{"$1"}=1;
       }
-   }
-   
-   other_options;
-   print 'Press key to select a scheme: ';
-
-   chomp(my $answer=<STDIN>);
-
-   if (defined $keyval{"$answer"}) {
-      $vars{'selected_scheme'}=$keyval{"$answer"};
-      return $command{'self'}->();
-   }
-   if (defined $command{"\u$answer"}) {
-      return $command{"\u$answer"}->();
-   } else {
-      return $command{'self'}->();
-   }
+    }
+  }
+  
+  other_options qw(R Q);
+  my $answer=prompt 'Press key to select a scheme';
+
+  if (defined $keyval{"$answer"}) {
+    $vars{'selected_scheme'}=$keyval{"$answer"};
+    return $command{'self'}->();
+  }
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"}->();
+  } else {
+    return $command{'self'}->();
+  }
 }
 
 
 sub collection_menu {
-   print "<<<<< COLLECTION MENU >>>>>>\n";
+  my %command=(
+    'self' => \&collection_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  my @collections;
+  my @keys=string_to_list "abcdefghijklmnopstuvwxyzABCDEFGHIJKLMNOPSTUVWXYZ";
+  my %keyval;
+  my $index=0;
+
+  menu_head 'Select collections:';
+
+  @collections=sort @collections_std;
+
+  foreach my $collection (@collections) {
+    $keyval{$keys[$index]}="$collection";
+    printf " %s %s %s\n", $keys[$index], button($vars{"$collection"}),
+    $collection;
+    ++$index;
+  }
+
+  other_options qw(- + R Q);
+  my $answer=prompt 'Press key to select collections';
+
+  my @keystrokes=string_to_list $answer;
+  
+  foreach my $keystroke (@keystrokes) {
+    if ($keystroke eq '-') {
+      for my $collection (@collections) {
+        $vars{"$collection"}=0 if defined $vars{"$collection"};
+      }
+    }
+    if ($keystroke eq '+') {
+      for my $collection (@collections) {
+        $vars{"$collection"}=1 if defined $vars{"$collection"};
+      }
+    }
+    if (defined $keyval{$keystroke}) {
+      toggle "$keyval{$keystroke}";
+    }
+  }
+
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"}->();
+  } else {
+    return $command{'self'}->();
+  }
 }
 
 sub language_menu {
-   print "<<<<< LANGUAGE MENU >>>>>>\n";
+  my %command=(
+    'self' => \&language_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  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;
+
+  menu_head 'Select languages:';
+
+  @languages=sort @collections_lang;
+  @lang_docs=sort @collections_lang_doc;
+
+  foreach my $language (@languages) {
+    $keyval{$lang_keys[$lang_index]}="$language";
+    printf " %s %s %s\n", $lang_keys[$lang_index],
+    button($vars{"$language"}),
+    $language;
+    ++$lang_index;
+  }
+
+  print "\nLanguage specific documentation.  Select languages first.\n\n";
+
+  foreach my $lang_docs (@lang_docs) {
+    $keyval{$lang_doc_keys[$lang_doc_index]}="$lang_docs";
+    printf " %s %s %s\n", $lang_doc_keys[$lang_doc_index],
+    button($vars{"$lang_docs"}),
+    substr $lang_docs, 11;
+    ++$lang_doc_index;
+  }
+
+  other_options qw (+ - R Q);
+  my $answer=prompt 'Press key to select language';
+
+  my @keystrokes=string_to_list $answer;
+  
+  foreach my $keystroke (@keystrokes) {
+    if ($keystroke eq '-') {
+      for my $collection (@languages,@lang_docs) {
+        $vars{"$collection"}=0 if defined $vars{"$collection"};
+      }
+    }
+    if ($keystroke eq '+') {
+      for my $collection (@languages,@lang_docs) {
+        $vars{"$collection"}=1 if defined $vars{"$collection"};
+      }
+    }
+    if (defined $keyval{$keystroke}) {
+      toggle "$keyval{$keystroke}";
+    }
+  }
+
+  if (defined $keyval{"$answer"}) {
+    $vars{'selected_scheme'}=$keyval{"$answer"};
+    return $command{'self'}->();
+  }
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"}->();
+  } else {
+    return $command{'self'}->();
+  }
 }
 
 
 sub directories_menu {
-   my %command=(
-      'self' => \&directories_menu,
-      'R' => \&main_menu,
-      'Q' => \&quit
-       );
-
-   menu_head "Current directories setup:";
-   print <<"EOF";
+  my %command=(
+    'self' => \&directories_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  menu_head "Current directories setup:";
+  print <<"EOF";
   <1>  TEXDIR:       $vars{'TEXDIR'}
        support tree: $vars{'TEXDIR'}/texmf
 
@@ -412,185 +573,190 @@ sub directories_menu {
 EOF
 ;
 
-   other_options;
-   print 'Enter command: ';
-
-   chomp(my $answer=<STDIN>);
-
-   if ("\u$answer" eq '1') {
-      print "New value TEXDIR [$vars{'TEXDIR'}]: ";
-      chomp($answer=<STDIN>);
-      $vars{'TEXDIR'}="$answer" if (length $answer);
-      $vars{'TEXDIR'}=~s@\\@/@g if (win32);
-      if ($vars{'TEXDIR'}=~/^(.*)\/texlive\/$texlive_release$/) {
-         $vars{'TEXMFLOCAL'}="$1/texlive/texmf-local";
-         $vars{'TEXMFSYSVAR'}="$1/texlive/$texlive_release/texmf-var";
-      return $command{'self'};
-      }
-   }
-   if ("\u$answer" eq '2') {
-      print "New value TEXMFLOCAL [$vars{'TEXMFLOCAL'}]: ";
-      chomp($answer=<STDIN>);
-      $vars{'TEXMFLOCAL'}="$answer" if (length $answer);
-      $vars{'TEXMFLOCAL'}=~s@\\@/@g if (win32);
-      return $command{'self'};
-   }
-   if ("\u$answer" eq '3') {
-      print "New value TEXMFSYSVAR [$vars{'TEXMFSYSVAR'}]: ";
-      chomp($answer=<STDIN>);
-      $vars{'TEXMFSYSVAR'}="$answer" if (length $answer);
-      $vars{'TEXMFSYSVAR'}=~s@\\@/@g if (win32);
+  other_options qw (R Q);
+  my $answer=prompt 'Enter command';
+
+  if ("\u$answer" eq '1') {
+    print "New value TEXDIR [$vars{'TEXDIR'}]: ";
+    chomp($answer=<STDIN>);
+    $vars{'TEXDIR'}="$answer" if (length $answer);
+    $vars{'TEXDIR'}=~s@\\@/@g if (win32);
+    if ($vars{'TEXDIR'}=~/^(.*)\/texlive\/$texlive_release$/) {
+      $vars{'TEXMFLOCAL'}="$1/texlive/texmf-local";
+      $vars{'TEXMFSYSVAR'}="$1/texlive/$texlive_release/texmf-var";
       return $command{'self'};
-   }
-   if ("\u$answer" eq '4') {
-      print "New value TEXMFHOME [$vars{'TEXMFHOME'}]: ";
-      chomp($answer=<STDIN>);
-      $vars{'TEXMFHOME'}="$answer" if (length $answer);
-      $vars{'TEXMFHOME'}=~s@\\@/@g if (win32);
-      return $command{'self'};
-   }
-
-   if (defined $command{"\u$answer"}) {
-      return $command{"\u$answer"}->();
-   } else {
-      return $command{'self'}->();
-   }
+    }
+  }
+  if ("\u$answer" eq '2') {
+    print "New value TEXMFLOCAL [$vars{'TEXMFLOCAL'}]: ";
+    chomp($answer=<STDIN>);
+    $vars{'TEXMFLOCAL'}="$answer" if (length $answer);
+    $vars{'TEXMFLOCAL'}=~s@\\@/@g if (win32);
+    return $command{'self'};
+  }
+  if ("\u$answer" eq '3') {
+    print "New value TEXMFSYSVAR [$vars{'TEXMFSYSVAR'}]: ";
+    chomp($answer=<STDIN>);
+    $vars{'TEXMFSYSVAR'}="$answer" if (length $answer);
+    $vars{'TEXMFSYSVAR'}=~s@\\@/@g if (win32);
+    return $command{'self'};
+  }
+  if ("\u$answer" eq '4') {
+    print "New value TEXMFHOME [$vars{'TEXMFHOME'}]: ";
+    chomp($answer=<STDIN>);
+    $vars{'TEXMFHOME'}="$answer" if (length $answer);
+    $vars{'TEXMFHOME'}=~s@\\@/@g if (win32);
+    return $command{'self'};
+  }
+
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"}->();
+  } else {
+    return $command{'self'}->();
+  }
 }
 
+
 sub options_menu {
-   my $b_altfontdir=button($vars{'o_altfontdir'});
-   my $b_symlinks=button($vars{'o_symlinks'});
-   my $b_doc=button($vars{'o_doc'});
-   my $b_src=button($vars{'o_src'});
-
-   my $altfontdir=$vars{'altfontdir'};
-   my $sys_bin=$vars{'sys_bin'};
-   my $sys_man=$vars{'sys_man'};
-   my $sys_info=$vars{'sys_info'};
-
-   my $t_altfontdir=($vars{'o_altfontdir'})? $vars{'altfontdir'}:'';
-   my $t_sys_bin=($vars{'o_symlinks'})? $vars{'sys_bin'}:'';
-   my $t_sys_man=($vars{'o_symlinks'})? $vars{'sys_man'}:'';
-   my $t_sys_info=($vars{'o_symlinks'})? $vars{'sys_info'}:'';
-
-   my %command=(
-      'self' => \&options_menu,
-      'R' => \&main_menu,
-      'Q' => \&quit
-       );
-
-   clear_screen;
-   menu_head "Current options setup:";
-
-   print <<"EOF";
+  my $b_altfontdir=button($vars{'o_altfontdir'});
+  my $b_symlinks=button($vars{'o_symlinks'});
+  my $b_doc=button($vars{'o_doc'});
+  my $b_src=button($vars{'o_src'});
+
+  my $altfontdir=$vars{'altfontdir'};
+  my $sys_bin=$vars{'sys_bin'};
+  my $sys_man=$vars{'sys_man'};
+  my $sys_info=$vars{'sys_info'};
+
+  my $t_altfontdir=($vars{'o_altfontdir'})? $vars{'altfontdir'}:'';
+  my $t_sys_bin=($vars{'o_symlinks'})? $vars{'sys_bin'}:'';
+  my $t_sys_man=($vars{'o_symlinks'})? $vars{'sys_man'}:'';
+  my $t_sys_info=($vars{'o_symlinks'})? $vars{'sys_info'}:'';
+
+  my %command=(
+    'self' => \&options_menu,
+    'R' => \&main_menu,
+    'Q' => \&quit
+      );
+
+  clear_screen;
+  menu_head "Current options setup:";
+
+  print <<"EOF";
  <A> alternate directory for automatically generated fonts: $b_altfontdir
          directory name: $t_altfontdir
 EOF
 ;
-   if (unix) {
-      print <<"EOF";
+  if (unix) {
+    print <<"EOF";
  <L> create symlinks in standard directories:               $b_symlinks
             binaries to: $t_sys_bin
             manpages to: $t_sys_man
                 info to: $t_sys_info
 EOF
 ;
-    }
-   print <<"EOF";
+  }
+  print <<"EOF";
  <D> install font/macro doc tree:    $b_doc
  <S> install font/macro source tree: $b_src
 EOF
 ;
 
-   other_options;
-   print 'Enter command: ';
+  other_options qw(R Q);
+  my $answer=prompt 'Enter command';
 
-   chomp(my $answer=<STDIN>);
-   if ("\u$answer" eq 'A') {
-      toggle 'o_altfontdir';
-      if ($vars{'o_altfontdir'}) {
-         print "New value for alternate directory [$altfontdir]: ";
-         chomp($answer=<STDIN>);
-         $vars{'altfontdir'}="$answer" if (length $answer);
-      }
-      return $command{'self'};
-   }
-   if (unix) {
-      if ("\u$answer" eq 'L') {
-         toggle 'o_symlinks';
-         if ($vars{'o_symlinks'}) {
-            print "New value for binary directory [$sys_bin]: ";
-            chomp($answer=<STDIN>);
-            $vars{'sys_bin'}="$answer" if (length $answer);
-            
-            if ($vars{'sys_bin'}=~/^(.*)\/bin$/) {
-               $vars{'sys_man'}="$1/man";
-               $vars{'sys_info'}="$1/info";
-            }
-            print "New value for man directory    [$vars{'sys_man'}]: ";
-            chomp($answer=<STDIN>);
-            $vars{'sys_man'}="$answer" if (length $answer);
-            
-            print "New value for info directory   [$vars{'sys_info'}]: ";
-            chomp($answer=<STDIN>);
-            $vars{'sys_info'}="$answer" if (length $answer);
-         }
-         return $command{'self'};
+  if ("\u$answer" eq 'A') {
+    toggle 'o_altfontdir';
+    if ($vars{'o_altfontdir'}) {
+      print "New value for alternate directory [$altfontdir]: ";
+      chomp($answer=<STDIN>);
+      $vars{'altfontdir'}="$answer" if (length $answer);
+    }
+    return $command{'self'};
+  }
+  if (unix) {
+    if ("\u$answer" eq 'L') {
+      toggle 'o_symlinks';
+      if ($vars{'o_symlinks'}) {
+        print "New value for binary directory [$sys_bin]: ";
+        chomp($answer=<STDIN>);
+        $vars{'sys_bin'}="$answer" if (length $answer);
+        
+        if ($vars{'sys_bin'}=~/^(.*)\/bin$/) {
+          $vars{'sys_man'}="$1/man";
+          $vars{'sys_info'}="$1/info";
+        }
+        print "New value for man directory    [$vars{'sys_man'}]: ";
+        chomp($answer=<STDIN>);
+        $vars{'sys_man'}="$answer" if (length $answer);
+        
+        print "New value for info directory   [$vars{'sys_info'}]: ";
+        chomp($answer=<STDIN>);
+        $vars{'sys_info'}="$answer" if (length $answer);
       }
-   }
-   if ("\u$answer" eq 'S') {
-      toggle 'o_src';
-      return $command{'self'};
-   }
-   if ("\u$answer" eq 'D') {
-      toggle 'o_doc';
       return $command{'self'};
-   }
-   if (defined $command{"\u$answer"}) {
-      return $command{"\u$answer"};
-   } else {
-      return $command{'self'};
-   }
+    }
+  }
+  if ("\u$answer" eq 'S') {
+    toggle 'o_src';
+    return $command{'self'};
+  }
+  if ("\u$answer" eq 'D') {
+    toggle 'o_doc';
+    return $command{'self'};
+  }
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"};
+  } else {
+    return $command{'self'};
+  }
 }
 
 sub install {
-   print "<<<<< install >>>>>>\n";
+  print "<<<<< install >>>>>>\n";
 }
 
 sub quit {
-   dump_vars;
-   exit 0;
+  dump_vars;
+  exit 0;
 }
 
 sub main_menu {
-   my $this_platform=platform_desc($vars{'this_platform'});
-
-   my $b_symlinks=button($vars{'o_symlinks'}); 
-   my $b_altfontdir=button($vars{'o_altfontdir'}); 
-   my $b_doc=button($vars{'o_doc'}); 
-   my $b_src=button($vars{'o_src'}); 
-   my $t_altfontdir=($vars{'o_altfontdir'})? "($vars{'altfontdir'})":'';
-
-   $vars{'n_systems_selected'}=0;
-   foreach my $key (keys %vars) {
-      if ($key=~/^diskbin.*/ or $key=~/^netbin.*/) {
-         ++$vars{'n_systems_selected'} if $vars{$key}==1;
-      }
-   }
-
-   my %command=(
-      'self' => \&main_menu,
-      'P' => \&platform_menu,
-      'O' => \&options_menu,
-      'D' => \&directories_menu,
-      'S' => \&scheme_menu,
-      'B' => \&binary_menu,
-      'Q' => \&quit
-       );
-
-   clear_screen;
-   
-   print <<"EOF";
+  my $this_platform=platform_desc($vars{'this_platform'});
+
+  my $b_symlinks=button($vars{'o_symlinks'}); 
+  my $b_altfontdir=button($vars{'o_altfontdir'}); 
+  my $b_doc=button($vars{'o_doc'}); 
+  my $b_src=button($vars{'o_src'}); 
+  my $t_altfontdir=($vars{'o_altfontdir'})? "($vars{'altfontdir'})":'';
+
+  $vars{'n_systems_selected'}=0;
+  $vars{'n_collections_selected'}=0;
+  foreach my $key (keys %vars) {
+    if ($key=~/^diskbin.*/ or $key=~/^netbin.*/) {
+      ++$vars{'n_systems_selected'} if $vars{$key}==1;
+    }
+    if ($key=~/^collection/) {
+      ++$vars{'n_collections_selected'} if $vars{$key}==1;
+    }
+  }
+
+  my %command=(
+    'self' => \&main_menu,
+    'P' => \&platform_menu,
+    'O' => \&options_menu,
+    'I' => \&install,
+    'C' => \&collection_menu,
+    'L' => \&language_menu,
+    'D' => \&directories_menu,
+    'S' => \&scheme_menu,
+    'B' => \&binary_menu,
+    'Q' => \&quit
+      );
+
+  clear_screen;
+  
+  print <<"EOF";
 ======================> TeX Live installation procedure <=====================
 
 =======> Note: Letters/digits in <angle brackets> indicate menu items <=======
@@ -624,27 +790,28 @@ EOF
 EOF
 ;
 
-   print 'Enter command: ';
+  print 'Enter command: ';
 
-   chomp(my $answer=<STDIN>);
-   if (defined $command{"\u$answer"}) {
-      return $command{"\u$answer"};
-   } else {
-      return $command{'self'};
-   }
+  chomp(my $answer=<STDIN>);
+  if (defined $command{"\u$answer"}) {
+    return $command{"\u$answer"};
+  } else {
+    return $command{'self'};
+  }
 }
 
 
 load_tlpdb;
 set_platforms_supported;
 set_texlive_default_dirs;
+initialize_collections;
 run_menu;
 
 __END__
 
 ### Local Variables:
-### perl-indent-level: 3
-### tab-width: 3
+### perl-indent-level: 2
+### tab-width: 2
 ### indent-tabs-mode: nil
 ### End:
-# vim:set tabstop=3 expandtab: #
+# vim:set tabstop=2 expandtab: #