Fix numbering rules, eval for design

TheNetAdmin · May 29, 2018 · 1b5e223 · 1b5e223
1 parent 0b7ec0a
commit 1b5e223
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/config/commands.tex b/config/commands.tex
@@ -106,7 +106,7 @@
                                      |>{\fangsong}X<{\centering}
                                      |>{\fangsong}c|}
             \hline
-            \makecell{成绩\\比例} & \makecell{文献综述\\（10\%）}& \makecell{开题报告\\（15\%）} & \makecell{外文翻译\\（5\%）} & 毕业论文（设计）质量及答辩（70\%） & \makecell{总评\\成绩} \\
+            \makecell{成绩\\比例} & \makecell{ \ifthenelse{\equal{\Type}{thesis}}{文献综述}{中期报告} \\（10\%）}& \makecell{开题报告\\（15\%）} & \makecell{外文翻译\\（5\%）} & 毕业论文（设计）质量及答辩（70\%） & \makecell{总评\\成绩} \\
             \hline
             \multirow{2}*{分值} & \multirow{2}*{\zihao{4}#1} & \multirow{2}*{\zihao{4}#2} & \multirow{2}*{\zihao{4}#3} & \multirow{2}*{\zihao{4}#4} & \multirow{2}*{\zihao{4}#5} \\
             ~ & ~ & ~ & ~ & ~ & ~ \\

diff --git a/config/format/general/numbering.tex b/config/format/general/numbering.tex
@@ -1,6 +1,10 @@
 \renewcommand*{\thesection}{\arabic{section}}
 
+\counterwithin*{figure}{section}
 \renewcommand{\thefigure}{\thesection.\arabic{figure}}
+\counterwithin*{table}{section}
 \renewcommand{\thetable}{\thesection.\arabic{table}}
+\AtBeginDocument{\counterwithin*{lstlisting}{section}}
 \AtBeginDocument{\renewcommand{\thelstlisting}{\thesection.\arabic{lstlisting}}}
+\counterwithin*{equation}{section}
 \renewcommand{\theequation}{\thesection-\arabic{equation}}
diff --git a/config/version.tex b/config/version.tex
@@ -1 +1 @@
-\newcommand{\zjuthesisversion}{1.2.5}
+\newcommand{\zjuthesisversion}{1.2.6}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		\newcommand{\zjuthesisversion}{1.2.5}
		\newcommand{\zjuthesisversion}{1.2.6}