summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-07 20:45:48 +0000
committerKarl Berry <karl@freefriends.org>2018-07-07 20:45:48 +0000
commit30ca482fc79a7e14921d0589b73420328f2f311f (patch)
treec3813050306e32570431c2f43bc7dd0f06078765
parenteeae341c0a3662936eecc4ac0630a102b6bb928a (diff)
jnuexam (7jul18)
git-svn-id: svn://tug.org/texlive/trunk@48157 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/README6
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.pdfbin99645 -> 99233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.tex2
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-a3split.pdfbin93651 -> 93229 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.pdfbin85858 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.pdfbin0 -> 85514 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.tex (renamed from Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a.pdfbin104269 -> 104049 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-a.tex44
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.pdfbin99720 -> 99282 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.tex2
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-a3split.pdfbin93739 -> 93290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.pdfbin85970 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.pdfbin0 -> 85581 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.tex (renamed from Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/exam-b.pdfbin104359 -> 104102 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdfbin59475 -> 58421 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jnuexam/jnuexam.tex34
-rw-r--r--Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls20
19 files changed, 62 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/jnuexam/README b/Master/texmf-dist/doc/latex/jnuexam/README
index 7fa70e2b677..6dfda47e55f 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/README
+++ b/Master/texmf-dist/doc/latex/jnuexam/README
@@ -1,8 +1,4 @@
-
Package: An exam class for Jinan University
-
Author: Jianrui Lyu <tolvjr@163.com>
-
Website: https://lvjr.bitbucket.io/jnuexam.html
-
-License: Creative Commons Attribution-ShareAlike 4.0 International License
+License: The LaTeX Project Public License 1.3 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.pdf
index 0f80518f944..07ffbc87672 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.tex b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.tex
index 2165c33f56d..5c75d8e5021 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3input.tex
@@ -4,6 +4,6 @@
% 直接包含 A4 试卷的 PDF 文件,生成双栏的 A3 试卷
\documentclass[a3paper]{jnuexam}
\begin{document}
-\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0]{exam-a-a4print}
+\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0]{exam-a-empty}
%\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0,frame]{exam-a}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3split.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3split.pdf
index b6267d46181..fa25ce6e1b1 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3split.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a3split.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.pdf
deleted file mode 100644
index d9119b72c82..00000000000
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.pdf
new file mode 100644
index 00000000000..e7d5030af6f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.tex b/Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.tex
index 6da2c24a858..6da2c24a858 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a-a4print.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a-empty.tex
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-a.pdf
index 1b4ef7a6ccb..257501b8496 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-a.tex b/Master/texmf-dist/doc/latex/jnuexam/exam-a.tex
index 30925233ed4..98ff78f9e60 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-a.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-a.tex
@@ -12,8 +12,8 @@
\renewcommand{\niandu}{2017--2018}
\renewcommand{\xueqi}{2}
\renewcommand{\kecheng}{大学数学}
-\renewcommand{\zhuanye}{经管~3~学分} % 可以为空白
-\renewcommand{\jiaoshi}{吕荐瑞}
+\renewcommand{\zhuanye}{理工~4~学分} % 可以为空白
+\renewcommand{\jiaoshi}{张三,李四,王五} % 教师姓名
\renewcommand{\shijian}{2018~年~06~月~28~日}
\renewcommand{\bixiu}{1} % 1 为必修,0 为选修
\renewcommand{\bijuan}{1} % 1 为闭卷,0 为开卷
@@ -93,10 +93,10 @@
\begin{problem}
下列各排列哪个是偶排列 \pickout{D}
-\quaditem{3712456}
-\quaditem{36715284}
-\quaditem{654321}
-\quaditem{41253}
+\quaritem{$3712456$}
+\quaritem{$36715284$}
+\quaritem{$654321$}
+\quaritem{$41253$}
\end{problem}
\vfill
@@ -111,10 +111,10 @@
b_1 & b_2 & b_3\\
c_1 & c_2 & c_3
\end{array}\right|=$ \pickout{A}
-\quaditem{1}
-\quaditem{-1}
-\quaditem{2}
-\quaditem{-2}
+\quaritem{$1$}
+\quaritem{$-1$}
+\quaritem{$2$}
+\quaritem{$-2$}
\end{problem}
\vfill
@@ -126,29 +126,29 @@
0 & 0 & 1
\end{array}\right)$ 其中两个特征值为 $\lambda_1 = 1$ 和 $\lambda_2
= 2$,则 $x=$ \pickout{B}
-\quaditem{2}
-\quaditem{1}
-\quaditem{0}
-\quaditem{-1}
+\quaritem{$2$}
+\quaritem{$1$}
+\quaritem{$0$}
+\quaritem{$-1$}
\end{problem}
\vfill
\begin{problem}
二次型 $f = 4 x_1^2 - 2 x_1 x_2 + 6 x_2^2$ 对应的矩阵等于 \pickout{C}
-\quaditem{$\left(\begin{array}{cc}
+\quaritem{$\left(\begin{array}{cc}
4 & - 2\\
- 2 & 6
\end{array}\right)$}
-\quaditem{$\left(\begin{array}{cc}
+\quaritem{$\left(\begin{array}{cc}
2 & - 2\\
- 2 & 3
\end{array}\right)$}
-\quaditem{$\left(\begin{array}{cc}
+\quaritem{$\left(\begin{array}{cc}
4 & - 1\\
- 1 & 6
\end{array}\right)$}
-\quaditem{$\left(\begin{array}{cc}
+\quaritem{$\left(\begin{array}{cc}
2 & - 1\\
- 1 & 3
\end{array}\right)$}
@@ -188,10 +188,10 @@
\begin{problem}
样本平均数$\bar{X}$\CJKunderline{未必是}总体期望值$\mu$的\pickout{A}
-\quaditem{最大似然估计}
-\quaditem{有效估计}
-\quaditem{一致估计}
-\quaditem{无偏估计}
+\quaritem{最大似然估计}
+\quaritem{有效估计}
+\quaritem{一致估计}
+\quaritem{无偏估计}
\end{problem}
\vfill
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.pdf
index b96cbfceda9..802078ba532 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.tex b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.tex
index 3bdbd18ea18..5b0ade2fefb 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3input.tex
@@ -4,6 +4,6 @@
% 直接包含 A4 试卷的 PDF 文件,生成双栏的 A3 试卷
\documentclass[a3paper]{jnuexam}
\begin{document}
-\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0]{exam-b-a4print}
+\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0]{exam-b-empty}
%\includepdf[pages=-,nup=2x1,offset=1cm 0,delta=-2cm 0,frame]{exam-b}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3split.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3split.pdf
index ba17005c2c5..a5b6210be3f 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3split.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a3split.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.pdf
deleted file mode 100644
index f6f63065421..00000000000
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.pdf
new file mode 100644
index 00000000000..de89c6040b2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.tex b/Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.tex
index 41db22542c4..41db22542c4 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b-a4print.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b-empty.tex
diff --git a/Master/texmf-dist/doc/latex/jnuexam/exam-b.pdf b/Master/texmf-dist/doc/latex/jnuexam/exam-b.pdf
index a9e757da8ab..9d135f741c8 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/exam-b.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/exam-b.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
index 97cbce40683..b227653ac19 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
+++ b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.tex b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.tex
index 0266b51a343..35bdcafe375 100644
--- a/Master/texmf-dist/doc/latex/jnuexam/jnuexam.tex
+++ b/Master/texmf-dist/doc/latex/jnuexam/jnuexam.tex
@@ -3,8 +3,8 @@
\documentclass[12pt]{beamer}
-\usepackage{arev}
\usepackage[UTF8,noindent]{ctex}
+\usepackage{arev}
\usepackage{ragged2e}
\usepackage{listings}
\usepackage{tabu}
@@ -28,10 +28,28 @@
\setbeamertemplate{frametitle}{\strut\insertframetitle\strut\par}
\setbeamertemplate{navigation symbols}{}
+\newcommand{\ulinefill}[1]{\xleaders\hbox{\underline{\vphantom{#1}\kern1pt}}\hfill\kern0pt}
+\newcommand{\fillbox}[1]{\ulinefill{#1}\underline{#1}\ulinefill{#1}}
+
+\setbeamercolor{normal text}{bg=gray!20}
+
+\setbeamertemplate{title page}{%
+ \renewcommand{\arraystretch}{2}%
+ \usebeamerfont{title}
+ \begin{tabu}{|X|}
+ \hline
+ 模板名称:\fillbox{\usebeamercolor[fg]{title}\inserttitle} \\
+ 模板作者:\fillbox{\insertauthor} \\
+ 所在单位:\fillbox{\insertinstitute} \\
+ 更新日期:\fillbox{\the\year}年\fillbox{\the\month}月\fillbox{\the\day}日\\
+ \hline
+ \end{tabu}%
+}
+
\begin{document}
\title{暨南大学试卷 LaTeX 模板}
-\author{吕荐瑞}
+\author{吕\ 荐\ 瑞}
\institute{暨南大学数学系}
\begin{frame}[plain]
@@ -42,7 +60,7 @@
\frametitle{简单介绍}
本文档介绍 \verb!jnuexam! 文档类。这个文档类提供暨南大学考试试卷的 LaTeX 模板。
\par
-这个模板将格式和内容分开,而且可以从一份 \verb!tex! 文件编译出四份试卷(A卷/B卷/A卷答案/B卷答案),使用方便。
+这个模板将格式和内容分开,而且可以从一份 \verb!tex! 文件编译出四份试卷(A卷 / B卷 / A卷答案 / B卷答案),使用方便。
\par
这个模板的最新版本可以在下面地址下载:\newline
\url{https://lvjr.bitbucket.io/jnuexam.html}
@@ -55,7 +73,7 @@
\par
如果对文件编码不熟悉,可以直接复制例子文件,然后在其中修改,即可正常编译。
\par
-这个文档类同时支持 \verb!XeLaTeX! 和 \verb!PDFLaTeX! 方式编译。为了得到最好的中文显示效果,
+这个文档类同时支持 \verb!XeLaTeX! 和 \verb!PDFLaTeX! 方式编译。为得到最好的中文显示效果,
推荐用较先进的 \verb!XeLaTeX! 编译。
\end{framex}
@@ -87,8 +105,8 @@
\renewcommand{\niandu}{2010--2011}
\renewcommand{\xueqi}{2}
\renewcommand{\kecheng}{大学数学}
-\renewcommand{\zhuanye}{经管3学分}
-\renewcommand{\jiaoshi}{吕荐瑞}
+\renewcommand{\zhuanye}{理工4学分}
+\renewcommand{\jiaoshi}{某某某}
\renewcommand{\shijian}{2011年07月08日}
\renewcommand{\bixiu}{1} % 1为必修,0为选修
\renewcommand{\bijuan}{1} % 1为闭卷,0为开卷
@@ -207,7 +225,7 @@
\begin{framex}
\frametitle{空白试卷}
-假设 \verb!exam-a.tex! 是含答案的试卷。新建一个包含以下内容的 \verb!exam-a-print.tex! 文档,
+假设 \verb!exam-a.tex! 是含答案的试卷。新建一个包含以下内容的 \verb!exam-a-empty.tex! 文档,
编译后将得到不含答案的空白试卷。
\begin{lstlisting}
\PassOptionsToClass{noanswer}{jnuexam}
@@ -248,7 +266,7 @@
\begin{framex}
\frametitle{分页命令}
分页命令 \verb!\newpage! 同样可以使用。由于A卷和B卷的小题顺序相反,
-其中的分页位置通常也不同。故这里另外提供 \verb!\newpagea! 和 \verb!\newpageb! 命令,
+其中的分页位置通常也不同。因此这里另外提供 \verb!\newpagea! 和 \verb!\newpageb! 命令,
分别只对 A 卷和 B 卷有效。
\par
\renewcommand{\arraystretch}{1.3}%
diff --git a/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls b/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
index 38b86cbdaaf..0b2b11fc4f4 100644
--- a/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
+++ b/Master/texmf-dist/tex/latex/jnuexam/jnuexam.cls
@@ -2,11 +2,11 @@
% ----------------------------------------------------------------------------
% Author: Jianrui Lyu <tolvjr@163.com>
% Website: https://lvjr.bitbucket.io/jnuexam.html
-% License: Creative Commons Attribution-ShareAlike 4.0 International License
+% License: The LaTeX Project Public License 1.3
% ----------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jnuexam}[2018/06/29 v0.2 An exam class for Jinan University]
+\ProvidesClass{jnuexam}[2018/07/07 v0.3 An exam class for Jinan University]
\newif\ifsidebyside \sidebysidefalse % 是否 A3 纸张
\newif\ifreverse \reversefalse % 是否逆序出题
@@ -70,7 +70,9 @@
\RequirePackage{pdfpages}
% 新版本 pdfpages 将 \includepdf 放在文档开头时会有命令未定义的错误
% 见 https://tex.stackexchange.com/questions/352007/ieeetran-and-pdfpages
- \@ifundefined{@setmarks}{}{}
+ % 另外从 LaTeX release 2018 开始 \@ifundefined 不再将未定义命令定义为 \relax
+ % 见 https://www.latex-project.org/news/latex2e-news/ltnews28.pdf
+ \@ifundefined{@setmarks}{\let\@setmarks\relax}{}
\fi
\setlength{\parindent}{0em}
@@ -91,6 +93,7 @@
\newcommand{\underspace}[1]{\underline{\hspace{#1}}}
\newcommand{\underbox}[2]{\underline{\makebox[#1]{#2}}}
+\newcommand{\underparbox}[2]{\underline{\parbox[b]{#1}{#2}}}
\newcommand{\ischeck}[1]{\ifnum#1>0\,\ding{51}\,\else\quad\fi}
\newcommand{\isquad}[1]{\ifnum#1=0\,\ding{51}\,\else\quad\fi}
@@ -101,9 +104,9 @@
\newcommand{\head@table@a}{%
\begin{tabular}{l}
- 教学年度:\underbox{8em}{\niandu} 年度第 \underbox{3.5em}{\xueqi} 学期 \\
+ \underbox{10em}{\niandu} 学年度第 \underbox{5.5em}{\xueqi} 学期 \\
课程名称:\underbox{17.5em}{\kecheng\ifx\zhuanye\my@empty\else\kern0pt(\zhuanye)\fi} \\
- 授课教师:\underbox{17.5em}{\jiaoshi} \\
+ 授课教师:\underparbox{17.5em}{\centering\rule{0pt}{3ex}\jiaoshi} \\
考试时间:\underbox{17.5em}{\shijian} \\
\end{tabular}
}
@@ -227,9 +230,9 @@
\newcommand{\pickin}[1]{(\makebox[1.5em]{\color{blue}\answer{#1}})}
\newcommand{\my@item}{\ifnum\value{choice}=0\par\fi\stepcounter{choice}}
-\newcommand{\fullitem}[1]{\my@item\makebox[\linewidth][l]{(\Alph{choice})\ #1}\break\ignorespaces}
-\newcommand{\halfitem}[1]{\my@item\makebox[0.502\linewidth][l]{(\Alph{choice})\ #1}\allowbreak\ignorespaces}
-\newcommand{\quaditem}[1]{\my@item\makebox[0.251\linewidth][l]{(\Alph{choice})\ #1}\allowbreak\ignorespaces}
+\newcommand{\fullitem}[1]{\my@item\parbox{\linewidth}{(\Alph{choice})\ #1\rule[-0.5em]{0pt}{0.5em}}\hfill\ignorespaces}
+\newcommand{\halfitem}[1]{\my@item\makebox[0.5\linewidth][l]{(\Alph{choice})\ #1}\hfill\ignorespaces}
+\newcommand{\quaritem}[1]{\my@item\makebox[0.25\linewidth][l]{(\Alph{choice})\ #1}\hfill\ignorespaces}
\newcommand\ignorepars{\@ifnextchar\par{\expandafter\ignorepars\@gobble}{}}
@@ -310,4 +313,3 @@
\excludecomment{proof}
\fi
}
-