From 36c983f092920931bf13926a95c7ebfc3f733815 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Fri, 2 Sep 2022 22:58:42 +0800 Subject: [PATCH 01/12] refactor: reduce the number of writing usr doc --- src/build.lua | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/build.lua b/src/build.lua index 927ef2af..f624f15e 100644 --- a/src/build.lua +++ b/src/build.lua @@ -396,6 +396,13 @@ if options["target"] == "add-demo" then end return false end) + + -- read sjtubeamer.tex + local usrdoc = docfiledir .. "/sjtubeamer.tex" + local usrdocfile = io.open(usrdoc, 'r') + local usrdoccontent = usrdocfile:read("a") + usrdocfile:close() + for _, num in ipairs(actionlist) do local oldid = num[2] local num = num[1] @@ -407,19 +414,17 @@ if options["target"] == "add-demo" then local newid = string.gsub(oldid, num, num + 1) ren(tutorialsuppdir, "step" .. oldid .. ".tex", "step" .. newid .. ".tex") - -- modify the number in sjtubeamer.tex - local usrdoc = docfiledir .. "/sjtubeamer.tex" - local usrdocfile = io.open(usrdoc, 'r') - local usrdoccontent = usrdocfile:read("a") - usrdocfile:close() + -- modify the number in usr doc content. local cnt usrdoccontent, cnt = string.gsub(usrdoccontent, "step" .. string.gsub(string.gsub(oldid,"%+","%%+"),"%-","%%-") .. "%.", "step" .. newid .. ".") -- avoid the magical character insertion - local usrdocfile = io.open(usrdoc, "w+") - usrdocfile:write(usrdoccontent) - usrdocfile:close() print("step" .. oldid .. " -> " .. "step" .. newid .. " Doc replaced: " .. cnt) end + + -- write sjtubeamer.tex + local usrdocfile = io.open(usrdoc, "w+") + usrdocfile:write(usrdoccontent) + usrdocfile:close() end -- The new demo file will be created. From c92d017b941471af6f6f1737e4c5a3d82d2fb312 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 01:14:12 +0800 Subject: [PATCH 02/12] feat: reset stampblockcnt at each frame --- src/source/beamerinnerthemesjtubeamer.dtx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 7760e6ba..798ff8bc 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -436,7 +436,7 @@ % Create a block with title decorated by the stamp shape with incremental numbering. % A mandantory parameter is needed for the title. % An optional parameter is for the customized numbering. -% Overlay could be specified. +% Overlay could be specified. In this scenario, the optional parameter must be specified in case of the increment of the counter. % \begin{macrocode} \newcounter{stampblockcnt} % \end{macrocode} @@ -478,6 +478,10 @@ \usebeamertemplate{block stamp end}% \end{actionenv}} % \end{macrocode} +% Finally, reset the \verb"stampblockcnt" counter at the beginning of each frame, since it is meaningless to keep the number continous among frames. +% \begin{macrocode} +\AtBeginEnvironment{frame}{\setcounter{stampblockcnt}{0}} +% \end{macrocode} % This macro is orginally prepared for poster. It is also useful for side-by-side comparision in one slide. % COPYRIGHT NOTICE: Reference to code from beamr class and beamerauxtheme. % \end{macro} From 9c08a7e2098649107db76abbabb4c351c40b558b Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 01:26:12 +0800 Subject: [PATCH 03/12] docs: increment of stampblockcnt --- src/doc/sjtubeamer.tex | 3 ++- src/source/beamerinnerthemesjtubeamer.dtx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/doc/sjtubeamer.tex b/src/doc/sjtubeamer.tex index f829f3ce..4ffbd9d7 100644 --- a/src/doc/sjtubeamer.tex +++ b/src/doc/sjtubeamer.tex @@ -412,7 +412,8 @@ \section{区块强调} \beamerdemo[1]{step13.tex} \begin{commentlist} - \item \env{stampblock} 用于生成印记区块环境，可以通过可选参数指定编号内容，可选参数缺省时为递增编号。该环境可以与 \env{columns} 配合使用，顶端对齐两列对比两种内容。必要时也可以添加覆盖参数，例如 \verb"<1>"。 + \item \env{stampblock} 用于生成印记区块环境，可以通过可选参数指定编号内容，可选参数缺省时为每帧内部从 1 开始的递增编号。该环境可以与 \env{columns} 配合使用，顶端对齐两列对比两种内容。 + \item 必要时也可以在可选参数前添加覆盖参数，例如 \verb"<1>[1]{标题}"。此时请指定可选参数编号内容 \verb"[1]"，否则覆盖帧内的区块编号也会意料外地递增。 \end{commentlist} \chapter{代码} diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 798ff8bc..1bf208a0 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -436,7 +436,7 @@ % Create a block with title decorated by the stamp shape with incremental numbering. % A mandantory parameter is needed for the title. % An optional parameter is for the customized numbering. -% Overlay could be specified. In this scenario, the optional parameter must be specified in case of the increment of the counter. +% Overlay could be specified. In this scenario, the optional parameter must be specified in case of the unexpected increment of the counter. % \begin{macrocode} \newcounter{stampblockcnt} % \end{macrocode} From f1e2263874c3d182b13b005debdc892a7275c79f Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 02:05:46 +0800 Subject: [PATCH 04/12] revert: remove the reset of stampblock cnt --- src/doc/sjtubeamer.tex | 6 +++++- src/source/beamerinnerthemesjtubeamer.dtx | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/doc/sjtubeamer.tex b/src/doc/sjtubeamer.tex index 4ffbd9d7..e801e736 100644 --- a/src/doc/sjtubeamer.tex +++ b/src/doc/sjtubeamer.tex @@ -412,8 +412,12 @@ \section{区块强调} \beamerdemo[1]{step13.tex} \begin{commentlist} - \item \env{stampblock} 用于生成印记区块环境，可以通过可选参数指定编号内容，可选参数缺省时为每帧内部从 1 开始的递增编号。该环境可以与 \env{columns} 配合使用，顶端对齐两列对比两种内容。 + \item \env{stampblock} 用于生成印记区块环境，可以通过可选参数指定编号内容，可选参数缺省时为递增编号。该环境可以与 \env{columns} 配合使用，顶端对齐两列对比两种内容。 \item 必要时也可以在可选参数前添加覆盖参数，例如 \verb"<1>[1]{标题}"。此时请指定可选参数编号内容 \verb"[1]"，否则覆盖帧内的区块编号也会意料外地递增。 + \item 如果需要每帧开始从 1 开始计数，可以在导言区添加 + \begin{verbatim} + \AtBeginEnvironment{frame}{\setcounter{stampblockcnt}{0}} + \end{verbatim} \end{commentlist} \chapter{代码} diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 1bf208a0..10710f3f 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -478,10 +478,6 @@ \usebeamertemplate{block stamp end}% \end{actionenv}} % \end{macrocode} -% Finally, reset the \verb"stampblockcnt" counter at the beginning of each frame, since it is meaningless to keep the number continous among frames. -% \begin{macrocode} -\AtBeginEnvironment{frame}{\setcounter{stampblockcnt}{0}} -% \end{macrocode} % This macro is orginally prepared for poster. It is also useful for side-by-side comparision in one slide. % COPYRIGHT NOTICE: Reference to code from beamr class and beamerauxtheme. % \end{macro} From d783b7f05485949ee63451a4ec6a06fbb455f6b0 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 12:37:24 +0800 Subject: [PATCH 05/12] docs: fix dev bib --- src/doc/dev.bib | 8 ++++---- src/doc/sjtubeamerdevguide.tex | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/doc/dev.bib b/src/doc/dev.bib index 393647c2..7436c2a8 100644 --- a/src/doc/dev.bib +++ b/src/doc/dev.bib @@ -56,7 +56,7 @@ @Misc{lact } @Manual{viman, - title = {SJTU VI Manual}, + title = {{SJTU VI} Manual}, author = {{Shanghai Jiao Tong University}}, month = apr, year = {2016}, @@ -65,7 +65,7 @@ @Manual{viman } @Misc{texsc, - title = {{TeX{} Stack Exchange}}, + title = {{\TeX{} Stack Exchange}}, url = {https://tex.stackexchange.com/}, } @@ -124,7 +124,7 @@ @Manual{texnote @Misc{tex2017, month = apr, - title = {{Tunight: TeX{} Workshop 2017}}, + title = {{Tunight: \TeX{} Workshop 2017}}, year = {2017}, organization = {TUNA}, url = {https://www.youtube.com/watch?v=fysg1IaCq2s&t=5328s}, @@ -150,7 +150,7 @@ @Manual{graphics @Misc{mylatexot1, author = {David Carlisle}, month = mar, - title = {Answer to "Precompiled header with XeLaTeX not working"}, + title = {Answer to ``Precompiled header with \hologo{XeLaTeX} not working''}, year = {2017}, url = {https://tex.stackexchange.com/a/359900/253485}, } diff --git a/src/doc/sjtubeamerdevguide.tex b/src/doc/sjtubeamerdevguide.tex index f892a51d..bcb3f136 100644 --- a/src/doc/sjtubeamerdevguide.tex +++ b/src/doc/sjtubeamerdevguide.tex @@ -647,9 +647,9 @@ \subsection{Beamer Interface}\label{sec:beamer} \subsection{Mainstream Packages}\label{sec:mainstream} -Mainstream \LaTeX{} packages are used to make sure the choice on marcos is maintained currently. Since some engine doesn't support \textsf{GhostScript} well (\emph{e.g.} Xe\LaTeX{}), \themename{} (as well as \textsf{beamer}) uses \textsc{pgf} as the backend for graphics in \textsf{PostScript}. And half of the jobs are done on graphics to implement the requirements of VI. +Mainstream \LaTeX{} packages are used to make sure the choice on marcos is maintained currently. Since some engine doesn't support \textsf{GhostScript} well (\emph{e.g.} \hologo{XeLaTeX}), \themename{} (as well as \textsf{beamer}) uses \textsc{pgf} as the backend for graphics in \textsf{PostScript}. And half of the jobs are done on graphics to implement the requirements of VI. -\themename{} doesn't use too many rasterized pictures, since they are not flexible. You could get the Adobe Illustrator files on VI website\cite{viman}. SJTU VI goes minimalism so that it could be implemented by package Ti\emph{k}Z (which is on top of \textsc{pgf}). You could almost draw any vectorized shapes by referring to Ti\emph{k}Z documentation \cite{tikzman}. In short, Ti\emph{k}Z uses node-edge system to create graphs and many Computer Science pictures can be drawn in such a system\cite{tikztuna}. And if you don't want to mess around with the thousand pages of documentation, Ti\emph{k}ZEdt could help you create that in a WYSIWYG(what you see is what you get) way\cite{tikzedt}, which is a tool to make drafts on patterns. +\themename{} doesn't use too many rasterized pictures, since they are not flexible. You could get the Adobe Illustrator files on VI website\cite{viman}. SJTU VI goes minimalism so that it could be implemented by package Ti\emph{k}Z (which is on top of \textsc{pgf}). You could almost draw any vectorized shapes by referring to Ti\emph{k}Z documentation \cite{tikzman}. In short, Ti\emph{k}Z uses node-edge system to create graphs and many Computer Science pictures can be drawn in such a system\cite{tikztuna}. And if you don't want to mess around with the thousand pages of documentation, Ti\emph{k}ZEdt could help you create that in a WYSIWYG (what you see is what you get) way\cite{tikzedt}, which is a tool to make drafts on patterns. \themename{} also uses additional packages like \textsc{pgfplots} and \textsc{PgfplotsTable} to draw highly personalized statistic graphs and layout table from CSV (Comma-Seperated Values) respectively. As is mentioned, the author created a tool \textsc{PgfplotsEdt} to help such graphs in an interactive way\cite{pgfedt}. From feac401c5ffefdf7520b04f47963d817ed0ba660 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 15:30:06 +0800 Subject: [PATCH 06/12] docs: fix usr doc myincludepdf --- src/doc/sjtubeamer.tex | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/doc/sjtubeamer.tex b/src/doc/sjtubeamer.tex index e801e736..3c702499 100644 --- a/src/doc/sjtubeamer.tex +++ b/src/doc/sjtubeamer.tex @@ -222,27 +222,27 @@ \chapter{样式} \themename{} 可以与 \cls{beamer} 提供的九种外样式随意搭配。 -\def\myincludepdf#1{ +\def\myincludepdf#1#2{ \tcbincludepdf[title={#1}, colframe=red!50!black,colback=red!10!white, colbacktitle=red!50!white,left=0pt,right=0pt,top=0pt, bottom=0pt,boxsep=0pt,boxrule=0.6pt, toptitle=1mm,bottomtitle=1mm,drop lifted shadow, center title,fonttitle=\ttfamily] - {tutorial/#1} + {tutorial/#2} } \begin{tcbitemize}[raster columns=3, raster equal height, left=0pt,right=0pt,top=0pt, bottom=0pt,boxsep=0pt,boxrule=0pt] - \tcbitem \myincludepdf{step2miniframes.pdf} - \tcbitem \myincludepdf{step2default.pdf} - \tcbitem \myincludepdf{step2infolines.pdf} - \tcbitem \myincludepdf{step2smoothbars.pdf} - \tcbitem \myincludepdf{step2sidebar.pdf} - \tcbitem \myincludepdf{step2split.pdf} - \tcbitem \myincludepdf{step2shadow.pdf} - \tcbitem \myincludepdf{step2tree.pdf} - \tcbitem \myincludepdf{step2smoothtree.pdf} + \tcbitem \myincludepdf{miniframes}{step2miniframes.pdf} + \tcbitem \myincludepdf{default}{step2default.pdf} + \tcbitem \myincludepdf{infolines}{step2infolines.pdf} + \tcbitem \myincludepdf{smoothbars}{step2smoothbars.pdf} + \tcbitem \myincludepdf{sidebar}{step2sidebar.pdf} + \tcbitem \myincludepdf{split}{step2split.pdf} + \tcbitem \myincludepdf{shadow}{step2shadow.pdf} + \tcbitem \myincludepdf{tree}{step2tree.pdf} + \tcbitem \myincludepdf{smoothtree}{step2smoothtree.pdf} \end{tcbitemize} \beamerdemo[1]{step2.tex} From 4d7f1307e7401336d172b1f5975bf02ef6b31eb0 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 15:38:28 +0800 Subject: [PATCH 07/12] style: reduce the opacity bg for blocks --- src/source/beamercolorthemesjtubeamer.dtx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx index a9cde570..61767015 100644 --- a/src/source/beamercolorthemesjtubeamer.dtx +++ b/src/source/beamercolorthemesjtubeamer.dtx @@ -119,9 +119,9 @@ \setbeamercolor{block body}{parent=normal text,use=block title, bg=block title.bg!15} \setbeamercolor{block body alerted}{parent=normal text, - use=block title alerted,bg=block title alerted.bg!30} + use=block title alerted,bg=block title alerted.bg!15} \setbeamercolor{block body example}{parent=normal text, - use=block title example,bg=block title example.bg!30} + use=block title example,bg=block title example.bg!15} % \end{macrocode} % % Set up the background color for stampblock. In case you want to change to something like \verb"cprimary!10". From f321e577b2e11a586114229ea1a10aa04a6545f4 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 15:42:40 +0800 Subject: [PATCH 08/12] style: increase the afterskip for stampblock --- src/source/beamerinnerthemesjtubeamer.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 10710f3f..2c304821 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -453,7 +453,7 @@ \vskip1ex } \defbeamertemplate*{block stamp end}{sjtubeamer}{ - \end{beamercolorbox}\vskip\smallskipamount% + \end{beamercolorbox}\vskip 2ex% } % \end{macrocode} % Set the template to the defined ones. From 8d61c9a15afca3f704ffee8cf173892604f73569 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 15:58:01 +0800 Subject: [PATCH 09/12] docs: add commented info on reset counter --- src/source/beamerinnerthemesjtubeamer.dtx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 2c304821..67487db5 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -478,6 +478,11 @@ \usebeamertemplate{block stamp end}% \end{actionenv}} % \end{macrocode} +% If you want to reset the counter from the beginning of every frame, uncomment or add the following line into your preamble: +% \begin{macrocode} + % \AtBeginEnvironment{\setcounter{stampblockcnt}{0}} +% \end{macrocode} +% We choose not to make it as a default action, since it is harder to remove this line for users if it is intended to make the counter continous among frames. % This macro is orginally prepared for poster. It is also useful for side-by-side comparision in one slide. % COPYRIGHT NOTICE: Reference to code from beamr class and beamerauxtheme. % \end{macro} From 7bf90e4bcf4c2c2dd5c5b14858a44148822caa12 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 16:01:50 +0800 Subject: [PATCH 10/12] fix: minor tweak --- src/source/beamerinnerthemesjtubeamer.dtx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 67487db5..7a070aba 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -453,7 +453,7 @@ \vskip1ex } \defbeamertemplate*{block stamp end}{sjtubeamer}{ - \end{beamercolorbox}\vskip 2ex% + \end{beamercolorbox}\vskip2ex% } % \end{macrocode} % Set the template to the defined ones. @@ -480,7 +480,8 @@ % \end{macrocode} % If you want to reset the counter from the beginning of every frame, uncomment or add the following line into your preamble: % \begin{macrocode} - % \AtBeginEnvironment{\setcounter{stampblockcnt}{0}} + %% If you want to reset the counter for each frame: + % \AtBeginEnvironment{frame}{\setcounter{stampblockcnt}{0}} % \end{macrocode} % We choose not to make it as a default action, since it is harder to remove this line for users if it is intended to make the counter continous among frames. % This macro is orginally prepared for poster. It is also useful for side-by-side comparision in one slide. From c43b0f905b28d0342b95b0455130a107a23c14e9 Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 16:19:36 +0800 Subject: [PATCH 11/12] style: increase the afterskip of stampblock --- src/source/beamerinnerthemesjtubeamer.dtx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 7a070aba..41c27265 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -453,7 +453,7 @@ \vskip1ex } \defbeamertemplate*{block stamp end}{sjtubeamer}{ - \end{beamercolorbox}\vskip2ex% + \end{beamercolorbox}\vskip2.5ex% } % \end{macrocode} % Set the template to the defined ones. From a2145989c0de31eddf92652338b0bf1d8a7d896b Mon Sep 17 00:00:00 2001 From: LogCreative Date: Mon, 5 Sep 2022 16:23:05 +0800 Subject: [PATCH 12/12] bump version to 2.9.4 --- .vscode/sjtubeamer.code-snippets | 2 +- beamercolorthemesjtubeamer.sty | 6 +++--- beamerfontthemesjtubeamer.sty | 2 +- beamerinnerthemesjtubeamer.sty | 6 ++++-- beamerouterthemesjtubeamer.sty | 2 +- beamerthemesjtubeamer.sty | 2 +- sjtucover.sty | 2 +- sjtuvi.sty | 2 +- src/source/beamercolorthemesjtubeamer.dtx | 2 +- src/source/beamerfontthemesjtubeamer.dtx | 2 +- src/source/beamerinnerthemesjtubeamer.dtx | 2 +- src/source/beamerouterthemesjtubeamer.dtx | 2 +- src/source/beamerthemesjtubeamer.dtx | 2 +- src/source/sjtucover.dtx | 2 +- src/source/sjtuvi.dtx | 2 +- 15 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.vscode/sjtubeamer.code-snippets b/.vscode/sjtubeamer.code-snippets index 98618194..a37d7496 100644 --- a/.vscode/sjtubeamer.code-snippets +++ b/.vscode/sjtubeamer.code-snippets @@ -75,7 +75,7 @@ "scope": "doctex,tex,latex", "prefix": "\n\\begin{stampblock", "body": "\n\\begin{stampblock}<$3>[${1:}]{$2}\n\t$3\n\\end{stampblock}\n", - "description": "Create a block with title decorated by the stamp shape with incremental numbering.\nA mandantory parameter is needed for the title.\nAn optional parameter is for the customized numbering.\nOverlay could be specified.\n" + "description": "Create a block with title decorated by the stamp shape with incremental numbering.\nA mandantory parameter is needed for the title.\nAn optional parameter is for the customized numbering.\nOverlay could be specified. In this scenario, the optional parameter must be specified in case of the unexpected increment of the counter.\n" }, "codeblock": { "scope": "doctex,tex,latex", diff --git a/beamercolorthemesjtubeamer.sty b/beamercolorthemesjtubeamer.sty index 48cbb20a..d258c315 100644 --- a/beamercolorthemesjtubeamer.sty +++ b/beamercolorthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer color theme] +\ProvidesPackage{beamercolorthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer color theme] \RequirePackage{sjtuvi} \DefineOption{color}{color}{red} \DefineOption{color}{color}{blue} @@ -69,9 +69,9 @@ \setbeamercolor{block body}{parent=normal text,use=block title, bg=block title.bg!15} \setbeamercolor{block body alerted}{parent=normal text, - use=block title alerted,bg=block title alerted.bg!30} + use=block title alerted,bg=block title alerted.bg!15} \setbeamercolor{block body example}{parent=normal text, - use=block title example,bg=block title example.bg!30} + use=block title example,bg=block title example.bg!15} \setbeamercolor{block body stamp}{bg=} \setbeamercolor{footnote}{fg=cprimary,bg=} \setbeamercolor{part title}{parent={palette primary}} diff --git a/beamerfontthemesjtubeamer.sty b/beamerfontthemesjtubeamer.sty index 2f197871..4d07555d 100644 --- a/beamerfontthemesjtubeamer.sty +++ b/beamerfontthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer font theme] +\ProvidesPackage{beamerfontthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer font theme] \RequirePackage{silence} \WarningFilter{latexfont}{Font shape} \usefonttheme{professionalfonts} diff --git a/beamerinnerthemesjtubeamer.sty b/beamerinnerthemesjtubeamer.sty index ca15584a..cb4687af 100644 --- a/beamerinnerthemesjtubeamer.sty +++ b/beamerinnerthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer inner theme] +\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer inner theme] \RequirePackage{sjtuvi} \RequirePackage{tcolorbox} \DefineOption{inner}{cover}{maxplus} @@ -182,7 +182,7 @@ \vskip1ex } \defbeamertemplate*{block stamp end}{sjtubeamer}{ - \end{beamercolorbox}\vskip\smallskipamount% + \end{beamercolorbox}\vskip2.5ex% } \setbeamertemplate{block stamp begin}[sjtubeamer] \setbeamertemplate{block stamp end}[sjtubeamer] @@ -196,6 +196,8 @@ {\par% \usebeamertemplate{block stamp end}% \end{actionenv}} + %% If you want to reset the counter for each frame: + % \AtBeginEnvironment{frame}{\setcounter{stampblockcnt}{0}} \lstset{ basicstyle=\ttfamily\small, keywordstyle=\color{cprimary},% diff --git a/beamerouterthemesjtubeamer.sty b/beamerouterthemesjtubeamer.sty index 8add8714..28630284 100644 --- a/beamerouterthemesjtubeamer.sty +++ b/beamerouterthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer outer theme] +\ProvidesPackage{beamerouterthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer outer theme] \RequirePackage{sjtuvi} \DefineOption{outer}{nav}{miniframes} \DefineOption{outer}{nav}{infolines} diff --git a/beamerthemesjtubeamer.sty b/beamerthemesjtubeamer.sty index ffdd71af..ce19301a 100644 --- a/beamerthemesjtubeamer.sty +++ b/beamerthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer parent theme] +\ProvidesPackage{beamerthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer parent theme] \DeclareOptionBeamer{maxplus}{ \def\sjtubeamer@cover{maxplus}\def\sjtubeamer@logopos{topright}} \DeclareOptionBeamer{max}{ diff --git a/sjtucover.sty b/sjtucover.sty index e2c869a4..f6fe750e 100644 --- a/sjtucover.sty +++ b/sjtucover.sty @@ -18,7 +18,7 @@ %% see https://vi.sjtu.edu.cn/index.php/articles/bulletin/16. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtucover}[2022/08/27 v2.9.3 cover library for sjtubeamer] +\ProvidesPackage{sjtucover}[2022/09/05 v2.9.4 cover library for sjtubeamer] \RequirePackage{sjtuvi} \DefineOption{cover}{lang}{zh} \DefineOption{cover}{lang}{en} diff --git a/sjtuvi.sty b/sjtuvi.sty index bd836863..5338d826 100644 --- a/sjtuvi.sty +++ b/sjtuvi.sty @@ -18,7 +18,7 @@ %% see https://vi.sjtu.edu.cn/index.php/articles/bulletin/16. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtuvi}[2022/08/27 v2.9.3 Visual Identity System library for sjtubeamer] +\ProvidesPackage{sjtuvi}[2022/09/05 v2.9.4 Visual Identity System library for sjtubeamer] \def\DefineOption#1#2#3{% % #1: package % #2: key diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx index 61767015..d851bc18 100644 --- a/src/source/beamercolorthemesjtubeamer.dtx +++ b/src/source/beamercolorthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer color theme] +\ProvidesPackage{beamercolorthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer color theme] % % \fi % \CheckSum{0} diff --git a/src/source/beamerfontthemesjtubeamer.dtx b/src/source/beamerfontthemesjtubeamer.dtx index 03ec3949..d925906c 100644 --- a/src/source/beamerfontthemesjtubeamer.dtx +++ b/src/source/beamerfontthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer font theme] +\ProvidesPackage{beamerfontthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer font theme] % % \fi % \CheckSum{0} diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 41c27265..780cdc52 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer inner theme] +\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer inner theme] % % \fi % \CheckSum{0} diff --git a/src/source/beamerouterthemesjtubeamer.dtx b/src/source/beamerouterthemesjtubeamer.dtx index a177409c..4365fb3b 100644 --- a/src/source/beamerouterthemesjtubeamer.dtx +++ b/src/source/beamerouterthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer outer theme] +\ProvidesPackage{beamerouterthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer outer theme] % % \fi % \CheckSum{0} diff --git a/src/source/beamerthemesjtubeamer.dtx b/src/source/beamerthemesjtubeamer.dtx index ae3da078..5ea83219 100644 --- a/src/source/beamerthemesjtubeamer.dtx +++ b/src/source/beamerthemesjtubeamer.dtx @@ -37,7 +37,7 @@ % ------------------------------------------------------------------- \fi % \iffalse \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemesjtubeamer}[2022/08/27 v2.9.3 sjtubeamer parent theme] +\ProvidesPackage{beamerthemesjtubeamer}[2022/09/05 v2.9.4 sjtubeamer parent theme] % \fi % % \subsection{Parent Theme} diff --git a/src/source/sjtucover.dtx b/src/source/sjtucover.dtx index c4748214..04ef3aa8 100644 --- a/src/source/sjtucover.dtx +++ b/src/source/sjtucover.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtucover}[2022/08/27 v2.9.3 cover library for sjtubeamer] +\ProvidesPackage{sjtucover}[2022/09/05 v2.9.4 cover library for sjtubeamer] % % \fi % \CheckSum{0} diff --git a/src/source/sjtuvi.dtx b/src/source/sjtuvi.dtx index 54c5bce6..28a3f954 100644 --- a/src/source/sjtuvi.dtx +++ b/src/source/sjtuvi.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtuvi}[2022/08/27 v2.9.3 Visual Identity System library for sjtubeamer] +\ProvidesPackage{sjtuvi}[2022/09/05 v2.9.4 Visual Identity System library for sjtubeamer] % % \fi % \CheckSum{0}