fix: revert \inserttitlegraphic to the original definition (#176)

sjtug · Dec 21, 2024 · 579b4c1 · 579b4c1
1 parent 2e4f39d
commit 579b4c1
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 66 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
       - run: cat build/build-*.log
         name: display build log
         if: ${{ failure() || success() }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: |
             build/build-*.pdf
@@ -60,7 +60,7 @@ jobs:
       - run: cat build/*.log
         name: display build log
         if: ${{ failure() || success() }}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: |
             build/build-*.pdf
@@ -85,7 +85,7 @@ jobs:
       - name: check if generated files are of latest version
         run: |
           git diff --exit-code
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: |
             src/build/distrib/tds/doc

diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
@@ -47,7 +47,7 @@ jobs:
             sed -i "s|<policy domain=\"coder\" rights=\"none\" pattern=\"PDF\" />|<policy domain=\"coder\" rights=\"read\|write\" pattern=\"PDF\" />|g" /etc/ImageMagick-*/policy.xml
             .github/ci/build_contrib.sh -halt-on-error -time -xelatex
         name: build contrib doc with XeLaTeX
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: |
             build/contrib.*.pdf

diff --git a/.vscode/sjtubeamer.code-snippets b/.vscode/sjtubeamer.code-snippets
diff --git a/beamercolorthemesjtubeamer.sty b/beamercolorthemesjtubeamer.sty
diff --git a/beamerfontthemesjtubeamer.sty b/beamerfontthemesjtubeamer.sty
diff --git a/beamerinnerthemesjtubeamer.sty b/beamerinnerthemesjtubeamer.sty
diff --git a/beamerouterthemesjtubeamer.sty b/beamerouterthemesjtubeamer.sty
diff --git a/beamerthemesjtubeamer.sty b/beamerthemesjtubeamer.sty
diff --git a/sjtucover.sty b/sjtucover.sty
diff --git a/sjtuvi.sty b/sjtuvi.sty
diff --git a/src/MANIFEST.md b/src/MANIFEST.md
diff --git a/src/doc/sjtubeamer.tex b/src/doc/sjtubeamer.tex
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %% ------------------------------------------------------------------------
 
-\ProvidesFile{sjtubeamer.tex}[2024/10/21 3.1.0 User Manual for sjtubeamer (Chinese)]
+\ProvidesFile{sjtubeamer.tex}[2024/12/21 v3.1.1 User Manual for sjtubeamer (Chinese)]
 \documentclass[
     UTF8,
     heading=true,

diff --git a/src/doc/sjtubeamerdevguide.tex b/src/doc/sjtubeamerdevguide.tex
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %% ------------------------------------------------------------------------
 
-\ProvidesFile{sjtubeamerdevguide.tex}[2024/10/21 3.1.0 Development Guide for sjtubeamer (English)]
+\ProvidesFile{sjtubeamerdevguide.tex}[2024/12/21 v3.1.1 Development Guide for sjtubeamer (English)]
 \documentclass{ltxdoc}
 \usepackage[scheme=plain]{ctex}
 \usepackage[style=ieee]{biblatex}

diff --git a/src/doc/sjtubeamerquickstart.tex b/src/doc/sjtubeamerquickstart.tex
@@ -14,7 +14,7 @@
 %% -----------------------------------------------------------------------
 
 % 本行为文件元数据，可省略。
-\ProvidesFile{sjtubeamerquickstart.tex}[2024/10/21 3.1.0 Quick Start for sjtubeamer (Chinese)]
+\ProvidesFile{sjtubeamerquickstart.tex}[2024/12/21 v3.1.1 Quick Start for sjtubeamer (Chinese)]
 
 % 加载 ctexbeamer 文档类【第一部分】
 % 如遇无法显示的数学符号，尝试对 ctexbeamer 文档类添加 no-math 选项；

diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer color theme]
+\ProvidesPackage{beamercolorthemesjtubeamer}[2024/12/21 v3.1.1 sjtubeamer color theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerfontthemesjtubeamer.dtx b/src/source/beamerfontthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer font theme]
+\ProvidesPackage{beamerfontthemesjtubeamer}[2024/12/21 v3.1.1 sjtubeamer font theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer inner theme]
+\ProvidesPackage{beamerinnerthemesjtubeamer}[2024/12/21 v3.1.1 sjtubeamer inner theme]
 %</package>
 % \fi
 % \CheckSum{0}
@@ -167,29 +167,32 @@
 \fi
 %    \end{macrocode}
 %
-% Redefine the \verb"\titlegraphic" command in \verb"beamer" to implement it
-% into the beamer template management system, as is been done in \verb"\logo".
-% The original definition of \verb"\titlegraphic" is to set the command
-% \verb"\inserttitlegraphic" as its parameter directly.
+% \begin{macro}{\setsjtutitlegraphic}
+% Set up titlegraphic for the native
+% SJTUBeamer theme cover.
 %    \begin{macrocode}
-\def\titlegraphic{\setbeamertemplate{titlegraphic}}
-%    \end{macrocode}
-% Redefine the \verb"\inserttitlegraphic" command to use the template
-% \verb"titlegraphic" directly, using the current color setup without
-% forming a group (not \verb"\usebeamertemplate*").
-%    \begin{macrocode}
-\def\inserttitlegraphic{\usebeamertemplate{titlegraphic}}
+\def\setsjtutitlegraphic#1{
+  \setbeamertemplate{sjtutitlegraphic}[#1]
+  \titlegraphic{\usebeamertemplate{sjtutitlegraphic}}
+}
 %    \end{macrocode}
-% This redefinition makes \verb"\inserttitlegraphic" never be \verb"\@empty".
-% If we need to check if the title graphic is empty now, use
-% \verb"\ifbeamertemplateempty{titlegraphic}{}{}" instead.
+% From version v2.5.2 to v3.1.0, the command \verb"\inserttitlegraphic" is
+% overrided to the custom mechanism of using the beamer template
+% \verb"titlegraphic" directly, but it was soon discovered that this could lead
+% to circular references (\TeX{} capacity exceeded) when the user tries to set
+% the title page to the default template where it will
+% \verb"\usebeamertemplate{titlegraphic}" to use \verb"\inserttitlegraphic"
+% where it will call \verb"\usebeamertemplate{titlegraphic}" again.
+% This has already been solved by reverting to the original definition where
+% \verb"\titlegraphic" will set the \verb"\inserttitlegraphic" directly.
+% 
+% \changes{v3.1.1}{2024/12/21}{add the command to set the native titlegraphic,
+% and remove the original way of overriding \cs{inserttitlegraphic}.}
+% \end{macro}
 %
 % Set up titlegraphic for this cover.
-% First set to empty in case that all definitions of this template in
-% \verb"sjtucover" is not extracted.
 %    \begin{macrocode}
-\setbeamertemplate{titlegraphic}{}
-\setbeamertemplate{titlegraphic}[\sjtubeamer@inner@cover]
+\setsjtutitlegraphic{\sjtubeamer@inner@cover}
 %    \end{macrocode}
 %
 % \subsubsection{Covers}

diff --git a/src/source/beamerouterthemesjtubeamer.dtx b/src/source/beamerouterthemesjtubeamer.dtx
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer outer theme]
+\ProvidesPackage{beamerouterthemesjtubeamer}[2024/12/21 v3.1.1 sjtubeamer outer theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerthemesjtubeamer.dtx b/src/source/beamerthemesjtubeamer.dtx
@@ -37,7 +37,7 @@
 % ------------------------------------------------------------------- \fi
 % \iffalse
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer parent theme]
+\ProvidesPackage{beamerthemesjtubeamer}[2024/12/21 v3.1.1 sjtubeamer parent theme]
 % \fi
 %
 % \subsection{Parent Theme}

diff --git a/src/source/sjtucover.dtx b/src/source/sjtucover.dtx
@@ -13,7 +13,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sjtucover}[2024/10/21 3.1.0 cover library for sjtubeamer]
+\ProvidesPackage{sjtucover}[2024/12/21 v3.1.1 cover library for sjtubeamer]
 %</package>
 % \fi
 % \CheckSum{0}
