diff --git a/include/about.tex b/include/about.tex index 598e461..8cd24f4 100644 --- a/include/about.tex +++ b/include/about.tex @@ -14,7 +14,7 @@ \tiny Beamer 主题：萧山 \link{https://ctan.org/pkg/pgfornament-han} \\ 正文字体：思源宋体 + Libertinus Serif \\ - 等宽字体：等距更纱黑体 + Iosevka + 等宽字体：思源黑体 + Roboto Mono \end{flushleft} \vspace{-0.5cm} \end{frame} diff --git a/include/advanced.tex b/include/advanced.tex index df07d09..66934a7 100644 --- a/include/advanced.tex +++ b/include/advanced.tex @@ -364,8 +364,9 @@ \section{进阶扩展} \frametitle{参考文献与扩展阅读} \begin{multicols}{2} \tiny -\newcommand\BOOK[1]{\textbf{#1}} -\newcommand\TAG[1]{\CASE{[#1]}} +\newcommand{\BOOK}[1]{\textbf{#1}} +\newcommand{\TAG}[1]{\CASE{[#1]}} +\newcommand{\URL}[1]{\scalebox{0.92}[1]{\url{#1}}} \begin{thebibliography}{99} \bibitem{} \textsc{Knuth D E}. @@ -388,19 +389,19 @@ \section{进阶扩展} \textsc{Oetiker T}, \textsc{Partl H}, \textsc{Hyna I} and \textsc{Schlegl E}. \CTeX{} 开发小组~译． \BOOK{一份（不太）简短的 \LaTeXe{} 介绍：或 111 分钟了解 \LaTeXe{}} \TAG{EB/OL}, 2021. - \newblock \url{https://ctan.org/pkg/lshort-zh-cn} + \newblock \URL{https://ctan.org/pkg/lshort-zh-cn} \bibitem{} 黄新刚（包太雷）． \BOOK{\LaTeX{} Notes: 雷太赫排版系统简介（第二版）} \TAG{EB/OL}, 2021. - \newblock \url{https://github.com/huangxg/lnotes} + \newblock \URL{https://github.com/huangxg/lnotes} \bibitem{} 汪彧之，陈晟祺． \BOOK{清华大学图书馆：如何使用 \LaTeX{} 排版论文} \TAG{EB/OL}, 2021. - \newblock \url{https://github.com/tuna/thulib-latex-talk} + \newblock \URL{https://github.com/tuna/thulib-latex-talk} \bibitem{} 吴伟健，李子龙． \BOOK{上海交通大学图书馆：如何使用 \LaTeX{} 排版论文} \TAG{EB/OL}, 2022. - \newblock \url{https://github.com/sjtug/sjtulib-latex-talk} + \newblock \URL{https://github.com/sjtug/sjtulib-latex-talk} \bibitem{} 刘海洋． \BOOK{\LaTeX{} \CJKsout[thickness=0.1em]{快速}入门} \TAG{EB/OL}, 2020. @@ -414,15 +415,15 @@ \section{进阶扩展} \bibitem{} Wikibooks. \BOOK{\LaTeX{}---Wikibooks, The Free Textbook Project} \TAG{EB/OL}. - \newblock \url{https://en.wikibooks.org/wiki/LaTeX} + \newblock \URL{https://en.wikibooks.org/wiki/LaTeX} \bibitem{} Overleaf. \BOOK{Overleaf Documentation} \TAG{EB/OL}. - \newblock \url{https://www.overleaf.com/learn} + \newblock \URL{https://www.overleaf.com/learn} \bibitem{} \LaTeX{} project. \BOOK{Learn\LaTeX.org} \TAG{EB/OL}. - \newblock \url{https://www.learnlatex.org} + \newblock \URL{https://www.learnlatex.org} \end{thebibliography} \end{multicols} \end{frame} diff --git a/include/content.tex b/include/content.tex index 7d415bd..60e261f 100644 --- a/include/content.tex +++ b/include/content.tex @@ -106,7 +106,7 @@ \section{填写内容} \documentclass{article} % 指明文档类型：文章 % 导言区：设置文档样式 \usepackage{amsmath} % 调用宏包，实现各种功能 - \newcommand\keyword[1]{\textbf{#1}} % 自定义命令 + \newcommand{\keyword}[1]{\textbf{#1}} % 自定义命令 \begin{document} % 正文：套用格式 @@ -193,48 +193,45 @@ \section{填写内容} \end{itemize} \pause \item 报告，我想偷懒！ - \item 报告，我听说了 Tailwind CSS！ + \item 报告，我听说了 Tailwind CSS \link{https://tailwindcss.com}！ \end{itemize} \end{frame} \begin{frame}[fragile] \frametitle{常用环境：列表与枚举} \begin{columns} -\begin{column}{0.55\textwidth} +\begin{column}{0.54\textwidth} \begin{texcode}[gobble=4, emph={[1]enumerate,itemize}] \begin{enumerate} - \item Da Vinci + \item Frontend \begin{itemize} - \item \textit{The Last Supper} - \item \textit{Salvator Mundi} - \item \textit{Mona Lisa} - \end{itemize} - \item Shakespeare - \begin{itemize} - \item \textit{Macbeth} - \item \textit{Hamlet} - \item \textit{King Lear} - \item \textit{Othello} + \item React + \item Vue.js + \item Svelte \end{itemize} + \item Backend + \begin{description} + \item[PHP] Laravel + \item[JavaScript] Express + \item[Python] Django + \end{description} \end{enumerate} \end{texcode} \end{column} \pause -\begin{column}{0.35\textwidth} +\begin{column}{0.38\textwidth} \begin{enumerate} - \item Da Vinci + \item Frontend \begin{itemize} - \item \textit{The Last Supper} - \item \textit{Salvator Mundi} - \item \textit{Mona Lisa} - \end{itemize} - \item Shakespeare - \begin{itemize} - \item \textit{Macbeth} - \item \textit{Hamlet} - \item \textit{King Lear} - \item \textit{Othello} + \item React + \item Vue.js + \item Svelte \end{itemize} + \item Backend \par + \vspace{0.5ex}\small + \textbf{PHP}\enspace Laravel \\ + \textbf{JavaScript}\enspace Express \\ + \textbf{Python}\enspace Django \end{enumerate} \end{column} \end{columns} @@ -243,7 +240,7 @@ \section{填写内容} \begin{frame}[fragile] \frametitle{常用环境：图片} \begin{columns} -\begin{column}{0.6\textwidth} +\begin{column}{0.64\textwidth} \begin{texcode}[gobble=4, moretexcs={\graphicspath,\includegraphics}, emph={[1]figure}, emph={[2]graphicx}] % 不是 graphics @@ -262,7 +259,7 @@ \section{填写内容} \end{texcode} \end{column} \pause -\begin{column}{0.3\textwidth} +\begin{column}{0.28\textwidth} \begin{figure} \centering \fduemblem+[x=0.1pt, y=0.1pt, color=FudanBlue] @@ -276,7 +273,7 @@ \section{填写内容} \begin{frame}[fragile] \frametitle{常用环境：表格} \begin{columns} -\begin{column}{0.6\textwidth} +\begin{column}{0.62\textwidth} \begin{texcode}[gobble=4, moretexcs={\toprule,\midrule,\bottomrule}, emph={[1]table,tabular}, emph={[2]booktabs}] \usepackage{booktabs} % 三线表 @@ -323,7 +320,7 @@ \section{填写内容} \begin{frame}[fragile] \frametitle{常用环境：定理} \begin{columns} -\begin{column}{0.57\textwidth} +\begin{column}{0.6\textwidth} \begin{texcode}[gobble=4, moredelim={[is][emphstyle]{!}{!}}, moretexcs={\newtheorem*}, emph={[2]amsthm}] \usepackage{amsthm} @@ -344,8 +341,8 @@ \section{填写内容} \end{texcode} \end{column} \pause -\begin{column}{0.33\textwidth} - \footnotesize +\begin{column}{0.32\textwidth} + \footnotesize\RaggedRight \setlength{\parskip}{0.5em} \setlength{\parindent}{0pt} @@ -555,7 +552,7 @@ \section{填写内容} \begin{itemize} \item |\pause| 命令 - \item |\onslide<1>|、|\item<1+>| 等 + \item |\onslide<1>|、|\item<1->| 等 \end{itemize} \end{itemize} \end{frame} diff --git a/include/introduction.tex b/include/introduction.tex index a3ffee5..93e6675 100644 --- a/include/introduction.tex +++ b/include/introduction.tex @@ -71,7 +71,7 @@ \section{介绍} \begin{frame}[fragile] \frametitle{\LaTeX{} 是什么？\mbox{}——\mbox{}What you \emph{think} is what you get!} \begin{columns} -\begin{column}{0.48\textwidth} +\begin{column}{0.5\textwidth} \begin{texcode}[basicstyle=\tiny\ttfamily, moretexcs={\maketitle}, emph={[1]equation,itemize,document}, emph={[2]article,amsmath,graphicx}] \documentclass{article} @@ -99,11 +99,12 @@ \section{介绍} \end{texcode} \end{column} \pause -\begin{column}{0.48\textwidth} +\begin{column}{0.42\textwidth} \begin{figure} \centering \vspace{-0.8cm} - \includegraphics[width=\textwidth]{examples/normal-dist/normal-dist.pdf} + \includegraphics[width=\textwidth, trim={2cm 2cm 2cm 2cm}, clip]% + {examples/normal-dist/normal-dist.pdf} \end{figure} \end{column} \end{columns} diff --git a/include/math.tex b/include/math.tex index 45556b3..fef8700 100644 --- a/include/math.tex +++ b/include/math.tex @@ -46,7 +46,7 @@ \section{公式} \item<+-> 分式 \begin{itemize} - \item |\frac{〈分子〉}{〈分母〉}| + \item |\frac{<分子>}{<分母>}| \item 行内分式、小分式不好看：改用 |a/b|，或改用独显公式 \item \alert{不推荐 \texttt{\textbackslash dfrac}} \end{itemize} @@ -54,7 +54,7 @@ \section{公式} \item<+-> 根式 \begin{itemize} - \item |\sqrt[〈次数〉]{〈内容〉}| + \item |\sqrt[<次数>]{<内容>}| \item 复杂情况改用分数指数：|{...}^{1/n}| \end{itemize} @@ -223,7 +223,7 @@ \section{公式} \item 抄录：忽略所有特殊类别码\zhparen{catcode}，原样显示 \begin{itemize} - \item |\verb〈char〉...〈char〉|、|verbatim| 环境 + \item |\verb...|、|verbatim| 环境 \item \pkg{verbatim}、\pkg{fancyvrb} 宏包 \end{itemize} \pause @@ -240,7 +240,6 @@ \section{公式} \end{itemize} \pause \begin{lstlisting}[ language = C, - basewidth = 0.54em, xleftmargin = 6em, numbers = left, numberstyle = \tiny, diff --git a/include/start.tex b/include/start.tex index a48b22f..ede1cdb 100644 --- a/include/start.tex +++ b/include/start.tex @@ -34,6 +34,7 @@ \section{开始之前……} \begin{frame}{编码} 关于 \LaTeX{} 源文件的编码，我们给出如下结论：\pause \begin{alertblock}{编码定理} + \vspace{0cm} 一般地，在任何场合使用（不带 BOM 的） \alert{UTF\CASE{-}8} 编码均是最优选择． \end{alertblock} \pause 此定理的证明留做习题． diff --git a/include/templates.tex b/include/templates.tex index 40f36b0..11641a0 100644 --- a/include/templates.tex +++ b/include/templates.tex @@ -38,7 +38,7 @@ \section{使用模板} \begin{frame}[fragile] \frametitle{\pkg{revtex}} \begin{itemize} - \item 获取 + \item<+-> 获取 \begin{itemize} \item APS 官网 \link{https://journals.aps.org/revtex} @@ -46,16 +46,16 @@ \section{使用模板} \item 阅读文档：|textdoc aps| \end{itemize} - \item 写作 + \item<+-> 写作 \begin{itemize} - \item 起手式：|\documentclass[aps,prl,twocolumn,...]{revtex4-2}| + \item |\documentclass[aps,prl,twocolumn,...]{revtex4-2}| \item 作者信息：|\title|、|\author| 等需放在 |\begin{document}| 之后 \item 跨栏长公式：|widetext| 环境 \item 文献引用：|\cite| + |\bibliography|，无需 |\bibliographystyle| \end{itemize} - \item 编译 + \item<+-> 编译 \begin{itemize} \item 推荐 \pdfLaTeX{}，也可 |latexmk -pdf| @@ -76,8 +76,8 @@ \section{使用模板} \begin{columns} \begin{column}{0.7\textwidth} \begin{itemize} - \item 最新版本：v0.8-dev - \item 建议直接从 GitHub 下载 \link{https://github.com/stone-zeng/fduthesis} + \item<+-> 最新版本：v0.8-dev + \item<+-> 建议直接从 GitHub 下载 \link{https://github.com/stone-zeng/fduthesis} \begin{itemize} \item Code > Download ZIP @@ -86,7 +86,7 @@ \section{使用模板} \item Releases 中的版本较旧 \end{itemize} - \item \TeX{} Live 和 Overleaf + \item<+-> \TeX{} Live 和 Overleaf \link{https://www.overleaf.com/latex/templates/fduthesis-latex-thesis-template-for-fudan-university/svtdhhstkmkt} 上的也较旧 @@ -97,6 +97,7 @@ \section{使用模板} \end{itemize} \end{column} \begin{column}{0.26\textwidth} + \onslide<2-> \includegraphics[width=\textwidth]{images/github-download.png} \end{column} \end{columns} @@ -105,14 +106,14 @@ \section{使用模板} \begin{frame}[fragile] \frametitle{\pkg{fduthesis}：使用} \begin{itemize} - \item 文档类选项 + \item<+-> 文档类选项 \begin{itemize} \item 论文类型：\lstinline[style=style@inline]+type = doctor|master|bachelor+ \item 单双面模式：|oneside| 或 |twoside| \end{itemize} - \item 参数设置举例 + \item<+-> 参数设置举例 \begin{texcode}[gobble=4, basicstyle=\scriptsize\ttfamily, moretexcs={\fdusetup}, emph={[1]style,info,font-size,bib-resource,title,author}, alsoletter={-}] @@ -123,14 +124,14 @@ \section{使用模板} } \end{texcode} - \item 文献引用 + \item<+-> 文献引用 \begin{itemize} \item |\cite|、|\citet|、|\parencite| 等 \item 文献列表：|\printbibliography| \end{itemize} - \item 编译 + \item<+-> 编译 \begin{itemize} \item 推荐 \XeLaTeX{}，也可 |latexmk -pdfxe| diff --git a/include/typography.tex b/include/typography.tex index 53d6145..9531b60 100644 --- a/include/typography.tex +++ b/include/typography.tex @@ -180,7 +180,7 @@ \section{字体排印} \item<+-> 波浪号： \begin{itemize} - \item |~| ≠ |\textasciitilde| ≠ |\texttildelow| ≠ |$\sim$| ≠ 你要的那一个 + \item |~| ≠ |\textasciitilde| ≠ |\texttildelow| ≠ |$\sim$| ≠ 你要的那个 \item 那就是~青\textasciitilde 藏\texttildelow 高 $\sim$ 原～～～～ \begin{itemize} @@ -210,7 +210,7 @@ \section{字体排印} \item 等宽字体： {\Courier Courier}, {\Menlo Menlo}, - \texttt{Iosevka}, \textit{etc.} + {\Unifont GNU Unifont}, \textit{etc.} \item 中文字体：宋体、{\HeiTi 黑体}、{\FangSong 仿宋}、{\KaiTi 楷书}、{\WaWa （娃娃体）}…… \end{itemize} diff --git a/latex-talk.tex b/latex-talk.tex index ce6891b..ed24033 100644 --- a/latex-talk.tex +++ b/latex-talk.tex @@ -36,6 +36,7 @@ \setbeamerfont{section title}{size=\Large, series=\bfseries} \setbeamerfont{frametitle}{size=\large, series=\bfseries} \setbeamerfont{caption}{size=\footnotesize, series=\bfseries} +\setbeamerfont{itemize/enumerate subbody}{size=\footnotesize} \setbeamerfont{footnote}{size=\tiny} \setbeamerfont{alerted text}{series=\bfseries} \addtobeamertemplate{institute}{\raggedleft}{} @@ -65,7 +66,6 @@ \vbox to 0pt {\smash{\raisebox{-128pt}{\inserttitlegraphic}}}% \nointerlineskip} \setbeamertemplate{frame numbering}{\zhnumber[style=Financial]{\insertframenumber}} -\setbeamertemplate{itemize/enumerate subbody begin}{\footnotesize} \setbeamertemplate{caption}{\parbox{\textwidth}{\centering\insertcaption}\par} \setbeamertemplate{bibliography item}[text] @@ -85,15 +85,21 @@ ItalicFont = *-Italic, BoldItalicFont = *-BoldItalic, Scale = 1.1] -\setmonofont{Iosevka}[Scale=0.96] +\setmonofont{RobotoMono}[ + Extension = .otf, + UprightFont = *-Regular, + BoldFont = *-Bold, + ItalicFont = *-Italic, + BoldItalicFont = *-BoldItalic, + Scale = 0.92] \setmathfont{LibertinusMath-Regular.otf} \setCJKmainfont{Source Han Serif SC}[ UprightFont = * SemiBold, BoldFont = * Heavy, ItalicFont = * SemiBold, BoldItalicFont = * SemiBold, - RawFeature = +fwid] -\setCJKmonofont{Sarasa Mono SC} + CharacterWidth = Full] +\setCJKmonofont{Source Han Sans SC}[AutoFakeSlant] \newfontfamily\EBGaramond{EBGaramond}[ Extension = .otf, @@ -114,7 +120,7 @@ \newfontfamily\Avenir{Avenir Next} \newfontfamily\Courier{Courier} \newfontfamily\Helvetica{Helvetica Neue Light} -\newfontfamily\Menlo{Menlo} +\newfontfamily\Menlo{Menlo}[Scale=MatchLowercase] \newfontfamily\NotoArabic{Noto Naskh Arabic}[Script=Arabic] \newfontfamily\NotoDevanagari{Noto Serif Devanagari} \newfontfamily\NotoEgyptian{Noto Sans Egyptian Hieroglyphs} @@ -126,6 +132,7 @@ \newCJKfontfamily\WaWa{Wawati SC} \newfontfamily\SimHei{simhei.ttf}[Path=./fonts/, AutoFakeBold=4, AutoFakeSlant] \newfontfamily\TimesNewRoman{Times New Roman} +\newfontfamily\Unifont{Unifont} \newfontfamily\xkcd{xkcd-script.ttf}[Path=./fonts/, Ligatures=TeX] % PDF bookmark @@ -137,7 +144,6 @@ \lstdefinestyle{style@latex}{ language = [latex]TeX, alsoletter = {*}, - basewidth = 0.54em, keywordstyle = \bfseries\color{keyword}, commentstyle = \itshape\color{comment}, texcsstyle = *\color{texcs}, @@ -186,26 +192,26 @@ \ExplSyntaxOff % Macros -\newcommand\link[1]{\href{#1}{\faLink}} -\newcommand\CASE[1]{{\addfontfeatures{Letters=Uppercase}#1}} -\newcommand\jatext[1]{{\addCJKfontfeatures{Language=Japanese}#1}} -\newcommand\zhparen[1]{（\raisebox{0.1ex}{#1}）} -\newcommand\enparen[1]{\CASE{(}#1\CASE{)}} -\newcommand\pkg[1]{\texttt{#1}} -\newcommand\usv[1]{\texttt{U+#1}} -\newcommand\kbd[1]{{\LibertinusKey#1}} -\DeclareRobustCommand{\nonumberfootnote}[2][]{% +\newcommand{\link}[1]{\href{#1}{\faLink}} +\newcommand{\CASE}[1]{{\addfontfeatures{Letters=Uppercase}#1}} +\newcommand{\jatext}[1]{{\addCJKfontfeatures{Language=Japanese}#1}} +\newcommand{\zhparen}[1]{（\raisebox{0.1ex}{#1}）} +\newcommand{\enparen}[1]{\CASE{(}#1\CASE{)}} +\newcommand{\pkg}[1]{\texttt{#1}} +\newcommand{\usv}[1]{\texttt{U+#1}} +\newcommand{\kbd}[1]{{\LibertinusKey#1}} +\newcommand{\nonumberfootnote}[2][]{% \let\thefootnote\relax \footnotetext#1{#2}} -\renewcommand*\footnoterule{} - -\newcommand\XeTeX{\hologo{XeTeX}} -\newcommand\pdfTeX{\hologo{pdfTeX}} -\newcommand\LuaTeX{\hologo{LuaTeX}} -\newcommand\XeLaTeX{\hologo{Xe}\kern-.13em\LaTeX{}} -\newcommand\pdfLaTeX{pdf\LaTeX{}} -\newcommand\LuaLaTeX{Lua\LaTeX{}} -\newcommand\BibTeX{\hologo{BibTeX}} +\renewcommand{\footnoterule}{} + +\newcommand{\XeTeX}{\hologo{XeTeX}} +\newcommand{\pdfTeX}{\hologo{pdfTeX}} +\newcommand{\LuaTeX}{\hologo{LuaTeX}} +\newcommand{\XeLaTeX}{\hologo{Xe}\kern-.13em\LaTeX{}} +\newcommand{\pdfLaTeX}{pdf\LaTeX{}} +\newcommand{\LuaLaTeX}{Lua\LaTeX{}} +\newcommand{\BibTeX}{\hologo{BibTeX}} \makeatother