diff --git a/.github/ci/build_package.sh b/.github/ci/build_package.sh index 00906d44..7792f2de 100755 --- a/.github/ci/build_package.sh +++ b/.github/ci/build_package.sh @@ -11,3 +11,9 @@ if [ ! -f src/sjtubeamer-ctan.zip ]; then echo "BUILD FAILED." exit 1 fi + +# test installation +cd src +l3build install +cd doc +latexmk min -halt-on-error -time -xelatex -outdir=build -shell-escape \ No newline at end of file diff --git a/.gitignore b/.gitignore index d07e66fb..3febe44b 100644 --- a/.gitignore +++ b/.gitignore @@ -258,6 +258,7 @@ thesis-bot.yml build/ build-*.pdf build-*.tex +src/tex *-ctan.zip *.listing diff --git a/README_en.md b/README_en.md index e1a2f24c..eb213fcb 100644 --- a/README_en.md +++ b/README_en.md @@ -2,7 +2,7 @@ Welcome! 🥳 -This is the beamer template exclusively for Shanghai Jiaotong University students to give a speech on group meeting or course project. +This is the beamer template exclusively for Shanghai Jiao Tong University students to give a speech on group meeting or course project. ## Starting Up 👋 diff --git a/beamercolorthemesjtubeamer.sty b/beamercolorthemesjtubeamer.sty index b3fc766e..a7dab832 100644 --- a/beamercolorthemesjtubeamer.sty +++ b/beamercolorthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemesjtubeamer}[2021/09/04 sjtubeamer color theme v2.0.0] +\ProvidesPackage{beamercolorthemesjtubeamer}[2021/09/05 sjtubeamer color theme v2.0.0] \RequirePackage{sjtuvi} \DefineOption{color}{color}{red} \DefineOption{color}{color}{blue} diff --git a/beamerfontthemesjtubeamer.sty b/beamerfontthemesjtubeamer.sty index d5d38408..76e07649 100644 --- a/beamerfontthemesjtubeamer.sty +++ b/beamerfontthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemesjtubeamer}[2021/09/04 sjtubeamer font theme v2.0.0] +\ProvidesPackage{beamerfontthemesjtubeamer}[2021/09/05 sjtubeamer font theme v2.0.0] \RequirePackage{silence} \WarningFilter{latexfont}{Font shape} \usefonttheme{professionalfonts} diff --git a/beamerinnerthemesjtubeamer.sty b/beamerinnerthemesjtubeamer.sty index 0a9f95ea..0ba1e8f3 100644 --- a/beamerinnerthemesjtubeamer.sty +++ b/beamerinnerthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemesjtubeamer}[2021/09/04 sjtubeamer inner theme v2.0.0] +\ProvidesPackage{beamerinnerthemesjtubeamer}[2021/09/05 sjtubeamer inner theme v2.0.0] \RequirePackage{sjtuvi} \RequirePackage{tcolorbox} \DeclareOptionBeamer{maxplus}{\def\sjtubeamer@inner@cover{maxplus}} @@ -90,7 +90,11 @@ \titlegraphic{\sjtubg[opacity=0.2]} \setbeamertemplate{background} { - \parbox[c][1.1\paperheight][c]{\paperwidth}{\centering\resizebox{\paperwidth}{!}{\sjtubg[cprimary!50,opacity=0.2]}} + \parbox[c][1.1\paperheight][c]{\paperwidth}{ + \centering\resizebox{\paperwidth}{!}{ + \sjtubg[cprimary!50,opacity=0.2] + } + } } \else \if\EqualOption{inner}{cover}{min} diff --git a/beamerouterthemesjtubeamer.sty b/beamerouterthemesjtubeamer.sty index d9d3566d..02577648 100644 --- a/beamerouterthemesjtubeamer.sty +++ b/beamerouterthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemesjtubeamer}[2021/09/04 sjtubeamer outer theme v2.0.0] +\ProvidesPackage{beamerouterthemesjtubeamer}[2021/09/05 sjtubeamer outer theme v2.0.0] \RequirePackage{sjtuvi} \DefineOption{outer}{nav}{miniframes} \DefineOption{outer}{nav}{infolines} diff --git a/beamerthemesjtubeamer.sty b/beamerthemesjtubeamer.sty index ecfd57d2..309a62f6 100644 --- a/beamerthemesjtubeamer.sty +++ b/beamerthemesjtubeamer.sty @@ -21,7 +21,7 @@ %% limitations under the License. %% ------------------------------------------------------------------------ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemesjtubeamer}[2021/09/04 sjtubeamer parent theme v2.0.0] +\ProvidesPackage{beamerthemesjtubeamer}[2021/09/05 sjtubeamer parent theme v2.0.0] \DeclareOptionBeamer{maxplus}{\def\sjtubeamer@cover{maxplus}} \DeclareOptionBeamer{max}{\def\sjtubeamer@cover{max}} \DeclareOptionBeamer{min}{\def\sjtubeamer@cover{min}} diff --git a/sjtucover.sty b/sjtucover.sty index 22ad7254..dd841e36 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}[2021/09/04 cover library for sjtubeamer v2.0.0] +\ProvidesPackage{sjtucover}[2021/09/05 cover library for sjtubeamer v2.0.0] \RequirePackage{sjtuvi} \DeclareOptionBeamer{maxplus}{\def\sjtubeamer@sjtucover@cover{maxplus}} \DeclareOptionBeamer{max}{\def\sjtubeamer@sjtucover@cover{max}} diff --git a/sjtuvi.sty b/sjtuvi.sty index 1040f7e7..f46325af 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}[2021/09/04 Visual Identity System library for sjtubeamer v2.0.0] +\ProvidesPackage{sjtuvi}[2021/09/05 Visual Identity System library for sjtubeamer v2.0.0] \def\DefineOption#1#2#3{ % #1: package % #2: key diff --git a/src/README.md b/src/README.md new file mode 100644 index 00000000..6696102e --- /dev/null +++ b/src/README.md @@ -0,0 +1,41 @@ +# SJTUBeamer 🤓 + +## 简介 + +欢迎使用 SJTUBeamer! 🥳 + +SJTUBeamer 是上海交通大学的非官方 Beamer 模版。您可以使用 SJTUBeamer 制作幻灯片，展示您的成果。 + +[仓库](https://github.com/sjtug/SJTUBeamer)中包含 SJTUBeamer 所使用的宏包 `sjtubeamer`，以及一个示例文档。 + +使用 `\usetheme{sjtubeamer}` 即可使用该主题。更多设置参见 `texdoc sjtubeamer`。 + +## 许可证 + +* SJTUBeamer 包使用的许可证为 Apache-2.0。 +* `sjtuvi` 和 `sjtucover` 库及其附属徽标、图片由上海交通大学持有版权。校属各单位及个人以经营为目的使用视觉形象识别系统，须向学校申请使用许可。校外单位及个人未经许可，不得制作或使用载有视觉形象识别系统的物品。您可以在 [vi.sjtu.edu.cn](https://vi.sjtu.edu.cn/index.php/articles/bulletin/16) 阅读许可协议。 + +------- + +# SJTUBeamer 🤓 + +## Introduction + +Welcome! 🥳 + +This is the beamer template exclusively for Shanghai Jiao Tong University students to give a speech on group meeting or course project. + +[This repository](https://github.com/sjtug/SJTUBeamer) contains the source code of SJTUBeamer and a demo file. + +To use the theme, input `\usetheme{sjtubeamer}`. To get more information, see `texdoc sjtubeamer`. + +## License + +* SJTUBeamer is licensed under Apache-2.0. +* `sjtuvi` and `sjtucover` library and related graphics is under [No commercial](https://vi.sjtu.edu.cn/index.php/articles/bulletin/16). + + +![cover-0](https://user-images.githubusercontent.com/4198311/132097433-3c44d6f6-47e1-4d38-95db-560252ec5817.png) +![cover-1](https://user-images.githubusercontent.com/4198311/132097442-0994886f-3eb1-4935-a8f5-34f5516fcdc3.png) +![cover-2](https://user-images.githubusercontent.com/4198311/132097445-6fbfeb22-8e19-4c48-ab1e-ba81672e7ba3.png) +![cover-3](https://user-images.githubusercontent.com/4198311/132097448-f3c44794-3834-4c4f-8a9a-769098aad8a9.png) diff --git a/src/doc/min.tex b/src/doc/min.tex index c431b8da..b7486de0 100644 --- a/src/doc/min.tex +++ b/src/doc/min.tex @@ -1,145 +1,13 @@ \documentclass[ - % draft, % 草稿模式 aspectratio=169, % 使用 16:9 比例 ]{ctexbeamer} -\mode -\usepackage{pgfplots} -\usepackage{pgfplotstable} \usetheme[min]{sjtubeamer} -% \usecolortheme[]{beaver} % 使用其他颜色主题 -\usepackage{biblatex} -\addbibresource{ref.bib} % gbt!=bibtex -\usepackage{multicol} - \begin{document} -\institute[School of Mathematical Sciences]{数学科学学院} % 组织 -% \logo{ -% \includegraphics{vi/cnlogored.pdf} % 重定义 logo -% } -\titlegraphic{ % 标题图像 - \includegraphics{head.png} -} +\institute[Shanghai Jiao Tong University *nix User Group]{上海交通大学 Linux 用户组} % 组织 \title{SJTUBeamer 幻灯片模板} % 标题 \subtitle{SJTUBeamer Template} % 副标题 \author{Anxue Chen, Alexara Wu, Log Creative} % 作者 \date{\today} % 日期 \maketitle % 创建标题页 - -\part{第一部分} - -% 使用节目录 -% \AtBeginSection[]{ -% \begin{frame} -% % \tableofcontents[currentsection] % 传统节目录 -% \sectionpage % 节页 -% \end{frame} -% } - -% 使用小节目录 -\AtBeginSubsection[]{ % 在每小节开始 - \begin{frame} - % \tableofcontents[currentsection,currentsubsection] % 传统小节目录 - \subsectionpage % 小节页 - \end{frame} -} - -\section{第 1 节} -\subsection{第 1 小节} - -\begin{frame} - \frametitle{标题} - - \paragraph{列表} 这个\alert{幻灯片}有下面几项： - - \begin{itemize} - \item 第 1 项 - \item 第 2 项 - \item 第 3 项 - \end{itemize} - -\end{frame} - -\begin{frame} - \frametitle{标题} - \framesubtitle{子标题} - - \begin{equation} - x^2+2x+1=(x+1)^2 - \end{equation} - -\end{frame} - -\section{第 2 节} -\begin{frame} - \frametitle{一些盒子} - - \begin{block}{盒子} - 这是一个盒子\cite{beamerman} - \end{block} - - \begin{alertblock}{注意} - 注意内容 - \end{alertblock} - - \begin{exampleblock}{示例} - 示例内容 - \end{exampleblock} -\end{frame} - -\begin{frame}[fragile] % 注意添加 fragile 标记 - \frametitle{代码块} - % 代码块参数：语言，标题 - % 请减少代码初始的缩进 - \begin{codeblock}[language=c++]{C++代码} - #include - - int main(){ - // Console Output - std::cout << "Hello, SJTU!" << std::endl; - return 0; - } - \end{codeblock} -\end{frame} - -\begin{frame} - \frametitle{图} - \begin{figure} - \centering - \begin{stampbox} - \includegraphics[height=0.3\textheight]{plant.jpg} - \end{stampbox} - \caption{图片标题\cite{viman}} - \end{figure} -\end{frame} - -\begin{frame} - \frametitle{表与统计图} - \begin{multicols}{2} - \begin{table} - \caption{表格标题\cite{pgfplotstableman}} - \pgfplotstabletypeset[ - columns/Quick/.style={dec sep align}, - columns/Cocktail/.style={dec sep align}, - column type=r, - % fixed zerofill, - ]{test.csv} - \end{table} - - \begin{figure} - \input{testgraph.tex} - \caption{统计图标题\cite{pgfplotsman}} - \end{figure} - \end{multicols} -\end{frame} - - -% gbt=bibtex -\part{参考文献} -\begin{frame}[allowframebreaks] - \printbibliography[title=参考文献] % gbt!=bibtex - % \bibliography{ref.bib} % gbt=bibtex -\end{frame} - \makebottom % 创建尾页 % 非标准命令 - \end{document} \ No newline at end of file diff --git a/src/doc/sjtubeamerdevguide.tex b/src/doc/sjtubeamerdevguide.tex index 45761b4b..bcb44034 100644 --- a/src/doc/sjtubeamerdevguide.tex +++ b/src/doc/sjtubeamerdevguide.tex @@ -38,6 +38,7 @@ \def\themename{\textsf{SJTUBeamer}} \title{Development Guide of\\\themename} +\author{SJTUG \\ \href{https://github.com/sjtug/SJTUBeamer}{github.com/sjtug/SJTUBeamer}} \begin{document} \maketitle @@ -555,10 +556,10 @@ \subsection{Old \TeX\ Distribution} \section{Developer} \begin{itemize} - \item Cascades Chen (cascadeschen@gmail.com) - \item Alex Chi (iskyzh@gmail.com) - \item Alexara Wu (alexarawu@outlook.com) - \item Log Creative (logcreative@outlook.com) + \item Cascades Chen (\href{mailto:cascadeschen@gmail.com}{cascadeschen@gmail.com}) + \item Alex Chi (\href{mailto:iskyzh@gmail.com}{iskyzh@gmail.com}) + \item Alexara Wu (\href{mailto:alexarawu@outlook.com}{alexarawu@outlook.com}) + \item Log Creative (\href{mailto:logcreative@outlook.com}{logcreative@outlook.com}) \end{itemize} \section{Implementation} diff --git a/src/source/beamercolorthemesjtubeamer.dtx b/src/source/beamercolorthemesjtubeamer.dtx index b11ce669..55533314 100644 --- a/src/source/beamercolorthemesjtubeamer.dtx +++ b/src/source/beamercolorthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthemesjtubeamer}[2021/09/04 sjtubeamer color theme v2.0.0] +\ProvidesPackage{beamercolorthemesjtubeamer}[2021/09/05 sjtubeamer color theme v2.0.0] % % \fi % \CheckSum{0} diff --git a/src/source/beamerfontthemesjtubeamer.dtx b/src/source/beamerfontthemesjtubeamer.dtx index cf5c757b..e601adf2 100644 --- a/src/source/beamerfontthemesjtubeamer.dtx +++ b/src/source/beamerfontthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthemesjtubeamer}[2021/09/04 sjtubeamer font theme v2.0.0] +\ProvidesPackage{beamerfontthemesjtubeamer}[2021/09/05 sjtubeamer font theme v2.0.0] % % \fi % \CheckSum{0} diff --git a/src/source/beamerinnerthemesjtubeamer.dtx b/src/source/beamerinnerthemesjtubeamer.dtx index 981dd771..8579dd13 100644 --- a/src/source/beamerinnerthemesjtubeamer.dtx +++ b/src/source/beamerinnerthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthemesjtubeamer}[2021/09/04 sjtubeamer inner theme v2.0.0] +\ProvidesPackage{beamerinnerthemesjtubeamer}[2021/09/05 sjtubeamer inner theme v2.0.0] % % \fi % \CheckSum{0} @@ -196,7 +196,11 @@ \titlegraphic{\sjtubg[opacity=0.2]} \setbeamertemplate{background} { - \parbox[c][1.1\paperheight][c]{\paperwidth}{\centering\resizebox{\paperwidth}{!}{\sjtubg[cprimary!50,opacity=0.2]}} + \parbox[c][1.1\paperheight][c]{\paperwidth}{ + \centering\resizebox{\paperwidth}{!}{ + \sjtubg[cprimary!50,opacity=0.2] + } + } } \else % diff --git a/src/source/beamerouterthemesjtubeamer.dtx b/src/source/beamerouterthemesjtubeamer.dtx index 5c519278..94b2f703 100644 --- a/src/source/beamerouterthemesjtubeamer.dtx +++ b/src/source/beamerouterthemesjtubeamer.dtx @@ -16,7 +16,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthemesjtubeamer}[2021/09/04 sjtubeamer outer theme v2.0.0] +\ProvidesPackage{beamerouterthemesjtubeamer}[2021/09/05 sjtubeamer outer theme v2.0.0] % % \fi % \CheckSum{0} diff --git a/src/source/beamerthemesjtubeamer.dtx b/src/source/beamerthemesjtubeamer.dtx index 4d9f48e0..ed606ed0 100644 --- a/src/source/beamerthemesjtubeamer.dtx +++ b/src/source/beamerthemesjtubeamer.dtx @@ -37,7 +37,7 @@ % ------------------------------------------------------------------- \fi % \iffalse \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerthemesjtubeamer}[2021/09/04 sjtubeamer parent theme v2.0.0] +\ProvidesPackage{beamerthemesjtubeamer}[2021/09/05 sjtubeamer parent theme v2.0.0] % \fi % % \subsection{Parent Theme} diff --git a/src/source/sjtucover.dtx b/src/source/sjtucover.dtx index 25af2540..518f0214 100644 --- a/src/source/sjtucover.dtx +++ b/src/source/sjtucover.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtucover}[2021/09/04 cover library for sjtubeamer v2.0.0] +\ProvidesPackage{sjtucover}[2021/09/05 cover library for sjtubeamer v2.0.0] % % \fi % \CheckSum{0} diff --git a/src/source/sjtuvi.dtx b/src/source/sjtuvi.dtx index bdba342a..245e9885 100644 --- a/src/source/sjtuvi.dtx +++ b/src/source/sjtuvi.dtx @@ -13,7 +13,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sjtuvi}[2021/09/04 Visual Identity System library for sjtubeamer v2.0.0] +\ProvidesPackage{sjtuvi}[2021/09/05 Visual Identity System library for sjtubeamer v2.0.0] % % \fi % \CheckSum{0}