@@ -64,28 +64,28 @@
 % \paragraph{maxplus.}
 %    \begin{macrocode}
 %<*maxplus>
-\defbeamertemplate*{titlegraphic}{maxplus}{\includegraphics{vi/sjtu-vi-sjtuphoto.jpg}}
+\defbeamertemplate*{sjtutitlegraphic}{maxplus}{\includegraphics{vi/sjtu-vi-sjtuphoto.jpg}}
 %</maxplus>
 %    \end{macrocode}
 %
 % \paragraph{max.}
 %    \begin{macrocode}
 %<*max>
-\defbeamertemplate*{titlegraphic}{max}{\sjtubg[opacity=0.2]}
+\defbeamertemplate*{sjtutitlegraphic}{max}{\sjtubg[opacity=0.2]}
 %</max>
 %    \end{macrocode}
 %
 % \paragraph{min.}
 %    \begin{macrocode}
 %<*min>
-\defbeamertemplate*{titlegraphic}{min}{\includegraphics{vi/sjtu-vi-sjtuphoto.jpg}}
+\defbeamertemplate*{sjtutitlegraphic}{min}{\includegraphics{vi/sjtu-vi-sjtuphoto.jpg}}
 %</min>
 %    \end{macrocode}
 %
 % \paragraph{my.}
 %    \begin{macrocode}
 %<*my>
-\defbeamertemplate*{titlegraphic}{my}{
+\defbeamertemplate*{sjtutitlegraphic}{my}{
   %
   % Developer could define your title graphic here for "my"...
   %
@@ -316,9 +316,12 @@
 %
 % \changes{v3.1.0}{2024/10/21}{Fix the condition of empty titlegraphic in
 % \texttt{min} theme.}
+% \changes{v3.1.1}{2024/12/21}{Revert to the original condition of empty titlegraphic in
+% \texttt{min} theme.}
 %    \begin{macrocode}
   \usebeamercolor{palette primary}% 
-  \ifbeamertemplateempty{titlegraphic}{}{%
+  \ifx\inserttitlegraphic\@empty%
+  \else
     \begin{tikzpicture}[overlay, yshift=1.2em]
       \node (pic) [fg, above left, inner sep=0.32em] at (0.86\paperwidth,0)
       {\resizebox{0.3\paperwidth}{!}{\inserttitlegraphic}};
@@ -332,7 +335,7 @@
       (pic.south east) --
       (pic.south west) -- cycle;
     \end{tikzpicture}
-  }
+  \fi
   \endgroup
   \vskip0.5em
   \vfill

diff --git a/src/source/sjtuvi.dtx b/src/source/sjtuvi.dtx
@@ -13,7 +13,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sjtuvi}[2024/10/21 3.1.0 Visual Identity System library for sjtubeamer]
+\ProvidesPackage{sjtuvi}[2024/12/21 v3.1.1 Visual Identity System library for sjtubeamer]
 %</package>
 % \fi
 % \CheckSum{0}