Reformat dir structure.

TheNetAdmin · Jun 21, 2019 · fd46316 · fd46316
1 parent 3a3a1b3
commit fd46316
Show file tree

Hide file tree

Showing 41 changed files with 36 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@
     | thesis: 论文类 | proposal: 开题报告   | true: 生成盲审用pdf（隐藏个人信息） | 默认: cs                             |
     | design: 设计类 | final: 最终论文/设计 | false: 生成提交用pdf                | 与 `config/format/major/` 下目录名相同 |
 
-1. 在 `content` 目录下编写内容
+1. 在 `body` 目录下编写内容
 1. 在 `pages` 目录下填写必要的内容，如审核评语等
-1. 在 `figure` 目录下保存图片，在 `reference/ref.bib` 内插入文献条目
+1. 在 `figure` 目录下保存图片，在 `body/ref.bib` 内插入文献条目
 1. 在根目录下运行命令 `latexmk -xelatex -outdir=out zjuthesis` 即可编译 TeX 文件到 `out` 目录（该目录不会被记录版本）
 
 ## 扩展

diff --git a/content/final/abstract.tex → body/final/abstract.tex b/content/final/abstract.tex → body/final/abstract.tex
diff --git a/content/final/appendix.tex → body/final/appendix.tex b/content/final/appendix.tex → body/final/appendix.tex
diff --git a/content/final/body/body.tex → body/final/body/body.tex b/content/final/body/body.tex → body/final/body/body.tex
diff --git a/content/final/content.tex → body/final/content.tex b/content/final/content.tex → body/final/content.tex
@@ -3,11 +3,11 @@
 \pagestyle{common}
 \setcounter{page}{1}
 
-\input{content/final/introduction/introduction}
-\input{content/final/body/body}
+\input{body/final/introduction/introduction}
+\input{body/final/body/body}
 
 \newpage
 \printbibliography[title={参考文献}]
 
