summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-09 20:57:42 +0000
committerKarl Berry <karl@freefriends.org>2018-08-09 20:57:42 +0000
commit082fb21b11cfdb51b60c031698be7fbc726e3ee2 (patch)
tree8b4eb47e6e817d6eb37b28f08f2f6d86bdc79198 /Master
parent9139d285da34f265af4e9839a69f90fe04e5e764 (diff)
beamertheme-focus (9aug18)
git-svn-id: svn://tug.org/texlive/trunk@48382 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-focus/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpgbin207747 -> 213686 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdfbin464291 -> 467405 bytes
-rw-r--r--Master/texmf-dist/doc/latex/beamertheme-focus/demo.tex27
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty5
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty6
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty9
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty27
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty20
9 files changed, 56 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/README.md b/Master/texmf-dist/doc/latex/beamertheme-focus/README.md
index f54f83a44e0..90178e7fb67 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-focus/README.md
+++ b/Master/texmf-dist/doc/latex/beamertheme-focus/README.md
@@ -1,4 +1,4 @@
-# Focus
+# Focus v2.2
A presentation theme for LaTeX Beamer that aims at a clean and minimalist design,
so to minimize distractions and put the focus directly on the content.
diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpg b/Master/texmf-dist/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpg
index cef1691fb84..b2f01050c66 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpg
+++ b/Master/texmf-dist/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
index 20505b8cc02..c4f9ddea735 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
+++ b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/demo.tex b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.tex
index 0deadcfb54c..8d69b7790a1 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-focus/demo.tex
+++ b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.tex
@@ -93,7 +93,32 @@
\end{description}
\end{columns}
\end{frame}
-
+\setbeamertemplate{caption}[numbered]
+ \begin{frame}{Figures and Tables}
+ \begin{columns}
+ \column{0.4\textwidth}
+ \begin{figure}
+ \centering
+ \includegraphics{focuslogo.pdf}
+ \caption{Figure caption.}
+ \label{fig:focuslogo}
+ \end{figure}
+
+ \column{0.6\textwidth}
+ \begin{table}
+ \centering
+ \begin{tabular}{rcc}
+ & Heading 1 & Heading 2 \\\hline
+ Row 1 & \(v_{11}\) & \(v_{12}\) \\
+ Row 2 & \(v_{21}\) & \(v_{22}\) \\
+ Row 3 & \(v_{31}\) & \(v_{32}\) \\
+ \end{tabular}
+ \caption{Table caption.}
+ \label{tab:demo}
+ \end{table}
+ \end{columns}
+ \end{frame}
+
\begin{frame}[focus]
Thanks for using \textbf{Focus}!
\end{frame}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
index 1fb3e4c99e3..ff80737d101 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
@@ -18,6 +18,8 @@
\mode<presentation>
+
+% DEFINE COLORS. ---------------------------------------------------------------
\definecolor{main}{RGB}{64, 64, 64}
\definecolor{background}{RGB}{239, 239, 239}
@@ -25,6 +27,7 @@
\definecolor{example}{RGB}{0, 110, 0}
+% SET COLORS. ------------------------------------------------------------------
\setbeamercolor{normal text}{fg=main, bg=background}
\setbeamercolor{alerted text}{fg=alert}
\setbeamercolor{example text}{fg=example}
@@ -52,6 +55,8 @@
\setbeamercolor{description item}{fg=main!70!black}
\setbeamercolor{description subitem}{fg=main!70!black}
+\setbeamercolor{caption name}{fg=main}
+
\setbeamercolor{section in toc}{fg=main}
\setbeamercolor{subsection in toc}{fg=main}
\setbeamercolor{section number projected}{bg=main}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
index 13b6e78d3fa..8e85dd5d006 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
@@ -18,6 +18,8 @@
\mode<presentation>
+
+% SET FONTS. -------------------------------------------------------------------
\setbeamerfont{title}{size=\huge, shape=\scshape\bfseries}
\setbeamerfont{subtitle}{size=\Large, shape=\scshape, parent=structure}
\setbeamerfont{author}{size=\Large, shape=\scshape}
@@ -32,6 +34,10 @@
\setbeamerfont{focusframe}{size=\huge, shape=\scshape}
+\setbeamerfont{description item}{shape=\bfseries}
+
+\setbeamerfont{caption name}{shape=\bfseries}
+
\setbeamerfont{bibliography item}{size=\small, shape=\scshape}
\setbeamerfont{bibliography entry author}{size=\small, shape=\scshape}
\setbeamerfont{bibliography entry title}{size=\small, series=\scshape\bfseries}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
index 3fa7e8b2dd4..c990d22f4de 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
@@ -1,5 +1,5 @@
% Copyright (C) 2018 Pasquale Claudio Africa.
-% 2018 Sebastia Friedl.
+% 2018 Sebastian Friedl.
%
% This file is part of beamerthemefocus.
%
@@ -21,8 +21,7 @@
\RequirePackage{tikz}
-% CUSTOMIZE STRUCTURE ELEMENTS. ---------------------------------------------------------------------
-
+% CUSTOMIZE STRUCTURE ELEMENTS. ------------------------------------------------
\setbeamertemplate{blocks}[default]
\setbeamertemplate{section in toc}[square]
@@ -32,9 +31,7 @@
\setbeamertemplate{itemize subitem}[triangle]
-
-% STRUCTURE FRAME TEMPLATE DEFINITIONS. -------------------------------------------------------------
-
+% STRUCTURE FRAME TEMPLATE DEFINITIONS. ----------------------------------------
% Title page.
\defbeamertemplate*{title page}{focus}{%
{\usebeamercolor{frametitle}\colorlet{focus@@temp}{bg}%
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
index 8a533022c3e..3f05f338e0e 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
@@ -23,8 +23,7 @@
\RequirePackage{tikz}
-% FRAMETITLE TEMPLATES. -------------------------------------------------------------------------------------------------
-
+% FRAMETITLE TEMPLATES. --------------------------------------------------------
\defbeamertemplate*{frametitle}{focus}{%
% If not title page.
\ifnum\value{framenumber}>0%
@@ -47,9 +46,7 @@
}
-
-% FOOTLINE TEMPLATES. ---------------------------------------------------------------------------------------------------
-
+% FOOTLINE TEMPLATES. ----------------------------------------------------------
% Lenghts for the progress bar footline.
\newlength{\focus@pbar@height}% Progress bar height.
\newlength{\focus@pbar@leftoffset}
@@ -99,6 +96,13 @@
\defbeamertemplate{footline}{fullbar}{%
% If not appendix.
\ifnum\mainend<0% From package appendixnumberbeamer.
+ %
+ \settowidth{\focus@pbar@leftoffset}{1}%
+ \addtolength{\focus@pbar@leftoffset}{1.5em}%
+ %
+ \settowidth{\focus@pbar@rightoffset}{\inserttotalframenumber}%
+ \addtolength{\focus@pbar@rightoffset}{1.5em}%
+ %
% If not title page.
\ifnum\c@framenumber>0%
\begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
@@ -125,9 +129,7 @@
\def\beamer@focus@numberingnone{none}
-
-% BACKGROUND CANVAS TEMPLATES. ------------------------------------------------------------------------------------------
-
+% BACKGROUND CANVAS TEMPLATES. -------------------------------------------------
\defbeamertemplate*{background canvas}{focus}{%
\begin{tikzpicture}
\clip (0,0) rectangle ++(\paperwidth,\paperheight);
@@ -150,9 +152,7 @@
}
-
-% HOOKS FOR CREATING FRAMES. --------------------------------------------------------------------------------------------
-
+% HOOKS FOR CREATING FRAMES. ---------------------------------------------------
\BeforeBeginEnvironment{frame}{%
\setbeamertemplate{background canvas}[focus]%
\setbeamertemplate{frametitle}[focus]%
@@ -179,7 +179,6 @@
}
% Enable noframenumbering option.
-
\define@key{beamerframe}{noframenumbering}[true]{%
\setbeamertemplate{footline}[none]%
\setlength{\focus@pbar@height}{0cm}%
@@ -190,7 +189,6 @@
% Enable plain option.
-
\define@key{beamerframe}{plain}[true]{%
\setbeamertemplate{background canvas}[focusplain]%
\setbeamertemplate{frametitle}[plain]%
@@ -201,7 +199,6 @@
% Full vertical centering
% (from https://tex.stackexchange.com/questions/247826/beamer-full-vertical-centering).
-
\define@key{beamerframe}{c}[true]{%
\beamer@frametopskip=0pt plus 1fill\relax%
\beamer@framebottomskip=0pt plus 1fill\relax%
@@ -212,7 +209,6 @@
% Enable focus option.
-
\providebool{focus@standout}
\define@key{beamerframe}{focus}[true]{%
\booltrue{focus@standout}%
@@ -239,7 +235,6 @@
% Recalculate the footline's size and refresh other parameters.
% Partially copied from the definition of \beamer@calculateheadfoot.
-
\def\focus@calculatefootheight{%
\footheight=\focus@pbar@height%
\advance\footheight by 4pt%
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
index 223ef2ce85d..f37394df1f6 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
@@ -17,17 +17,12 @@
% along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2018/07/15 v2.0 Focus Beamer theme]
-
-% Note:
-% Packages should be required in the package file using their commands!
-
+\ProvidesPackage{beamerthemefocus}[2018/08/09 v2.2 Focus Beamer theme]
\mode<presentation>
-% THEME OPTIONS. ------------------------------------------------------------------------------------
-
+% THEME OPTIONS. ---------------------------------------------------------------
\DeclareOptionBeamer{numbering}{%
\PassOptionsToPackage{numbering=#1}{beamerouterthemefocus}
}
@@ -36,13 +31,10 @@
\@focus@loadfirafontstrue
\DeclareOptionBeamer{nofirafonts}{\@focus@loadfirafontsfalse}
-
\ProcessOptionsBeamer
-
-% LOAD EXTERNAL PACKAGES. ---------------------------------------------------------------------------------------
-
+% LOAD EXTERNAL PACKAGES. ------------------------------------------------------
\if@focus@loadfirafonts
\RequirePackage[T1]{fontenc}
@@ -53,7 +45,6 @@
\RequirePackage{FiraMono}
\fi
-
\usecolortheme{focus}
\usefonttheme{focus}
\useinnertheme{focus}
@@ -62,11 +53,8 @@
\setbeamertemplate{navigation symbols}{}
-
-% SET MARGINS. ------------------------------------------------------------------------------------------
-
+% SET MARGINS. -----------------------------------------------------------------
\setbeamersize{text margin left=0.75cm, text margin right=0.75cm}
\setlength{\leftmargini}{0.75cm}
-%\leftmarginii=0.75\leftmargini\relax
\mode<all>