exam-zh (15aug22)

git-svn-id: svn://tug.org/texlive/trunk@64123 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 132 insertions, 25 deletions

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 3d95350b1e2..b2d1d39baf3 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-12} {v0.1.17}
+\ProvidesExplPackage {exam-zh-chinese-english} {2022-08-15} {v0.1.18}
   {exam-zh chinese and english module}
 
 \PassOptionsToPackage { tcolorbox } { most }
@@ -667,4 +667,6 @@
   }
   {
     \end{tcolorbox}
-  }
\ No newline at end of file
+  }
+
+\endinput
\ No newline at end of file
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 3a7d9f7d2c5..ef7c39ba881 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-12} {v0.1.17}
+\ProvidesExplPackage {exam-zh-choices} {2022-08-15} {v0.1.18}
   {exam-zh choices module}
 
 \dim_new:N \l__examzh_choices_column_sep_dim
@@ -552,4 +552,6 @@
 %   - 表格形式
 
 % 答案确定
-% 通过 \item 是否带 * 判断，有的话则标记为正确答案
\ No newline at end of file
+% 通过 \item 是否带 * 判断，有的话则标记为正确答案
+
+\endinput
\ No newline at end of file
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 d342229cc16..cda40621014 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
@@ -1,5 +1,5 @@
 %
-% Copyright (c) 2022 Zeping Lee
+% Copyright (c) 2022 Zeping Lee and AlphaZTX
 % Released under the LaTeX Project Public License v1.3c License.
 % Repository: https://gitee.com/zepinglee/exam-zh
 %
@@ -9,7 +9,7 @@
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 
-\ProvidesExplPackage {exam-zh-font} {2022-08-12} {v0.1.17}
+\ProvidesExplPackage {exam-zh-font} {2022-08-15} {v0.1.18}
   {exam-zh font module}
 
 \RequirePackage { unicode-math }
@@ -23,14 +23,15 @@
   {
     font .choices:nn =
       {
-        newcm ,
+        garamond ,
+        libertinus ,
         lm ,
-        times ,
+        newcm ,
+        pala ,
+        stix ,
         termes ,
-        stix,
+        times ,
         xits ,
-        libertinus ,
-        % newtx ,
         none
       }
       {
@@ -39,14 +40,16 @@
       } ,
     math-font .choices:nn =
       {
-        newcm ,
+        asana ,
+        cambria ,
+        garamond ,
+        libertinus ,
         lm ,
+        newcm ,
+        pala ,
+        stix ,
         termes ,
-        stix,
         xits ,
-        libertinus ,
-        cambria ,
-        % newtx ,
         none
       }
       {
@@ -139,6 +142,52 @@
     \examzh_font_set_tex_gyre_sans_mono:
   }
 
+
+% Garamond (实际上是 EB Garamond)
+\cs_new:Npn \examzh_font_set_font_garamond:
+  {
+    \setmainfont { EBGaramond }
+      [
+        Extension      = .otf ,
+        UprightFont    = *-Regular ,
+        BoldFont       = *-Bold ,
+        ItalicFont     = *-Italic ,
+        BoldItalicFont = *-BoldItalic ,
+      ]
+    \setsansfont { LinBiolinum }
+      [
+        Extension      = .otf ,
+        UprightFont    = *_R ,
+        BoldFont       = *_RB ,
+        ItalicFont     = *_RI ,
+        BoldItalicFont = *_RBO ,
+      ]
+    \setmonofont { texgyrecursor }
+      [
+        Extension      = .otf ,
+        UprightFont    = *-regular ,
+        BoldFont       = *-bold ,
+        ItalicFont     = *-italic ,
+        BoldItalicFont = *-bolditalic ,
+      ]
+  }
+
+
+% Palatino (TeX Gyre Pagella)
+\cs_new:Npn \examzh_font_set_font_pala:
+  {
+    \setmainfont { texgyrepagella }
+      [
+        Extension      = .otf ,
+        UprightFont    = *-regular ,
+        BoldFont       = *-bold ,
+        ItalicFont     = *-italic ,
+        BoldItalicFont = *-bolditalic ,
+      ]
+    \examzh_font_set_tex_gyre_sans_mono:
+  }
+
+% TeX Gyre Heros / Cursor
 \cs_new:Npn \examzh_font_set_tex_gyre_sans_mono:
   {
     \setsansfont { texgyreheros }
@@ -553,8 +602,46 @@
       Extension    = .otf,
       range        = { \complement } ,
     ]
+  \message
+    {
+      Please~note~that~the~Cambria~font~family~cannot~be~used~on~commercial~purpose~unless~you~are~using~Windows~7/8/10/11~PROFESSIONAL.
+    }
 }
 
