Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: reduce frametitle height #99

Merged
merged 6 commits into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion beamercolorthemesjtubeamer.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion beamerfontthemesjtubeamer.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion beamerinnerthemesjtubeamer.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 12 additions & 7 deletions beamerouterthemesjtubeamer.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion beamerthemesjtubeamer.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sjtucover.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sjtuvi.sty

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/doc/sjtubeamer.tex
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ \section{手动输入}
\begin{commentlist}
\item \LaTeX{} 本身提供了 \texttt{thebibliography} 环境,环境的强制参数用于指定排版最长的标签(这里是两位数占位符),配套 \texttt{\textbackslash{}bibitem[标签]\{主键\}},在 \texttt{beamer} 中需要辅以 \texttt{\textbackslash{}newblock} 来分隔作者、文章标题、书目与其他内容。这里的主键可以在正文中引用。
\item 在 \texttt{beamer} 中可以通过设定 \texttt{bibliography item} 模板为对应预设来更改图标,这里是 \texttt{text} 预设用于排印编号。也可以改为文章图标 \texttt{article},图书图标 \texttt{book} 或网络图标 \texttt{online} 等。
\item 引入 \texttt{bibliolist} 环境$^*$以避免使用 \texttt{\textbackslash{}bibitem} 命令,并添加对应的 \texttt{\textbackslash{}articleitem}, \texttt{\textbackslash{}bookitem}, \texttt{\textbackslash{}onlineitem} 用于切换不同的图标$^*$,并保持与 \texttt{\textbackslash{}bibitem} 相同的用法(除了不能设定引用标签)。
\item 引入 \texttt{bibliolist} 环境$^*$以避免使用 \texttt{\textbackslash{}bibitem} 命令,对于每一条引用添加对应的 \texttt{\textbackslash{}articleitem}, \texttt{\textbackslash{}bookitem}, \texttt{\textbackslash{}onlineitem} 用于切换不同的图标$^*$,并保持与 \texttt{\textbackslash{}bibitem} 相同的用法(除了不能设定引用标签)。
\item 在 \texttt{bibliolist} 环境中也可以直接使用 \texttt{\textbackslash{}item} 以不使用 \texttt{\textbackslash{}newblock} 来分割条目中的不同部分,正如 \textsc{SJTUThesis} 所做的那样。但请不要与上一条中的图标命令混用。
\end{commentlist}

Expand Down
2 changes: 1 addition & 1 deletion src/source/beamercolorthemesjtubeamer.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamercolorthemesjtubeamer}[2022/05/09 v2.7.1 sjtubeamer color theme]
\ProvidesPackage{beamercolorthemesjtubeamer}[2022/05/10 v2.7.2 sjtubeamer color theme]
%</package>
% \fi
% \CheckSum{0}
Expand Down
2 changes: 1 addition & 1 deletion src/source/beamerfontthemesjtubeamer.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerfontthemesjtubeamer}[2022/05/09 v2.7.1 sjtubeamer font theme]
\ProvidesPackage{beamerfontthemesjtubeamer}[2022/05/10 v2.7.2 sjtubeamer font theme]
%</package>
% \fi
% \CheckSum{0}
Expand Down
2 changes: 1 addition & 1 deletion src/source/beamerinnerthemesjtubeamer.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/05/09 v2.7.1 sjtubeamer inner theme]
\ProvidesPackage{beamerinnerthemesjtubeamer}[2022/05/10 v2.7.2 sjtubeamer inner theme]
%</package>
% \fi
% \CheckSum{0}
Expand Down
22 changes: 15 additions & 7 deletions src/source/beamerouterthemesjtubeamer.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerouterthemesjtubeamer}[2022/05/09 v2.7.1 sjtubeamer outer theme]
\ProvidesPackage{beamerouterthemesjtubeamer}[2022/05/10 v2.7.2 sjtubeamer outer theme]
%</package>
% \fi
% \CheckSum{0}
Expand Down Expand Up @@ -77,18 +77,18 @@
% \begin{macrocode}
\if\EqualOption{outer}{logopos}{topright}
\AtBeginDocument{
\defbeamertemplate*{frametitle}{sjtubeamer}[1][left]
\defbeamertemplate*{frametitle}{sjtubeamer}[1][]
{%
\ifbeamercolorempty[bg]{frametitle}{}{\nointerlineskip}%
\@tempdima=\textwidth%
\advance\@tempdima by\beamer@leftmargin%
\advance\@tempdima by\beamer@rightmargin%
\begin{beamercolorbox}[sep=0.3cm,#1,wd=\the\@tempdima]{frametitle}
\begin{beamercolorbox}[sep=0.15cm,leftskip=0.15cm,#1,wd=\the\@tempdima]{frametitle}
\begingroup
\usebeamerfont{frametitle}
\vbox{}
\ifx\insertframesubtitle\@empty\vskip-2pt%
\else\vskip-1ex\fi%
\else\vskip-5pt\fi%
\if@tempswa\else\csname beamer@fte#1\endcsname\fi%
\strut\insertframetitle\strut\par%
{%
Expand All @@ -105,19 +105,27 @@
\endgroup%
\raggedleft%
\begingroup
\ifx\insertframesubtitle\@empty\vskip-2.5ex%
\else\vskip-3.5ex\fi%
\ifx\insertframesubtitle\@empty\vskip-2.3ex%
\else\vskip-3.0ex\fi%
% \end{macrocode}
% Insert the outer logo with 0.7cm height. \verb"\vphantom" here is to create a phantom box to make sure the \verb"\resizebox" has a non-zero height box input. The calculation is fixed for a 0.7cm height logo placeholder.
% \begin{macrocode}
\resizebox{!}{0.7cm}{\vphantom{-}\usebeamertemplate{logo}}\hspace*{5pt}%
\endgroup%
\ifx\insertframesubtitle\@empty%
\else\vskip0.5ex\fi%
\else\vskip0.6ex\fi%
\if@tempswa\else\vskip-.3cm\fi%
\end{beamercolorbox}%
}
}
% \end{macrocode}
% Make a larger height of frametitle when it is in \verb"default" navigation configuration. This could only be made when it is in \verb"topright" logo position mode.
% \begin{macrocode}
\if\EqualOption{outer}{nav}{default}
\AtBeginDocument{
\setbeamertemplate{frametitle}[sjtubeamer][leftskip=0cm,sep=0.3cm]
}
\fi
\fi
% \end{macrocode}
%
Expand Down
2 changes: 1 addition & 1 deletion src/source/beamerthemesjtubeamer.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
% ------------------------------------------------------------------- \fi
% \iffalse
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthemesjtubeamer}[2022/05/09 v2.7.1 sjtubeamer parent theme]
\ProvidesPackage{beamerthemesjtubeamer}[2022/05/10 v2.7.2 sjtubeamer parent theme]
% \fi
%
% \subsection{Parent Theme}
Expand Down
2 changes: 1 addition & 1 deletion src/source/sjtucover.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{sjtucover}[2022/05/09 v2.7.1 cover library for sjtubeamer]
\ProvidesPackage{sjtucover}[2022/05/10 v2.7.2 cover library for sjtubeamer]
%</package>
% \fi
% \CheckSum{0}
Expand Down
2 changes: 1 addition & 1 deletion src/source/sjtuvi.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{sjtuvi}[2022/05/09 v2.7.1 Visual Identity System library for sjtubeamer]
\ProvidesPackage{sjtuvi}[2022/05/10 v2.7.2 Visual Identity System library for sjtubeamer]
%</package>
% \fi
% \CheckSum{0}
Expand Down