diff --git a/doc/readme/pkuthss-english.patch b/doc/readme/pkuthss-english.patch index ed463fe..17dcc02 100644 --- a/doc/readme/pkuthss-english.patch +++ b/doc/readme/pkuthss-english.patch @@ -26,9 +26,23 @@ index 4af4d39..09de33d 100644 % vim:ts=4:sw=4 diff --git a/doc/example/chap/chap1.tex b/doc/example/chap/chap1.tex -index 85f7008..da8c177 100644 +index 3d631f3..6e46b13 100644 --- a/doc/example/chap/chap1.tex +++ b/doc/example/chap/chap1.tex +@@ -1,7 +1,7 @@ + % Copyright (c) 2014,2016,2018 Casper Ti. Vector + % Public domain. + +-\chapter{引言} +-\pkuthssffaq % 中文测试文字。 ++\chapter{Introduction} ++Test text. + + % vim:ts=4:sw=4 +diff --git a/doc/example/chap/chap2.tex b/doc/example/chap/chap2.tex +index 85f7008..da8c177 100644 +--- a/doc/example/chap/chap2.tex ++++ b/doc/example/chap/chap2.tex @@ -1,7 +1,7 @@ % Copyright (c) 2014,2016 Casper Ti. Vector % Public domain. @@ -39,17 +53,17 @@ index 85f7008..da8c177 100644 +Test text. % vim:ts=4:sw=4 -diff --git a/doc/example/chap/concl.tex b/doc/example/chap/concl.tex -index 93941bc..a472892 100644 ---- a/doc/example/chap/concl.tex -+++ b/doc/example/chap/concl.tex +diff --git a/doc/example/chap/chap3.tex b/doc/example/chap/chap3.tex +index ed66f12..ae221d6 100644 +--- a/doc/example/chap/chap3.tex ++++ b/doc/example/chap/chap3.tex @@ -1,7 +1,7 @@ - % Copyright (c) 2014,2016 Casper Ti. Vector + % Copyright (c) 2014,2016,2018 Casper Ti. Vector % Public domain. --\specialchap{结论} +-\chapter{结论和展望} -\pkuthssffaq % 中文测试文字。 -+\specialchap{Conclusion} ++\chapter{Conclusion} +Test text. % vim:ts=4:sw=4 @@ -64,20 +78,6 @@ index 9834829..4296e9a 100644 -\chapter{附件} -\pkuthssffaq % 中文测试文字。 +\chapter{Some appendix} -+Test text. - - % vim:ts=4:sw=4 -diff --git a/doc/example/chap/intro.tex b/doc/example/chap/intro.tex -index c0e033e..7c1920f 100644 ---- a/doc/example/chap/intro.tex -+++ b/doc/example/chap/intro.tex -@@ -1,7 +1,7 @@ - % Copyright (c) 2014,2016 Casper Ti. Vector - % Public domain. - --\specialchap{序言} --\pkuthssffaq % 中文测试文字。 -+\specialchap{Introduction} +Test text. % vim:ts=4:sw=4 @@ -100,7 +100,7 @@ index ac5b0c9..9d2ad60 100644 - % vim:ts=4:sw=4 diff --git a/doc/example/thesis.tex b/doc/example/thesis.tex -index a96cb1e..0080051 100644 +index d7a575f..baed091 100644 --- a/doc/example/thesis.tex +++ b/doc/example/thesis.tex @@ -14,53 +14,44 @@ @@ -174,13 +174,13 @@ index a96cb1e..0080051 100644 - - 如果编译时不出参考文献, - 请参考 \texttt{texdoc pkuthss}“问题及其解决”一章 -- “上游宏包可能引起的问题”一节中关于 biber 的说明。 +- “上游宏包可能引起的问题”一节中关于 biber 的说明。% -} - \begin{document} % 以下为正文之前的部分,默认不进行章节编号。 \frontmatter -@@ -96,7 +87,7 @@ +@@ -94,7 +85,7 @@ \appendix % 排版参考文献列表。bibintoc 选项使“参考文献”出现在目录中; % 如果同时要使参考文献列表参与章节编号,可将“bibintoc”改为“bibnumbered”。 @@ -215,19 +215,19 @@ index c2c951b..d453918 100644 \def\label@ckeywords{关键词:} \def\label@ekeywords{KEYWORDS:\ } diff --git a/tex/pkuthss.cls b/tex/pkuthss.cls -index 383965c..40a8ae3 100644 +index 6208799..a785d69 100644 --- a/tex/pkuthss.cls +++ b/tex/pkuthss.cls -@@ -286,7 +286,7 @@ - \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} - \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} - \if@twoside -- \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} -+ \fancyhead[CE]{\zihao{5}\normalfont{{\euniversity} {\ethesisname}}} - \fancyhead[CO]{\zihao{5}\normalfont\pkuthss@int@setcase{\leftmark}} - \else - \fancyhead[C]{\zihao{5}\normalfont\pkuthss@int@setcase{\leftmark}} -@@ -354,13 +354,13 @@ +@@ -300,7 +300,7 @@ + \fancyhf{}\renewcommand*{\headrulewidth}{0.75bp} + \fancyfoot[C]{\zihao{5}\normalfont{\thepage}} + \if@twoside +- \fancyhead[CE]{\zihao{5}\normalfont{\cuniversity\cthesisname}} ++ \fancyhead[CE]{\zihao{5}\normalfont{{\euniversity} {\ethesisname}}} + \fancyhead[CO]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} + \else + \fancyhead[C]{\zihao{5}\normalfont\thss@int@setcase{\leftmark}} +@@ -349,13 +349,13 @@ \zihao{1}% \includegraphics[height = 2.4em]{pkulogo}\hspace{0.4em}% \raisebox{0.4em}{\includegraphics[height = 1.6em]{pkuword}}\\[0.8em] @@ -238,38 +238,38 @@ index 383965c..40a8ae3 100644 % Title of the thesis. {% \zihao{2}{\label@ctitle}% -- \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% -+ \pkuthss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}% +- \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@ctitle}}% ++ \thss@int@fillinblank{2}{0.64\textwidth}{\textbf{\@etitle}}% } \vfill % Information about the author. -@@ -368,19 +368,19 @@ +@@ -363,19 +363,19 @@ % Slightly adjust the line skip when using new font size. \zihao{3}\linespread{1.75}\selectfont - \def\pkuthss@tmp@len{0.56\textwidth} + \def\thss@tmp@len{0.56\textwidth} - \begin{tabular}{l@{\extracolsep{0.2em}}c} - {\bfseries\label@cauthor} & -- \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cauthor} \\ +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cauthor} \\ - {\bfseries\label@studentid} & + \begin{tabular}{c@{\extracolsep{0.2em}}c@{\extracolsep{0.2em}}c} + {\bfseries\label@cauthor} & : & -+ \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@eauthor} \\ ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@eauthor} \\ + {\bfseries\label@studentid} & : & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@studentid} \\ + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@studentid} \\ - {\bfseries\label@school} & + {\bfseries\label@school} & : & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@school} \\ + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@school} \\ - {\bfseries\label@cmajor} & -- \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmajor} \\ +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmajor} \\ - {\bfseries\label@direction} & + {\bfseries\label@cmajor} & : & -+ \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@emajor} \\ ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@emajor} \\ + {\bfseries\label@direction} & : & - \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@direction} \\ + \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@direction} \\ - {\bfseries\label@cmentor} & -- \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@cmentor} \\ +- \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@cmentor} \\ + {\bfseries\label@cmentor} & : & -+ \pkuthss@int@fillinblank{1}{\pkuthss@tmp@len}{\fangsong\@ementor} \\ ++ \thss@int@fillinblank{1}{\thss@tmp@len}{\fangsong\@ementor} \\ \end{tabular}% } \vfill