Skip to content
GitLab
Commit 6d157244 authored by Ivo Kabadshow's avatar Ivo Kabadshow
Browse files

Merge branch 'herten1/beamertheme-juelich-feature--progressbar' 

* fixed some white-spaces
parents 42cfb6ed ddb371c1
Pipeline #26882 failed with stage
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 6d157244
## Adopted from https://github.com/github/gitignore/blob/master/TeX.gitignore
## changed to exclude ambiguous suffixes only in root directory, since e.g. *.log files in Data/ directory are valid tracking candidates
## Core latex/pdflatex auxiliary files:
/*.aux
/*.lof
/*.log
/*.lot
/*.fls
/*.out
/*.toc
/*.lop
*.aux
*.lof
*.log
*.lot
*.fls
*.out
*.toc
*.lop
# these rules might exclude target builds (pdf) in root directory etc.
*.dvi
*-converted-to.*
......@@ -17,28 +17,28 @@
*.eps
/*.pdf
## Bibliography auxiliary files (bibtex/biblatex/biber):
/*.bbl
/*.bcf
/*.blg
/*-blx.aux
/*-blx.bib
/*.brf
/*.run.xml
*.bbl
*.bcf
*.blg
*-blx.aux
*-blx.bib
*.brf
*.run.xml
## Build tool auxiliary files:
/*.fdb_latexmk
/*.synctex.gz
/*.synctex.gz(busy)
/*.pdfsync
*.fdb_latexmk
*.synctex.gz
*.synctex.gz(busy)
*.pdfsync
## Auxiliary and intermediate files from other packages:
# algorithms
/*.alg
/*.loa
*.alg
*.loa
# amsthm
/*.thm
*.thm
# beamer
/*.nav
/*.snm
/*.vrb
*.nav
*.snm
*.vrb
# (e)ledmac/(e)ledpar
/*.end
/*.[1-9]
......@@ -177,4 +177,4 @@ notes/auto
# cache folder
cache/*
**/auto/
\ No newline at end of file
**/auto/
beamerouterthemeJuelich.sty
View file @ 6d157244
......@@ -237,12 +237,6 @@
\defbeamertemplatealias{footline}{default}{visible}
% handout and trans mode settings
\only<handout| trans>{%
% disable progressbar
\setbeamertemplate{progressbar}[invisible]
}
%------------------------------------------------
% background canvas
%------------------------------------------------
......
beamerthemeJuelich.sty
View file @ 6d157244
......@@ -12,6 +12,7 @@
\RequirePackage{tikz}
\RequirePackage{calc}
\RequirePackage{textcase}
\RequirePackage{ifthen}
\usetikzlibrary{calc}
\usetikzlibrary{external}
......@@ -98,18 +99,114 @@
% define progressbar
\makeatletter
\newlength{\fzj@progressinheadfoot}
\newlength{\fzj@progressinheadfoot@linewidth}
\setlength{\fzj@progressinheadfoot@linewidth}{0.4pt}
\newif\iffzj@progressbar@countoverlays
\newif\iffzj@progressbar@countappendix
\newif\iffzj@progressbar@counttitlepage
\newif\iffzj@progressbar@invertappendix
\pgfkeys{/beamerfzj/progress bar/.cd,
%
height/.default=0.4pt,
height/.code={%
\setlength{\fzj@progressbar@height}{#1}%
},
count overlays/.is if=fzj@progressbar@countoverlays,
count appendix/.is if=fzj@progressbar@countappendix,
count titlepage/.is if=fzj@progressbar@counttitlepage,
invert appendix/.is if=fzj@progressbar@invertappendix,
% show in handout/.is if=fzj@progressbar@show@inhandout,
show in handout/.is choice,
show in handout/false/.code={
\only<handout>{\setbeamertemplate{progressbar}[invisible]}
},
show in handout/true/.code={
\only<handout>{\setbeamertemplate{progressbar}[visible]}
},
show in trans/.is choice,
show in trans/false/.code={
\only<trans>{\setbeamertemplate{progressbar}[invisible]}
},
show in trans/true/.code={
\only<trans>{\setbeamertemplate{progressbar}[visible]}
},
}
\newcommand\fzj@progressbar@end\inserttotalframenumber%
\newcommand\fzj@progressbar@current\insertframenumber%
\newlength{\fzj@progressbar@width}%
\newlength{\fzj@progressbar@height}%
\newcommand\fzj@progressbar@titlepagereduction@current{0}%
\newcommand\fzj@progressbar@titlepagereduction@end{0}%
\pgfkeys{/beamerfzj/progress bar/height}%
\pgfkeys{/beamerfzj/progress bar/show in handout=false}%
\pgfkeys{/beamerfzj/progress bar/show in trans=false}%
\setbeamertemplate{progress bar footer}{
\nointerlineskip
\setlength{\fzj@progressinheadfoot}{%
\paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
%%
%% CHECK OPTIONS
%%
%% Count pages (overlays) or frames?
\iffzj@progressbar@countoverlays%
\renewcommand\fzj@progressbar@end\insertdocumentendpage%
\renewcommand\fzj@progressbar@current\insertpagenumber%
\else%
\renewcommand\fzj@progressbar@end\inserttotalframenumber%
\renewcommand\fzj@progressbar@current\insertframenumber%
\fi%
%% Stop at end of appendix or before appendix?
\iffzj@progressbar@countappendix%
% Don't change anything
\else%
%% This works only if we count pages and not frames
\iffzj@progressbar@countoverlays%
\renewcommand\fzj@progressbar@end{\beamer@startpageofappendix - 1}%
\else%
% not implemented, one would need \beamer@startpageofappendix but for frame number and not page number
\fi%
\fi%
%% Include the title page in progress bar or not
%% There are so many ifs because frame count for title page is 0, bud slide count for title page is 1
\iffzj@progressbar@counttitlepage%
\iffzj@progressbar@countoverlays%
\renewcommand{\fzj@progressbar@titlepagereduction@current}{0}%
\renewcommand{\fzj@progressbar@titlepagereduction@end}{0}%
\else%
\renewcommand{\fzj@progressbar@titlepagereduction@current}{1}%
\renewcommand{\fzj@progressbar@titlepagereduction@end}{1}%
\fi%
\else%
\iffzj@progressbar@countoverlays%
\renewcommand{\fzj@progressbar@titlepagereduction@current}{-1}%
\renewcommand{\fzj@progressbar@titlepagereduction@end}{+1}%
\else%
\renewcommand{\fzj@progressbar@titlepagereduction@current}{0}%
\renewcommand{\fzj@progressbar@titlepagereduction@end}{2}%
\fi%
\fi%
%% Invert appendix progress bar
%%% Only supported for frames
%%% Makes only sense if count appendix=true
\iffzj@progressbar@invertappendix%
\ifthenelse{\not\(\insertpagenumber<\beamer@startpageofappendix\)}{%
\pgfmathsetmacro{\fzj@progressbar@current}{1+\insertdocumentendpage-\insertpagenumber}
\pgfmathsetmacro{\fzj@progressbar@end}{2+\insertdocumentendpage-(\beamer@startpageofappendix)}
}%
{}%
\else%
% Nothing to do here
\fi%
%%
%%
%%
\nointerlineskip%
\pgfmathsetlength{%
\fzj@progressbar@width%
}{%
\paperwidth * divide(\fzj@progressbar@current + \fzj@progressbar@titlepagereduction@current,\fzj@progressbar@end - \fzj@progressbar@titlepagereduction@end)%
}%
\begin{beamercolorbox}[wd=\paperwidth]{progress bar footer}
\tikzset{external/export next=false}%
\begin{tikzpicture}
\fill[fg] (0,0) rectangle (\fzj@progressinheadfoot, \fzj@progressinheadfoot@linewidth);
\fill[fg] (0,0) rectangle (\fzj@progressbar@width, \fzj@progressbar@height);
\end{tikzpicture}%
\end{beamercolorbox}
}
......
tutorial/part_tweaks.tex
View file @ 6d157244
......@@ -74,3 +74,17 @@
\end{frame}
}%footer element JSC
\section{Progress Bar}
{%
\setbeamertemplate{progressbar}[visible]%
\fzjset{progress bar/height=0.4ex}%
\begin{frame}[fragile]
\frametitle{Progress Bar}
\begin{itemize}
\item (Experimental) Support for progress bar
\item Highly configurable, see \verb+progressbar.tex+
\item Feedback welcome!
\end{itemize}
\end{frame}
}
tutorial/progressbar.tex 0 → 100644
View file @ 6d157244
\documentclass[aspectratio=169]{beamer}
\usetheme{Juelich}
\title{Progress Bar Configuration}
\subtitle{See all the options for Progress Bar}
\author{Andreas Herten}
\date{\today}
\institute{JSC}
\fzjset{title page=text}
\fzjset{title=allcaps}
\fzjset{subtitle=allcaps}
\fzjset{part=allcaps}
\fzjset{frametitle=regular}
\fzjset{section page=text}
%% Use FZJ Progress Bar
\setbeamertemplate{progressbar}[visible]
%% Adapt height (default: 0.4pt)
\fzjset{progress bar/height=1ex}
%% Rather count overlays not frames (default: false)
\fzjset{progress bar/count overlays=true}
%% Title page should not have a progress bar (default: false)
\fzjset{progress bar/count titlepage=false}
%% Let the progress bar end when the appendix starts (default: false)
\fzjset{progress bar/count appendix=false}
%% If we're in the appendix, the progress bar should shrink from right to left (default: false)
\fzjset{progress bar/invert appendix=true}
%% Show the progress bar in handout / trans mode (default: false)
\fzjset{progress bar/show in handout=true}
\fzjset{progress bar/show in trans=true}
%% Change color of progress bar, either globally in preamble (i.e. here) or locally for a (set of) slide(s) -- see below (default: fg=fzjblue)
% \setbeamercolor{progressbar}{fg=fzjgreen}
\newcommand{\printpagesinfo}{%
Frame \insertframenumber{} of \inserttotalframenumber{}
Page \insertpagenumber{} of \insertdocumentendpage{}
}
\begin{document}
\maketitle
\begin{frame}
\frametitle{First Slide}
\printpagesinfo
Orion's sword. Rogue extraordinary claims require extraordinary evidence birth? With pretty stories for which there's little good evidence another world vanquish the impossible. Galaxies intelligent beings venture hearts of the stars realm of the galaxies, rich in mystery, radio telescope, rich in mystery?
\end{frame}
{\setbeamercolor{progressbar}{fg=fzjgreen}
\begin{frame}
\frametitle{Second Slide}
\framesubtitle<1>{First part}
\framesubtitle<2>{Second part}
\printpagesinfo
Brain is the seed of intelligence! Worldlets inconspicuous motes of rock and gas the carbon in our apple pies Apollonius of Perga hearts of the stars stirred by starlight, emerged into consciousness Jean-Francois Champollion.
Overlay
\only<2->{Cosmic fugue network of wormholes shores of the cosmic ocean tingling of the spine, radio telescope extraordinary claims require extraordinary evidence.}
% \makeatletter\beamerfzj@pb@counter\makeatother
\end{frame}
}
\begin{frame}
\frametitle{Third Slide}
\printpagesinfo
\begin{itemize}[<+->]
\item First bullet
\item Second bullet
\item Third bullet
\item Fourth bullet
\item Done
\end{itemize}
\end{frame}
\appendix
\begin{frame}
\frametitle{First Appendix Slide}
\printpagesinfo
Capt. Malcolm Reynolds: Ah, hell, Shepherd, I ain't looking for help from on high. That's a long wait for a train don't come. Shepherd Book: Why when I talk about belief, why do you always assume I'm talking about God?
The Operative: [to Mal] You cannot make me angry. Inara Serra: Please, spend an hour with him!
\end{frame}
\begin{frame}
\frametitle{Second Appendix Slide}
\printpagesinfo
\begin{itemize}
\item<+-> Carson Beckett M. D.: [a parasite has attached itself to Sheppard's neck, paralyzing him] I'm told you have something of a cling-on.\\
Maj. John Sheppard: That's funny.
\item<+-> Dr. Rodney McKay: I'm not crazy. I just have another consciousness in my brain. Maj.\\
John Sheppard: So he just looks crazy.\\
Dr. Rodney McKay: I'm sure I do, but only because Dr. Fumbles McStupid over here was in way over his head!
\end{itemize}
\end{frame}
\begin{frame}
\frametitle{Third Appendix Slide}
\printpagesinfo
Course if I was one of them – these people that you seem to think are your enemies – what would I do? Well, there’d be no balloon. So I’d draw a map to a real secluded place, like a cave or some underbrush, good place for a trap. An ambush. And when your friends got there, a bunch of my people would be waiting for ‘em. Then they’d use them to trade for me…I guess it’s a good thing I’m not one of them huh? You g1uys got any milk
\end{frame}
\end{document}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment