xduts (27nov22)

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

3 files changed, 72 insertions, 90 deletions

diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
index 46631292cef..4233f10dfc5 100644
--- a/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
+++ b/Master/texmf-dist/tex/xelatex/xduts/xdufont.sty
@@ -28,7 +28,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplPackage{xdufont}
-  {2022/11/23}{2.14.1.3}
+  {2022/11/27}{2.16.1.3}
   {Xidian University Font package}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { quiet } { xeCJK }
@@ -52,8 +52,9 @@
       { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
     math-font .choices:nn =
       {
-        asana, cambria, cm, fira, garamond, lm, libertinus, stix,
-        bonum, dejavu, pagella, schola, termes, xits, erewhon, none
+        asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler,
+        fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm,
+        pagella, schola, stix, stix2, termes, xcharter, xits, none
       }
       { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl },
     unicode-math .tl_set:N = \l__xdu_unicode_math_tl,
@@ -72,10 +73,6 @@
     style / font-type      = font,
     style / font-path      = fonts
   }
-\cs_new:Npn \__xdu_if_platform_macos:FT #1#2
-  { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } }
-\cs_new:Npn \__xdu_texmf_font:nn #1#2
-  { \__xdu_if_platform_macos:FT { #1 } { #2 } }
 \cs_new:Npn \__xdu_select_font:nn #1#2
   {
     \str_if_eq:NNTF { \l__xdu_font_type_tl } { font }
@@ -405,31 +402,28 @@
   }
 \clist_map_inline:nn
   {
-    { asana      } { Asana-Math.otf             },
-    { fira       } { FiraMath-Regular.otf       },
-    { garamond   } { Garamond-Math.otf          },
-    { lm         } { latinmodern-math.otf       },
-    { erewhon    } { Erewhon-Math.otf           },
-    { libertinus } { LibertinusMath-Regular.otf },
-    { stix       } { STIXMath-Regular.otf       },
-    { bonum      } { texgyrebonum-math.otf      },
-    { dejavu     } { texgyredejavu-math.otf     },
-    { pagella    } { texgyrepagella-math.otf    },
-    { schola     } { texgyreschola-math.otf     },
-    { termes     } { texgyretermes-math.otf     }
+    { asana          } { Asana-Math.otf             },
+    { concrete       } { Concrete-Math.otf          },
+    { erewhon        } { Erewhon-Math.otf           },
+    { euler          } { Euler-Math.otf             },
+    { fira           } { FiraMath-Regular.otf       },
+    { garamond       } { Garamond-Math.otf          },
+    { gfsneohellenic } { GFSNeohellenicMath.otf     },
+    { kp             } { KpMath-Regular.otf         },
+    { libertinus     } { LibertinusMath-Regular.otf },
+    { lm             } { latinmodern-math.otf       },
+    { newcm          } { NewCMMath-Regular.otf      },
+    { stix           } { STIXMath-Regular.otf       },
+    { stix2          } { STIXTwoMath-Regular.otf    },
+    { xcharter       } { XCharter-Math.otf          },
+    { xits           } { XITSMath-Regular.otf       },
+    { bonum          } { texgyrebonum-math.otf      },
+    { dejavu         } { texgyredejavu-math.otf     },
+    { pagella        } { texgyrepagella-math.otf    },
+    { schola         } { texgyreschola-math.otf     },
+    { termes         } { texgyretermes-math.otf     }
   }
   { \__xdu_define_math_font:nn #1 }
-\cs_new:Npn \__xdu_load_math_font_xits:
-  {
-    \__xdu_load_unicode_math_pkg:
-    \__xdu_if_platform_macos:FT
-      { \setmathfont { XITS~Math } }
-      {
-        \setmathfont { XITSMath-Regular.otf }
-        \setmathfont { XITSMath-Bold.otf    }
-          [ range= { bfup -> up, bfit -> it } ]
-      }
-  }
 \cs_new:Npn \__xdu_load_math_font_cm: { }
 \cs_new:Npn \__xdu_load_math_font_none: { }
 \cs_new:Npn \__xdu_load_font:
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
index 56bf7154be2..c6f32e9f0f2 100644
--- a/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
+++ b/Master/texmf-dist/tex/xelatex/xduts/xdupgthesis.cls
@@ -28,7 +28,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{xdupgthesis}
-  {2022/11/23}{2.14.1.3}
+  {2022/11/27}{2.16.1.3}
   {Xidian University Postgraduate Thesis document class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { quiet } { xeCJK }
@@ -65,8 +65,9 @@
       { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
     math-font .choices:nn =
       {
-        asana, cambria, cm, fira, garamond, lm, libertinus, stix,
-        bonum, dejavu, pagella, schola, termes, xits, erewhon, none
+        asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler,
+        fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm,
+        pagella, schola, stix, stix2, termes, xcharter, xits, none
       }
       { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl },
     unicode-math .tl_set:N = \l__xdu_unicode_math_tl,
@@ -85,10 +86,6 @@
     style / font-type      = font,
     style / font-path      = fonts
   }
-\cs_new:Npn \__xdu_if_platform_macos:FT #1#2
-  { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } }
-\cs_new:Npn \__xdu_texmf_font:nn #1#2
-  { \__xdu_if_platform_macos:FT { #1 } { #2 } }
 \cs_new:Npn \__xdu_select_font:nn #1#2
   {
     \str_if_eq:NNTF { \l__xdu_font_type_tl } { font }
@@ -418,31 +415,28 @@
   }
 \clist_map_inline:nn
   {
-    { asana      } { Asana-Math.otf             },
-    { fira       } { FiraMath-Regular.otf       },
-    { garamond   } { Garamond-Math.otf          },
-    { lm         } { latinmodern-math.otf       },
-    { erewhon    } { Erewhon-Math.otf           },
-    { libertinus } { LibertinusMath-Regular.otf },
-    { stix       } { STIXMath-Regular.otf       },
-    { bonum      } { texgyrebonum-math.otf      },
-    { dejavu     } { texgyredejavu-math.otf     },
-    { pagella    } { texgyrepagella-math.otf    },
-    { schola     } { texgyreschola-math.otf     },
-    { termes     } { texgyretermes-math.otf     }
+    { asana          } { Asana-Math.otf             },
+    { concrete       } { Concrete-Math.otf          },
+    { erewhon        } { Erewhon-Math.otf           },
+    { euler          } { Euler-Math.otf             },
+    { fira           } { FiraMath-Regular.otf       },
+    { garamond       } { Garamond-Math.otf          },
+    { gfsneohellenic } { GFSNeohellenicMath.otf     },
+    { kp             } { KpMath-Regular.otf         },
+    { libertinus     } { LibertinusMath-Regular.otf },
+    { lm             } { latinmodern-math.otf       },
+    { newcm          } { NewCMMath-Regular.otf      },
+    { stix           } { STIXMath-Regular.otf       },
+    { stix2          } { STIXTwoMath-Regular.otf    },
+    { xcharter       } { XCharter-Math.otf          },
+    { xits           } { XITSMath-Regular.otf       },
+    { bonum          } { texgyrebonum-math.otf      },
+    { dejavu         } { texgyredejavu-math.otf     },
+    { pagella        } { texgyrepagella-math.otf    },
+    { schola         } { texgyreschola-math.otf     },
+    { termes         } { texgyretermes-math.otf     }
   }
   { \__xdu_define_math_font:nn #1 }
-\cs_new:Npn \__xdu_load_math_font_xits:
-  {
-    \__xdu_load_unicode_math_pkg:
-    \__xdu_if_platform_macos:FT
-      { \setmathfont { XITS~Math } }
-      {
-        \setmathfont { XITSMath-Regular.otf }
-        \setmathfont { XITSMath-Bold.otf    }
-          [ range= { bfup -> up, bfit -> it } ]
-      }
-  }
 \cs_new:Npn \__xdu_load_math_font_cm: { }
 \cs_new:Npn \__xdu_load_math_font_none: { }
 \cs_new:Npn \__xdu_load_font:
diff --git a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
index 5a8cbf3d84e..f4b4c5fbca0 100644
--- a/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
+++ b/Master/texmf-dist/tex/xelatex/xduts/xduugthesis.cls
@@ -28,7 +28,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
 \ProvidesExplClass{xduugthesis}
-  {2022/11/23}{2.14.1.3}
+  {2022/11/27}{2.16.1.3}
   {Xidian University Undergraduate Thesis document class}
 \RequirePackage { xparse, l3keys2e }
 \PassOptionsToPackage { quiet } { xeCJK }
@@ -66,8 +66,9 @@
       { \tl_set_eq:NN \l__xdu_latin_font_tl \l_keys_choice_tl },
     math-font .choices:nn =
       {
-        asana, cambria, cm, fira, garamond, lm, libertinus, stix,
-        bonum, dejavu, pagella, schola, termes, xits, erewhon, none
+        asana, bonum, cambria, cm, concrete, dejavu, erewhon, euler,
+        fira, garamond, gfsneohellenic, kp, libertinus, lm, newcm,
+        pagella, schola, stix, stix2, termes, xcharter, xits, none
       }
       { \tl_set_eq:NN \l__xdu_math_font_tl \l_keys_choice_tl },
     unicode-math .tl_set:N = \l__xdu_unicode_math_tl,
@@ -86,10 +87,6 @@
     style / font-type      = font,
     style / font-path      = fonts
   }
-\cs_new:Npn \__xdu_if_platform_macos:FT #1#2
-  { \file_if_exist:nTF { /System/Library/Fonts/Menlo.ttc } { #2 } { #1 } }
-\cs_new:Npn \__xdu_texmf_font:nn #1#2
-  { \__xdu_if_platform_macos:FT { #1 } { #2 } }
 \cs_new:Npn \__xdu_select_font:nn #1#2
   {
     \str_if_eq:NNTF { \l__xdu_font_type_tl } { font }
@@ -419,31 +416,28 @@
   }
 \clist_map_inline:nn
   {
-    { asana      } { Asana-Math.otf             },
-    { fira       } { FiraMath-Regular.otf       },
-    { garamond   } { Garamond-Math.otf          },
-    { lm         } { latinmodern-math.otf       },
-    { erewhon    } { Erewhon-Math.otf           },
-    { libertinus } { LibertinusMath-Regular.otf },
-    { stix       } { STIXMath-Regular.otf       },
-    { bonum      } { texgyrebonum-math.otf      },
-    { dejavu     } { texgyredejavu-math.otf     },
-    { pagella    } { texgyrepagella-math.otf    },
-    { schola     } { texgyreschola-math.otf     },
-    { termes     } { texgyretermes-math.otf     }
+    { asana          } { Asana-Math.otf             },
+    { concrete       } { Concrete-Math.otf          },
+    { erewhon        } { Erewhon-Math.otf           },
+    { euler          } { Euler-Math.otf             },
+    { fira           } { FiraMath-Regular.otf       },
+    { garamond       } { Garamond-Math.otf          },
+    { gfsneohellenic } { GFSNeohellenicMath.otf     },
+    { kp             } { KpMath-Regular.otf         },
+    { libertinus     } { LibertinusMath-Regular.otf },
+    { lm             } { latinmodern-math.otf       },
+    { newcm          } { NewCMMath-Regular.otf      },
+    { stix           } { STIXMath-Regular.otf       },
+    { stix2          } { STIXTwoMath-Regular.otf    },
+    { xcharter       } { XCharter-Math.otf          },
+    { xits           } { XITSMath-Regular.otf       },
+    { bonum          } { texgyrebonum-math.otf      },
+    { dejavu         } { texgyredejavu-math.otf     },
+    { pagella        } { texgyrepagella-math.otf    },
+    { schola         } { texgyreschola-math.otf     },
+    { termes         } { texgyretermes-math.otf     }
   }
   { \__xdu_define_math_font:nn #1 }
-\cs_new:Npn \__xdu_load_math_font_xits:
-  {
-    \__xdu_load_unicode_math_pkg:
-    \__xdu_if_platform_macos:FT
-      { \setmathfont { XITS~Math } }
-      {
-        \setmathfont { XITSMath-Regular.otf }
-        \setmathfont { XITSMath-Bold.otf    }
-          [ range= { bfup -> up, bfit -> it } ]
-      }
-  }
 \cs_new:Npn \__xdu_load_math_font_cm: { }
 \cs_new:Npn \__xdu_load_math_font_none: { }
 \cs_new:Npn \__xdu_load_font: