diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/README | 17 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat | 96 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat | 62 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf | bin | 359749 -> 359775 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat | 96 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat | 62 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls | 2 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 1 |
15 files changed, 178 insertions, 184 deletions
diff --git a/Master/texmf-dist/doc/latex/pkuthss/README b/Master/texmf-dist/doc/latex/pkuthss/README deleted file mode 100644 index e63d97ca442..00000000000 --- a/Master/texmf-dist/doc/latex/pkuthss/README +++ /dev/null @@ -1,17 +0,0 @@ -pkuthss: LaTeX template for dissertations in Peking University. ---------------------------------------------------------------- - -Maintainer: Casper Ti. Vector <CasperVector@gmail.com> -Homepage: <http://code.google.com/p/caspervector/> - -License: -* LaTeX Project Public License 1.3 or later for files in `tex/'. -* New BSD License for `doc/img/pkulogo.eps', `doc/img/pkuword.eps', - `doc/chap/copyright.tex', `doc/chap/originauth.tex'. -* Public domain for all other files. - -This package provides a simple, clear and flexible LaTeX template for -dissertations in Peking University. - -See the file `pkuthss.pdf' for details. - diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt index 280b4d086cd..7d1941c98ae 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/ChangeLog.txt @@ -1,3 +1,9 @@ +2012-11-12, v1.4 beta3 + + * Misc: + - Fix incorrect CTAN support. + - utils/dist: Fix date conversion code again. + 2012-10-11, v1.4 beta2 * Changes to package code: - Adjust pkulogo/pkuword typesetting according to diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat index 4fc74078fc9..711a52c2bd9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/Make.bat @@ -1,48 +1,48 @@ -@echo off - -@rem vim:ts=4:sw=4 -@rem -@rem Copyright (c) 2008-2009 solvethis -@rem Copyright (c) 2010-2012 Casper Ti. Vector -@rem Public domain. - -set JOBNAME=pkuthss -@rem 这个变量的值可以为 latex 或 pdflatex。 -set LATEX=latex -@rem 如果无法使用 biber,可以改为“bibtex”。 -set BIBTEX=biber -l zh__pinyin -set GBK2UNI=gbk2uni -set DVIPDF=dvipdfmx - -if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME% -) else (set DODVIPDF=echo No need to run %DVIPDF%.) -@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。 -if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME% -) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.) -if "%1"=="" goto doc -if "%1"=="doc" goto doc -if "%1"=="clear" (goto clear) else (goto usage) - -:doc -cd img -call Make.bat -cd .. -%LATEX% %JOBNAME% -%BIBTEX% %JOBNAME% -%DOGBK2UNI% -%LATEX% %JOBNAME% -%LATEX% %JOBNAME% -%DODVIPDF% -goto end - -:clear -del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out -del missfont.log chap\*.aux -goto end - -:usage -echo %0 [doc] [clear] -goto end - -:end - +@echo off
+
+@rem vim:ts=4:sw=4
+@rem
+@rem Copyright (c) 2008-2009 solvethis
+@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Public domain.
+
+set JOBNAME=pkuthss
+@rem 这个变量的值可以为 latex 或 pdflatex。
+set LATEX=latex
+@rem 如果无法使用 biber,可以改为“bibtex”。
+set BIBTEX=biber -l zh__pinyin
+set GBK2UNI=gbk2uni
+set DVIPDF=dvipdfmx
+
+if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
+) else (set DODVIPDF=echo No need to run %DVIPDF%.)
+@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。
+if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME%
+) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.)
+if "%1"=="" goto doc
+if "%1"=="doc" goto doc
+if "%1"=="clear" (goto clear) else (goto usage)
+
+:doc
+cd img
+call Make.bat
+cd ..
+%LATEX% %JOBNAME%
+%BIBTEX% %JOBNAME%
+%DOGBK2UNI%
+%LATEX% %JOBNAME%
+%LATEX% %JOBNAME%
+%DODVIPDF%
+goto end
+
+:clear
+del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
+del missfont.log chap\*.aux
+goto end
+
+:usage
+echo %0 [doc] [clear]
+goto end
+
+:end
+
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat index dd14e3db220..c5f78b3a9ea 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/img/Make.bat @@ -1,31 +1,31 @@ -@echo off - -@rem vim:ts=4:sw=4 -@rem -@rem Copyright (c) 2008-2009 solvethis -@rem Copyright (c) 2010-2012 Casper Ti. Vector -@rem Public domain. - -set GS=gswin32c -set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -set WIDTHOPT=-dDEVICEWIDTHPOINTS= -set HEIGHTOPT=-dDEVICEHEIGHTPOINTS= -set OUTPUTOPT=-sOutputFile= - -if "%1"=="" goto pdf -if "%1"=="clean" (goto clean) else (goto usage) - -:pdf -%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps -%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps -goto end - -:clean -del pkulogo.pdf pkuword.pdf -goto end - -:usage -echo %0 [pdf] [clean] - -:end - +@echo off
+
+@rem vim:ts=4:sw=4
+@rem
+@rem Copyright (c) 2008-2009 solvethis
+@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Public domain.
+
+set GS=gswin32c
+set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite
+set WIDTHOPT=-dDEVICEWIDTHPOINTS=
+set HEIGHTOPT=-dDEVICEHEIGHTPOINTS=
+set OUTPUTOPT=-sOutputFile=
+
+if "%1"=="" goto pdf
+if "%1"=="clean" (goto clean) else (goto usage)
+
+:pdf
+%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps
+%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps
+goto end
+
+:clean
+del pkulogo.pdf pkuword.pdf
+goto end
+
+:usage
+echo %0 [pdf] [clean]
+
+:end
+
diff --git a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex index 3dfb34496d4..2be40dd793b 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/gbkcrlf/pkuthss.tex @@ -29,7 +29,7 @@ \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss 文档模版的版本。 -\newcommand{\docversion}{v1.4 beta2} +\newcommand{\docversion}{v1.4 beta3} % 设定文档的基本信息。 \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -45,7 +45,7 @@ cauthor = {盖茨波 $\cdot$ 钛 $\cdot$ 维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {二〇一二年十月}, + date = {二〇一二年十一月}, school = {化学与分子工程学院}, cmajor = {化学(?)}, emajor = {Chemistry}, direction = {据说 Casper 自己也不知道}, diff --git a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf Binary files differindex c0487a77913..c22b0734538 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf +++ b/Master/texmf-dist/doc/latex/pkuthss/pkuthss.pdf diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt index 0b90cfa061b..a78adf57699 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/ChangeLog.txt @@ -1,3 +1,9 @@ +2012-11-12, v1.4 beta3 + + * Misc: + - Fix incorrect CTAN support. + - utils/dist: Fix date conversion code again. + 2012-10-11, v1.4 beta2 * Changes to package code: - Adjust pkulogo/pkuword typesetting according to diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat index 4fc74078fc9..711a52c2bd9 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/Make.bat @@ -1,48 +1,48 @@ -@echo off - -@rem vim:ts=4:sw=4 -@rem -@rem Copyright (c) 2008-2009 solvethis -@rem Copyright (c) 2010-2012 Casper Ti. Vector -@rem Public domain. - -set JOBNAME=pkuthss -@rem 这个变量的值可以为 latex 或 pdflatex。 -set LATEX=latex -@rem 如果无法使用 biber,可以改为“bibtex”。 -set BIBTEX=biber -l zh__pinyin -set GBK2UNI=gbk2uni -set DVIPDF=dvipdfmx - -if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME% -) else (set DODVIPDF=echo No need to run %DVIPDF%.) -@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。 -if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME% -) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.) -if "%1"=="" goto doc -if "%1"=="doc" goto doc -if "%1"=="clear" (goto clear) else (goto usage) - -:doc -cd img -call Make.bat -cd .. -%LATEX% %JOBNAME% -%BIBTEX% %JOBNAME% -%DOGBK2UNI% -%LATEX% %JOBNAME% -%LATEX% %JOBNAME% -%DODVIPDF% -goto end - -:clear -del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out -del missfont.log chap\*.aux -goto end - -:usage -echo %0 [doc] [clear] -goto end - -:end - +@echo off
+
+@rem vim:ts=4:sw=4
+@rem
+@rem Copyright (c) 2008-2009 solvethis
+@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Public domain.
+
+set JOBNAME=pkuthss
+@rem 这个变量的值可以为 latex 或 pdflatex。
+set LATEX=latex
+@rem 如果无法使用 biber,可以改为“bibtex”。
+set BIBTEX=biber -l zh__pinyin
+set GBK2UNI=gbk2uni
+set DVIPDF=dvipdfmx
+
+if "%LATEX%"=="latex" (set DODVIPDF=%DVIPDF% %JOBNAME%
+) else (set DODVIPDF=echo No need to run %DVIPDF%.)
+@rem 用 pdflatex 时可能需要使用 gbk2uni 转换 .out 文件编码以防书签乱码。
+if "%LATEX%"=="pdflatex" (@rem set DOGBK2UNI=%GBK2UNI% %JOBNAME%
+) else (set DOGBK2UNI=echo No need to run %GBK2UNI%.)
+if "%1"=="" goto doc
+if "%1"=="doc" goto doc
+if "%1"=="clear" (goto clear) else (goto usage)
+
+:doc
+cd img
+call Make.bat
+cd ..
+%LATEX% %JOBNAME%
+%BIBTEX% %JOBNAME%
+%DOGBK2UNI%
+%LATEX% %JOBNAME%
+%LATEX% %JOBNAME%
+%DODVIPDF%
+goto end
+
+:clear
+del *.aux *.bbl *.bcf *.blg *.dvi *.lof *.log *.lot *.run.xml *.toc *.out
+del missfont.log chap\*.aux
+goto end
+
+:usage
+echo %0 [doc] [clear]
+goto end
+
+:end
+
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat index dd14e3db220..c5f78b3a9ea 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/img/Make.bat @@ -1,31 +1,31 @@ -@echo off - -@rem vim:ts=4:sw=4 -@rem -@rem Copyright (c) 2008-2009 solvethis -@rem Copyright (c) 2010-2012 Casper Ti. Vector -@rem Public domain. - -set GS=gswin32c -set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -set WIDTHOPT=-dDEVICEWIDTHPOINTS= -set HEIGHTOPT=-dDEVICEHEIGHTPOINTS= -set OUTPUTOPT=-sOutputFile= - -if "%1"=="" goto pdf -if "%1"=="clean" (goto clean) else (goto usage) - -:pdf -%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps -%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps -goto end - -:clean -del pkulogo.pdf pkuword.pdf -goto end - -:usage -echo %0 [pdf] [clean] - -:end - +@echo off
+
+@rem vim:ts=4:sw=4
+@rem
+@rem Copyright (c) 2008-2009 solvethis
+@rem Copyright (c) 2010-2012 Casper Ti. Vector
+@rem Public domain.
+
+set GS=gswin32c
+set GSOPTS=-q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite
+set WIDTHOPT=-dDEVICEWIDTHPOINTS=
+set HEIGHTOPT=-dDEVICEHEIGHTPOINTS=
+set OUTPUTOPT=-sOutputFile=
+
+if "%1"=="" goto pdf
+if "%1"=="clean" (goto clean) else (goto usage)
+
+:pdf
+%GS% %GSOPTS% %WIDTHOPT%400 %HEIGHTOPT%400 %OUTPUTOPT%pkulogo.pdf -f pkulogo.eps
+%GS% %GSOPTS% %WIDTHOPT%525 %HEIGHTOPT%150 %OUTPUTOPT%pkuword.pdf -f pkuword.eps
+goto end
+
+:clean
+del pkulogo.pdf pkuword.pdf
+goto end
+
+:usage
+echo %0 [pdf] [clean]
+
+:end
+
diff --git a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex index f3fa47178d7..4e3604094a0 100644 --- a/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex +++ b/Master/texmf-dist/doc/latex/pkuthss/utf8lf/pkuthss.tex @@ -29,7 +29,7 @@ \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} % pkuthss 鏂囨。妯$増鐨勭増鏈 -\newcommand{\docversion}{v1.4 beta2} +\newcommand{\docversion}{v1.4 beta3} % 璁惧畾鏂囨。鐨勫熀鏈俊鎭 \pkuthssinfo{ cthesisname = {鏈鐢熸瘯涓氳鏂噠, ethesisname = {Undergraduate Thesis}, @@ -45,7 +45,7 @@ cauthor = {鐩栬尐娉 $\cdot$ 閽 $\cdot$ 缁村厠鎵榼, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {浜屻囦竴浜屽勾鍗佹湀}, + date = {浜屻囦竴浜屽勾鍗佷竴鏈坿, school = {鍖栧涓庡垎瀛愬伐绋嬪闄, cmajor = {鍖栧锛堬紵锛墋, emajor = {Chemistry}, direction = {鎹 Casper 鑷繁涔熶笉鐭ラ亾}, diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty index a16e4a1e35d..0d8eec78528 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-extra.sty @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{pkuthss-extra} - [2012/10/11 v1.4-beta2 Common extra settings for the pkuthss document class] + [2012/11/12 v1.4-beta3 Common extra settings for the pkuthss document class] % Check the dependency of pkuthss. \@ifclassloaded{pkuthss}{}{ diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def index db2862a542e..9a798b50352 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-gbk.def @@ -23,7 +23,7 @@ % pkuthss-extra.sty \ProvidesFile{pkuthss-gbk.def} - [2012/10/11 v1.4-beta2 Labels and captions in GBK encoding + [2012/11/12 v1.4-beta3 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{题目:} diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def index 10d6ea71f9a..6be580aeb68 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss-utf8.def @@ -23,7 +23,7 @@ % pkuthss-extra.sty \ProvidesFile{pkuthss-utf8.def} - [2012/10/11 v1.4-beta2 Labels and captions in UTF-8 encoding + [2012/11/12 v1.4-beta3 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{棰樼洰锛殅 diff --git a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls index 8683162ce1c..d958ac8b784 100644 --- a/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls +++ b/Master/texmf-dist/tex/latex/pkuthss/pkuthss.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2012/10/11 v1.4-beta2 Peking University dissertation document class] + [2012/11/12 v1.4-beta3 Peking University dissertation document class] % Process the encoding options. \newif\ifpkuthss@opt@gbk \pkuthss@opt@gbktrue diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 21d41f1f3b5..8c099addd07 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -728,7 +728,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'pigpen', "&MAKEflatten", 'pinlabel', "&MAKEnosymlinks", 'pitthesis', "die 'skipping, noinfo license", - 'pkuthss', "&MAKEmv_doctex", 'pl', "die 'skipping, not ready, cf. cc-pl, sorry", 'pl-qx', "&MAKEplqx", 'pmxchords', "die 'skipping, problematic musixtex scripts'", |