From c109dff9e28ca1d53092373150be9a653ff4870a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Aug 2022 20:45:58 +0000 Subject: exam-zh (11aug22) git-svn-id: svn://tug.org/texlive/trunk@64098 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/xelatex/exam-zh/CHANGELOG.md | 7 +++++++ .../doc/xelatex/exam-zh/doc/body/usage.tex | 1 + .../doc/xelatex/exam-zh/doc/exam-zh-doc-setup.tex | 2 +- .../doc/xelatex/exam-zh/doc/exam-zh-doc.pdf | Bin 1096057 -> 1096069 bytes .../tex/latex/exam-zh/exam-zh-chinese-english.sty | 2 +- .../tex/latex/exam-zh/exam-zh-choices.sty | 2 +- .../texmf-dist/tex/latex/exam-zh/exam-zh-font.sty | 2 +- .../tex/latex/exam-zh/exam-zh-question.sty | 8 +++++--- .../tex/latex/exam-zh/exam-zh-symbols.sty | 2 +- Master/texmf-dist/tex/latex/exam-zh/exam-zh.cls | 2 +- 10 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/xelatex/exam-zh/CHANGELOG.md b/Master/texmf-dist/doc/xelatex/exam-zh/CHANGELOG.md index 5309e2dd9d9..ba0c53e0c43 100644 --- a/Master/texmf-dist/doc/xelatex/exam-zh/CHANGELOG.md +++ b/Master/texmf-dist/doc/xelatex/exam-zh/CHANGELOG.md @@ -5,6 +5,13 @@ 格式参照 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 并且此项目遵守 [Semantic Versioning](https://semver.org/spec/v2.0.0.html)。 +## [0.1.16] - 2022-08-11 + +### Fixed + +- 修复双栏下使用 `\fillin` 造成的 `linegoal` 干扰问题 + + ## [0.1.15] - 2022-08-09 ### Fixed diff --git a/Master/texmf-dist/doc/xelatex/exam-zh/doc/body/usage.tex b/Master/texmf-dist/doc/xelatex/exam-zh/doc/body/usage.tex index 8fa19b40f9e..c797579d3cf 100644 --- a/Master/texmf-dist/doc/xelatex/exam-zh/doc/body/usage.tex +++ b/Master/texmf-dist/doc/xelatex/exam-zh/doc/body/usage.tex @@ -1967,6 +1967,7 @@ width-type = (*<(fill)|normal>*) \end{ccnusyntax} \kvopt{show-answer}{false} 且 \kvopt{no-answer-type}{none} 时 \opt{fillin/width} 设置时若 \meta{width} 的长度超过了当前行的剩余长度,则多余部分在下一行的表现。\opt{fill} 表示多余部分只要不超过 \tn{linewidth} 就自动 fill 为 \tn{linewidth} 的长度(此时建议 \opt{width} 的值不是 \tn{linewidth} 的整数倍,而是(以最终一共两行为例)比如 |1.5\linewidth|);\opt{normal} 表示多余部分严格按照 \meta{width} 的值排版。由于使用了 \pkg{linegoal},需要编译至少两次才能获得正确的效果。 + % \emph{注意:由于 \kvopt{no-answer-type}{none} 下的算法是基于 \pkg{linegoal} 获取当前行的剩余距离,如果此时同一行出现了两个 \tn{fillin} 就会互相干扰,导致编译异常。所以 \kvopt{no-answer-type}{none} 下尽可能避免同一行出现两个 \tn{fillin} 命令} \end{function} \begin{latexexample}{\opt{width-type} 示例} diff --git a/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc-setup.tex b/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc-setup.tex index 0d58eb870dd..072135fcc0a 100644 --- a/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc-setup.tex +++ b/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc-setup.tex @@ -31,7 +31,7 @@ \title{\textcolor{MaterialIndigo800}{% \textbf{exam-zh: 高考试卷 \LaTeX \xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}} \author{李泽平,夏康玮,郭李军} -\date{2022/08/02\quad v0.1.15% +\date{2022/08/11\quad v0.1.16% \thanks{% \url{https://gitee.com/zepinglee/exam-zh} } diff --git a/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc.pdf b/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc.pdf index c05b3ae4f41..64f66098ca8 100644 Binary files a/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc.pdf and b/Master/texmf-dist/doc/xelatex/exam-zh/doc/exam-zh-doc.pdf differ diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-chinese-english.sty b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-chinese-english.sty index b0ccffa0fbd..b6ff7988462 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-chinese-english.sty +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-chinese-english.sty @@ -8,7 +8,7 @@ \RequirePackage{expl3} -\ProvidesExplPackage {exam-zh-chinese-english} {2022-08-09} {v0.1.15} +\ProvidesExplPackage {exam-zh-chinese-english} {2022-08-11} {v0.1.16} {exam-zh chinese and english module} \PassOptionsToPackage { tcolorbox } { most } diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-choices.sty b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-choices.sty index 1f43e892908..09b434e5e11 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-choices.sty +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-choices.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-choices} {2022-08-09} {v0.1.15} +\ProvidesExplPackage {exam-zh-choices} {2022-08-11} {v0.1.16} {exam-zh choices module} \dim_new:N \l__examzh_choices_column_sep_dim diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-font.sty b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-font.sty index 3ba6cbcbd88..0a8348b0941 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-font.sty +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-font.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-font} {2022-08-09} {v0.1.15} +\ProvidesExplPackage {exam-zh-font} {2022-08-11} {v0.1.16} {exam-zh font module} \RequirePackage { unicode-math } diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-question.sty b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-question.sty index 6651de73834..6e612c19aaa 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-question.sty +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-question.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-question} {2022-08-09} {v0.1.15} +\ProvidesExplPackage {exam-zh-question} {2022-08-11} {v0.1.16} {exam-zh question module} @@ -1155,11 +1155,13 @@ % #1: CJKunderline / use:n % #2: \allowbreak { + \dim_set_eq:NN \l_tmpb_dim \linegoal % 比较 \l__examzh_fillin_F_width_dim 和 linegoal \dim_compare:nNnTF { \l__examzh_fillin_F_width_dim } > { \linegoal } { % 超过 linegoal 就排一段 linegoal,然后 \l__examzh_fillin_F_width_dim 减去 linegoal 长度 - \dim_set:NV \l_tmpa_dim \linegoal + % \dim_set:NV \l_tmpa_dim \linegoal + \dim_set:NV \l_tmpa_dim \l_tmpb_dim % 是否处于 list 环境中 \bool_if:NTF \l__if_list_bool { @@ -1172,7 +1174,7 @@ } { % 正文中 - #1 { \hspace { \linegoal } } + #1 { \hspace { \l_tmpb_dim } } } \dim_sub:NV \l__examzh_fillin_F_width_dim \l_tmpa_dim \dim_while_do:nNnn { \l__examzh_fillin_F_width_dim } > { \linewidth } diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-symbols.sty b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-symbols.sty index 246335ef0a3..0940b545db2 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh-symbols.sty +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh-symbols.sty @@ -8,7 +8,7 @@ \RequirePackage{expl3} -\ProvidesExplPackage {exam-zh-symbols} {2022-08-09} {v0.1.15} +\ProvidesExplPackage {exam-zh-symbols} {2022-08-11} {v0.1.16} {exam-zh symbols module} \RequirePackage { tikz } diff --git a/Master/texmf-dist/tex/latex/exam-zh/exam-zh.cls b/Master/texmf-dist/tex/latex/exam-zh/exam-zh.cls index d9fc8090014..90d70c8095b 100644 --- a/Master/texmf-dist/tex/latex/exam-zh/exam-zh.cls +++ b/Master/texmf-dist/tex/latex/exam-zh/exam-zh.cls @@ -6,7 +6,7 @@ \NeedsTeXFormat{LaTeX2e}[2017/04/15] \RequirePackage{expl3} -\ProvidesExplClass {exam-zh} {2022-08-09} {v0.1.15} {LaTeX template for Chinese exam} +\ProvidesExplClass {exam-zh} {2022-08-11} {v0.1.16} {LaTeX template for Chinese exam} % 检查 LaTeX2e kernel 版本 \msg_new:nnn { exam-zh } { latex-too-old } -- cgit v1.2.3