beamertheme-focus (7dec21)

git-svn-id: svn://tug.org/texlive/trunk@61241 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 59 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/README.md b/Master/texmf-dist/doc/latex/beamertheme-focus/README.md
index 6851759db6f..3586a78da9a 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 v2.9.0
+# Focus v3.0.0
 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.
 
@@ -69,11 +69,17 @@ can be customized with:
 \footlineinfo{Custom footline text}
 ```
 
+For both footline styles the total frame number (shown by default) can be suppressed with:
+```latex
+\usetheme[totalframenumbering=no]{focus}
+```
+
 The footline may also be disabled globally by typing:
 ```latex
 \usetheme[numbering=none]{focus}
 ```
 
+
 Customize fonts
 ---------------
 Focus is using the [Fira fonts](https://bboxtype.com/typefaces/FiraSans/) by default.
@@ -102,7 +108,8 @@ Focus was initially created and designed by [Pasquale Africa](https://github.com
 The following people deserve appreciation and acknowledgment for improving the template with
 additions and modifications (in alphabetical order):
 
-- Sebastian Friedl
-- Benjamin Goldman
+- [max](https://github.com/imntl)
+- [MonsieurPi](https://github.com/MonsieurPi)
+- [SFr682k](https://github.com/SFr682k)
 
 A more detailed contribution list is found [here](https://github.com/elauksap/focus-beamertheme/graphs/contributors).
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
index 9031ac0ca35..0f092439770 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
@@ -68,6 +68,9 @@
 \newlength{\focus@pbar@leftoffset}
 \newlength{\focus@pbar@rightoffset}
 
+% Comparision token for totalframenumbering.
+\def\no{no}
+
 \defbeamertemplate*{footline}{progressbar}{%
     % If not appendix.
     \ifnum\mainend<0% From package appendixnumberbeamer.
@@ -75,8 +78,13 @@
         \settowidth{\focus@pbar@leftoffset}{1}%
         \addtolength{\focus@pbar@leftoffset}{1.5em}%
         %
-        \settowidth{\focus@pbar@rightoffset}{\inserttotalframenumber}%
-        \addtolength{\focus@pbar@rightoffset}{1.5em}%
+        \ifx\beamer@focus@totalframenumbering\no%
+            \settowidth{\focus@pbar@rightoffset}{}%
+            \addtolength{\focus@pbar@rightoffset}{0.5em}%
+        \else%
+            \settowidth{\focus@pbar@rightoffset}{\inserttotalframenumber}%
+            \addtolength{\focus@pbar@rightoffset}{1.5em}%
+        \fi%
         %
         % If not title page.
         \ifnum\value{realframenumber}>0%
@@ -91,8 +99,11 @@
                     \fill[footline.bg] (\the\focus@pbar@leftoffset,0) rectangle ++(\focus@pbar@progress pt,\the\focus@pbar@height)
                                        ++(0,{-0.5*\the\focus@pbar@height}) node[anchor=east, text=footline.fg] {\strut\insertframenumber};
                     
-                    \fill[footline.bg] (\paperwidth,0) rectangle ++(-\the\focus@pbar@rightoffset,\the\focus@pbar@height)
-                                       ++(0,{-0.5*\the\focus@pbar@height}) node[anchor=west, text=footline.fg] {\strut\inserttotalframenumber};
+                    \ifx\beamer@focus@totalframenumbering\no%
+                    \else%
+                        \fill[footline.bg] (\paperwidth,0) rectangle ++(-\the\focus@pbar@rightoffset,\the\focus@pbar@height)
+                                           ++(0,{-0.5*\the\focus@pbar@height}) node[anchor=west, text=footline.fg] {\strut\inserttotalframenumber};
+                    \fi%
                 \end{tikzpicture}%
             \else%
                 \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
@@ -100,8 +111,12 @@
                     \fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                     
                     \node[anchor=east, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\insertframenumber};
-                    \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
-                    \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
+
+                    \ifx\beamer@focus@totalframenumbering\no%
+                    \else%
+                        \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
+                        \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
+                    \fi%
                 \end{tikzpicture}%
             \fi%
         \fi%
@@ -118,8 +133,13 @@
         \settowidth{\focus@pbar@leftoffset}{1}%
         \addtolength{\focus@pbar@leftoffset}{1.5em}%
         %
-        \settowidth{\focus@pbar@rightoffset}{\inserttotalframenumber}%
-        \addtolength{\focus@pbar@rightoffset}{1.5em}%
+        \ifx\beamer@focus@totalframenumbering\no%
+            \settowidth{\focus@pbar@rightoffset}{}%
+            \addtolength{\focus@pbar@rightoffset}{0.5em}%
+        \else%
+            \settowidth{\focus@pbar@rightoffset}{\inserttotalframenumber}%
+            \addtolength{\focus@pbar@rightoffset}{1.5em}%
+        \fi%
         %
         % If not title page.
         \ifnum\value{realframenumber}>0%
@@ -127,14 +147,18 @@
                 \clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                 \fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
 
-                \ifx\focus@footlineinfo\empty
-                \else
+                \ifx\focus@footlineinfo\empty%
+                \else%
                     \node[anchor=west, footline.fg] at ({\the\focus@pbar@leftoffset},{0.5*\focus@pbar@height}) {\focus@footlineinfo};
-                \fi
+                \fi%
 
                 \node[anchor=east, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\insertframenumber};
-                \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
-                \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
+
+                \ifx\beamer@focus@totalframenumbering\no%
+                \else%
+                    \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
+                    \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
+                \fi%
             \end{tikzpicture}%
         \fi%
     \fi%
@@ -145,12 +169,19 @@
 
 \DeclareOptionBeamer{numbering}{\def\beamer@focus@numbering{#1}}
 \ExecuteOptionsBeamer{numbering=progressbar}
+
+\DeclareOptionBeamer{totalframenumbering}{\def\beamer@focus@totalframenumbering{#1}}
+\ExecuteOptionsBeamer{totalframenumbering=yes}
+
 \ProcessOptionsBeamer
 
 \def\beamer@focus@numberingprogressbar{progressbar}
 \def\beamer@focus@numberingfullbar{fullbar}
 \def\beamer@focus@numberingnone{none}
 
+\def\beamer@focus@totalframenumberingyes{yes}
+\def\beamer@focus@totalframenumberingno{no}
+
 
 % BACKGROUND CANVAS TEMPLATES. -------------------------------------------------
 \defbeamertemplate*{background canvas}{focus}{%
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
index 37509b17d9d..70effd63864 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
@@ -19,7 +19,7 @@
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2021/07/19 v2.9.0 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2021/12/07 v3.0.0 Focus Beamer theme]
 
 \mode<presentation>
 
@@ -29,6 +29,10 @@
     \PassOptionsToPackage{numbering=#1}{beamerouterthemefocus}
 }
 
+\DeclareOptionBeamer{totalframenumbering}{%
+    \PassOptionsToPackage{totalframenumbering=#1}{beamerouterthemefocus}
+}
+
 \newif\if@focus@loadfirafonts
 \@focus@loadfirafontstrue