diff --git a/contents/basis.tex b/contents/basis.tex index 8548ab2e..64e88a5c 100644 --- a/contents/basis.tex +++ b/contents/basis.tex @@ -2,7 +2,7 @@ % !TeX root = ../main.tex %% ------------------------------------------------------------------------ -%% Copyright (C) 2021,2022 SJTUG +%% Copyright (C) 2021-2023 SJTUG %% %% SJTUBeamer Example Document by SJTUG %% @@ -304,7 +304,9 @@ \subsection{\LaTeX{} 排版入门} \begin{columns} \begin{column}{.6\textwidth} - \begin{lstlisting}[basicstyle=\ttfamily\small] + \begin{lstlisting}[basicstyle=\ttfamily\small,morekeywords={ + tableofcontents, part, chapter, section, subsection, subsubsection, + paragraph, subparagraph}] \tableofcontents % 这里是目录 \part{有监督学习} \chapter{支持向量机} @@ -383,7 +385,7 @@ \subsubsection{支持向量机的诞生} \begin{figure}[htbp] \centering \includegraphics[height=.2\textheight]% - {libicon.pdf} + {sjtu-badge-blue.pdf} \caption{交大校徽。} \label{fig:badge} \end{figure} @@ -397,6 +399,7 @@ \subsubsection{支持向量机的诞生} \end{frame} \begin{frame}[fragile]{交叉引用与插入表格} + \vspace{-1.5em} \begin{columns} \column{.6\textwidth} \begin{lstlisting} @@ -628,7 +631,7 @@ \subsection{论文模板使用} \begin{itemize} \item 获取模板：已随发行版自带 \begin{itemize} - \item 在安装目录 \verb|\texlive\2021\texmf-dist\doc\latex\IEEEtran| + \item 在安装目录 \verb|/texlive/2023/texmf-dist/doc/latex/IEEEtran| 下找到 \verb|bare_jrnl.tex| \item 复制到某个文件夹(比如个人存论文的目录) \end{itemize} @@ -639,4 +642,4 @@ \subsection{论文模板使用} \end{itemize} \end{itemize} \end{block} -\end{frame} \ No newline at end of file +\end{frame} diff --git a/contents/introduction.tex b/contents/introduction.tex index 9b1ab766..378cf0ef 100644 --- a/contents/introduction.tex +++ b/contents/introduction.tex @@ -2,7 +2,7 @@ % !TeX root = ../main.tex %% ------------------------------------------------------------------------ -%% Copyright (C) 2021,2022 SJTUG +%% Copyright (C) 2021-2023 SJTUG %% %% SJTUBeamer Example Document by SJTUG %% @@ -258,7 +258,7 @@ \subsection{安装} \item \TL \begin{itemize} \item 跨平台：Windows, Linux, macOS (\MacTeX{} $\approx$ \TL) - \item 每年四月左右发布以年份命名的新版本，当前为 \TL 2021 + \item 每年四月左右发布以年份命名的新版本，当前为 \TL{} 2023 \item 官方维护，入门首选 \end{itemize} \item \MiKTeX @@ -281,7 +281,7 @@ \subsection{安装} \begin{itemize} \item 注意! \begin{itemize} - \item 新手建议安装完整版 \TL (\MacTeX) + \item 新手建议安装完整版 \TL{} (\MacTeX) \item 建议使用 ISO 镜像离线安装 \item 在线安装要求网络稳定 \item Windows 下不要放在带有中文的路径中 @@ -337,10 +337,10 @@ \subsection{安装} \item Linux \begin{itemize} \item 添加环境变量到 \nolinkurl{~/.bashrc} 文件： - \begin{lstlisting}[language=bash] -export PATH=/usr/local/texlive/2021/bin/x86_64-linux:$PATH -export MANPATH=/usr/local/texlive/2021/texmf/doc/man:$MANPATH -export INFOPATH=/usr/local/texlive/2021/texmf/doc/info:$INFOPATH + \begin{lstlisting}[language=sh] +export PATH=/usr/local/texlive/2023/bin/x86_64-linux:$PATH +export MANPATH=/usr/local/texlive/2023/texmf/doc/man:$MANPATH +export INFOPATH=/usr/local/texlive/2023/texmf/doc/info:$INFOPATH \end{lstlisting} \item 安装一个 dummy package，让系统的包管理器知道 \TL 已经装过了 \begin{itemize} @@ -368,7 +368,7 @@ \subsection{安装} \begin{itemize} \item 专用编辑器 \begin{itemize} - \item TeXworks、TeXShop、\alert{TeXStudio}、TeXmaker、WinEdt 等 + \item TeXworks、TeXShop、\alert{TeXstudio}、TeXmaker、WinEdt 等 \end{itemize} \item 通用编辑器（安装 \LaTeX{} 插件） \begin{itemize} @@ -376,7 +376,8 @@ \subsection{安装} \end{itemize} \item 在线协作平台 \begin{itemize} - \item OverLeaf \link{https://www.overleaf.com/}, \sout{ShareLaTeX}（已经与前者合并） + \item OverLeaf \link{https://www.overleaf.com/}, \TeX{} Page + \link{https://www.texpage.com} \item 交大 LaTeX 文档助手 \link{https://latex.sjtu.edu.cn/}（基于 OverLeaf） \end{itemize} \item 编辑器对比：\link{https://tex.stackexchange.com/q/339} diff --git a/contents/summary.tex b/contents/summary.tex index 13d736bf..7302e7ba 100644 --- a/contents/summary.tex +++ b/contents/summary.tex @@ -2,7 +2,7 @@ % !TeX root = ../main.tex %% ------------------------------------------------------------------------ -%% Copyright (C) 2021,2022 SJTUG +%% Copyright (C) 2021-2023 SJTUG %% %% SJTUBeamer Example Document by SJTUG %% @@ -66,7 +66,7 @@ \section{总结} \begin{frame}[fragile]{利用文档} \begin{itemize} - \item 常用文档 + \item 常用文档（\verb|texdoc |） \begin{itemize} \item \pkg{symbols}: 符号大全 \item \pkg{Mathmode}: 数学参考 @@ -80,7 +80,7 @@ \section{总结} \item \verb|texdoc|: \TeX{} 文档查看器\\ 例如：\verb|texdoc lshort-zh-cn| \item 在线文档 \TeX{}doc \link{http://texdoc.net/} - \item TeX Studio 和 WinEdt 都支持在帮助里看文档 + \item \TeX{}studio 和 WinEdt 都支持在帮助里看文档 \end{itemize} \end{itemize} \end{frame} @@ -118,7 +118,7 @@ \section{总结} \item 撤销与回滚：\verb|git reset|、\verb|git revert| \item 分支与高级用法：\verb|git branch|、\verb|git checkout| \verb|git rebase| - \item 远端仓库操作：\verb|git pull|、\verb|git push| + \item 远端仓库操作：\verb|git pull|、\verb|git push|、 \verb|git fetch| \item 推荐用 VS Code 等进行可视化操作 \item 参考链接：\link{https://git-scm.com/book/en/v2} @@ -140,7 +140,7 @@ \section{总结} \begin{itemize} \item BBS \begin{itemize} - \item 水源社区 \link{https://dev.bbs.sjtu.edu.cn/} + \item 水源社区 \link{https://shuiyuan.sjtu.edu.cn/tag/latex} \item \sout{\CTeX 社区} （已关闭） \link{http://bbs.ctex.org/} \item 转移到 GitHub 的 \CTeX 社区 \link{https://github.com/CTeX-org/forum} @@ -167,4 +167,4 @@ \section{总结} \item 科普、答疑 \item \sout{来当主讲人} \end{itemize} -\end{frame} \ No newline at end of file +\end{frame} diff --git a/contents/thesis.tex b/contents/thesis.tex index 7a2c6a47..e755b3e8 100644 --- a/contents/thesis.tex +++ b/contents/thesis.tex @@ -2,7 +2,7 @@ % !TeX root = ../main.tex %% ------------------------------------------------------------------------ -%% Copyright (C) 2021,2022 SJTUG +%% Copyright (C) 2021-2023 SJTUG %% %% SJTUBeamer Example Document by SJTUG %% @@ -18,22 +18,24 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \begin{frame}{\SJTUThesis} \framesubtitle{上海交通大学学位论文 \LaTeX{} 模板} - \begin{itemize} - \item 最早由韦建文于 2009 年 11 月发布 0.1a 版，2018 年起由 SJTUG 接手维护 - \item 最新版：\SJTUThesisVersion{} (\SJTUThesisDate) - \item 支持本科、硕士、博士学位论文以及课程论文的排版 - \end{itemize} - \begin{figure}[htbp] - \centering - \includegraphics[height=.4\textheight] - {sjtuthesis-bachelor-crop.pdf}\hspace{6pt} - \includegraphics[height=.4\textheight] - {sjtuthesis-master-crop.pdf}\hspace{6pt} - \includegraphics[height=.4\textheight] - {sjtuthesis-doctor-crop.pdf}\hspace{6pt} - \includegraphics[height=.4\textheight] - {sjtuthesis-course-crop.pdf} - \end{figure} + \begin{columns} + \begin{column}{.7\textwidth} + \begin{itemize} + \item 最早由韦建文于 2009 年 11 月发布 0.1a 版，2018 年起由 SJTUG 接手维护 + \item 最新版：\SJTUThesisVersion{} (\SJTUThesisDate) + \item 支持本科、硕士、博士学位论文以及课程论文的排版 + \end{itemize} + \end{column} + \begin{column}{.2\textwidth} + \begin{figure}[htbp] + \centering + { + \setlength{\fboxsep}{0pt} + \fcolorbox{black}{white}{\includegraphics[height=.5\textheight]{sjtuthesis-cover.pdf}} + } + \end{figure} + \end{column} + \end{columns} \end{frame} \begin{frame}[fragile]{获取\SJTUThesis{}} @@ -49,7 +51,7 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \item 下载最新开发版（高级 / 想尝鲜 / 着急的用户） \begin{itemize} \item \url{https://github.com/sjtug/SJTUThesis} - \item 切换到 \verb|develop| 分支，点右边栏 + \item 点右边栏 \href{https://github.com/sjtug/SJTUThesis/archive/dev.zip}{Download ZIP} 按钮 \end{itemize} \item 编译 @@ -73,7 +75,7 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \begin{frame}[fragile]{模板选项} \begin{description} - \item[type] 指定论文类型（本科/硕士/博士/课程） + \item[type] 指定论文类型（本科/硕士/博士） \begin{lstlisting}[basicstyle=\ttfamily] \documentclass[type=bachelor]{sjtuthesis} \end{lstlisting} @@ -93,16 +95,16 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \begin{lstlisting} \sjtusetup{ info = { - title = {上海交通大学学位论文 \LaTeX{} 模板示例文档}, - title* = {A Sample for \LaTeX-based SJTU Thesis Template}, - author = {某\quad{}某}, - author* = {Mo Mo}, + zh/title = {上海交通大学学位论文 \LaTeX{} 模板示例文档}, + en/title = {A Sample for \LaTeX-based SJTU Thesis Template}, + zh/author = {某\quad{}某}, + en/author = {Mo Mo}, }, style = { - header-logo-color = red, + title-logo-color = red, }, name = { - publications = {攻读学位期间完成的论文}, + achv = {攻读学位期间完成的论文}, }, } \end{lstlisting} @@ -114,30 +116,26 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \centering \footnotesize \begin{tabular}{lll} \toprule - 命令作用 & 中文对应选项 & 英文对应选项 \\ \midrule - 论文标题 & \verb|title| & \verb|title*| - \\ - 关键字列表 & \verb|keywords| & \verb|keywords*| \\ - 作者姓名 & \verb|author| & \verb|author*| \\ - 申请学位名称 & \verb|degree| & \verb|degree*| \\ - 院系名称 & \verb|department| & \verb|department*| \\ - 专业名称 & \verb|major| & \verb|major*| \\ - 导师 & \verb|supervisor| & \verb|supervisor*| - \\ - 副导师 & \verb|assisupervisor| & \verb|assisupervisor*| - \\ - 日期 & \multicolumn{2}{c}{\texttt{date}} - \\ - 学号 & \multicolumn{2}{c}{\texttt{id}} - \\ - \bottomrule + 命令作用 & 中文对应选项 & 英文对应选项 \\ \midrule + 论文标题 & \texttt{zh/title} & \texttt{en/title} \\ + 关键字列表 & \texttt{zh/keywords} & \texttt{en/keywords} \\ + 作者姓名 & \texttt{zh/author} & \texttt{en/author} \\ + 申请学位名称 & \texttt{zh/degree} & \texttt{en/degree} \\ + 院系名称 & \texttt{zh/department} & \texttt{en/department} \\ + 专业名称 & \texttt{zh/major} & \texttt{en/major} \\ + 导师 & \texttt{zh/supervisor} & \texttt{en/supervisor} \\ + 副导师 & \texttt{zh/assoc-supervisor} & \texttt{en/assoc-supervisor} \\ + 联培导师 & \texttt{zh/co-supervisor} & \texttt{en/co-supervisor} \\ + 日期 & \multicolumn{2}{c}{\texttt{date}} \\ + 学号 & \multicolumn{2}{c}{\texttt{id}} \\ \bottomrule \end{tabular} \end{table} \end{frame} \begin{frame}[fragile]{数学} \begin{itemize} - \item 公式示例：\nolinkurl{contents/math_and_citations.tex} + \item 公式示例：\verb|contents/math_and_citations.tex| + \link{https://github.com/sjtug/SJTUThesis/blob/master/contents/math_and_citations.tex} \item \SJTUThesis{} 定义了常用的数学环境（需要手工引入 \verb|amsthm| 宏包）： \begin{table}[h] \centering @@ -194,7 +192,7 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \cite{key12, key13} \end{lstlisting} \item 正文模式：如“文献~[14] 证明了……” - \begin{lstlisting}[basicstyle=\ttfamily] + \begin{lstlisting}[basicstyle=\ttfamily,morekeywords={parencite}] \parencite{key14} \end{lstlisting} \end{itemize} @@ -206,7 +204,8 @@ \subsection{\SJTUThesis 上海交通大学学位论文模板} \item 常见问题 \begin{itemize} \item 参考文献列表出错、缺少字体、无法编译、格式不对…… - \item 阅读模板文档 \verb|sjtuthesis.pdf| 和 SJTUThesis 示例文档代码 + \item 阅读模板文档 \verb|sjtutex.pdf| \link{https://github.com/sjtug/SJTUTeX/releases} + 和 SJTUThesis 示例文档代码 \item 查看 Wiki \link{https://github.com/sjtug/SJTUThesis/wiki} \end{itemize} diff --git a/figures/sjtuthesis-bachelor-crop.pdf b/figures/sjtuthesis-bachelor-crop.pdf deleted file mode 100644 index 778a4478..00000000 Binary files a/figures/sjtuthesis-bachelor-crop.pdf and /dev/null differ diff --git a/figures/sjtuthesis-course-crop.pdf b/figures/sjtuthesis-course-crop.pdf deleted file mode 100644 index 6d6d1a61..00000000 Binary files a/figures/sjtuthesis-course-crop.pdf and /dev/null differ diff --git a/figures/sjtuthesis-cover.pdf b/figures/sjtuthesis-cover.pdf new file mode 100644 index 00000000..a6907400 Binary files /dev/null and b/figures/sjtuthesis-cover.pdf differ diff --git a/figures/sjtuthesis-doctor-crop.pdf b/figures/sjtuthesis-doctor-crop.pdf deleted file mode 100644 index 861372a2..00000000 Binary files a/figures/sjtuthesis-doctor-crop.pdf and /dev/null differ diff --git a/figures/sjtuthesis-master-crop.pdf b/figures/sjtuthesis-master-crop.pdf deleted file mode 100644 index a47e861e..00000000 Binary files a/figures/sjtuthesis-master-crop.pdf and /dev/null differ diff --git a/figures/title-background.jpg b/figures/title-background.jpg deleted file mode 100644 index 3c43a335..00000000 Binary files a/figures/title-background.jpg and /dev/null differ diff --git a/main.tex b/main.tex index 0bb473f4..54280d04 100644 --- a/main.tex +++ b/main.tex @@ -1,7 +1,7 @@ % !TeX encoding = UTF-8 %% ------------------------------------------------------------------------ -%% Copyright (C) 2021,2022 SJTUG +%% Copyright (C) 2021-2023 SJTUG %% %% SJTUBeamer Example Document by SJTUG %% @@ -16,21 +16,20 @@ %% ----------------------------------------------------------------------- \documentclass[xcolor=table,dvipsnames,svgnames,aspectratio=169]{ctexbeamer} -% 可以通过 fontset=macnew / fontset=ubuntu / fontset=windows 选项切换字体集 +% 可以通过 fontset=macnew / fontset=ubuntu / fontset=windows 选项切换字体集； +% 如遇无法显示的数学符号，尝试对 ctexbeamer 文档类添加 no-math 选项； +% 写纯英文幻灯片可以改用 beamer 文档类。 \usepackage{tikz} \usepackage[normalem]{ulem} \usetikzlibrary{arrows} \usepackage{amsmath} -\usepackage{mflogo} \usepackage{graphicx} -\usepackage{ccicons} \usepackage{hologo} \usepackage{colortbl} \usepackage{shapepar} \usepackage{hyperxmp} \usepackage{booktabs} -\usepackage{qrcode} \usepackage{listings} \usepackage{tipa} \usepackage{multicol} @@ -41,13 +40,11 @@ % 参考文献设置，使用 style=gb7714-2015 样式为标准顺序编码制， % 使用 style=gb7714-2015ay 样式可以改为著者-出版年制。 \usepackage[backend=biber,style=gb7714-2015]{biblatex} -\addbibresource{thesis.bib} +\addbibresource{ref.bib} \graphicspath{{figures/}} \hypersetup{ - pdfsubject = {上海交通大学图书馆专题培训讲座}, - pdfauthor = {Alexara Wu}, pdfcopyright = {Licensed under CC-BY-SA 4.0. Some rights reserved.}, pdflicenseurl = {http://creativecommons.org/licenses/by-sa/4.0/}, unicode = true, @@ -77,8 +74,8 @@ \def\TeXLive{\TeX{} Live} \let\TL=\TeXLive \newcommand{\SJTUThesis}{\textsc{SJTUThesis}} -\newcommand{\SJTUThesisVersion}{1.1.0} -\newcommand{\SJTUThesisDate}{2022/3/26} +\newcommand{\SJTUThesisVersion}{2.0.3} +\newcommand{\SJTUThesisDate}{2023/9/25} \newcommand{\SJTUBeamer}{\textsc{SJTUBeamer}} \newcommand{\SJTUBeamerVersion}{3.0.0} \newcommand{\SJTUBeamerDate}{2022/11/22} @@ -91,17 +88,6 @@ \def\cmdxmp#1#2#3{\small{\texttt{\color{structure}$\backslash$#1}\{#2\} \hspace{1em}\\ $\Rightarrow$\hspace{1em} {#3}\par\vskip1em}} -\lstset{ - language=[LaTeX]TeX, - basicstyle=\ttfamily\footnotesize, - tabsize=2, - keywordstyle=\bfseries\ttfamily\color{cprimary}, - commentstyle=\sl\ttfamily\color[RGB]{100,100,100}, - stringstyle=\ttfamily\color[RGB]{50,50,50}, - extendedchars=true, - breaklines=true, -} - \usetheme[maxplus]{sjtubeamer} % 使用 maxplus/max/min 切换标题页样式 % 使用 red/blue 切换主色调 @@ -113,9 +99,23 @@ % 使用 topright/bottomright 切换徽标位置 % 使用逗号分隔列表以同时使用多种选项 +% \setbeamertemplate{background}{} +% 对于 max 主题，如果需要关闭正文背景图，请取消注释上一行。 + % \tikzexternalize[prefix=build/] % 如果您需要缓存 tikz 图像，请取消注释上一行，并在编译选项中添加 -shell-escape。 +\lstset{ + language=[LaTeX]TeX, % 更改高亮语言 + texcsstyle=*\color{cprimary}, % 只在高亮 LaTeX 语言时必须 + tabsize=2, + basicstyle=\ttfamily\small,% + keywordstyle=\color{cprimary},% + stringstyle=\color{csecondary},% + commentstyle=\color{ctertiary!50!gray},% + breaklines,% +} + \author{Alexara Wu} \institute[SJTUG]{上海交通大学 Linux 用户组} \date{\the\year 年 \the\month 月} @@ -163,13 +163,14 @@ \vspace*{2ex} \begin{itemize} - \item 本示例文档的源码结构适用于简短的单次报告，仅展示 \beamer{} 文档类的通用功能，更多地在使用 \SJTUBeamer{} - 的样式信息。 + \item 本示例文档的源码结构适用于简短的单次报告，仅展示 \beamer{} 文档类的通 + 用功能，更多地在使用 \SJTUBeamer{} 的样式信息。 \item 为发挥 \SJTUBeamer{} 的全部功能，参见发布区 - \link{https://github.com/sjtug/SJTUBeamer/releases} 的快速入门、用户手册与开发文档。 + \link{https://github.com/sjtug/SJTUBeamer/releases} 的快速入门、用户手 + 册与开发文档。 \item 就制作一组讲座而言，相关源码结构可以参考新讲座 - \link{https://github.com/sjtug/sjtulib-latex-talk/tree/logcreative-2022}。新讲座使用了 - 社区版主题的同时也展示了 \SJTUBeamer{} 的特殊用法。 + \link{https://github.com/sjtug/sjtulib-latex-talk/tree/logcreative-2022}。 + 新讲座使用了社区版主题的同时也展示了 \SJTUBeamer{} 的特殊用法。 \end{itemize} \end{frame} diff --git a/thesis.bib b/ref.bib similarity index 100% rename from thesis.bib rename to ref.bib diff --git a/src/doc/sjtubeamerquickstart.tex b/src/doc/sjtubeamerquickstart.tex index bf088f03..f4fd446b 100644 --- a/src/doc/sjtubeamerquickstart.tex +++ b/src/doc/sjtubeamerquickstart.tex @@ -17,6 +17,7 @@ \ProvidesFile{sjtubeamerquickstart.tex}[2023/11/25 v3.0.1 Quick Start for sjtubeamer (Chinese)] % 加载 ctexbeamer 文档类【第一部分】 +% 如遇无法显示的数学符号，尝试对 ctexbeamer 文档类添加 no-math 选项； % 如果编写英文内容，建议直接使用 beamer 文档类。 \documentclass[ % draft, % 草稿模式 @@ -41,6 +42,9 @@ % 当前目录下需要有 contrib 文件夹。 % \usesjtutheme{sjtug} +% \setbeamertemplate{background}{} +% 对于 max 主题，如果需要关闭正文背景图，请取消注释上一行。 + % \tikzexternalize[prefix=build/] % 如果您需要缓存 tikz 图像，请取消注释上一行，并在编译选项中添加 -shell-escape。