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

修正图题字体 #212

Merged
merged 1 commit into from
Dec 6, 2017
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
10 changes: 5 additions & 5 deletions sjtuthesis.cls
Original file line number Diff line number Diff line change
Expand Up @@ -179,19 +179,18 @@
\DeclareGraphicsExtensions{.pdf,.eps,.png,.jpg,.jpeg}

% Caption setting in caption and bicaption pacakge
\captionsetup{format=plain,labelformat=simple,labelsep=space,justification=centering,font=small}
\DeclareCaptionFont{kaishu}{\kaishu}
\captionsetup{format=plain,labelformat=simple,labelsep=space,justification=centering,font={small,kaishu}}
\captionsetup[bi-first]{bi-first}
\captionsetup[bi-second]{bi-second}

\DeclareCaptionOption{bi-first}[]{
\def\tablename{\sjtu@tablename}
\def\figurename{\sjtu@figurename}

}
\DeclareCaptionOption{bi-second}[]{
\def\tablename{Table}
\def\figurename{Figure}

}

% Ref https://github.com/weijianwen/SJTUThesis/issues/186
Expand All @@ -203,12 +202,13 @@
\renewcommand{\bottomfraction}{0.65}
\renewcommand{\floatpagefraction}{0.60}

% 定公式、图、表、算法的编号为"3-1"的形式,即分隔符由.变为短杠
% 定公式、图、表、算法、代码的编号为"3-1"的形式,即分隔符由.变为短杠
\renewcommand{\theequation}{\arabic{chapter}--\arabic{equation}}
\renewcommand{\thefigure}{\arabic{chapter}--\arabic{figure}}
\renewcommand\p@subfigure{\thefigure}
\renewcommand{\thetable}{\arabic{chapter}--\arabic{table}}
\renewcommand{\thealgorithm}{\arabic{chapter}--\arabic{algorithm}}
\AtBeginDocument{\renewcommand{\thelstlisting}{\arabic{chapter}--\arabic{lstlisting}}}

% 使用enumitem宏包配制列表环境
% 紧凑间距
Expand Down Expand Up @@ -247,7 +247,7 @@
%% added by http://bbs.ctex.org/viewthread.php?tid=53451
fontadjust,
captionpos=t,
framextopmargin=2pt,framexbottommargin=2pt,abovecaptionskip=-3pt,belowcaptionskip=3pt,
framextopmargin=2pt,framexbottommargin=2pt,abovecaptionskip=-6pt,belowcaptionskip=9pt,
xleftmargin=4em,xrightmargin=4em, % 设定listing左右的空白
texcl=true,
% 设定中文冲突,断行,列模式,数学环境输入,listing数字的样式
Expand Down
4 changes: 2 additions & 2 deletions tex/example.tex
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ \subsection{长标题的换行}
\centering
\includegraphics[width=4cm]{example/sjtulogo.pdf}
\bicaption[这里将出现在插图索引]
{海交通大学是我国历史最悠久的高等学府之一,是教育部直属、教育部与上海市共建的全国重点大学.}
{上海交通大学是我国历史最悠久的高等学府之一,是教育部直属、教育部与上海市共建的全国重点大学.}
{Where there is a will, there is a way.}
\label{fig:longcaptionbad}
\end{figure}
Expand All @@ -225,7 +225,7 @@ \subsection{长标题的换行}
\centering
\includegraphics[width=4cm]{example/sjtulogo.pdf}
\bicaption[出现在插图索引中]
{海交通大学是我国历史最悠久的高等学府之一,是教育部直属、教育部与上海市共建的全国重点大学.}
{上海交通大学是我国历史最悠久的高等学府之一,是教育部直属、教育部与上海市共建的全国重点大学.}
{Where there is a will, there is a way.}
\label{fig:longcaptiongood}
\end{minipage}
Expand Down