fix: poster headline and footer (#169)

* fix: poster title bg pattern overlay * fix: landscape sjtugate bottom margin * ci: use github.actor to display the name https://github.com/latex3/latex3/blob/59dba2aec02da078208ee19802c5e1eb4cdb6413/.github/workflows/main.yaml#L112 * fix: poster title multi line * docs: update poster copyright * ci: update test * release: bump version to 3.1.0 * docs: update manifest and change history * docs: update README version
sjtug · Nov 1, 2024 · 1844558 · 1844558
1 parent 62e901b
commit 1844558
Show file tree

Hide file tree

Showing 26 changed files with 86 additions and 72 deletions.
diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml
@@ -98,7 +98,7 @@ jobs:
               format(
                 env.MESSAGE,
                 steps.contrib_name.outputs.content,
-                github.event.push.commits[0].author[0],
+                github.actor,
                 join(fromJSON(steps.contrib_png.outputs.markdown_urls), '  ')
               )
             }}

diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ int main(){
   * 之后通过 `latexmk -xelatex main.tex` 命令进行编译即可。
   * VSCode 用户可以使用 LaTeX Workshop 中的 “Recipe: latexmk (latexmkrc)” 进行编译。
 
-目前模版最新的稳定版是 v3.0.0。您可以在 [发布页](https://github.com/sjtug/SJTUBeamer/releases) 查看修改日志和更多资料。通常来说，SJTUBeamer 的一个稳定版本包括如下内容：
+目前模版最新的稳定版是 v3.1.0。您可以在 [发布页](https://github.com/sjtug/SJTUBeamer/releases) 查看修改日志和更多资料。通常来说，SJTUBeamer 的一个稳定版本包括如下内容：
 
 * `sjtubeamerquickstart.pdf`：SJTUBeamer 快速入门，另见对应 [源代码](https://github.com/sjtug/SJTUBeamer/blob/main/src/doc/sjtubeamerquickstart.tex)。
 * `sjtubeamer.pdf`: **强烈推荐在使用前阅读一遍 👍👍👍** SJTUBeamer 用户文档。

diff --git a/README_en.md b/README_en.md
@@ -142,7 +142,7 @@ Edit `main.tex` and start to use.
   * Run `latexmk -xelatex main.tex` to compile
   * VSCode LaTeX Workshop: use “Recipe: latexmk (latexmkrc)” to compile
 
-The current stable version is v3.0.0。You could visit [the release page](https://github.com/sjtug/SJTUBeamer/releases) for the changelog and more details. Generally speaking, a release of SJTUBeamer has the following content:
+The current stable version is v3.1.0。You could visit [the release page](https://github.com/sjtug/SJTUBeamer/releases) for the changelog and more details. Generally speaking, a release of SJTUBeamer has the following content:
 
 * `sjtubeamerquickstart.pdf`：SJTUBeamer Quick Start. You could also read the [source code](https://github.com/sjtug/SJTUBeamer/blob/main/src/doc/sjtubeamerquickstart.tex) of the document.
 * `sjtubeamer.pdf`: SJTUBeamer User Guide.

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/contrib/poster/poster.tex b/contrib/poster/poster.tex
@@ -9,7 +9,8 @@
 \addbibresource{\getcontribpath{poster}{ref.bib}}
 \usepackage{zhlipsum}
 \begin{document}
-\title{poster 子主题}
+% 当标题较长时，可以使用 \\ 换行。
+\title{poster 子主题\\使用说明}
 \author{作者}
 \logo{\zhlogo}
 \institute[Test Institute]{测试机构}

diff --git a/contrib/poster/sjtubeamerthemeposter.ltx b/contrib/poster/sjtubeamerthemeposter.ltx
@@ -1,5 +1,5 @@
 %% ------------------------------------------------------------------------
-%% Copyright (C) 2022 LogCreative <[email protected]>
+%% Copyright (C) 2022-2024 LogCreative <[email protected]>
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
 % 设置 headline 颜色跟随亮色/暗色
 \setbeamercolor{headline}{parent=palette primary}
 \AtBeginDocument{
+  \newsavebox{\maintitle}  % 标题盒子变量
+  \newlength{\titlebottom} % 标题盒子的高度
   % 修改 headline，需要在文档起始处覆盖，防止 default 的行为
   \setbeamertemplate{headline}{
     \begin{beamercolorbox}[wd=\paperwidth,sep=0.02\paperwidth]{headline}
@@ -40,17 +42,20 @@
             \fi%
           \fi%
         \end{column}
+        \savebox{\maintitle}{%
         \begin{column}{0.5\textwidth}
           \vfill
           \centering
           \usebeamercolor{title in headline}{%
-            \color{fg}\textbf{\LARGE{\inserttitle}}\vskip2.5ex
+            \color{fg}\textbf{\LARGE{\inserttitle}}\vskip2.5ex%
           }
           \usebeamercolor{author in headline}{%
-            \color{fg}\large{\insertauthor}
+            \color{fg}\large{\insertauthor}%
           }
           \vfill
         \end{column}
+        }
+        \usebox{\maintitle}
         \begin{column}{0.25\textwidth}
           \if\EqualOption{poster}{sepinst}{true}
             \hfill
@@ -60,22 +65,23 @@
               \resizebox{!}{4cm}{\vphantom{-}\secondaryinstlogo[\insertshortinstitute]{\insertinstitute}{}}
             \fi
             \hspace*{0.03\paperwidth}
-          \else
-            \begin{tikzpicture}[overlay]
-              \if\EqualOption{poster}{landscape}{true}
-                \def\stampheight{0.05}
-                \def\stampsize{60pt}
-              \else
-                \def\stampheight{0.03}
-                \def\stampsize{50pt}
-              \fi
-              \usebeamercolor{palette primary}
-              \stamparray{\stampsize}{(-0.05\paperwidth,-\stampheight\paperheight)}{(\paperwidth,\stampheight\paperheight)}
-              \fill[bg, path fading=fade right] (-0.05\paperwidth, -\stampheight\paperheight) rectangle (\paperwidth, \stampheight\paperheight);
-            \end{tikzpicture}
           \fi
         \end{column}
       \end{columns}
+      \if\EqualOption{poster}{sepinst}{true}\else
+      \begin{tikzpicture}[overlay, remember picture]
+        \def\stampsize{60pt}
+        \if\EqualOption{poster}{landscape}{true}
+          \def\stampheight{0.08}
+        \else
+          \def\stampheight{0.05}
+        \fi
+        \usebeamercolor{palette primary}
+        \setlength{\titlebottom}{\dimexpr\ht\maintitle-0.02\paperwidth\relax}
+        \stamparray{\stampsize}{(0.75\paperwidth,0.2\paperwidth)}{(\paperwidth,\titlebottom)}
+        \fill[bg, path fading=fade right] (0.75\paperwidth,0.2\paperwidth) rectangle (1.35\paperwidth, \titlebottom);
+      \end{tikzpicture}
+    \fi
     \end{beamercolorbox}
   }
 }
@@ -90,7 +96,12 @@
 % 底栏为空时不会出现
 \setbeamercolor{footline}{parent=palette primary}
 \setbeamertemplate{footline}{%
-  \resizebox{\paperwidth}{!}{\sjtugate[cprimary]}\vskip-6cm\par
+  \resizebox{\paperwidth}{!}{\sjtugate[cprimary]}%
+  \if\EqualOption{poster}{landscape}{true}%
+    \vskip-12cm%
+  \else%
+    \vskip-6cm%
+  \fi\par
   \posterfootlinetrue
   \ifx\posterleftfootline\relax
     \ifx\posterrightfootline\relax

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
@@ -1,5 +1,5 @@
 %% ------------------------------------------------------------------------
-%% Copyright (C) 2021-2023 SJTUG
+%% Copyright (C) 2021-2024 SJTUG
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %% ------------------------------------------------------------------------
 
-\ProvidesFile{sjtubeamer.tex}[2023/11/25 v3.0.1 User Manual for sjtubeamer (Chinese)]
+\ProvidesFile{sjtubeamer.tex}[2024/10/21 3.1.0 User Manual for sjtubeamer (Chinese)]
 \documentclass[
     UTF8,
     heading=true,

diff --git a/src/doc/sjtubeamerdevguide.tex b/src/doc/sjtubeamerdevguide.tex
@@ -1,5 +1,5 @@
 %% ------------------------------------------------------------------------
-%% Copyright (C) 2021-2023 SJTUG
+%% Copyright (C) 2021-2024 SJTUG
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %% ------------------------------------------------------------------------
 
-\ProvidesFile{sjtubeamerdevguide.tex}[2023/11/25 v3.0.1 Development Guide for sjtubeamer (English)]
+\ProvidesFile{sjtubeamerdevguide.tex}[2024/10/21 3.1.0 Development Guide for sjtubeamer (English)]
 \documentclass{ltxdoc}
 \usepackage[scheme=plain]{ctex}
 \usepackage[style=ieee]{biblatex}
@@ -1327,7 +1327,7 @@ \section{Implementation}
 \begin{quotation}
   \scriptsize
 
-  Copyright (C) 2021-2023 SJTUG
+  Copyright (C) 2021-2024 SJTUG
 
   Licensed under the Apache License, Version 2.0 (the "License"); you may not use
   this file except in compliance with the License. You may obtain a copy of the

diff --git a/src/doc/sjtubeamerquickstart.tex b/src/doc/sjtubeamerquickstart.tex
@@ -1,7 +1,7 @@
 % !TeX encoding = UTF-8
 
 %% ------------------------------------------------------------------------
-%% Copyright (C) 2021-2023 SJTUG
+%% Copyright (C) 2021-2024 SJTUG
 %% 
 %% SJTUBeamer 快速入门
 %% 
@@ -14,7 +14,7 @@
 %% -----------------------------------------------------------------------
 
 % 本行为文件元数据，可省略。
-\ProvidesFile{sjtubeamerquickstart.tex}[2023/11/25 v3.0.1 Quick Start for sjtubeamer (Chinese)]
+\ProvidesFile{sjtubeamerquickstart.tex}[2024/10/21 3.1.0 Quick Start for sjtubeamer (Chinese)]
 
 % 加载 ctexbeamer 文档类【第一部分】
 % 如遇无法显示的数学符号，尝试对 ctexbeamer 文档类添加 no-math 选项；

diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment --------------------------------------------------
-% Copyright (C) 2021-2023 SJTUG
+% Copyright (C) 2021-2024 SJTUG
 %
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemesjtubeamer}[2023/11/25 v3.0.1 sjtubeamer color theme]
+\ProvidesPackage{beamercolorthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer color theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerfontthemesjtubeamer.dtx b/src/source/beamerfontthemesjtubeamer.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment --------------------------------------------------
-% Copyright (C) 2021-2023 SJTUG
+% Copyright (C) 2021-2024 SJTUG
 %
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemesjtubeamer}[2023/11/25 v3.0.1 sjtubeamer font theme]
+\ProvidesPackage{beamerfontthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer font theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment --------------------------------------------------
-% Copyright (C) 2021-2023 SJTUG
+% Copyright (C) 2021-2024 SJTUG
 %
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemesjtubeamer}[2023/11/25 v3.0.1 sjtubeamer inner theme]
+\ProvidesPackage{beamerinnerthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer inner theme]
 %</package>
 % \fi
 % \CheckSum{0}

diff --git a/src/source/beamerouterthemesjtubeamer.dtx b/src/source/beamerouterthemesjtubeamer.dtx
@@ -1,5 +1,5 @@
 % \iffalse meta-comment --------------------------------------------------
-% Copyright (C) 2021-2023 SJTUG
+% Copyright (C) 2021-2024 SJTUG
 %
 % Licensed under the Apache License, Version 2.0 (the "License");
 % you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 % \iffalse
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemesjtubeamer}[2023/11/25 v3.0.1 sjtubeamer outer theme]
+\ProvidesPackage{beamerouterthemesjtubeamer}[2024/10/21 3.1.0 sjtubeamer outer theme]
 %</package>
 % \fi
 % \CheckSum{0}