diff --git a/.travis.yml b/.travis.yml index 76c2190..a180ce8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: script: - make html - - make xelatexpdf + - make latexpdf after_success: - cp build/latex/Makefile.pdf build/html/ diff --git a/Makefile b/Makefile index f4ca23a..ba501f6 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ BUILDDIR = build # Put it first so that "make" without argument is like "make help". help: @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - @echo " xelatexpdf to make LaTeX files and run them through xelatex" .PHONY: help Makefile @@ -18,9 +17,3 @@ help: # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -# make sphinx support chinese with xelatex -xelatexpdf: Makefile latex - @echo "Runnning LaTeX files through xelatex..." - cd $(BUILDDIR)/latex; latexmk -xelatex -shell-escape -interaction=nonstopmode - @echo "xelatex finished; the PDF files are in $(BUILDDIR)/latex." diff --git a/source/conf.py b/source/conf.py index cb2c639..c60450f 100644 --- a/source/conf.py +++ b/source/conf.py @@ -149,7 +149,7 @@ htmlhelp_basename = 'Makefiledoc' # -- Options for LaTeX output --------------------------------------------- - +latex_engine="xelatex" if on_rtd: latex_elements = { # The paper size ('letterpaper' or 'a4paper').