beamerthemejltree renamed from beamer-contrib

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

4 files changed, 22 insertions, 21 deletions

diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 4a4b7e81f82..e1214c05150 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -50,7 +50,7 @@ my @TLP_working = qw(
     barcodes barr bartel-chess-fonts bashful baskervald 
     bbcard bbding bbm bbm-macros bbold bbold-type1 bclogo
     beamer beamer2thesis beamer-FUBerlin beamer-tut-pt beamerposter
-    beamerthemenirma
+    beamerthemejltree beamerthemenirma
     beebe begriff bengali bera berenisadf betababel beton
     bez123 bezos bgreek
     bib-fr bibarts biber bibhtml
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 120df3477fd..25f4f07bfea 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -2,13 +2,12 @@
 # $Id$
 # Public domain.  Originally written 2005, Karl Berry.
 # 
-# Return information given a TL package name (i.e., a tpm file name).
-# We use local copies of CTAN and the TeX Catalogue.
+# Return information given a TL package name (i.e., a tlpsrc file name).
+# We require local copies of CTAN and the TeX Catalogue.
 
 exit (&main ());
 
-sub main
-{
+sub main {
   $CTAN = $ENV{"CTAN"} || "/home/ftp/tex-archive";
   $TMPDIR = $ENV{"TMPDIR"} || "/tmp";
   $CATALOGUE = $ENV{"TEX_CATALOGUE"} || "/home/httpd/html/catalogue/entries";
@@ -60,8 +59,7 @@ sub main
 # Return 0 for success if we find a path (and print it on stdout), else
 # return 1.
 # 
-sub find_ctan_dir 
-{
+sub find_ctan_dir {
   my ($pkgname) = @_;
   return 1 unless $pkgname;  
   
@@ -188,8 +186,7 @@ sub find_ctan_dir
 # If the .tlpsrc file for ME has a catalogue entry, return it.
 # Else return empty string.
 # 
-sub tlpsrc_find_catalogue
-{
+sub tlpsrc_find_catalogue {
   my ($me) = @_;
   
   chomp (my $mydir = `dirname $0`);
@@ -211,8 +208,7 @@ sub tlpsrc_find_catalogue
 # 
 # Return the ctan path if found (without leading /), or undef.
 # 
-sub catalogue_find_ctan_path
-{
+sub catalogue_find_ctan_path {
   my ($pkgname) = @_;
   
   # catalogue uses all-lowercase file/directory names.
@@ -225,15 +221,21 @@ sub catalogue_find_ctan_path
   while ($ctan_path = <CATFILE>) {
     last if $ctan_path =~ /<ctan /;
   }
-  do { close CATFILE; return undef } unless $ctan_path; # the tag may not exist
-  $ctan_path .= $_ while (($ctan_path !~ m#/>#) and (<CATFILE>));
+  if (! $ctan_path) { # give up if the tag wasn't there.
+    close CATFILE;
+    return undef;
+  } 
+  # if we found the tag, read more lines until we get to the end of the value.
+  while ($ctan_path !~ m,/>,) {
+    $ctan_path .= <CATFILE>;
+  }
   close CATFILE;
   $ctan_path =~ s/\n/ /g;
-  ($ctan_path) = ($ctan_path =~ m#(<.*?/>)#);
+  ($ctan_path) = ($ctan_path =~ m,(<.*?/>),);
   return undef unless $ctan_path;  # in case it's not present at all
 
   # extract just the dir or file name, without options, etc.
-  $ctan_path =~ m#path=(["'])/(.*?)\1#;
+  $ctan_path =~ m,path=(["'])/(.*?)\1,;
   $ctan_loc = $2;
   return undef unless $ctan_loc; # should never happen, but who knows
 
@@ -249,8 +251,8 @@ sub catalogue_find_ctan_path
       return undef;
     } else {
       return $do_copy # are we called by prepare() or not? 
-      ? &copy_to_tmpdir ($pkgname, "$CTAN/$ctan_loc")
-      : "$CTAN/$ctan_loc";
+        ? &copy_to_tmpdir ($pkgname, "$CTAN/$ctan_loc")
+        : "$CTAN/$ctan_loc";
     }
   }
   
@@ -262,8 +264,7 @@ sub catalogue_find_ctan_path
 # Create a tmpdir with the tds-ready tree unpacked if any,
 # else return the normal ctan dir.
 #
-sub prepare
-{
+sub prepare {
   my ($pkg) = @_;
   return undef unless $pkg;
 
@@ -332,8 +333,7 @@ sub prepare
 
 # copy file to temp dir and return that for ctan2tl to use.
 #
-sub copy_to_tmpdir
-{
+sub copy_to_tmpdir {
   my ($pkgname,$src) = @_;
   
   my $pkgdir = "$TMPDIR/tl.$pkgname";
diff --git a/Master/tlpkg/tlpsrc/beamerthemejltree.tlpsrc b/Master/tlpkg/tlpsrc/beamerthemejltree.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/beamerthemejltree.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 57066b324f5..9c7fea751cc 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -40,6 +40,7 @@ depend bashful
 depend beamer-contrib
 depend beamer2thesis
 depend beamerposter
+depend beamerthemejltree
 depend beamerthemenirma
 depend begriff
 depend beton