diff --git a/main.tex b/main.tex index 38b6a78..f236347 100644 --- a/main.tex +++ b/main.tex @@ -5,24 +5,31 @@ \title{思源黑体 + FiraGO} +\author{丛宇} \date{\today} \begin{document} \maketitle test math font. - -\[ +\( G'=(V,E) -\] -\textbf{math!!! 粗的!} -$MATH$ +\) -\section{is this bold $MATH \Z$?} +测试中文 + +\textbf{粗中文a} + +$\mathbf{Bold Math}$ + +\section{$Bold \; MATH \Z\R \Q$ in title $\mathbf{Bold Math \Z \R \Q}$?} \section{这是bold $\text{你好abc}\R$?} \begin{theorem}[sbada] aaa 中文 \end{theorem} +\begin{proof} + test setminus and qed $A\setminus B$ +\end{proof} \begin{equation} \begin{aligned} @@ -40,7 +47,11 @@ return ss \end{algo} \caption{this is a fig 这是图} \end{figure} -\textsc{Sans} -\texttt{monolM} + +\textsc{Small Capital} + +\textit{italic} + +\texttt{mono} \end{document} \ No newline at end of file diff --git a/myctex.sty b/myctex.sty index 9b1e7a0..e0538da 100644 --- a/myctex.sty +++ b/myctex.sty @@ -1,6 +1,6 @@ \ProvidesPackage{myctex} -\usepackage[fontset=none, scheme=plain]{ctex} -\usepackage{fontspec} +\RequirePackage[fontset=none, scheme=plain]{ctex} +\RequirePackage{fontspec} \newif\ifmyctex@sans \myctex@sansfalse % Default is serif @@ -15,8 +15,9 @@ \setCJKmainfont{Source Han Sans SC}[BoldFont=*, ItalicFont=*] \setCJKsansfont{Source Han Sans SC} \setCJKmonofont{Source Han Sans SC} -\usepackage[fira]{fontsetup} -\usepackage{FiraMono} +\RequirePackage[fira]{fontsetup} +\RequirePackage{FiraMono} +\setmathfont{Fira Math}[range=\setminus] \else \setCJKmainfont{Source Han Serif SC}[BoldFont=*, ItalicFont=*] @@ -95,10 +96,10 @@ % ---------------------------------------------------------------------- \def\etal{\emph{et~al.}} % and others -%\def\ie{\emph{i.e.}} % that is -\def\ie{\textcolor{red}{that is}} -%\def\eg{\emph{e.g.}} % for example -\def\eg{\textcolor{red}{for example}} +\def\ie{\emph{i.e.}} % that is +% \def\ie{\textcolor{red}{that is}} +\def\eg{\emph{e.g.}} % for example +% \def\eg{\textcolor{red}{for example}} % ----------------------- % Common Names @@ -109,14 +110,14 @@ % useful shortcuts % ----------------------- -\def\cost{\cent} +% \def\cost{\cent} % ---------------------------------------------------------------------- % Simple math stuff % ---------------------------------------------------------------------- -\renewcommand{\subset}{\subseteq} +% \renewcommand{\subset}{\subseteq} % ---- SYMBOLS ---- -\let\e\varepsilon % a ``real'' epsilon — better yet, just use Unicode ε. +\let\e\epsilon % a ``real'' epsilon — better yet, just use Unicode ε. % % I give up. These are in the wrong font, but my kludged versions % LOOK like kludges, especially \Z, \Q, and \C. @@ -316,9 +317,9 @@ \newif\ifneedqed \global\needqedfalse \@ifundefined{square}{\let\square\Box}{} % grumble latex2e -\def\QED{\ensuremath{{\square}}} +% \def\QED{\ensuremath{{\square}}} \def\markatright#1{\leavevmode\unskip\nobreak\quad\hspace*{\fill}{#1}} -\def\qed{\ifneedqed\markatright{\QED}\global\needqedfalse\else\null\fi} +\def\qed{\ifneedqed\markatright{\ensuremath{{\square}}}\global\needqedfalse\else\null\fi} \newproof{proof}{Proof\global\needqedtrue}[\qed] \newproof{sketch}{Proof Sketch\global\needqedtrue}[\qed]