beamertheme-focus (16apr20)

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

7 files changed, 15 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/beamertheme-focus/README.md b/Master/texmf-dist/doc/latex/beamertheme-focus/README.md
index 1a6155d4c7b..154ae8123af 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.5
+# Focus v2.6
 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.pdf b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
index bd40c547454..d4eafee0dcd 100644
--- a/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
+++ b/Master/texmf-dist/doc/latex/beamertheme-focus/demo.pdf
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
index 4a45cecba1c..80dd314b677 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
 % A full list of contributors can be found at
 %
 %     https://github.com/elauksap/focus-beamertheme
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
index 3a956c61546..380af922545 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
 % A full list of contributors can be found at
 %
 %     https://github.com/elauksap/focus-beamertheme
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
index a753dacf367..e0317d51af7 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
 % A full list of contributors can be found at
 %
 %     https://github.com/elauksap/focus-beamertheme
@@ -84,6 +84,7 @@
    	\vspace*{0pt plus 100fill}
     
     \addtocounter{framenumber}{-1}
+    \addtocounter{realframenumber}{-1}
 }
 
 % Section page.
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
index 26afe6799ef..bbf893eeaa1 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
 % A full list of contributors can be found at
 %
 %     https://github.com/elauksap/focus-beamertheme
@@ -37,11 +37,12 @@
 \RequirePackage{etoolbox} % \BeforeBeginEnvironment.
 \RequirePackage{tikz}
 
+\newcounter{realframenumber}
 
 % FRAMETITLE TEMPLATES. --------------------------------------------------------
 \defbeamertemplate*{frametitle}{focus}{%
     % If not title page.
-    \ifnum\value{framenumber}>0%
+    \ifnum\value{realframenumber}>0%
         \vspace{-1pt}%
         \begin{beamercolorbox}[wd=\paperwidth,leftskip=0.55cm,rightskip=0.55cm,sep=0.2cm]{frametitle}%
             \strut\insertframetitle\strut%
@@ -52,7 +53,7 @@
 % Plain header.
 \defbeamertemplate*{frametitle}{plain}{%
     % If not title page.
-    \ifnum\value{framenumber}>0%
+    \ifnum\value{realframenumber}>0%
         \vspace{-1pt}%
         \begin{beamercolorbox}[wd=\paperwidth,leftskip=0.55cm,rightskip=0.55cm,sep=0.2cm,ignorebg]{frametitle}%
             \strut%
@@ -78,8 +79,8 @@
         \addtolength{\focus@pbar@rightoffset}{1.5em}%
         %
         % If not title page.
-        \ifnum\c@framenumber>0%
-            \ifnum\c@framenumber<\inserttotalframenumber%
+        \ifnum\value{realframenumber}>0%
+            \ifnum\value{framenumber}<\inserttotalframenumber%
                 \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]\usebeamerfont{footline}
                     \pgfmathsetmacro{\focus@pbar@progress}%
                         {(\paperwidth-\focus@pbar@leftoffset-\focus@pbar@rightoffset)*(\insertframenumber/\inserttotalframenumber)}
@@ -119,7 +120,7 @@
         \addtolength{\focus@pbar@rightoffset}{1.5em}%
         %
         % If not title page.
-        \ifnum\c@framenumber>0%
+        \ifnum\value{realframenumber}>0%
             \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
                 \clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                 \fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
@@ -169,6 +170,7 @@
 
 % HOOKS FOR CREATING FRAMES. ---------------------------------------------------
 \BeforeBeginEnvironment{frame}{%
+    \stepcounter{realframenumber}
     \setbeamertemplate{background canvas}[focus]%
     \setbeamertemplate{frametitle}[focus]%
     %
diff --git a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
index 134cd0596bb..6da4b056835 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-focus/beamerthemefocus.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
 % A full list of contributors can be found at
 %
 %     https://github.com/elauksap/focus-beamertheme
@@ -19,7 +19,7 @@
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2019/11/20 v2.5 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2020/04/15 v2.6 Focus Beamer theme]
 
 \mode<presentation>