Merge branch 'develop'

wengan-li · Nov 27, 2019 · 84d8e4d · 84d8e4d
2 parents 546df3d + da43259
commit 84d8e4d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+#### v1.5.8 [Nov 27, 2019]:
++ **修正錯誤**:
+  封面日期的產出問題 \([感謝MOHOAzure提供Pull request \#44](https://github.com/wengan-li/ncku-thesis-template-latex/pull/44)\)
+
 #### v1.5.7 [Jun 23, 2019]:
 
 + **更新**:

diff --git a/thesis/conf/conf.tex b/thesis/conf/conf.tex
@@ -10,7 +10,7 @@
 % 就會使用'./context/context.tex'中你所編寫論文內容.
 % 否則會使用'./example/context.tex'的模版說明文件內容.
 
-\DemoMode
+% \DemoMode
 
 % ----------------------------------------------------------------------------
 
@@ -41,7 +41,7 @@
 % 不論你是使用\DisplayCoverInChi或\DisplayCoverInEng,
 % 使用\DisplayCoverPeoplesBothNames以設定同時顯示中英文名字.
 
-%\DisplayCoverInChi
+\DisplayCoverInChi
 \DisplayCoverInEng
 \DisplayCoverPeoplesBothNames
 
@@ -113,7 +113,7 @@
 % 次序: {年份}{月份}{日}
 % \SetOralDate{2016}{12}{31}
 
-\SetOralDate{2016}{12}{31}
+\SetOralDate{2019}{12}{31}
 
 %--------------------------------------------------
 
@@ -124,9 +124,9 @@
 
 % 設定西元的年月, 會自動計算出民國的年份, 和英文的月份轉換
 % 次序: {年份}{月份}
-% \SetCoverDate{2016}{12}
+% \SetCoverDate{2019}{12}
 
-\SetCoverDate{2016}{12}
+\SetCoverDate{2019}{12}
 
 % ----------------------------------------------------------------------------
 

diff --git a/thesis/template/command/cmd-common.tex b/thesis/template/command/cmd-common.tex
@@ -27,14 +27,23 @@
 \newcommand{\GetMonthInEng}[1]
 {%
   \ifthenelse{\equal{#1}{1}}{January}{}%
+  \ifthenelse{\equal{#1}{01}}{January}{}%
   \ifthenelse{\equal{#1}{2}}{February}{}%
+  \ifthenelse{\equal{#1}{02}}{February}{}%
   \ifthenelse{\equal{#1}{3}}{March}{}%
+  \ifthenelse{\equal{#1}{03}}{March}{}%
   \ifthenelse{\equal{#1}{4}}{April}{}%
+  \ifthenelse{\equal{#1}{04}}{April}{}%
   \ifthenelse{\equal{#1}{5}}{May}{}%
+  \ifthenelse{\equal{#1}{05}}{May}{}%
   \ifthenelse{\equal{#1}{6}}{June}{}%
+  \ifthenelse{\equal{#1}{06}}{June}{}%
   \ifthenelse{\equal{#1}{7}}{July}{}%
+  \ifthenelse{\equal{#1}{07}}{July}{}%
   \ifthenelse{\equal{#1}{8}}{August}{}%
+  \ifthenelse{\equal{#1}{08}}{August}{}%
   \ifthenelse{\equal{#1}{9}}{September}{}%
+  \ifthenelse{\equal{#1}{09}}{September}{}%
   \ifthenelse{\equal{#1}{10}}{October}{}%
   \ifthenelse{\equal{#1}{11}}{November}{}%
   \ifthenelse{\equal{#1}{12}}{December}{}%

diff --git a/thesis/template/command/cmd-cover.tex b/thesis/template/command/cmd-cover.tex
@@ -33,14 +33,10 @@
   %
   \EnableCoverPageStyle
   %
-  % Aligned to the center of the page
-  \begin{center}
 } % End of \newcommand{}
 
 \newcommand{\EndCover}
 {
-  % End of alignment
-  \end{center}
   \DisableCoverPageStyle
   \EndOfPage
   \UseDefaultLineStretch
@@ -303,7 +299,10 @@
 } % End of \newcommand{}
 
 % Use to include and display inner cover
-\newcommand{\DisplayInnerCover}{\input{./template/cover/inner.tex}}
+\newcommand{\DisplayInnerCover}%
+{
+	\input{./template/cover/inner}
+} % End of \newcommand{}
 
 % ----------------------------------------------------------------------------
 

diff --git a/thesis/template/cover/cover-chi.tex b/thesis/template/cover/cover-chi.tex
@@ -187,6 +187,7 @@
       }%
   \end{center}
 \end{minipage}
+
 % ------------------------------------------------
 
 % Date 日期

diff --git a/thesis/template/cover/cover-eng.tex b/thesis/template/cover/cover-eng.tex
@@ -27,6 +27,7 @@
 \StartCover
 % ------------------------------------------------
 
+
 % 顯示 校名, 系所名, 論文種類
 \begin{minipage}[c][5cm][t]{\textwidth}
   \begin{center}
@@ -190,6 +191,7 @@
       }%
   \end{center}
 \end{minipage}
+
 % ------------------------------------------------
 
 % Date 日期