-\input{content/final/appendix}
-\input{content/final/cv}
+\input{body/final/appendix}
+\input{body/final/cv}
diff --git a/content/final/cv.tex → body/final/cv.tex b/content/final/cv.tex → body/final/cv.tex
diff --git a/content/final/introduction/introduction.tex → body/final/introduction/introduction.tex b/content/final/introduction/introduction.tex → body/final/introduction/introduction.tex
diff --git a/content/final/thanksto.tex → body/final/thanksto.tex b/content/final/thanksto.tex → body/final/thanksto.tex
diff --git a/content/proposal/content.tex → body/proposal/content.tex b/content/proposal/content.tex → body/proposal/content.tex
@@ -14,19 +14,19 @@
 \ifthenelse{\equal{\Type}{thesis}}
 {
     % `thesis` content
-    \input{content/proposal/review/review}
-    \input{content/proposal/proposal/proposal}
-    \input{content/proposal/translation/translation}
-    \input{content/proposal/original/original}
+    \input{body/proposal/review/review}
+    \input{body/proposal/proposal/proposal}
+    \input{body/proposal/translation/translation}
+    \input{body/proposal/original/original}
 }
 {
     \ifthenelse{\equal{\Type}{design}}
     {
         % `design` content
-        \input{content/proposal/proposal/proposal}
-        \input{content/proposal/translation/translation}
-        \input{content/proposal/original/original}
-        \input{content/proposal/midcheck/midcheck}
+        \input{body/proposal/proposal/proposal}
+        \input{body/proposal/translation/translation}
+        \input{body/proposal/original/original}
+        \input{body/proposal/midcheck/midcheck}
     }
     {
         % otherwise, blank

diff --git a/content/proposal/midcheck/midcheck.tex → body/proposal/midcheck/midcheck.tex b/content/proposal/midcheck/midcheck.tex → body/proposal/midcheck/midcheck.tex
diff --git a/content/proposal/original/original.tex → body/proposal/original/original.tex b/content/proposal/original/original.tex → body/proposal/original/original.tex
diff --git a/content/proposal/proposal/background.tex → body/proposal/proposal/background.tex b/content/proposal/proposal/background.tex → body/proposal/proposal/background.tex
diff --git a/content/proposal/proposal/content.tex → body/proposal/proposal/content.tex b/content/proposal/proposal/content.tex → body/proposal/proposal/content.tex
diff --git a/content/proposal/proposal/plan.tex → body/proposal/proposal/plan.tex b/content/proposal/proposal/plan.tex → body/proposal/proposal/plan.tex
diff --git a/body/proposal/proposal/proposal.tex b/body/proposal/proposal/proposal.tex
@@ -0,0 +1,9 @@
+\cleardoublepage
+\chapter{开题报告}
+
+\input{body/proposal/proposal/background}
+\input{body/proposal/proposal/content}
+\input{body/proposal/proposal/plan}
+
+\newpage
+\printbibliography[title={参考文献}]
diff --git a/content/proposal/review/review.tex → body/proposal/review/review.tex b/content/proposal/review/review.tex → body/proposal/review/review.tex
diff --git a/content/proposal/translation/translation.tex → body/proposal/translation/translation.tex b/content/proposal/translation/translation.tex → body/proposal/translation/translation.tex
diff --git a/reference/ref.bib → body/ref.bib b/reference/ref.bib → body/ref.bib
diff --git a/config/commands.tex b/config/commands.tex
@@ -17,7 +17,7 @@
 
 \newcommand{\bful}[1]{{\bfseries\uline{#1}}}
 
-\newcommand{\inputpage}[1]{\input{pages/#1}}
+\newcommand{\inputpage}[1]{\input{page/#1}}
 
 \newcommand{\chapternonum}[1]
 {

diff --git a/config/path.tex b/config/path.tex
@@ -1,2 +1,2 @@
 \graphicspath{{figure/}}
-\bibliography{reference/ref.bib}
+\bibliography{body/ref.bib}
diff --git a/content/proposal/proposal/proposal.tex b/content/proposal/proposal/proposal.tex
diff --git a/pages/final/cover.tex → page/final/cover.tex b/pages/final/cover.tex → page/final/cover.tex
diff --git a/pages/final/eval.tex → page/final/eval.tex b/pages/final/eval.tex → page/final/eval.tex
diff --git a/pages/final/job.tex → page/final/job.tex b/pages/final/job.tex → page/final/job.tex
diff --git a/pages/final/post.tex → page/final/post.tex b/pages/final/post.tex → page/final/post.tex
diff --git a/pages/final/previous.tex → page/final/previous.tex b/pages/final/previous.tex → page/final/previous.tex
@@ -2,5 +2,5 @@
 \pagestyle{previous}
 
 \inputpage{final/promise}
-\input{content/final/thanksto}
-\input{content/final/abstract}
+\input{body/final/thanksto}
+\input{body/final/abstract}
diff --git a/pages/final/promise.tex → page/final/promise.tex b/pages/final/promise.tex → page/final/promise.tex
diff --git a/pages/final/toc.tex → page/final/toc.tex b/pages/final/toc.tex → page/final/toc.tex
diff --git a/pages/proposal/cover.tex → page/proposal/cover.tex b/pages/proposal/cover.tex → page/proposal/cover.tex
diff --git a/pages/proposal/design/midcheckeval.tex → page/proposal/design/midcheckeval.tex b/pages/proposal/design/midcheckeval.tex → page/proposal/design/midcheckeval.tex
diff --git a/page/proposal/design/post.tex b/page/proposal/design/post.tex
@@ -0,0 +1,5 @@
+\cleardoublestylepage{empty}
+\pagestyle{empty}
+
+\inputpage{proposal/design/proposaleval}
+\inputpage{proposal/design/midcheckeval}
diff --git a/pages/proposal/design/previous.tex → page/proposal/design/previous.tex b/pages/proposal/design/previous.tex → page/proposal/design/previous.tex
diff --git a/pages/proposal/design/proposaleval.tex → page/proposal/design/proposaleval.tex b/pages/proposal/design/proposaleval.tex → page/proposal/design/proposaleval.tex
diff --git a/pages/proposal/post.tex → page/proposal/post.tex b/pages/proposal/post.tex → page/proposal/post.tex
diff --git a/pages/proposal/previous.tex → page/proposal/previous.tex b/pages/proposal/previous.tex → page/proposal/previous.tex
diff --git a/pages/proposal/thesis/post.tex → page/proposal/thesis/post.tex b/pages/proposal/thesis/post.tex → page/proposal/thesis/post.tex
@@ -1,4 +1,4 @@
 \cleardoublestylepage{empty}
 \pagestyle{empty}
 
-\input{pages/proposal/thesis/proposaleval}
+\inputpage{proposal/thesis/proposaleval}
diff --git a/pages/proposal/thesis/previous.tex → page/proposal/thesis/previous.tex b/pages/proposal/thesis/previous.tex → page/proposal/thesis/previous.tex
diff --git a/pages/proposal/thesis/proposaleval.tex → page/proposal/thesis/proposaleval.tex b/pages/proposal/thesis/proposaleval.tex → page/proposal/thesis/proposaleval.tex
diff --git a/pages/proposal/toc.tex → page/proposal/toc.tex b/pages/proposal/toc.tex → page/proposal/toc.tex
diff --git a/pages/proposal/design/post.tex b/pages/proposal/design/post.tex
diff --git a/zjuthesis.tex b/zjuthesis.tex
@@ -30,7 +30,7 @@
     \ifthenelse{\equal{\Type}{design}}
         {\part{毕业设计}}
         {\part{毕业论文}}
-    \input{content/final/content}
+    \input{body/final/content}
 
     \inputpage{final/post}
 
@@ -43,7 +43,7 @@
 
     \inputpage{proposal/cover}
     \inputpage{proposal/previous}
-    \input{content/proposal/content}
+    \input{body/proposal/content}
     \inputpage{proposal/post}
 }
 
@@ -52,7 +52,7 @@
     \inputpage{proposal/cover}
     \inputpage{proposal/previous}
     \inputpage{proposal/toc}
-    \input{content/proposal/content}
+    \input{body/proposal/content}
     \inputpage{proposal/post}
 }