summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/thuthesis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-01 23:38:54 +0000
committerKarl Berry <karl@freefriends.org>2016-03-01 23:38:54 +0000
commit9484681dceef0e89457f4f8d595aafa1b543769b (patch)
tree4e957f8fa584490e4361507810e4fe7e4ccb8fea /Master/texmf-dist/doc/latex/thuthesis
parent5065e43c7ef28af0f81652f6cc9b959e70478fb7 (diff)
thuthesis (28feb16)
git-svn-id: svn://tug.org/texlive/trunk@39915 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/thuthesis')
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/Makefile157
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/README.md25
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/main.pdfbin704097 -> 704234 bytes
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/shuji.pdfbin11579 -> 11729 bytes
-rw-r--r--Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdfbin701063 -> 700159 bytes
5 files changed, 46 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/thuthesis/Makefile b/Master/texmf-dist/doc/latex/thuthesis/Makefile
index f059320ed0b..e1f47d0b742 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/Makefile
+++ b/Master/texmf-dist/doc/latex/thuthesis/Makefile
@@ -1,6 +1,6 @@
# Makefile for ThuThesis
-# Compiling method: latexmk/xelatex/pdflatex/dvipdfmx
+# Compiling method: latexmk/xelatex/pdflatex
METHOD = latexmk
# Set opts for latexmk if you use it
LATEXMKOPTS = -xelatex
@@ -9,173 +9,87 @@ THESISMAIN = main
# Basename of shuji
SHUJIMAIN = shuji
-ifeq ($(MAKE),)
- override MAKE = make
-endif
-
-ifeq ($(TEXI2DVI),)
- override TEXI2DVI = texi2dvi
-endif
-
PACKAGE=thuthesis
SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
-THESISCONTENTS=$(THESISMAIN).tex data/*.tex $(EPS)
+THESISCONTENTS=$(THESISMAIN).tex data/*.tex $(FIGURES)
# NOTE: update this to reflect your local file types.
-EPS=$(wildcard figures/*.eps)
+FIGURES=$(wildcard figures/*.eps figures/*.pdf)
BIBFILE=ref/*.bib
SHUJICONTENTS=$(SHUJIMAIN).tex
CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
# make deletion work on Windows
ifdef SystemRoot
- RM = del /Q
- SLASH = \\
+ RM = del /Q
+ OPEN = start
else
- RM = rm -f
- SLASH = /
+ RM = rm -f
+ OPEN = open
endif
-.PHONY: all clean distclean dist thesis viewthesis shuji viewshuji doc viewdoc cls FORCE_MAKE
+.PHONY: all clean distclean dist thesis viewthesis shuji viewshuji doc viewdoc cls check FORCE_MAKE
all: doc thesis shuji
-###### generate cls/cfg
cls: $(CLSFILES)
$(CLSFILES): $(SOURCES)
latex $(PACKAGE).ins
-###### for doc
-
viewdoc: doc
- open $(PACKAGE).pdf
+ $(OPEN) $(PACKAGE).pdf
doc: $(PACKAGE).pdf
-ifeq ($(METHOD),xelatex)
+viewthesis: thesis
+ $(OPEN) $(THESISMAIN).pdf
-$(PACKAGE).pdf: $(CLSFILES)
- xelatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- xelatex $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
+thesis: $(THESISMAIN).pdf
-else ifeq ($(METHOD),pdflatex)
+viewshuji: shuji
+ $(OPEN) $(SHUJIMAIN).pdf
-$(PACKAGE).pdf: $(CLSFILES)
- pdflatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- pdflatex $(PACKAGE).dtx
- pdflatex $(PACKAGE).dtx
+shuji: $(SHUJIMAIN).pdf
-else ifeq ($(METHOD),latexmk)
+ifeq ($(METHOD),latexmk)
$(PACKAGE).pdf: $(CLSFILES) FORCE_MAKE
- latexmk $(LATEXMKOPTS) $(PACKAGE).dtx
-
-else
+ $(METHOD) $(LATEXMKOPTS) $(PACKAGE).dtx
-$(PACKAGE).dvi: $(CLSFILES)
- latex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- latex $(PACKAGE).dtx
- latex $(PACKAGE).dtx
-
-$(PACKAGE).pdf: $(PACKAGE).dvi
- latex $(PACKAGE).dtx
- dvipdfmx $(PACKAGE).dvi
-
-endif
-
-###### for thesis
-
-viewthesis: thesis
- open $(THESISMAIN).pdf
-
-thesis: $(THESISMAIN).pdf
+$(THESISMAIN).pdf: $(CLSFILES) FORCE_MAKE
+ $(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
-ifeq ($(METHOD),xelatex)
+$(SHUJIMAIN).pdf: $(CLSFILES) FORCE_MAKE
+ $(METHOD) $(LATEXMKOPTS) $(SHUJIMAIN)
-$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
- xelatex $(THESISMAIN).tex
- xelatex $(THESISMAIN).tex
+else ifneq (,$(filter $(METHOD),xelatex pdflatex))
-$(THESISMAIN).bbl: $(BIBFILE)
- xelatex $(THESISMAIN).tex
- -bibtex $(THESISMAIN)
- $(RM) $(THESISMAIN).pdf
-
-else ifeq ($(METHOD),pdflatex)
+$(PACKAGE).pdf: $(CLSFILES)
+ $(METHOD) $(PACKAGE).dtx
+ makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
+ makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
+ $(METHOD) $(PACKAGE).dtx
+ $(METHOD) $(PACKAGE).dtx
$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
- pdflatex $(THESISMAIN).tex
- pdflatex $(THESISMAIN).tex
+ $(METHOD) $(THESISMAIN)
+ $(METHOD) $(THESISMAIN)
$(THESISMAIN).bbl: $(BIBFILE)
- pdflatex $(THESISMAIN).tex
+ $(METHOD) $(THESISMAIN)
-bibtex $(THESISMAIN)
$(RM) $(THESISMAIN).pdf
-else ifeq ($(METHOD),latexmk)
-
-$(THESISMAIN).pdf: $(CLSFILES) FORCE_MAKE
- latexmk $(LATEXMKOPTS) $(THESISMAIN)
-
-else
-
-$(THESISMAIN).pdf: $(THESISMAIN).dvi
- latex $(THESISMAIN).tex
- dvipdfmx $(THESISMAIN).dvi
-
-$(THESISMAIN).dvi: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
- $(TEXI2DVI) $(THESISMAIN).tex
-
-$(THESISMAIN).bbl: $(BIBFILE)
- $(TEXI2DVI) $(THESISMAIN).tex
- -bibtex $(THESISMAIN)
-
-endif
-
-
-###### for shuji
-
-viewshuji: shuji
- open $(SHUJIMAIN).pdf
-
-shuji: $(SHUJIMAIN).pdf
-
-ifeq ($(METHOD),xelatex)
-
-$(SHUJIMAIN).pdf: $(CLSFILES) $(SHUJICONTENTS)
- xelatex $(SHUJIMAIN).tex
-
-else ifeq ($(METHOD),pdflatex)
-
$(SHUJIMAIN).pdf: $(CLSFILES) $(SHUJICONTENTS)
- pdflatex $(SHUJIMAIN).tex
-
-else ifeq ($(METHOD),latexmk)
-
-$(SHUJIMAIN).pdf: $(CLSFILES) FORCE_MAKE
- latexmk $(LATEXMKOPTS) $(SHUJIMAIN)
+ $(METHOD) $(SHUJIMAIN)
else
-
-$(SHUJIMAIN).dvi: $(CLSFILES) $(SHUJICONTENTS)
- $(TEXI2DVI) $(SHUJIMAIN).tex
-
-$(SHUJIMAIN).pdf: $(SHUJIMAIN).dvi
- latex $(SHUJIMAIN).tex
- dvipdfmx $(SHUJIMAIN).dvi
+$(error Unknown METHOD: $(METHOD))
endif
clean:
latexmk -c $(PACKAGE).dtx $(THESISMAIN) $(SHUJIMAIN)
- -@$(RM) $(PACKAGE).dvi $(THESISMAIN).dvi $(SHUJIMAIN).dvi
-@$(RM) *~
cleanall: clean
@@ -185,7 +99,10 @@ distclean: cleanall
-@$(RM) $(CLSFILES)
-@$(RM) -r dist
-dist:
+check: FORCE_MAKE
+ ag 'Tsinghua University Thesis Template|\\def\\version|"version":' thuthesis.dtx package.json
+
+dist: all
@if [ -z "$(version)" ]; then \
echo "Usage: make dist version=[x.y.z | ctan]"; \
else \
diff --git a/Master/texmf-dist/doc/latex/thuthesis/README.md b/Master/texmf-dist/doc/latex/thuthesis/README.md
index 9e8038934df..3bf721b94a8 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/README.md
+++ b/Master/texmf-dist/doc/latex/thuthesis/README.md
@@ -33,13 +33,12 @@ ThuThesis为 <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Templa
* [TeX@newsmth](http://www.newsmth.net/nForum/#!board/TeX)
* [ThuThesis@Google Groups](http://groups.google.com/group/thuthesis)
----
-
# Makefile的用法
- make [{all|thesis|shuji|doc|clean|distclean}] \
- [METHOD={latexmk|xelatex|pdflatex|dvipdfmx}] \
- [TEXI2DVI=<tex2dvi>]
+```shell
+make [{all|thesis|shuji|doc|clean|cleanall|distclean}] \
+ [METHOD={latexmk|xelatex|pdflatex}]
+```
## 目标
* `make all` 等于 `make thesis && make shuji && make doc`;
@@ -47,18 +46,12 @@ ThuThesis为 <b>T</b>sing<b>h</b>ua <b>U</b>niversity <b>Thesis</b> LaTeX Templa
* `make thesis` 生成论文 main.pdf;
* `make shuji` 生成书脊 shuji.pdf;
* `make doc` 生成使用说明书 thuthesis.pdf;
-* `make clean` 删除示例文件的中间文件(不含main.pdf);
-* `make cleanall` 删除示例文件的中间文件和main.pdf;
-* `make distclean` 删除示例文件和模板的所有中间文件和PDF。
+* `make clean` 删除示例文件的中间文件(不含 main.pdf);
+* `make cleanall` 删除示例文件的中间文件和 main.pdf;
+* `make distclean` 删除示例文件和模板的所有中间文件和 PDF。
## 参数
* **METHOD**:指定生成 pdf 的方式,缺省采用 latexmk。
- * METHOD=latexmk 表示使用 latexmk 的方式生成 pdf。
+ * METHOD=latexmk 表示使用 latexmk 的方式生成 pdf(使用 xelatex)。
* METHOD=xelatex 表示使用 xelatex 引擎编译生成 pdf;
- * METHOD=pdflatex 表示使用 pdflatex 引擎编译生成 pdf;
- * METHOD=dvipdfmx 表示使用 texi2dvi -> dvipdfmx 的方式生成 pdf。
-* **TEXI2DVI**: `texi2dvi` 实用工具的文件名,该工具的作用是自动重复运行latex 若
- 干遍,直至所有交叉引用都正确为止。在有的发行版中该工具的文件名不叫
- `texi2dvi`,譬如 CTeX 下的这个工具就叫 `texify`。遇到这种情况可以在命令
- 行通过 `TEXI2DVI=texify` 命令指定使用其它的 `texi2dvi` 工具。
-
+ * METHOD=pdflatex 表示使用 pdflatex 引擎编译生成 pdf。
diff --git a/Master/texmf-dist/doc/latex/thuthesis/main.pdf b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
index 65d3f9b16eb..c122a73f4f9 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/main.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/main.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
index 0cd29ce4a1b..73ee6a5186b 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/shuji.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
index 8dd8f81261d..00c07af7f86 100644
--- a/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
+++ b/Master/texmf-dist/doc/latex/thuthesis/thuthesis.pdf
Binary files differ