diff --git a/Makefile b/Makefile index 34394004ed384436e94781cc299eea02b90b9be5..1bae0e3f081d044a14a1c4de7803679063b84482 100644 --- a/Makefile +++ b/Makefile @@ -5,31 +5,40 @@ LATEX = latex BIBTEX = bibtex DVIPS = dvips PS2PDF = ps2pdf14 +GNUPLOT = gnuplot PDF = $(addsuffix .pdf, $(basename $(shell grep -l '\\begin{document' *.tex))) -BIB = $(addsuffix .bbl, $(basename $(shell grep -l '\\cite{' *.tex))) +BIB = $(addsuffix .bbl, $(basename $(shell grep -l '\\nocite{\|\\cite{' *.tex))) +EPS = $(addsuffix .eps, $(basename $(shell ls *.gnp))) -all: $(BIB) $(PDF) +all: $(EPS) $(BIB) $(PDF) clean clean: - rm -f *.blg *.log *.nav *.out *.snm *.toc *.dvi *.aux + rm -f *.blg *.log *.nav *.out *.snm *.toc *.dvi *.aux *.vrb release: all clean distclean: clean - rm -f $(BIB) $(PDF) + rm -f $(BIB) $(PDF) $(EPS) -%.aux %.dvi: %.tex - $(LATEX) $^ - $(LATEX) $^ +%.aux: %.tex $(LATEX) $^ + rm $(addsuffix .dvi, $(basename $^)) %.bbl: %.aux $(BIBTEX) $(basename $^) +%.dvi: %.tex + $(LATEX) $^ + $(LATEX) $^ + $(LATEX) $^ + %.ps: %.dvi $(DVIPS) $^ -o $@ %.pdf: %.ps $(PS2PDF) $^ + +%.eps: %.gnp + $(GNUPLOT) < $< diff --git a/beamerthemelumc.sty b/beamerthemelumc.sty index 16162406c07fe355fddd08600aa0a92085a8718f..5ae6cf3fe8ed0fb0a82113c0a6aae3e6e7074f1a 100644 --- a/beamerthemelumc.sty +++ b/beamerthemelumc.sty @@ -14,14 +14,25 @@ % For the footer. \usepackage{tabularx} +% Always nice to have. +\usepackage{multirow} +\usepackage{multicol} +\usepackage{ifthen} + +% Some defaults for using a bibliography. +\usepackage{bibentry} +\setbeamertemplate{bibliography item}[triangle] +\bibliographystyle{plain} + % Select a nicer font. \usepackage{newcent} \renewcommand{\sfdefault}{pnc} +\usepackage{eurosym} % Package for making graphs and automata. \usepackage{gastex} % Spaces around `=' break functionality. -\gasset{Nadjust=w, linecolor=white, linewidth=0.5} +\gasset{linecolor=white, linewidth=0.5, AHLength=3} % Custom colours (use the gimp colour picker and divide by 255). \definecolor{LUMCBlue}{rgb}{0, 0.11372, 0.38039} @@ -37,20 +48,35 @@ % Change the bullets in the itemize environment. \setbeamertemplate{itemize items}[circle] +\newcommand{\fakeitem}{\,\ \ \ $\bullet$\ \,} -% Macro for bold text. -\newcommand{\bt}[1]{\texttt{\textbf{#1}}} +% Macros for bold text. +\newcommand{\bt}[1]{\texttt{\textbf{#1}}} % Bold truetype. +\newcommand{\bs}[1]{\bf{\scriptsize{#1}}} % Bold small. +\newcommand{\bi}[1]{\textit{\textbf{#1}}} % Bold italic. +\newcommand{\bsi}[1]{\textit{\textbf{\scriptsize{#1}}}} % Bold italic small. +\newcommand{\permfoot}[1]{\onslide<1->\bs{#1}} % Enable numbering of figures and tables. \setbeamertemplate{caption}[numbered] -% +% Put a frame title on the slide. \renewcommand{\frametitle}[1]{ {\it{\textbf{#1}}} \bigskip } +% A filled frame, use this to make use of the \vfill command. +\newenvironment{fframe}{ + \begin{frame} + \vspace{.15cm} + \vbox to 1.15\textheight \bgroup +}{ + \egroup + \end{frame} +} + % % Settings for displaying code. % @@ -76,6 +102,12 @@ numberstyle = \tiny } +% Define an empty language to use only for typesetting. +\lstdefinelanguage{none}{} + +% Trick to get out of math mode highlighting. +\newcommand{\rmath}[1]{\phantom{\lstinline!#1!}} + % % Settings for the title page. % diff --git a/mkpres.sh b/mkpres.sh index e4763413cf1573eaf1d988b2af1455e3b84f00ef..67c413557aedf463e3c17b03d87c6f719fb8c6af 100644 --- a/mkpres.sh +++ b/mkpres.sh @@ -18,6 +18,8 @@ ln -s $here/lumc_logo_small.eps $1/ ln -s $here/ul_logo.eps $1/ ln -s $here/lgtc_logo.eps $1/ ln -s $here/nbic_logo.eps $1/ +ln -s $here/nwo_logo_en.eps $1/ +ln -s $here/ngi_logo.eps $1/ ln -s $here/gen2phen_logo.eps $1/ ln -s $here/Makefile $1/ ln -s $here/beamerthemelumc.sty $1/ diff --git a/presentation.tex b/presentation.tex index 6544d97a315208159c375a327dedce78b6845dfe..27fa6b78e8c4dac8e76efac1ac4432e60b62c82b 100644 --- a/presentation.tex +++ b/presentation.tex @@ -9,12 +9,14 @@ \providecommand{\myCenter}{Center for Human and Clinical Genetics} \providecommand{\lastCenterLogo}{ \raisebox{-0.1cm}{ - \includegraphics[height = 1cm]{lgtc_logo} + %\includegraphics[height = 1cm]{lgtc_logo} + %\includegraphics[height = 0.7cm]{ngi_logo} } } \providecommand{\lastRightLogo}{ - \includegraphics[height = 0.7cm]{nbic_logo} + %\includegraphics[height = 0.7cm]{nbic_logo} %\includegraphics[height = 0.8cm]{nwo_logo_en} + %\hspace{1.5cm}\includegraphics[height = 0.7cm]{gen2phen_logo} } \usetheme{lumc} @@ -30,13 +32,19 @@ % First page of the presentation. \section{Introduction} \begin{frame} - \frametitle{Title of this frame.} - First line. + \frametitle{Title of this frame.} + First line. + + \pause + + Second line. +\end{frame} - \pause +\begin{fframe} + \frametitle{Title of this frame.} - Second line. -\end{frame} + \vfill +\end{fframe} \section{Topic2} \begin{frame}