diff --git a/doc/example/Make.bat b/doc/example/Make.bat index e57cca7..efbd3df 100644 --- a/doc/example/Make.bat +++ b/doc/example/Make.bat @@ -1,32 +1,19 @@ @echo off @rem Copyright (c) 2008-2009 solvethis -@rem Copyright (c) 2010-2012 Casper Ti. Vector +@rem Copyright (c) 2010-2012,2019 Casper Ti. Vector @rem Public domain. -set JOB=thesis -@rem 这个变量的值可以为 latex、pdflatex 或 xelatex。 -set LATEX=latex -set BIBTEX=biber -l zh__pinyin --output-safechars -set DVIPDF=dvipdfmx - -if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOB% -) else (set DODVIPDF=echo No need to run %DVIPDF%.) if "%1"=="" goto doc if "%1"=="doc" goto doc if "%1"=="clean" (goto clean) else (goto usage) :doc -%LATEX% %JOB% -%BIBTEX% %JOB% -%LATEX% %JOB% -%LATEX% %JOB% -%DODVIPDF% +latexmk goto end :clean -del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out -del missfont.log chap\*.aux +latexmk -c goto end :usage diff --git a/doc/example/latexmkrc b/doc/example/latexmkrc new file mode 100644 index 0000000..4878610 --- /dev/null +++ b/doc/example/latexmkrc @@ -0,0 +1,11 @@ +@default_files = ('thesis'); +# 5锛歺elatex锛3锛歭atex锛+ dvipdfmx锛夛紱1锛歱dflatex銆 +$pdf_mode = 5; +# 鐢 latex 妯″紡缂栬瘧鏃讹紝浣跨敤 dvipdfmx 鑰岄潪榛樿鐨 dvipdf銆 +$dvipdf = "dvipdfmx %O -o %D %S"; +# 姝ら夐」鐩稿叧璇存槑瑙 texdoc latexmk銆 +$bibtex_use = 1.5; +$biber = "biber -l zh__pinyin --output-safechars %O %S"; +# latexmk -c 鏃惰嚜鍔ㄥ垹闄 .run.xml 鏂囦欢銆 +$clean_ext = "run.xml"; + diff --git a/doc/readme/Makefile b/doc/readme/Makefile deleted file mode 100644 index 8835cd2..0000000 --- a/doc/readme/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2008-2009 solvethis -# Copyright (c) 2010-2012,2014-2015,2018 Casper Ti. Vector -# Public domain. - -JOB = pkuthss -BIBTEX = biber -l zh__pinyin --output-safechars -DVIPDF = dvipdfmx -MAKE = make -RM = rm -f - -ifndef LATEX - LATEX1 = latex - LATEX2 = xelatex -else - LATEX1 = $(LATEX) - LATEX2 = $(LATEX) -endif - -ifeq ($(LATEX), latex) - DODVIPDF = $(DVIPDF) $(JOB) -endif - -doc: - $(LATEX1) $(JOB) - $(BIBTEX) $(JOB) - $(LATEX2) $(JOB) - $(LATEX2) $(JOB) - $(DODVIPDF) - -clean: - $(RM) $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi \ - $(JOB).lof $(JOB).log $(JOB).lot $(JOB).run.xml $(JOB).toc \ - $(JOB).out $(JOB).out.bak missfont.log texput.log chap/*.aux - -distclean: clean - $(RM) $(JOB).pdf - -# vim:ts=4:sw=4 diff --git a/doc/readme/latexmkrc b/doc/readme/latexmkrc new file mode 100644 index 0000000..ac55586 --- /dev/null +++ b/doc/readme/latexmkrc @@ -0,0 +1,7 @@ +@default_files = ('pkuthss'); +$pdf_mode = 5; +$dvipdf = "dvipdfmx %O -o %D %S"; +$bibtex_use = 1.5; +$biber = "biber -l zh__pinyin --output-safechars %O %S"; +$clean_ext = "run.xml"; + diff --git a/utils/dist b/utils/dist index 7dc8c35..7a7aedd 100755 --- a/utils/dist +++ b/utils/dist @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -# Copyright (c) 2011-2015 Casper Ti. Vector +# Copyright (c) 2011-2015,2019 Casper Ti. Vector # Public domain. CP = cp -a @@ -9,6 +9,7 @@ MD = mkdir -p RM = rm -rf ZIP = zip -rT MAKE = make +LMK = latexmk SELF = utils/dist PERM = find . -type d -exec chmod 755 '{}' + && \ find . -type f -exec chmod 644 '{}' + @@ -26,11 +27,11 @@ doc-dist: doc/ # Make the directory. $(MD) $@/ # Example src and pdf. - cd doc/example/ && $(MAKE) && $(MAKE) clean + cd doc/example/ && $(LMK) && $(LMK) -c && $(RM) *.xdv $(MV) doc/example/$(EXAMPLE).pdf $@/example.pdf $(CP) doc/example/ $@/example # Readme src and pdf. - cd doc/readme/ && $(MAKE) && $(MAKE) clean + cd doc/readme/ && $(LMK) && $(LMK) -c && $(RM) *.xdv $(MV) doc/readme/$(README).pdf $@/readme.pdf $(CP) doc/readme/ $@/readme @@ -56,8 +57,8 @@ $(TITLE)-$(VERSION).zip: dir-ctan $(ZIP) -y ../$@ $(TITLE)/ $(TITLE).tds.zip clean: - cd doc/readme/ && $(MAKE) distclean - cd doc/example/ && $(MAKE) distclean + cd doc/readme/ && $(LMK) -C + cd doc/example/ && $(LMK) -C $(RM) dir-ctan/ dir-tds/ tex-dist/ doc-dist/ distclean: