fix format (#35)

* pre-release 1.5.0 (#26)

* GNU General Public License v3.0

* Update README.md

* Update README.md (#25)

Co-authored-by: cfrpg <[email protected]>

* update 1.5.0

* update

* update format

Co-authored-by: cfrpg <[email protected]>

Author: polossk

README.md

@@ -69,7 +69,7 @@ be very generous of you!
 
 Copyright (c) 2016-2020 *NWPU Metaphysics Office* <https://github.com/NWPUMetaphysicsOffice>
 
-This repo is under the license of **GNU General Public License v3.0**. Go 
+This repo is under the license of **GNU General Public License v3.0**. Go
 and check [license](LICENSE) for details.
 
 The association *NWPU Metaphysics Office* is a club-like student group. The

chapters/chapter02.tex

@@ -1,7 +1,7 @@
 \chapter{测试A}
 \blindtext
 \section{我做的1个事}
-\blindtext\cite{knuth1986the}\cite{lamport1989latex:}
+\blindtext\ucite{knuth1986the}\ucite{lamport1989latex:}
 \section{我又做的1个事}
 \blindtext
 \subsection{两个小标题q}

example.pdf

@@ -31,7 +31,7 @@
 \thispagestyle{empty}
 \phantom{s}
 \clearpage
-\includepdf{preface/tasklist.pdf} 
+\includepdf{preface/tasklist.pdf}
 \newpage
 \clearpage
 \thispagestyle{empty}
@@ -55,7 +55,7 @@
 
 \mainmatter
 
-\renewcommand{\baselinestretch}{1.0}
+\renewcommand{\baselinestretch}{1.25}
 \sHalfXiaosi\fSong
 
 % 正文内容

example.tex

@@ -1,25 +1,62 @@
 TEX      = xelatex
 BIB      = bibtex
+MKI      = makeindex
 MAIN     = example
+TEXARGS  = -synctex=1 -shell-escape
 
-target: close clean tex open
+sample: close wipesample clean texsamplebib opensample
 
-tex: $(MAIN).tex
-	$(TEX) $<
+
+ifeq ($(OS), Windows_NT)
+    PLATFORM = Windows
+else
+    ifeq ($(shell uname), Darwin)
+        PLATFORM = MacOS
+    else
+        PLATFORM = Unix-Like
+    endif
+endif
+
+ifeq ($(PLATFORM), Windows)
+    RM = del /s /f
+    OPEN = cmd /c start
+    CLOSE = cmd /c taskkill /im Acrobat.exe /t /f
+else
+    RM = rm -rf
+    OPEN = open
+    PID = $$(ps -ef | grep AdobeAcrobat | grep -v grep | awk '{print $$2}')
+    CLOSE = kill -9 $(PID)
+endif
+
+texsample: $(MAIN).tex
+	$(TEX) $(TEXARGS) $<
+	$(TEX) $(TEXARGS) $<
+
+texsamplebib: $(MAIN).tex
+	$(TEX) $(TEXARGS) $<
 	$(BIB) $(MAIN).aux
-	$(TEX) $<
-	$(TEX) $<
+	$(TEX) $(TEXARGS) $<
+	$(TEX) $(TEXARGS) $<
 
 open: $(MAIN).pdf
-	cmd /c start $(MAIN).pdf
+	$(OPEN) $(MAIN).pdf
+
+opensample: $(MAIN).pdf
+	$(OPEN) $(MAIN).pdf
 
 close:
-	cmd /c taskkill /im Acrobat.exe /t /f || echo not find
+	@$(CLOSE) || echo not found
 
 clean:
-	del /s /f *.aux *.bbl *.blg *.log *.out *.gz *.toc *.thm *.fdb_latexmk *.fls
+	$(RM) *.gls *.glo *.ind *.idx
+	$(RM) *.ilg *.aux *.toc *.aux
+	$(RM) *.hd *.out *.thm *.gz *.nlo *.nls
+	$(RM) *.log *.lof *.lot *.bbl *.blg
 
 wipe:
-	del /f $(MAIN).pdf
+	$(RM) $(MAIN).pdf
+
+wipesample:
+	$(RM) $(MAIN)-sample.pdf
 
-.PHONY: clean
+.PHONY: open close clean wipe

makefile

@@ -1,36 +1,36 @@
 @misc{NWPUThesisLaTeXTemplate,
-    title={{{\LaTeX}}-Template-For-NPU-Thesis},
-    author={Shangkun Shen and Zhihe Wang and Jiduo Zhang and Weijia Zhang},
-    year={2016},
-    month={05}
+  title  = {{{\LaTeX}} Template For {NPU} Thesis},
+  author = {Shangkun Shen and Zhihe Wang and Jiduo Zhang and Weijia Zhang},
+  year   = {2016},
+  month  = {05}
 }
 
 @book{knuth1986the,
-    title={The {{\TeX}}book},
-    author={Knuth, Donald E},
-    publisher={Addison-Wesley},
-    year={1986}
+  title     = {The {{\TeX}}book},
+  author    = {Knuth, Donald E},
+  publisher = {Addison-Wesley},
+  year      = {1986}
 }
 
 @book{lamport1989latex:,
-    title={{{\LaTeX}}: a document preparation system},
-    author={Lamport, Leslie},
-    publisher={Addison-Wesley Professional},
-    year={1989}
+  title     = {{{\LaTeX}}: a document preparation system},
+  author    = {Lamport, Leslie},
+  publisher = {Addison-Wesley Professional},
+  year      = {1989}
 }
 
 
 @article{szegedy2015going,
-    title={Going deeper with convolutions},
-    author={Szegedy, Christian and Liu, Wei and Jia, Yangqing and Sermanet, Pierre and Reed, Scott E and Anguelov, Dragomir and Erhan, Dumitru and Vanhoucke, Vincent and Rabinovich, Andrew},
-    journal={computer vision and pattern recognition},
-    pages={1--9},
-    year={2015}
+  title   = {Going deeper with convolutions},
+  author  = {Szegedy, Christian and Liu, Wei and Jia, Yangqing and Sermanet, Pierre and Reed, Scott E and Anguelov, Dragomir and Erhan, Dumitru and Vanhoucke, Vincent and Rabinovich, Andrew},
+  journal = {computer vision and pattern recognition},
+  pages   = {1--9},
+  year    = {2015}
 }
 
 @misc{MathSymbolsinLaTeXbypolossk,
-    title={Math-Symbols-in-{{\LaTeX}}},
-    author={Shangkun Shen},
-    year={2017},
-    month={10}
+  title  = {Math Symbols in {{\LaTeX}}},
+  author = {Shangkun Shen},
+  year   = {2017},
+  month  = {10}
 }

references/reference.bib

@@ -176,7 +176,7 @@
 
 
 \titleformat{\chapter}[hang]{\normalfont\sSanhao\filcenter\fHei\bf}%
-{\sSanhao{\chaptertitlename}}{20pt}{\sSanhao}
+{\sSanhao{\chaptertitlename}}{1em}{\sSanhao}
 \titleformat{\section}[hang]{\fHei \bf \sXiaosan}%
 {\sXiaosan \thesection}{0.5em}{}{}
 \titleformat{\subsection}[hang]{\fHei \bf \sLargeHalfXiaosi}%
@@ -185,9 +185,9 @@
 {(\arabic{subsubsection})}{0.5em}{}{}   % 小标题式的subsubsection:(4) 标题
 
 % 缩小正文中各级标题之间的缩进
-\titlespacing{\chapter}{0pt}{-3ex plus .1ex minus .2ex}{0.25em}
-\titlespacing{\section}{0pt}{-0.2em}{0em}
-\titlespacing{\subsection}{0pt}{0.5em}{0em}
+\titlespacing{\chapter}{0pt}{4pt}{12.25pt}
+\titlespacing{\section}{0pt}{7pt}{0em}
+\titlespacing{\subsection}{0pt}{6.5pt}{0em}
 \titlespacing{\subsubsection}{0pt}{0.25em}{0pt}
 
 % 定义目录中各级标题之间的格式以及缩进