From f21ed6178df3c1d1cd9e2a09de9dbf2b7bd6681b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Nov 2020 22:16:14 +0000 Subject: beamertheme-pure-minimalistic (14nov20) git-svn-id: svn://tug.org/texlive/trunk@56934 c570f23f-e606-0410-a88d-b1316a301751 --- .../beamercolorthemepureminimalistic.sty | 2 +- .../beamerfontthemepureminimalistic.sty | 68 ++++++++------ .../beamerinnerthemepureminimalistic.sty | 31 ++++-- .../beamerouterthemepureminimalistic.sty | 104 +++++++++++++++------ .../beamerthemepureminimalistic.sty | 7 +- 5 files changed, 141 insertions(+), 71 deletions(-) (limited to 'Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic') diff --git a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamercolorthemepureminimalistic.sty b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamercolorthemepureminimalistic.sty index ded9343170b..060518c8c2b 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamercolorthemepureminimalistic.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamercolorthemepureminimalistic.sty @@ -19,7 +19,7 @@ % If problems/bugs are found or enhancements are desired, please contact % me over: https://github.com/kai-tub/latex-beamer-pure-minimalistic -\ProvidesPackage{beamercolorthemepureminimalistic}[v1.2.4] +\ProvidesPackage{beamercolorthemepureminimalistic}[v2.0.0] \RequirePackage{ifthen} \mode diff --git a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerfontthemepureminimalistic.sty b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerfontthemepureminimalistic.sty index 7df83b361e7..11a8deeeb13 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerfontthemepureminimalistic.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerfontthemepureminimalistic.sty @@ -19,69 +19,77 @@ % If problems/bugs are found or enhancements are desired, please contact % me over: https://github.com/kai-tub/latex-beamer-pure-minimalistic -\ProvidesPackage{beamerfontthemepureminimalistic}[v1.2.4] +\ProvidesPackage{beamerfontthemepureminimalistic}[v2.0.0] \RequirePackage{ifthen} +% Adds micro-typographical enhancements +% Has no significant impact on presentation slides +% Adds issues to japanese packages... +% \RequirePackage{microtype} \mode -\newboolean{nofirafonts} -\setboolean{nofirafonts}{false} -\newboolean{helvetica} -\setboolean{helvetica}{false} +\newboolean{customfont} +\setboolean{customfont}{false} +\newboolean{noto} +\setboolean{noto}{false} -\DeclareOptionBeamer{nofirafonts}{\setboolean{nofirafonts}{true}} -\DeclareOptionBeamer{helvetica}{\setboolean{helvetica}{true}} +\DeclareOptionBeamer{customfont}{\setboolean{customfont}{true}} +\DeclareOptionBeamer{noto}{\setboolean{noto}{true}} \ProcessOptionsBeamer \RequirePackage{silence} % I have no clue how I can fix this warning \WarningFilter{latex}{Font shape declaration has incorrect series value} +\RequirePackage{iftex} -\ifthenelse{\boolean{helvetica}}{% - % If Helvetica overwrites the fira fonts settings - \RequirePackage[T1]{fontenc} - \RequirePackage[scaled]{helvet} +\ifpdftex + \RequirePackage[T1]{fontenc} +\fi + +\ifthenelse{\boolean{noto}}{% + % If Noto overwrites the fira fonts settings + \RequirePackage{noto} }{% - \ifthenelse{\boolean{nofirafonts}}{% + \ifthenelse{\boolean{customfont}}{% % Load default fonts }{% % By default load Fira - \RequirePackage[T1]{fontenc} \RequirePackage[sfdefault]{FiraSans} \RequirePackage{FiraMono} } } -\renewcommand\normalsize{\fontsize{12pt}{14pt}\selectfont} +\renewcommand\footnotesize{\fontsize{8pt}{10pt}\selectfont} \renewcommand\small{\fontsize{10pt}{12pt}\selectfont} +\renewcommand\normalsize{\fontsize{12pt}{14pt}\selectfont} \renewcommand\large{\fontsize{14pt}{16pt}\selectfont} \renewcommand\Large{\fontsize{16pt}{18pt}\selectfont} -\setbeamerfont{normal text}{family=\sffamily,size*={12pt}{14pt},series=\mdseries} +\setbeamerfont{normal text}{family=\sffamily, size=\normalsize, series=\mdseries} \setbeamerfont{alerted text}{parent=normal text} -\setbeamerfont{structure}{parent=normal text,series=\mdseries} +\setbeamerfont{structure}{parent=normal text} -\setbeamerfont{footline}{parent=structure,size*={8pt}{10pt}} +\setbeamerfont{all titles}{parent=normal text} +\setbeamerfont{presentation title}{parent=all titles, size=\large, shape=\scshape} +\setbeamerfont{subtitle}{parent=all titles, shape=\upshape} +\setbeamerfont{frametitle}{parent=all titles, size=\Large} -\setbeamerfont{title}{size*={14pt}{16pt},parent=alerted text,shape=\scshape} -\setbeamerfont{title in head/foot}{parent=footline,series=\bfseries} - -\setbeamerfont{subtitle}{parent=title,shape=\upshape} +\setbeamerfont{footline}{parent=structure,size=\footnotesize} +\setbeamerfont{title in head/foot}{parent=footline, series=\bfseries} +\setbeamerfont{author in head/foot}{parent=footline} \setbeamerfont{section in toc}{parent=normal text} \setbeamerfont{subsection in toc}{parent=section in toc} \setbeamerfont{subsubsection in toc}{parent=subsection in toc} -\setbeamerfont{author}{parent=normal text} -\setbeamerfont{author in head/foot}{parent=footline} -\setbeamerfont*{institute}{parent=normal text} +\setbeamerfont{author}{parent=normal text, size=\small} +\setbeamerfont{institute}{parent=normal text, size=\small} -\setbeamerfont{frametitle}{parent=alerted text,size*={16pt}{18pt}} -\setbeamerfont{caption}{series=\normalfont, size=\small} -\setbeamerfont{caption name}{series=\normalfont, size=\small} +\setbeamerfont{caption}{parent=normal text, size=\small} +\setbeamerfont{caption name}{series=normal text, size=\small} -\setbeamerfont*{itemize/enumerate body}{parent=normal text} -\setbeamerfont*{itemize/enumerate subbody}{parent=itemize/enumerate body} -\setbeamerfont*{itemize/enumerate subsubbody}{parent=itemize/enumerate subbody} +\setbeamerfont{itemize/enumerate body}{parent=normal text} +\setbeamerfont{itemize/enumerate subbody}{parent=itemize/enumerate body} +\setbeamerfont{itemize/enumerate subsubbody}{parent=itemize/enumerate subbody} \mode \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerinnerthemepureminimalistic.sty b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerinnerthemepureminimalistic.sty index 1bc26800b80..8f0cb997b24 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerinnerthemepureminimalistic.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerinnerthemepureminimalistic.sty @@ -19,17 +19,34 @@ % If problems/bugs are found or enhancements are desired, please contact % me over: https://github.com/kai-tub/latex-beamer-pure-minimalistic -\ProvidesPackage{beamerinnerthemepureminimalistic}[v1.2.4] +\ProvidesPackage{beamerinnerthemepureminimalistic}[v2.0.0] \mode \def\itemsymbol{\raisebox{0.3ex}{\small$\bullet$}} +% Save the \item makro to \svitem \let\svitem\item -\newenvironment{vfilleditems}{% - \begin{itemize} % - \let\olditem\item - \renewcommand\item[1][\itemsymbol]{\vfill\svitem[##1]}}% - {\end{itemize}\vfill} +\makeatletter +\newenvironment<>{vfilleditems}{% + \begin{itemize}[#1]% + \let\olditem\item + \renewcommand\item[1][\itemsymbol]{ + \ifnum\@itemdepth=1\relax + \vfill + \else + \ifnum\@itemdepth=2\relax + \setlength\itemsep{0.5ex} + \else + \ifnum\@itemdepth=3\relax + \setlength\itemsep{0.25ex} + \fi\fi\fi + \svitem[##1] + } +}{ + \end{itemize}\vfill +} +\makeatother + \defbeamertemplate*{section in toc}{pureminimalistic}{% \hspace{0.5em} \inserttocsectionnumber.~\inserttocsection @@ -79,7 +96,7 @@ \begin{beamercolorbox}[wd=\textwidth,dp=1ex]{author}% \vskip 3pt - \small\usebeamerfont{author}\usebeamercolor{author}\insertauthor $\quad$ + \usebeamerfont{author}\usebeamercolor{author}\insertauthor $\quad$ \ifx\insertinstitute\@empty% \else% {\usebeamerfont{institute}\insertinstitute $\quad$}% diff --git a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerouterthemepureminimalistic.sty b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerouterthemepureminimalistic.sty index 0e501bf5aa6..65a1d47dadc 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerouterthemepureminimalistic.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerouterthemepureminimalistic.sty @@ -19,7 +19,7 @@ % If problems/bugs are found or enhancements are desired, please contact % me over: https://github.com/kai-tub/latex-beamer-pure-minimalistic -\ProvidesPackage{beamerouterthemepureminimalistic}[v1.2.4] +\ProvidesPackage{beamerouterthemepureminimalistic}[v2.0.0] \RequirePackage{ifthen} \RequirePackage{etoolbox} \RequirePackage{calc} @@ -28,11 +28,14 @@ \newboolean{showmaxslides} \setboolean{showmaxslides}{false} +\newboolean{nofooterlogo} +\setboolean{nofooterlogo}{false} \newboolean{nofooter} \setboolean{nofooter}{false} \DeclareOptionBeamer{showmaxslides}{\setboolean{showmaxslides}{true}} +\DeclareOptionBeamer{nofooterlogo}{\setboolean{nofooterlogo}{true}} \DeclareOptionBeamer{nofooter}{\setboolean{nofooter}{true}} \ProcessOptionsBeamer @@ -55,6 +58,16 @@ % full linewidth should be used \newcommand{\logofooter}{\includegraphics[width=.8\linewidth]{\institutepath}} +\newcommand{\pageword}{Page} +\newcommand{\showpagenum}{% + \pageword{} \insertframenumber\ifthenelse{% + \boolean{showmaxslides}% + }{% + /\inserttotalframenumber% + }{}% +} + + \defbeamertemplate*{frametitle}{largetitle}{ \logotitle } @@ -69,6 +82,23 @@ \setlength{\myfooterheight}{.08\paperheight} \setbeamersize{text margin left=\myleftmargin, text margin right=\myrightmargin} +% This cannot be an environment because I need to access the height parameter +% after closing the relevant beamercolorbox +\newcommand{\basicfooter}[2]{% + \leavevmode + \begin{beamercolorbox}[sep=0pt, wd=\myleftmargin, ht=#1, dp=1ex]{footline} + \end{beamercolorbox}% + \begin{beamercolorbox}[sep=0pt, wd=\mytextlength, ht=#1, dp=1ex]{footline} + \parbox{\linewidth}% + % Don't ask me why I had to insert a space/character after \usebeamercolor + % for it to have an effect on \hrule. Same goes for \color{white} \hrule + { \usebeamercolor[fg]{normal text}\ \hrule } + \leavevmode% + #2% + \end{beamercolorbox}% + \begin{beamercolorbox}[sep=0pt, wd=\myrightmargin, dp=1ex, ht=#1]{footline} + \end{beamercolorbox}% +} \defbeamertemplate*{frametitle}{pureminimalistictitle}{ \vskip 10pt @@ -82,44 +112,58 @@ \end{beamercolorbox} }% -\defbeamertemplate*{footline}{pureminimalisticfooter}{% - \ifthenelse{\boolean{nofooter}}{}{% - \leavevmode - \begin{beamercolorbox}[sep=0pt, wd=\myleftmargin, ht=\myfooterheight, dp=1ex]{footline} - \end{beamercolorbox}% - \begin{beamercolorbox}[sep=0pt, wd=\mytextlength, ht=\myfooterheight, dp=1ex]{footline} - \parbox{\linewidth}% - % Don't ask me why I had to insert a space/character after \usebeamercolor - % for it to have an effect on \hrule. Same goes for \color{white} \hrule - { \usebeamercolor[fg]{normal text}\ \hrule } - \leavevmode - \begin{beamercolorbox}[sep=0mm, wd=.6\paperwidth, ht=\myfooterheight]{footline}% - \usebeamerfont{footline}% - \vbox to\myfooterheight{% +\defbeamertemplate*{footline}{pureminimalisticfooterdefault}{% + \basicfooter{% + \myfooterheight + }{% + \begin{beamercolorbox}[sep=0mm, wd=.725\mytextlength, ht=\myfooterheight]{footline}% + \usebeamerfont{footline}% + \vbox to\myfooterheight{% \vfil% \insertshorttitle{} $~|~$ % - \insertshortauthor{} $\quad$ % + \insertshortauthor{} $\quad$% \insertshortsubtitle{}\par% - Page \insertframenumber\ifthenelse{% - \boolean{showmaxslides}}% - {/\inserttotalframenumber}% - {}\par% + \ifthenelse{\boolean{nofooterlogo}}{}{ + \showpagenum + } + \par% \vfil% \vfil% - }% - \end{beamercolorbox}% - \begin{beamercolorbox}[sep=0mm, wd=.275\paperwidth,right, ht=\myfooterheight]{footline} - \vbox to\myfooterheight{% + } + \end{beamercolorbox}% + \begin{beamercolorbox}[sep=0mm, wd=.275\mytextlength,right, ht=\myfooterheight]{footline} + \vbox to\myfooterheight{% \vfil% \logofooter \vfil% - \vfil% - }% - \end{beamercolorbox}% + }% \end{beamercolorbox}% - \begin{beamercolorbox}[sep=0pt, wd=\myrightmargin, dp=1ex, ht=\myfooterheight]{footline} - \end{beamercolorbox} + } +} + +\defbeamertemplate{footline}{pureminimalisticfooternologo}{% + \basicfooter{% + \myfooterheight + }{% + \vbox to\myfooterheight{% + \vfil% + \insertshorttitle{} $~|~$ % + \insertshortauthor{} $\quad$% + \insertshortsubtitle{}% + \hfill \showpagenum% + \par\vfil\vfil } } - +} + +\defbeamertemplate{footline}{pureminimalisticfooterdisable}{} + +\ifthenelse{\boolean{nofooter}}{ + \setbeamertemplate{footline}[pureminimalisticfooterdisable] +}{} + +\ifthenelse{\boolean{nofooterlogo}}{ + \setbeamertemplate{footline}[pureminimalisticfooternologo] +}{} + \mode \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerthemepureminimalistic.sty b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerthemepureminimalistic.sty index 0f38bd834f4..c939ed689e1 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerthemepureminimalistic.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-pure-minimalistic/beamerthemepureminimalistic.sty @@ -19,15 +19,16 @@ % If problems/bugs are found or enhancements are desired, please contact % me over: https://github.com/kai-tub/latex-beamer-pure-minimalistic -\ProvidesPackage{beamerthemepureminimalistic}[v1.2.4] +\ProvidesPackage{beamerthemepureminimalistic}[v2.0.0] \mode \DeclareOptionBeamer{darkmode}{\PassOptionsToPackage{darkmode}{beamercolorthemepureminimalistic}} \DeclareOptionBeamer{showmaxslides}{\PassOptionsToPackage{showmaxslides}{beamerouterthemepureminimalistic}} +\DeclareOptionBeamer{nofooterlogo}{\PassOptionsToPackage{nofooterlogo}{beamerouterthemepureminimalistic}} \DeclareOptionBeamer{nofooter}{\PassOptionsToPackage{nofooter}{beamerouterthemepureminimalistic}} -\DeclareOptionBeamer{nofirafonts}{\PassOptionsToPackage{nofirafonts}{beamerfontthemepureminimalistic}} -\DeclareOptionBeamer{helvetica}{\PassOptionsToPackage{helvetica}{beamerfontthemepureminimalistic}} +\DeclareOptionBeamer{customfont}{\PassOptionsToPackage{customfont}{beamerfontthemepureminimalistic}} +\DeclareOptionBeamer{noto}{\PassOptionsToPackage{noto}{beamerfontthemepureminimalistic}} \ProcessOptionsBeamer -- cgit v1.2.3