summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/unicode-math
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-25 23:13:48 +0000
committerKarl Berry <karl@freefriends.org>2015-09-25 23:13:48 +0000
commit3b7cf30fa31187f5d624753e77da7864f97f309b (patch)
tree7a05de00bfaa673ceaeda919c8818bae3b479699 /Master/texmf-dist/tex/latex/unicode-math
parent5a520fc41536ed6b179bfa9237a24a465b3bc4b2 (diff)
unicode-math (25sep15)
git-svn-id: svn://tug.org/texlive/trunk@38462 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/unicode-math')
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty31
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex4
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty29
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty3
4 files changed, 16 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
index 06bf4687261..f127f0a17db 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
@@ -79,11 +79,9 @@
\edef\mathbotaccentwide{\string\mathbotaccentwide}
\cs_new:Nn \__um_set_big_operator:nnn
{
- \group_begin:
- \char_set_catcode_active:n {#3}
- \__um_char_gmake_mathactive:n {#3}
- \__um_active_char_set:wc #3 \q_nil { \cs_to_str:N #2 _sym }
- \group_end:
+ \__um_char_gmake_mathactive:n {#3}
+ \cs_set_protected_nopar:Npx \__um_tmpa: { \exp_not:c { \cs_to_str:N #2 _sym } }
+ \char_gset_active_eq:nN {#3} \__um_tmpa:
\__um_set_mathchar:cNnn {\cs_to_str:N #2 op} \mathop {#1} {#3}
@@ -543,7 +541,7 @@
\tl_set:Nn \l__um_tmpa_tl { #1 }
\tl_remove_all:Nn \l__um_tmpa_tl { _ }
\__um_font_param_aux:ccc { __um_ #1 :N } { __um_set_ #1 :Nn }
- { luatexUmath \l__um_tmpa_tl }
+ { Umath \l__um_tmpa_tl }
}
\cs_new_protected_nopar:Nn \__um_font_param:nnn
{
@@ -1161,38 +1159,21 @@
\exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
}
}
-\CatchFileEdef \g__um_mathtable_tl {unicode-math-table.tex} {\__um_symbol_setup:}
+\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
-\cs_set:Npn \__um_cs_set_eq_active_char:Nw #1 = "#2 \q_nil
- {
- \exp_last_unbraced:NNx \cs_gset_eq:NN #1 { \Ucharcat "#2 ~ 12 ~ }
- }
-\group_begin:
- \char_set_catcode_other:N \^
- \cs_new:Npn \__um_active_char_set:wc "#1 \q_nil #2
- {
- \tex_lowercase:D
- {
- \tl_rescan:nn { \ExplSyntaxOn }
- { \cs_gset_protected_nopar:Npx ^^^^^#1 { \exp_not:c {#2} } }
- }
- }
-\group_end:
\AtBeginDocument{\__um_define_math_chars:}
\cs_new:Nn \__um_define_math_chars:
{
\group_begin:
- \char_set_catcode_math_superscript:N \^
\cs_set:Npn \__um_sym:nnn ##1##2##3
{
\tl_if_in:nnT
{ \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
{##3}
{
- \__um_cs_set_eq_active_char:Nw ##2 = ##1 \q_nil \ignorespaces
+ \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
}
}
- \char_set_catcode_other:N \#
\__um_input_math_symbol_table:
\group_end:
}
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
index 1babad3be0d..9d2ef42932f 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
@@ -145,7 +145,9 @@
\UnicodeMathSymbol{"02057}{\qprime }{\mathord}{quadruple prime, not superscripted}%
\UnicodeMathSymbol{"020AC}{\euro }{\mathord}{euro sign}%
\UnicodeMathSymbol{"020D0}{\leftharpoonaccent }{\mathaccent}{combining left harpoon above}%
+\UnicodeMathSymbol{"020D0}{\overleftharpoon }{\mathaccentwide}{combining left harpoon above}%
\UnicodeMathSymbol{"020D1}{\rightharpoonaccent }{\mathaccent}{combining right harpoon above}%
+\UnicodeMathSymbol{"020D1}{\overrightharpoon }{\mathaccentwide}{combining right harpoon above}%
\UnicodeMathSymbol{"020D2}{\vertoverlay }{\mathaccent}{combining long vertical line overlay}%
\UnicodeMathSymbol{"020D6}{\overleftarrow }{\mathaccentwide}{combining left arrow above}%
\UnicodeMathSymbol{"020D7}{\overrightarrow }{\mathaccentwide}{combining left arrow above}%
@@ -2440,3 +2442,5 @@
\UnicodeMathSymbol{"1D7FD}{\mttseven }{\mathord}{mathematical monospace digit 7}%
\UnicodeMathSymbol{"1D7FE}{\mtteight }{\mathord}{mathematical monospace digit 8}%
\UnicodeMathSymbol{"1D7FF}{\mttnine }{\mathord}{mathematical monospace digit 9}%
+\UnicodeMathSymbol{"1EEF0}{\arabicmaj }{\mathop}{arabic mathematical operator meem with hah with tatweel}%
+\UnicodeMathSymbol{"1EEF1}{\arabichad }{\mathop}{arabic mathematical operator hah with dal}%
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
index a5cac59aec8..e1ee6b8ea6f 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
@@ -77,11 +77,9 @@
\edef\mathbotaccentwide{\string\mathbotaccentwide}
\cs_new:Nn \__um_set_big_operator:nnn
{
- \group_begin:
- \char_set_catcode_active:n {#3}
- \__um_char_gmake_mathactive:n {#3}
- \__um_active_char_set:wc #3 \q_nil { \cs_to_str:N #2 _sym }
- \group_end:
+ \__um_char_gmake_mathactive:n {#3}
+ \cs_set_protected_nopar:Npx \__um_tmpa: { \exp_not:c { \cs_to_str:N #2 _sym } }
+ \char_gset_active_eq:nN {#3} \__um_tmpa:
\__um_set_mathchar:cNnn {\cs_to_str:N #2 op} \mathop {#1} {#3}
@@ -1186,38 +1184,21 @@
\exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
}
}
-\CatchFileEdef \g__um_mathtable_tl {unicode-math-table.tex} {\__um_symbol_setup:}
+\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
-\cs_set:Npn \__um_cs_set_eq_active_char:Nw #1 = "#2 \q_nil
- {
- \exp_last_unbraced:NNx \cs_gset_eq:NN #1 { \Ucharcat "#2 ~ 12 ~ }
- }
-\group_begin:
- \char_set_catcode_other:N \^
- \cs_new:Npn \__um_active_char_set:wc "#1 \q_nil #2
- {
- \tex_lowercase:D
- {
- \tl_rescan:nn { \ExplSyntaxOn }
- { \cs_gset_protected_nopar:Npx ^^^^^#1 { \exp_not:c {#2} } }
- }
- }
-\group_end:
\AtBeginDocument{\__um_define_math_chars:}
\cs_new:Nn \__um_define_math_chars:
{
\group_begin:
- \char_set_catcode_math_superscript:N \^
\cs_set:Npn \__um_sym:nnn ##1##2##3
{
\tl_if_in:nnT
{ \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
{##3}
{
- \__um_cs_set_eq_active_char:Nw ##2 = ##1 \q_nil \ignorespaces
+ \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
}
}
- \char_set_catcode_other:N \#
\__um_input_math_symbol_table:
\group_end:
}
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
index 584b03f79e7..b587a824c65 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -19,7 +19,7 @@
%%
%% This work is "maintained" by Will Robertson.
\ProvidesPackage{unicode-math}
- [2015/09/09 v0.8b Unicode maths in XeLaTeX and LuaLaTeX]
+ [2015/09/24 v0.8c Unicode maths in XeLaTeX and LuaLaTeX]
\usepackage{ifxetex,ifluatex}
\ifxetex
\ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%
@@ -46,7 +46,6 @@
\RequirePackage{xparse}
\RequirePackage{l3keys2e}
\RequirePackage{fontspec}[2015/03/14]
-\RequirePackage{catchfile}
\RequirePackage{fix-cm} % avoid some warnings
\RequirePackage{filehook}
\ExplSyntaxOn