summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-05 15:57:39 +0000
committerKarl Berry <karl@freefriends.org>2011-04-05 15:57:39 +0000
commit57a5179d7c1ea1d34e207784e5e52e2438ba16de (patch)
tree51a7c268c2a733e37ddb696bc6153993d540d732
parent540927ad17a1d3f65acd988f4f93edf13d4b303e (diff)
beamerthemejltree renamed from beamer-contrib
git-svn-id: svn://tug.org/texlive/trunk@21977 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/latex/beamerthemejltree/beamerthemeJLTree.sty117
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo40
-rw-r--r--Master/tlpkg/tlpsrc/beamerthemejltree.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
5 files changed, 139 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/beamerthemejltree/beamerthemeJLTree.sty b/Master/texmf-dist/tex/latex/beamerthemejltree/beamerthemeJLTree.sty
new file mode 100644
index 00000000000..2a8354093a9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamerthemejltree/beamerthemeJLTree.sty
@@ -0,0 +1,117 @@
+\ProvidesPackage{beamerthemeJLTree}
+
+%% this is versin 1.1 2006/11/18
+
+%% Copyright Jerome LELONG <jerome.lelong@gmail.com> 2006
+%% This program can be redistributed and/or modified under the terms
+%% of the GNU Public License, version 2 or later.
+
+
+\newif\ifbeamer@tree@showhooks
+\beamer@tree@showhookstrue
+
+\DeclareOptionBeamer{hooks}[true]{\csname beamer@tree@showhooks#1\endcsname}
+
+\ProcessOptionsBeamer
+\mode
+<presentation>
+
+\setbeamertemplate{navigation symbols}{}
+\usecolortheme{rose}
+\useinnertheme[shadow=true]{rounded}% les block
+
+
+\defbeamertemplate*{footline}{JLTree theme}
+{
+ \begin{beamercolorbox}[colsep=1.5pt]{upper separation line foot}
+ \end{beamercolorbox}
+ \hbox{%
+ \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,left]{title in head/foot}%
+ \usebeamerfont{title in head/foot}\hspace*{2ex}\insertauthor \hspace*{1ex}(\insertshortinstitute) \hspace*{2ex} \insertdate
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.5\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}%
+ \usebeamerfont{date in head/foot}
+ \insertframenumber{} / \inserttotalframenumber\hspace*{2ex}
+ \end{beamercolorbox}}%
+}
+
+
+\defbeamertemplate*{sidebar right}{JLTree theme}{}
+
+\usesectionheadtemplate
+{\hfil\insertsectionhead}
+{\hfill\color{fg!50!bg}\insertsectionhead}
+
+
+\usesubsectionheadtemplate
+{\hfil\insertsubsectionhead}
+{\hfill\color{fg!50!bg}\insertsubsectionhead}
+
+
+
+\defbeamertemplate*{headline}{JLTree theme}
+{%
+ \leavevmode%
+ \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{upper separation line head}
+ \end{beamercolorbox}
+ \@tempdimb=3.625ex% 2.4375ex%
+ \multiply\@tempdimb by\beamer@sectionmax%
+%% \advance\@tempdimb by 1.125ex%
+ \advance\@tempdimb by -1.125ex%
+ \ifdim\@tempdimb<10.9ex% 3*(2.5+1.125)
+ \@tempdimb=10.9ex%
+ \fi
+ \begin{beamercolorbox}[wd=.45\paperwidth, ht=\@tempdimb]{left block}%
+ \usebeamerfont{section in head/foot}%
+ \vbox to\@tempdimb{\vfill\insertsectionnavigation{.45\paperwidth}\vfill}%
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=1.125ex,ht=\@tempdimb,dp=1.125ex]{middle separation line head}%
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.44\paperwidth]{middle block}%
+ \vbox to\@tempdimb{\vfill%
+ \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
+ leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
+ \usebeamerfont{title in head/foot}\insertshorttitle
+ \end{beamercolorbox}
+ \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
+ leftskip=.3cm,rightskip=.3cm plus1fil]{section in head/foot}
+ \usebeamerfont{section in head/foot}%
+ \ifbeamer@tree@showhooks
+ \setbox\beamer@tempbox=\hbox{\insertsectionhead}%
+ \ifdim\wd\beamer@tempbox>1pt%
+ \hskip2pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
+ \hskip1pt%
+ \fi%
+ \else%
+ \hskip6pt%
+ \fi%
+ \insertsectionhead
+ \end{beamercolorbox}
+ \begin{beamercolorbox}[wd=.44\paperwidth,ht=2.5ex,dp=1.125ex,%
+ leftskip=.3cm,rightskip=.3cm plus1fil]{subsection in head/foot}
+ \usebeamerfont{subsection in head/foot}%
+ \ifbeamer@tree@showhooks
+ \setbox\beamer@tempbox=\hbox{\insertsubsectionhead}%
+ \ifdim\wd\beamer@tempbox>1pt%
+ \hskip9.4pt\raise1.9pt\hbox{\vrule width0.4pt height1.875ex\vrule width 5pt height0.4pt}%
+ \hskip1pt%
+ \fi%
+ \else%
+ \hskip12pt%
+ \fi%
+ \insertsubsectionhead
+ \end{beamercolorbox}%
+ \vfill}%
+ \end{beamercolorbox}%
+ \begin{beamercolorbox}[wd=.1\paperwidth,ht=\@tempdimb,right]{right block}%
+ \vbox to\@tempdimb{\vfill\insertlogo\vfill}
+ \end{beamercolorbox}
+ \vfill
+ \begin{beamercolorbox}[wd=\paperwidth,colsep=1.5pt]{lower separation line head}
+ \end{beamercolorbox}
+}
+\setbeamercolor{separation line}{use=structure,bg=structure.fg!50!bg}
+
+
+\mode
+<all>
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