summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/unicode-math
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-02-22 22:57:16 +0000
committerKarl Berry <karl@freefriends.org>2013-02-22 22:57:16 +0000
commitefe439a05915472e0f602b1912c0779ff95c6758 (patch)
treea16312ef1e6d5384bdd342427ea8f367c6656033 /Master/texmf-dist/tex/latex/unicode-math
parent4abd94a3d5c1416292c8e8a7ba4121173b2410da (diff)
unicode-math (22feb13)
git-svn-id: svn://tug.org/texlive/trunk@29204 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.sty57
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty44
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty8
3 files changed, 50 insertions, 59 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 0d1316b9ab4..9d1bd8f178f 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
@@ -5,9 +5,9 @@
%% The original source files were:
%%
%% unicode-math.dtx (with options: `package,LU')
-%% Copyright 2006-2012 Will Robertson <will.robertson@latex-project.org>
-%% Copyright 2010-2011 Philipp Stephani <st_philipp@yahoo.de>
-%% Copyright 2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2006-2013 Will Robertson <will.robertson@latex-project.org>
+%% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
+%% Copyright 2012-2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% This package is free software and may be redistributed and/or modified under
%% the conditions of the LaTeX Project Public License, version 1.3c or higher
@@ -15,16 +15,18 @@
%%
%% This work is "author-maintained" by Will Robertson.
\ExplSyntaxOn
-\cs_new:Nn \um_cs_compat:n
- { \cs_set_eq:cc {U#1} {luatexU#1} }
-\um_cs_compat:n {mathcode}
-\um_cs_compat:n {delcode}
-\um_cs_compat:n {mathcodenum}
-\um_cs_compat:n {mathcharnum}
-\um_cs_compat:n {mathchardef}
-\um_cs_compat:n {radical}
-\um_cs_compat:n {mathaccent}
-\um_cs_compat:n {delimiter}
+\ifnum\luatexversion<75%
+ \cs_new:Nn \um_cs_compat:n
+ { \cs_set_eq:cc {U#1} {luatexU#1} }
+ \um_cs_compat:n {mathcode}
+ \um_cs_compat:n {delcode}
+ \um_cs_compat:n {mathcodenum}
+ \um_cs_compat:n {mathcharnum}
+ \um_cs_compat:n {mathchardef}
+ \um_cs_compat:n {radical}
+ \um_cs_compat:n {mathaccent}
+ \um_cs_compat:n {delimiter}
+\fi
\RequirePackage { lualatex-math } [ 2011/08/07 ]
\RequirePackage { luatexbase }
\RequirePackage { luaotfload } [ 2010/11/26 ]
@@ -281,7 +283,7 @@
\tl_remove_once:Nn \@preamblecmds {\do#1}
}
\cs_set:Nn \um_set_mathsymbol:nNNn {
- \prg_case_tl:Nnn #3 {
+ \tl_case:Nnn #3 {
\mathop { \um_set_big_operator:nnn {#1} {#2} {#4} }
\mathopen
{
@@ -1001,7 +1003,7 @@
\clist_map_inline:nn {#2} {
\tl_set:Nx \l_um_tmpa_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {um_config_ \l_um_style_tl _\l_um_tmpa_tl :n} {
- \str_if_eq:xxTF {\l_um_tmpa_tl}{misc} {
+ \str_if_eq_x:nnTF {\l_um_tmpa_tl}{misc} {
\um_maybe_init_alphabet:V \l_um_style_tl
\clist_map_break:
}{
@@ -1015,7 +1017,7 @@
\clist_map_inline:nn {#2} {
\tl_set:Nx \l_um_tmpa_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {um_config_ \l_um_style_tl _ \l_um_tmpa_tl :n} {
- \str_if_eq:xxTF {\l_um_tmpa_tl}{misc} {
+ \str_if_eq_x:nnTF {\l_um_tmpa_tl}{misc} {
\um_log:nx {setup-alph} {math \l_um_style_tl~(\l_um_tmpa_tl)}
\use:c {um_config_ \l_um_style_tl _ \l_um_tmpa_tl :n} {#3}
}{
@@ -1059,7 +1061,7 @@
}
}
\cs_set:Npn \um_map_chars_range:nnn #1#2#3 {
- \prg_stepwise_inline:nnnn {0}{1}{#1-1} {
+ \int_step_inline:nnnn {0}{1}{#1-1} {
\um_map_char_single:nn {#2+##1}{#3+##1}
}
}
@@ -1118,7 +1120,7 @@
{ \um_to_usv:nn {#3} {#4} }
}
\cs_new:Npn \um_set_mathalph_range:nNnn #1#2#3#4 {
- \prg_stepwise_inline:nnnn {0}{1}{#1-1}
+ \int_step_inline:nnnn {0}{1}{#1-1}
{ \um_set_mathalphabet_char:Nnn {#2} { ##1 + #3 } { ##1 + #4 } }
}
\cs_generate_variant:Nn \um_set_mathalph_range:nNnn {nNcc}
@@ -1831,7 +1833,7 @@
\cs_if_exist:NF \l_um_fontname_tl
{
% XXX: update this when lmmath-bold.otf is released
- \setmathfont[BoldFont={lmmath-regular.otf}]{lmmath-regular.otf}
+ \setmathfont[BoldFont={latinmodernmath-regular.otf}]{latinmodernmath-regular.otf}
}
}
\cs_new:Nn \um_arg_i_before_egroup:n {#1\egroup}
@@ -1849,7 +1851,7 @@
}
}
\cs_new:Nn \um_nprimes_select:nn {
- \prg_case_int:nnn {#2}{
+ \int_case:nnn {#2}{
{1} { \um_superscript:n {#1} }
{2} {
\um_glyph_if_exist:nTF {"2033}
@@ -1871,7 +1873,7 @@
}
}
\cs_new:Nn \um_nbackprimes_select:nn {
- \prg_case_int:nnn {#2}{
+ \int_case:nnn {#2}{
{1} { \um_superscript:n {#1} }
{2} {
\um_glyph_if_exist:nTF {"2036}
@@ -2414,19 +2416,6 @@
\box_use_clear:N \l_tmpa_box
}
}
-\AtEndOfPackageFile * {amsopn} {
- \cs_set:Npn \newmcodes@ {
- \mathcode`\'39\scan_stop:
- \mathcode`\*42\scan_stop:
- \mathcode`\."613A\scan_stop:
-%% \ifnum\mathcode`\-=45 \else
-%% \mathchardef\std@minus\mathcode`\-\relax
-%% \fi
- \mathcode`\-45\scan_stop:
- \mathcode`\/47\scan_stop:
- \mathcode`\:"603A\scan_stop:
- }
-}
\cs_set:Npn \| {\Vert}
\cs_set:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
\cs_set:Npn \cdots {\mathinner{\unicodecdots}}
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 9c4035b1179..3818e576d28 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
@@ -5,9 +5,9 @@
%% The original source files were:
%%
%% unicode-math.dtx (with options: `package,XE')
-%% Copyright 2006-2012 Will Robertson <will.robertson@latex-project.org>
-%% Copyright 2010-2011 Philipp Stephani <st_philipp@yahoo.de>
-%% Copyright 2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2006-2013 Will Robertson <will.robertson@latex-project.org>
+%% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
+%% Copyright 2012-2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% This package is free software and may be redistributed and/or modified under
%% the conditions of the LaTeX Project Public License, version 1.3c or higher
@@ -15,16 +15,18 @@
%%
%% This work is "author-maintained" by Will Robertson.
\ExplSyntaxOn
-\cs_new:Nn \um_cs_compat:n
- { \cs_set_eq:cc {U#1} {XeTeX#1} }
-\um_cs_compat:n {mathcode}
-\um_cs_compat:n {delcode}
-\um_cs_compat:n {mathcodenum}
-\um_cs_compat:n {mathcharnum}
-\um_cs_compat:n {mathchardef}
-\um_cs_compat:n {radical}
-\um_cs_compat:n {mathaccent}
-\um_cs_compat:n {delimiter}
+\ifdim\number\XeTeXversion\XeTeXrevision in<0.9999in
+ \cs_new:Nn \um_cs_compat:n
+ { \cs_set_eq:cc {U#1} {XeTeX#1} }
+ \um_cs_compat:n {mathcode}
+ \um_cs_compat:n {delcode}
+ \um_cs_compat:n {mathcodenum}
+ \um_cs_compat:n {mathcharnum}
+ \um_cs_compat:n {mathchardef}
+ \um_cs_compat:n {radical}
+ \um_cs_compat:n {mathaccent}
+ \um_cs_compat:n {delimiter}
+\fi
\cs_new:Nn \usv_set:nnn {
\tl_set:cn { \um_to_usv:nn {#1}{#2} } {#3}
}
@@ -279,7 +281,7 @@
\def\new@mathgroup{\alloc@8\mathgroup\chardef\@cclvi}
\let\newfam\new@mathgroup
\cs_set:Nn \um_set_mathsymbol:nNNn {
- \prg_case_tl:Nnn #3 {
+ \tl_case:Nnn #3 {
\mathop { \um_set_big_operator:nnn {#1} {#2} {#4} }
\mathopen
{
@@ -1029,7 +1031,7 @@
\clist_map_inline:nn {#2} {
\tl_set:Nx \l_um_tmpa_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {um_config_ \l_um_style_tl _\l_um_tmpa_tl :n} {
- \str_if_eq:xxTF {\l_um_tmpa_tl}{misc} {
+ \str_if_eq_x:nnTF {\l_um_tmpa_tl}{misc} {
\um_maybe_init_alphabet:V \l_um_style_tl
\clist_map_break:
}{
@@ -1043,7 +1045,7 @@
\clist_map_inline:nn {#2} {
\tl_set:Nx \l_um_tmpa_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {um_config_ \l_um_style_tl _ \l_um_tmpa_tl :n} {
- \str_if_eq:xxTF {\l_um_tmpa_tl}{misc} {
+ \str_if_eq_x:nnTF {\l_um_tmpa_tl}{misc} {
\um_log:nx {setup-alph} {math \l_um_style_tl~(\l_um_tmpa_tl)}
\use:c {um_config_ \l_um_style_tl _ \l_um_tmpa_tl :n} {#3}
}{
@@ -1087,7 +1089,7 @@
}
}
\cs_set:Npn \um_map_chars_range:nnn #1#2#3 {
- \prg_stepwise_inline:nnnn {0}{1}{#1-1} {
+ \int_step_inline:nnnn {0}{1}{#1-1} {
\um_map_char_single:nn {#2+##1}{#3+##1}
}
}
@@ -1146,7 +1148,7 @@
{ \um_to_usv:nn {#3} {#4} }
}
\cs_new:Npn \um_set_mathalph_range:nNnn #1#2#3#4 {
- \prg_stepwise_inline:nnnn {0}{1}{#1-1}
+ \int_step_inline:nnnn {0}{1}{#1-1}
{ \um_set_mathalphabet_char:Nnn {#2} { ##1 + #3 } { ##1 + #4 } }
}
\cs_generate_variant:Nn \um_set_mathalph_range:nNnn {nNcc}
@@ -1859,7 +1861,7 @@
\cs_if_exist:NF \l_um_fontname_tl
{
% XXX: update this when lmmath-bold.otf is released
- \setmathfont[BoldFont={lmmath-regular.otf}]{lmmath-regular.otf}
+ \setmathfont[BoldFont={latinmodernmath-regular.otf}]{latinmodernmath-regular.otf}
}
}
\cs_new:Nn \um_arg_i_before_egroup:n {#1\egroup}
@@ -1877,7 +1879,7 @@
}
}
\cs_new:Nn \um_nprimes_select:nn {
- \prg_case_int:nnn {#2}{
+ \int_case:nnn {#2}{
{1} { \um_superscript:n {#1} }
{2} {
\um_glyph_if_exist:nTF {"2033}
@@ -1899,7 +1901,7 @@
}
}
\cs_new:Nn \um_nbackprimes_select:nn {
- \prg_case_int:nnn {#2}{
+ \int_case:nnn {#2}{
{1} { \um_superscript:n {#1} }
{2} {
\um_glyph_if_exist:nTF {"2036}
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 3a2d27a216d..e0e271c8e78 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -7,9 +7,9 @@
%% unicode-math.dtx (with options: `preamble')
%% unicode-math.dtx (with options: `msg')
%% unicode-math.dtx (with options: `load')
-%% Copyright 2006-2012 Will Robertson <will.robertson@latex-project.org>
-%% Copyright 2010-2011 Philipp Stephani <st_philipp@yahoo.de>
-%% Copyright 2012 Khaled Hosny <khaledhosny@eglug.org>
+%% Copyright 2006-2013 Will Robertson <will.robertson@latex-project.org>
+%% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
+%% Copyright 2012-2013 Khaled Hosny <khaledhosny@eglug.org>
%%
%% This package is free software and may be redistributed and/or modified under
%% the conditions of the LaTeX Project Public License, version 1.3c or higher
@@ -17,7 +17,7 @@
%%
%% This work is "author-maintained" by Will Robertson.
\ProvidesPackage{unicode-math}
- [2012/07/28 v0.7a Unicode maths in XeLaTeX and LuaLaTeX]
+ [2013/02/22 v0.7b Unicode maths in XeLaTeX and LuaLaTeX]
\usepackage{ifxetex,ifluatex}
\ifxetex
\ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%