fix spaces above figures

ustctug · Apr 18, 2017 · 798a3b1 · 798a3b1
1 parent f0df2b9
commit 798a3b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/ustctug/ustcthesis/total.svg)](https://github.com/ustctug/ustcthesis/releases)
 [![GitHub commits](https://img.shields.io/github/commits-since/ustctug/ustcthesis/v2.2.svg)](https://github.com/ustctug/ustcthesis/commits/master)
 
-本项目是中国科学技术大学的毕业论文 LaTeX 模板 ustcthesis v2.2。
+本项目是中国科学技术大学的毕业论文 LaTeX 模板 ustcthesis v2.2.1。
 
 新模板进行了彻底的重写，相对于旧版
 [ywgATustcbbs/ustcthesis](https://github.com/ywgATustcbbs/ustcthesis)

diff --git a/ustcthesis.cls b/ustcthesis.cls
@@ -20,7 +20,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ustcthesis}
-    [2017/04/16 v2.1.5 USTC thesis template]
+    [2017/04/19 v2.2.1 USTC thesis template]
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=ustc@opt, prefix=ustc@opt@, setkeys=\kvsetkeys}
 \DeclareBoolOption[false]{doctor}
@@ -437,6 +437,7 @@
 \setlength{\parindent}{2\ccwd}
 \setlength{\parskip}{0bp}
 \RequirePackage{caption}
+\RequirePackage{calc}
 \DeclareCaptionLabelSeparator{zhspace}{\hspace{\ccwd}}
 \captionsetup{
     format = hang,
@@ -450,12 +451,6 @@
         labelfont+={bf},
     }
 \fi
-\setlength{\intextsep}{0bp}
-\captionsetup[figure]{
-    position = bottom,
-    aboveskip = 6bp,
-    belowskip = 12bp,
-}
 \captionsetup[table]{
     position = top,
     aboveskip = 6bp,

diff --git a/ustcthesis.dtx b/ustcthesis.dtx
@@ -54,7 +54,7 @@ LaTeX version 1999/12/01 or later.
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{ustcthesis}
 %<*class>
-    [2017/04/17 v2.2 USTC thesis template]
+    [2017/04/19 v2.2.1 USTC thesis template]
 %</class>
 %
 %<*driver>
@@ -1365,9 +1365,12 @@ LaTeX version 1999/12/01 or later.
 %
 % \subsection{图、表}
 % 用 \pkg{caption} 宏包设置图、表的格式
+% 注意计算 belowskip 必须用 \pkg{calc} 宏包修正。
 % \changes{v2.2}{2017/04/17}{Fix distance below figure captions.}
+% \changes{v2.2.1}{2017/04/18}{Fix distance above figures.}
 %    \begin{macrocode}
 \RequirePackage{caption}
+\RequirePackage{calc}
 \DeclareCaptionLabelSeparator{zhspace}{\hspace{\ccwd}}
 \captionsetup{
     format = hang,
@@ -1381,12 +1384,11 @@ LaTeX version 1999/12/01 or later.
         labelfont+={bf},
     }
 \fi
-\setlength{\intextsep}{0bp}
-\captionsetup[figure]{
-    position = bottom,
-    aboveskip = 6bp,
-    belowskip = 12bp,
-}
+% \captionsetup[figure]{
+%     position = bottom,
+%     aboveskip = 6bp,
+%     belowskip = {12bp-\intextsep},
+% }
 \captionsetup[table]{
     position = top,
     aboveskip = 6bp,