+% 新增的 asana, garamond, pala
+\cs_new:Npn \examzh_font_set_math_font_asana: 
+  {
+    \setmathfont { Asana-Math.otf }
+    \examzh_font_set_stix_names:
+    \setmathfont { \g__examzh_font_font_name_stix_math_tl }
+      [
+        Extension    = .otf,
+        range        = { \complement } ,
+      ]
+  }
+
+\cs_new:Npn \examzh_font_set_math_font_garamond: 
+  {
+    \setmathfont { Garamond-Math.otf }
+    \examzh_font_set_stix_names:
+    \setmathfont { \g__examzh_font_font_name_stix_math_tl }
+      [
+        Extension    = .otf,
+        range        = { \complement } ,
+      ]
+  }
+
+\cs_new:Npn \examzh_font_set_math_font_pala: 
+  {
+    \setmathfont { texgyrepagella-math.otf }
+    \examzh_font_set_stix_names:
+    \setmathfont { \g__examzh_font_font_name_stix_math_tl }
+      [
+        Extension    = .otf,
+        range        = { \complement } ,
+      ]
+  }
+
 
 
 \AtEndPreamble
@@ -571,11 +658,23 @@
 % 兼容旧的粗体命令：\pkg{bm} 的 \cs{bm} 和 \pkg{amsmath} 的 \cs{boldsymbol}。
 \AtEndOfPackageFile* { unicode-math }
   {
-    \NewDocumentCommand \bm { m } { { \symbfit { ##1 } } }
-    \RenewDocumentCommand \boldsymbol { m } { { \symbfit { ##1 } } }
+    \NewDocumentCommand \bm { m } 
+      { 
+        \tl_if_head_eq_catcode:nNTF { ##1 } A 
+          { \symbfit{#1} }
+          { 
+            #1 
+            \PackageWarning { exam-zh-font } 
+              { 
+                Do~not~use~\string\bm \space ~with~`unicode-math',~normal~font~instead. 
+              }
+          }
+      }
+    \RenewDocumentCommand \boldsymbol { } { \bm }
     % 兼容 \pkg{amsfonts} 和 \pkg{amssymb} 中的一些命令。
     \NewDocumentCommand \square { } { \mdlgwhtsquare }
     \NewDocumentCommand \blacksquare { } { \mdlgblksquare }
-    \AtBeginDocument
-      { \RenewDocumentCommand \checkmark { } { \ensuremath{ ✓ } } }
+    \AtBeginDocument { \RenewDocumentCommand \checkmark { } { \ensuremath{ ✓ } } }
   }
+
+\endinput
\ No newline at end of file
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 d1a07de8ad0..7cf7524e08d 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-12} {v0.1.17}
+\ProvidesExplPackage {exam-zh-question} {2022-08-15} {v0.1.18}
   {exam-zh question module}
 
 
@@ -1451,4 +1451,6 @@
           }
       }
     \tag * { \zsaveposx { \thezref@unique R } #1 }
-  }
\ No newline at end of file
+  }
+
+\endinput
\ No newline at end of file
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 c5c2d35245c..2b0490284d4 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-12} {v0.1.17}
+\ProvidesExplPackage {exam-zh-symbols} {2022-08-15} {v0.1.18}
   {exam-zh symbols module}
 
 \RequirePackage { tikz }
@@ -1205,4 +1205,6 @@
             \fontsize{\ssf@size}{\ssf@size}\selectfont #1 
           }
       }
-  }
\ No newline at end of file
+  }
+
+\endinput
\ No newline at end of file
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 3449ff42de7..817ee767e5a 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-12} {v0.1.17} {LaTeX template for Chinese exam}
+\ProvidesExplClass {exam-zh} {2022-08-15} {v0.1.18} {LaTeX template for Chinese exam}
 
 % 检查 LaTeX2e kernel 版本
 \msg_new:nnn { exam-zh } { latex-too-old }