summaryrefslogtreecommitdiff
path: root/macros/xetex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-23 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2023-06-23 03:00:58 +0000
commitddaf122566480fe48b9786c172e647ca0ea4c6d5 (patch)
tree9115d611b96558c66692de0b88e9106d9a9f76b0 /macros/xetex
parentac667b3d60d89dfd061e15583ed0062204ec705c (diff)
CTAN sync 202306230300
Diffstat (limited to 'macros/xetex')
-rw-r--r--macros/xetex/latex/exam-zh/CHANGELOG.md10
-rw-r--r--macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdfbin1595118 -> 1595064 bytes
-rw-r--r--macros/xetex/latex/exam-zh/doc/exam-zh-doc.tex2
-rw-r--r--macros/xetex/latex/exam-zh/examples/example-multiple.pdfbin160183 -> 160194 bytes
-rw-r--r--macros/xetex/latex/exam-zh/examples/example-single.pdfbin134468 -> 134479 bytes
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty2
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty6
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-font.sty2
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-question.sty7
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty2
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh-textfigure.sty2
-rw-r--r--macros/xetex/latex/exam-zh/tex/exam-zh.cls20
12 files changed, 32 insertions, 21 deletions
diff --git a/macros/xetex/latex/exam-zh/CHANGELOG.md b/macros/xetex/latex/exam-zh/CHANGELOG.md
index 384d067eb5..44002138a6 100644
--- a/macros/xetex/latex/exam-zh/CHANGELOG.md
+++ b/macros/xetex/latex/exam-zh/CHANGELOG.md
@@ -5,8 +5,16 @@
格式参照 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
并且此项目遵守 [Semantic Versioning](https://semver.org/spec/v2.0.0.html)。
+## [0.1.26] - 2023-06-22
-## [0.1.25] - 2023-06-01
+
+### Fixed
+
+- 修复 `choices` 环境的 `columns` 失效问题(#I7FBVF)
+
+
+
+## [0.1.25] - 2023-05-25
### Changed
diff --git a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf
index 2ae39ae7a5..77c9d82abf 100644
--- a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf
+++ b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf
Binary files differ
diff --git a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.tex b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.tex
index 8a5b804084..ad247296c1 100644
--- a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.tex
+++ b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.tex
@@ -1,7 +1,7 @@
\documentclass{xdyydoc}
\newcommand{\DocDate}{2022-10-4}
-\newcommand{\DocVersion}{v0.1.25}
+\newcommand{\DocVersion}{v0.1.26}
\input{exam-zh-doc-setup.tex}
\usepackage{amssymb}
diff --git a/macros/xetex/latex/exam-zh/examples/example-multiple.pdf b/macros/xetex/latex/exam-zh/examples/example-multiple.pdf
index 967799ad5f..76abecf4e9 100644
--- a/macros/xetex/latex/exam-zh/examples/example-multiple.pdf
+++ b/macros/xetex/latex/exam-zh/examples/example-multiple.pdf
Binary files differ
diff --git a/macros/xetex/latex/exam-zh/examples/example-single.pdf b/macros/xetex/latex/exam-zh/examples/example-single.pdf
index dd0226e183..69f8591c5e 100644
--- a/macros/xetex/latex/exam-zh/examples/example-single.pdf
+++ b/macros/xetex/latex/exam-zh/examples/example-single.pdf
Binary files differ
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty
index 2e84afa5c6..e905af6f5a 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty
@@ -8,7 +8,7 @@
\RequirePackage{expl3}
-\ProvidesExplPackage {exam-zh-chinese-english} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-chinese-english} {2023-06-22} {v0.1.26}
{exam-zh chinese and english module}
\PassOptionsToPackage { tcolorbox } { most }
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty
index f564fdff66..57e8dd4ef2 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty
@@ -9,7 +9,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {exam-zh-choices} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-choices} {2023-06-22} {v0.1.26}
{exam-zh choices module}
\dim_new:N \l__examzh_choices_column_sep_dim
@@ -124,12 +124,14 @@
% 用户没有输入的话就采用自动计算列数
\int_compare:nNnT { \l__examzh_choices_columns_int } < {1}
{ \__examzh_choices_calc_columns: }
+ % 解决 columns 无效的问题
+ \keys_set:nn { exam-zh / choices } {#1}
% 计算每个选项内容的宽度 \l__examzh_choices_item_width_dim
\__examzh_choices_calc_item_width:
% 输出选项
\__examzh_print_choices:N \l__examzh_choices_seq
% 输出正确选项
- \__examzh_print_correctchoice:
+ % \__examzh_print_correctchoice:
\vspace* { \l__examzh_choices_bottom_sep_skip }
}
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty
index 71320f5305..91257434b7 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty
@@ -9,7 +9,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {exam-zh-font} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-font} {2023-06-22} {v0.1.26}
{exam-zh font module}
\RequirePackage { unicode-math }
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty
index 40dde06024..4cb1c943fa 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty
@@ -9,7 +9,7 @@
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {exam-zh-question} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-question} {2023-06-22} {v0.1.26}
{exam-zh question module}
@@ -1612,12 +1612,14 @@
{
% \addvspace { \l__examzh_solution_top_sep_skip }
\keys_set:nn { exam-zh / solution } {#1}
- \vspace { \l__examzh_solution_top_sep_skip }
% 放在这是使得 \examsetup 设置 qedsymbol 可以放在正文区
\cs_set_eq:NN \qedsymbol \l__examzh_solution_qedsymbol_tl
\bool_if:NTF \l__examzh_solution_show_bool
{
+ \vspace { \l__examzh_solution_top_sep_skip }
\__examzh_solution_print_answer:n {#2}
+ \par
+ \vspace { \l__examzh_solution_bottom_sep_skip }
}
{
\str_case:VnF \l__examzh_solution_blank_type_str
@@ -1631,7 +1633,6 @@
\par
% \mode_leave_vertical:
% \addvspace { \l__examzh_solution_bottom_sep_skip }
- \vspace { \l__examzh_solution_bottom_sep_skip }
}
{}
\cs_new:Npn \__examzh_solution_simply_hide_solution:n #1
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty
index 4997a0d292..0ac2e1db4a 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty
@@ -8,7 +8,7 @@
\RequirePackage{expl3}
-\ProvidesExplPackage {exam-zh-symbols} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-symbols} {2023-06-22} {v0.1.26}
{exam-zh symbols module}
\RequirePackage { tikz }
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-textfigure.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-textfigure.sty
index ccefefae71..5b21d1e2d3 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh-textfigure.sty
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh-textfigure.sty
@@ -7,7 +7,7 @@
\RequirePackage{expl3}
-\ProvidesExplPackage {exam-zh-textfigure} {2023-06-01} {v0.1.25}
+\ProvidesExplPackage {exam-zh-textfigure} {2023-06-22} {v0.1.26}
{exam-zh text with figure module}
diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh.cls b/macros/xetex/latex/exam-zh/tex/exam-zh.cls
index 2959abe67f..818feeceb9 100644
--- a/macros/xetex/latex/exam-zh/tex/exam-zh.cls
+++ b/macros/xetex/latex/exam-zh/tex/exam-zh.cls
@@ -6,7 +6,7 @@
\NeedsTeXFormat{LaTeX2e}[2017/04/15]
\RequirePackage{expl3}
-\ProvidesExplClass {exam-zh} {2023-06-01} {v0.1.25} {LaTeX template for Chinese exam}
+\ProvidesExplClass {exam-zh} {2023-06-22} {v0.1.26} {LaTeX template for Chinese exam}
% 检查 LaTeX2e kernel 版本
\msg_new:nnn { exam-zh } { latex-too-old }
@@ -661,7 +661,7 @@
}
% 科目
-\tl_new:N \l__exam_zh_subject_tl
+\tl_new:N \l__examzh_subject_tl
\NewDocumentCommand \subject { o m }
{
\IfNoValueTF {#1}
@@ -669,14 +669,14 @@
% 默认使用自然宽度
\hbox_set:Nn \l_tmpa_box {#2}
\dim_set:Nn \l_tmpa_dim { \box_wd:N \l_tmpa_box * 2 }
- \tl_set:Nn \l__exam_zh_subject_tl
+ \tl_set:Nn \l__examzh_subject_tl
{
\__examzh_spread_box:nn { \l_tmpa_dim } {#2}
}
}
{
% 手动调整宽度
- \tl_set:Nn \l__exam_zh_subject_tl
+ \tl_set:Nn \l__examzh_subject_tl
{
\__examzh_spread_box:nn {#1} {#2}
}
@@ -691,10 +691,10 @@
\begin { center }
\let \footnote \thanks
{ \l__examzh_title_format_tl \@title \par }
- \tl_if_blank:VF \l__exam_zh_subject_tl
+ \tl_if_blank:VF \l__examzh_subject_tl
{
\addvspace { 1em }
- { \l__examzh_subject_format_tl \l__exam_zh_subject_tl }
+ { \l__examzh_subject_format_tl \l__examzh_subject_tl }
}
\end { center }
\par
@@ -1805,7 +1805,7 @@
{
\small
\use:c { __examzh_foot_content_a4paper_output: }
- % \l__exam_zh_subject_tl 试题第 \thepage { } 页(共 \pageref { LastPage } ~ 页)
+ % \l__examzh_subject_tl 试题第 \thepage { } 页(共 \pageref { LastPage } ~ 页)
}
}
}
@@ -1820,7 +1820,7 @@
\fancyfoot [ C ]
{
\small
- % \l__exam_zh_subject_tl 试题第 \thepage { } 页(共 \pageref { LastPage } ~ 页)
+ % \l__examzh_subject_tl 试题第 \thepage { } 页(共 \pageref { LastPage } ~ 页)
\use:c { __examzh_foot_content_a3paper_common_output: }
}
}
@@ -1832,7 +1832,7 @@
{
\small
\use:c { __examzh_foot_content_a3paper_separate_left_output: }
- % \l__exam_zh_subject_tl 试题第
+ % \l__examzh_subject_tl 试题第
% % \thepage
% \int_eval:n { 2 * \c@page - 1 }
% { } 页
@@ -1852,7 +1852,7 @@
% % \int_gincr:N \c@page
% \int_set:Nn \l__examzh_tmp_int { \lastpage@lastpage }
- % \l__exam_zh_subject_tl 试题第
+ % \l__examzh_subject_tl 试题第
% \int_eval:n { 2 * \c@page }
% { }
% 页