unicode-math 0.5b (19sep10)

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

2 files changed, 30 insertions, 15 deletions

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 d91f7706c53..9f2f6c75cd5 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
@@ -8,7 +8,7 @@
 \UnicodeMathSymbol{"0002B}{\plus                    }{\mathbin}{plus sign b:}%
 \UnicodeMathSymbol{"0002C}{\comma                   }{\mathpunct}{comma}%
 \UnicodeMathSymbol{"0002E}{\period                  }{\mathalpha}{full stop, period}%
-\UnicodeMathSymbol{"0002F}{\slash                   }{\mathord}{solidus}%
+\UnicodeMathSymbol{"0002F}{\mathslash               }{\mathord}{solidus}%
 \UnicodeMathSymbol{"0003A}{\mathcolon               }{\mathpunct}{colon}%
 \UnicodeMathSymbol{"0003B}{\semicolon               }{\mathpunct}{semicolon p:}%
 \UnicodeMathSymbol{"0003C}{\less                    }{\mathrel}{less-than sign r:}%
@@ -28,6 +28,7 @@
 \UnicodeMathSymbol{"000B1}{\pm                      }{\mathbin}{plus-or-minus sign}%
 \UnicodeMathSymbol{"000B7}{\cdotp                   }{\mathbin}{/centerdot b: middle dot}%
 \UnicodeMathSymbol{"000D7}{\times                   }{\mathbin}{multiply sign}%
+\UnicodeMathSymbol{"000F0}{\matheth                 }{\mathalpha}{eth}%
 \UnicodeMathSymbol{"000F7}{\div                     }{\mathbin}{divide sign}%
 \UnicodeMathSymbol{"001B5}{\Zbar                    }{\mathord}{impedance (latin capital letter z with stroke)}%
 \UnicodeMathSymbol{"00300}{\grave                   }{\mathaccent}{grave accent}%
@@ -134,7 +135,6 @@
 \UnicodeMathSymbol{"02037}{\backtrprime             }{\mathord}{triple reverse prime, not superscripted}%
 \UnicodeMathSymbol{"02038}{\caretinsert             }{\mathord}{caret (insertion mark)}%
 \UnicodeMathSymbol{"0203C}{\Exclam                  }{\mathord}{double exclamation mark}%
-\UnicodeMathSymbol{"0203E}{\overline                }{\mathord}{overline}%
 \UnicodeMathSymbol{"02040}{\tieconcat               }{\mathbin}{character tie, z notation sequence concatenation}%
 \UnicodeMathSymbol{"02043}{\hyphenbullet            }{\mathord}{rectangle, filled (hyphen bullet)}%
 \UnicodeMathSymbol{"02044}{\fracslash               }{\mathbin}{fraction slash}%
@@ -679,7 +679,7 @@
 \UnicodeMathSymbol{"025B2}{\bigblacktriangleup      }{\mathord}{   0x25b2 6 6d      black up-pointing triangle}%
 \UnicodeMathSymbol{"025B3}{\bigtriangleup           }{\mathbin}{big up triangle, open}%
 \UnicodeMathSymbol{"025B4}{\blacktriangle           }{\mathord}{up triangle, filled}%
-\UnicodeMathSymbol{"025B5}{\vartriangle             }{\mathord}{/triangle - up triangle, open}%
+\UnicodeMathSymbol{"025B5}{\vartriangle             }{\mathrel}{/triangle - up triangle, open}%
 \UnicodeMathSymbol{"025B6}{\blacktriangleright      }{\mathord}{(large) right triangle, filled}%
 \UnicodeMathSymbol{"025B7}{\triangleright           }{\mathbin}{(large) right triangle, open; z notation range restriction}%
 \UnicodeMathSymbol{"025B8}{\smallblacktriangleright }{\mathord}{right triangle, filled}%
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 dc8c72ececc..795c8fcc246 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -15,7 +15,7 @@
 %% 
 %% This work is "author-maintained" by Will Robertson.
 \ProvidesPackage{unicode-math}
-  [2010/07/14 v0.5a Unicode maths in XeLaTeX]
+  [2010/09/19 v0.5b Unicode maths in XeLaTeX and LuaLaTeX]
 \usepackage{ifxetex,ifluatex}
 \ifxetex\else\ifluatex\else
   \PackageError{unicode-math}{%
@@ -820,7 +820,7 @@
   \group_begin:
     \char_make_active:n {#3}
     \char_gmake_mathactive:n {#3}
-    \um@scanactivedef #3 \@nil { \csname\cs_to_str:N #2 _sym\endcsname }
+    \um_active_char_set:wc #3 \q_nil { \cs_to_str:N #2 _sym }
   \group_end:
   \um_set_mathchar:cNnn {\cs_to_str:N #2 op} \mathop {#1} {#3}
   \cs_gset:cpx { \cs_to_str:N #2 _sym } {
@@ -2102,7 +2102,7 @@
 \cs_new:Npn \um_input_math_symbol_table: {\g_um_mathtable_tl}
 \begingroup
   \char_make_other:N \^
-  \cs_gset:Npn \um@scancharlet#1="#2\@nil {
+  \cs_gset:Npn \um_cs_set_eq_active_char:Nw #1 = "#2 \q_nil {
     \lowercase{
       \tl_rescan:nn {
         \char_make_other:N \{
@@ -2115,13 +2115,14 @@
       }
     }
   }
-  \gdef\um@scanactivedef"#1\@nil#2{
-    \lowercase{
-      \tl_rescan:nn{
-        \ExplSyntaxOn
-        \char_make_math_superscript:N\^
+  \cs_gnew:Npn \um_active_char_set:wc "#1 \q_nil #2 {
+    \lowercase {
+      \tl_rescan:nn {
+        \catcode`\_=11\relax
+        \catcode`\:=11\relax
+        \catcode`\^=7\relax
       }{
-        \global\def^^^^^#1{#2}
+        \protected\gdef^^^^^#1{\csname #2\endcsname}%
       }
     }
   }
@@ -2135,7 +2136,7 @@
                     \cs_if_eq_p:NN #3 \mathclose  ||
                     \cs_if_eq_p:NN #3 \mathover   ||
                     \cs_if_eq_p:NN #3 \mathunder } {
-        \um@scancharlet#2=#1\@nil\ignorespaces
+        \um_cs_set_eq_active_char:Nw #2 = #1 \q_nil \ignorespaces
       }
     }
     \char_make_other:N \#
@@ -2348,7 +2349,7 @@
   }
 \group_end:
 \luatex_if_engine:T {
-  \DeclareDocumentCommand \sqrt { O{} m } {
+  \RenewDocumentCommand \sqrt { O{} m } {
     \luatexUroot \l_um_radical_sqrt_tl {#1} {#2}
   }
   \cs_set:Npn \root #1 \of #2 {
@@ -2496,7 +2497,8 @@
   \char_make_active:N #1
   \char_gmake_mathactive:N #1
   \tl_rescan:nn {
-    \ExplSyntaxOn
+    \catcode`\_=11\relax
+    \catcode`\:=11\relax
   }{
     \cs_gset:Npx #1 {
       \bool_if:NTF \l_um_smallfrac_bool {\exp_not:N\tfrac} {\exp_not:N\frac}
@@ -2539,6 +2541,12 @@
 \def\bullet{\smblkcircle}
 \def\mathyen{\yen}
 \def\mathsterling{\sterling}
+\def\diamond{\smwhtdiamond}
+\def\emptyset{\varnothing}
+\def\hbar{\hslash}
+\def\backepsilon{\upbackepsilon}
+\def\eth{\matheth}
+\def\smallint{{\textstyle\int}\limits}
 \@ifpackageloaded{amsmath}{
   % define their own colon, perhaps I should just steal it. (It does look much better.)
 }{
@@ -2548,6 +2556,9 @@
 }
 \def\mathrm{\mathup}
 \let\mathfence\mathord
+\luatex_if_engine:T {
+  \cs_set:Npn \overline {\pdfprimitive\overline}
+}
 \def\digamma{\updigamma}
 \def\Digamma{\upDigamma}
 \def\operator@font{\um_switchto_mathup:}
@@ -2601,6 +2612,10 @@
   \def\widehat{\hat}
   \def\widetilde{\tilde}
 }
+\cs_set_eq:NN \um_text_slash: \slash
+\cs_set:Npn \slash {
+  \mode_if_math:TF {\mathslash} {\um_text_slash:}
+}
 \AtEndOfPackage{
   \@ifclassloaded{beamer}{
     \ifbeamer@suppressreplacements\else