add upernat, beamer router sidebar, and another cmg font; update ls-R

diff --git a/texmf/ls-R b/texmf/ls-R
index cb8014fd54ed5bef0b7667605e50adf245e66dc2..911e7d3f3f1f0b75cfb704dbedc315baa626d1cc 100644 (file)
--- a/texmf/ls-R
+++ b/texmf/ls-R
@@ -693,6 +693,7 @@ curve.cls
 envlab.sty
 exam.cls
 fixme.sty
+hypernat.sty
 invoice.def
 invoice.sty
 realcalc.tex

diff --git a/texmf/metafont/kelly/cmg10.657pk b/texmf/metafont/kelly/cmg10.657pk
new file mode 100644 (file)
index 0000000..3e3b304
Binary files /dev/null and b/texmf/metafont/kelly/cmg10.657pk differ

diff --git a/texmf/tex/latex/beamerouterthemedebiansidebar.sty b/texmf/tex/latex/beamerouterthemedebiansidebar.sty
new file mode 100644 (file)
index 0000000..19002ff
--- /dev/null
+++ b/texmf/tex/latex/beamerouterthemedebiansidebar.sty
@@ -0,0 +1,163 @@
+% Copyright 2003 by Till Tantau <tantau@users.sourceforge.net>
+%
+% This program can be redistributed and/or modified under the terms
+% of the GNU Public License, version 2.
+
+\newdimen\beamer@debiansidebarwidth
+\newdimen\beamer@headheight
+\usebeamerfont{frametitle}
+\beamer@debiansidebarwidth=2.5\baselineskip
+\beamer@headheight=2.5\baselineskip
+\reset@font
+
+\def\beamer@lefttext{left}
+
+\DeclareOptionBeamer{hideothersubsections}[]{\beamer@nav@subsectionstyle{show/show/hide}}
+\DeclareOptionBeamer{hideallsubsections}[]{\beamer@nav@subsectionstyle{hide}}
+
+\DeclareOptionBeamer{width}{\beamer@debiansidebarwidth=#1}
+\DeclareOptionBeamer{height}{\beamer@headheight=#1}
+\DeclareOptionBeamer{left}{\def\beamer@debiansidebarside{left}}
+\DeclareOptionBeamer{right}{\def\beamer@debiansidebarside{right}}
+\ExecuteOptionsBeamer{left}
+\ProcessOptionsBeamer
+
+
+\mode<presentation>
+
+\ifdim\beamer@headheight>0pt
+% if head height is 0pt, use default frame title
+
+  \setbeamercolor*{frametitle}{parent=debiansidebar}
+
+  \defbeamertemplate*{frametitle}{debiansidebar theme}
+  {%
+    \nointerlineskip%
+    \vskip-\beamer@headheight%
+    \vbox to \beamer@headheight{%
+      \vfil
+      \leftskip=-\beamer@leftmargin%
+      \advance\leftskip by0.3cm%
+      \rightskip=-\beamer@rightmargin%
+      \advance\rightskip by0.3cm plus1fil%
+      {\usebeamercolor[fg]{frametitle}\usebeamerfont{frametitle}\insertframetitle\par}%
+      {\usebeamercolor[fg]{framesubtitle}\usebeamerfont{framesubtitle}\insertframesubtitle\par}%
+      \vbox{}%
+      \vskip-1em%
+      \vfil
+    }%
+  }
+
+  \defbeamertemplate*{headline}{debiansidebar theme}
+  {%
+    \begin{beamercolorbox}[wd=\paperwidth]{frametitle}
+      \ifx\beamer@debiansidebarside\beamer@lefttext%
+      \else%
+        \hfill%
+      \fi%
+      \ifdim\beamer@debiansidebarwidth>0pt%  
+        \usebeamercolor[bg]{logo}%
+        \vrule width\beamer@debiansidebarwidth height \beamer@headheight%
+        \hskip-\beamer@debiansidebarwidth%
+        \hbox to \beamer@debiansidebarwidth{\hss\vbox to
+          \beamer@headheight{\vss\hbox{\color{fg}\insertlogo}\vss}\hss}%
+      \else%
+        \vrule width0pt height \beamer@headheight%  
+      \fi%
+    \end{beamercolorbox}
+  }
+\fi
+
+
+\def\beamer@debiansidebarformat#1#2#3{%
+  \begin{beamercolorbox}[wd=\beamer@debiansidebarwidth,leftskip=#1,rightskip=1ex plus1fil,vmode]{#2}
+    \vbox{}%
+    #3\par%
+    \vbox{}%
+    \vskip-1.5ex%
+  \end{beamercolorbox}
+}
+
+\defbeamertemplate*{section in debiansidebar}{debiansidebar theme}
+{%
+  \vbox{%
+    \vskip1ex%
+    \beamer@debiansidebarformat{3pt}{section in debiansidebar}{\insertsectionhead}%
+  }%
+}
+
+\defbeamertemplate*{section in debiansidebar shaded}{debiansidebar theme}
+{%
+  \vbox{%
+    \vskip1ex%
+    \beamer@debiansidebarformat{3pt}{section in debiansidebar shaded}{\insertsectionhead}%
+  }%
+}
+
+\defbeamertemplate*{subsection in debiansidebar}{debiansidebar theme}
+{%
+  \beamer@debiansidebarformat{5pt}{subsection in debiansidebar}{\insertsubsectionhead}%
+}
+
+\defbeamertemplate*{subsection in debiansidebar shaded}{debiansidebar theme}
+{%
+  \beamer@debiansidebarformat{5pt}{subsection in debiansidebar shaded}{\insertsubsectionhead}%
+}
+
+\defbeamertemplate*{subsubsection in debiansidebar}{debiansidebar theme}
+{%
+  \beamer@debiansidebarformat{7pt}{subsubsection in debiansidebar}{\insertsubsubsectionhead}%
+}
+
+\defbeamertemplate*{subsubsection in debiansidebar shaded}{debiansidebar theme}
+{%
+  \beamer@debiansidebarformat{7pt}{subsubsection in debiansidebar shaded}{\insertsubsubsectionhead}%
+}
+
+
+\ifdim\beamer@debiansidebarwidth>0pt
+
+                                % debiansidebar
+  \setbeamersize{debiansidebar width \beamer@debiansidebarside=\beamer@debiansidebarwidth}
+  \defbeamertemplate*{debiansidebar \beamer@debiansidebarside}{debiansidebar theme}
+  {
+    \beamer@tempdim=\beamer@debiansidebarwidth%
+    \advance\beamer@tempdim by -6pt%
+    {\usebeamerfont{title in debiansidebar}%
+      \vskip0em%
+      \hskip3pt%
+      \usebeamercolor[fg]{title in debiansidebar}%
+      \includegraphics[width=5cm]{openlogo-crop.pdf}%
+      \insertshorttitle[width=\beamer@tempdim,center,respectlinebreaks]\par%
+      \vskip0.5em%
+    }%
+    {%
+      \hskip3pt%
+      \usebeamercolor[fg]{author in debiansidebar}%
+      \usebeamerfont{author in debiansidebar}%
+      \insertshortauthor[width=\beamer@tempdim,center,respectlinebreaks]\par%
+      \vskip0.5em%
+    }%
+    \insertverticalnavigation{\beamer@debiansidebarwidth}%
+    \vfill
+    \ifx\beamer@debiansidebarside\beamer@lefttext%
+    \else%
+      \usebeamercolor{normal text}%
+      \llap{\usebeamertemplate***{navigation symbols}\hskip0.1cm}%
+      \vskip2pt%
+    \fi%
+  }%
+  
+  \ifx\beamer@debiansidebarside\beamer@lefttext%
+    \defbeamertemplate*{debiansidebar right}{debiansidebar theme}
+    {%
+      \vfill%
+      \llap{\usebeamertemplate***{navigation symbols}\hskip0.1cm}%
+      \vskip2pt}
+  \fi
+                                % Margins
+  \setbeamersize{text margin left=0.5cm,text margin right=0.5cm}
+\fi
+
+\mode
+<all>

diff --git a/texmf/tex/latex/hypernat.sty b/texmf/tex/latex/hypernat.sty
new file mode 100644 (file)
index 0000000..d40bcb0
--- /dev/null
+++ b/texmf/tex/latex/hypernat.sty
@@ -0,0 +1,127 @@
+%% hypernat.sty v1.0b (C) 2001 Jens Berger
+%%
+%%  This packages makes the hyperref package and the natbib package
+%%  with options `numbers' and `sort&compress' work together. This
+%%  means, that the citations (e.g [3,2,1]) will be compressed to
+%%  [1-3], where the `1' and the `3' are (color-)linked to the
+%%  bibliography.
+%%
+%%  The changes I made here are suggested (in August 2000) for the
+%%  next natbib release.
+%%
+%%  This package will disappear from CTAN, when natbib will do
+%%  the job by himself.
+%%
+%%  Load this package after natbib and hyperref!
+%%
+%%  Please make sure that you are using at least natbib v7.0!
+%%
+%% Changes
+%%
+%%   v1.0b 2001/07/09 anchor for all citations in the list added 
+%%                    to make backref options working (bug reported by Günter Keusen)
+%%   v1.0a 2001/01/22 \noexpand for some \hyper@natlinkend added 
+%%                    (bug reported by Frank Meißen), hypernat.sty 
+%%                    is working now for `dvips --> ps2pdf' or `dvips -> Distiller'
+%%
+\ProvidesPackage{hypernat}[2001/07/09 v1.0b hyperref and natbib compatibility (jb)]
+\AtBeginDocument{\def\NAT@sort{2}}
+\def\NAT@citexnum[#1][#2]#3{%
+  \NAT@sort@cites{#3}%
+  \let\@citea\@empty
+   \@cite{\def\NAT@num{-1}\let\NAT@last@yr\relax\let\NAT@nm\@empty
+    \@for\@citeb:=\NAT@cite@list\do
+    {\edef\@citeb{\expandafter\@firstofone\@citeb}%
+     \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi
+     \@ifundefined{b@\@citeb\@extra@b@citeb}{%
+       {\reset@font\bfseries?}
+        \NAT@citeundefined\PackageWarning{natbib}%
+       {Citation `\@citeb' on page \thepage \space undefined}}%
+     {\let\NAT@last@num\NAT@num\let\NAT@last@nm\NAT@nm
+      \NAT@parse{\@citeb}%
+      \ifNAT@longnames\@ifundefined{bv@\@citeb\@extra@b@citeb}{%
+        \let\NAT@name=\NAT@all@names
+        \global\@namedef{bv@\@citeb\@extra@b@citeb}{}}{}%
+      \fi
+      \ifNAT@full\let\NAT@nm\NAT@all@names\else
+        \let\NAT@nm\NAT@name\fi
+      \ifNAT@swa
+       \ifnum\NAT@ctype>1\relax\@citea
+        \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+            \ifnum\NAT@ctype=2\relax\NAT@test{\NAT@ctype}%
+            \else\NAT@alias
+            \fi\hyper@natlinkend\else
+       \ifnum\NAT@sort>1
+         \begingroup\catcode`\_=8
+            \ifcat _\ifnum\z@<0\NAT@num _\else A\fi
+              \global\let\NAT@nm=\NAT@num \else \gdef\NAT@nm{-2}\fi
+            \ifcat _\ifnum\z@<0\NAT@last@num _\else A\fi
+              \global\@tempcnta=\NAT@last@num \global\advance\@tempcnta by\@ne
+              \else \global\@tempcnta\m@ne\fi
+         \endgroup
+% v0.1b anchor added to make backref's working, watch for errors!
+         \ifnum\NAT@nm=\@tempcnta
+         \ifHy@backref\hyper@natlinkstart{\@citeb\@extra@b@citeb}\hyper@natlinkend\fi
+           \ifx\NAT@last@yr\relax
+%             \edef\NAT@last@yr{\@citea \mbox{\noexpand\citenumfont{\NAT@num}}}%
+            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+               \edef\NAT@last@yr{\@citea \mbox{\noexpand%
+                    \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+                      \noexpand\citenumfont{\NAT@num}%
+                    \noexpand\hyper@natlinkend}%
+               }%
+            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+           \else
+%             \edef\NAT@last@yr{--\penalty\@m\mbox{\noexpand\citenumfont{\NAT@num}}}%
+            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+             \edef\NAT@last@yr{--\penalty\@m\mbox{\noexpand%
+                  \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+                    \noexpand\citenumfont{\NAT@num}%
+                  \noexpand\hyper@natlinkend}%
+             }%
+            %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+           \fi
+         \else
+%           \NAT@last@yr \@citea \mbox{\citenumfont{\NAT@num}}%
+           %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+           \NAT@last@yr \@citea \mbox{%
+                \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+                    \citenumfont{\NAT@num}%
+                \hyper@natlinkend}%
+           %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+           \let\NAT@last@yr\relax
+         \fi
+       \else
+         \@citea \mbox{\hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+           {\citenumfont{\NAT@num}}\hyper@natlinkend}%
+       \fi
+       \fi
+       \def\@citea{\NAT@sep\penalty\@m\NAT@space}%
+      \else
+        \ifcase\NAT@ctype\relax
+          \ifx\NAT@last@nm\NAT@nm \NAT@yrsep\penalty\@m\NAT@space\else
+          \@citea \NAT@test{1}\ \NAT@@open
+          \if*#1*\else#1\ \fi\fi \NAT@mbox{%
+          \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+          {\citenumfont{\NAT@num}}\hyper@natlinkend}%
+          \def\@citea{\NAT@@close\NAT@sep\penalty\@m\ }%
+        \or\@citea
+          \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+           \NAT@test{\NAT@ctype}\hyper@natlinkend
+          \def\@citea{\NAT@sep\penalty\@m\ }%
+        \or\@citea
+          \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+           \NAT@test{\NAT@ctype}\hyper@natlinkend
+          \def\@citea{\NAT@sep\penalty\@m\ }%
+        \or\@citea
+          \hyper@natlinkstart{\@citeb\@extra@b@citeb}%
+           \NAT@alias\hyper@natlinkend
+          \def\@citea{\NAT@sep\penalty\@m\ }%
+        \fi
+      \fi
+      }}%
+      \ifnum\NAT@sort>1\relax\NAT@last@yr\fi
+      \ifNAT@swa\else\ifnum\NAT@ctype=0\if*#2*\else
+      \NAT@cmt#2\fi \NAT@@close\fi\fi}{#1}{#2}%
+}
+\endinput