unicode-math (19sep11)

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

1 files changed, 54 insertions, 25 deletions

diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
index 458c3203f4f..000f6953597 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
@@ -58,7 +58,7 @@ This work is "author-maintained" by Will Robertson.
 %<preamble&XE>\ProvidesPackage{unicode-math-xetex}
 %<preamble&LU>\ProvidesPackage{unicode-math-luatex}
 %<*preamble>
-  [2011/09/18 v0.6 Unicode maths in XeLaTeX and LuaLaTeX]
+  [2011/09/19 v0.6a Unicode maths in XeLaTeX and LuaLaTeX]
 %</preamble>
 %<*internal>
 \documentclass[a4paper]{ltxdoc}
@@ -997,6 +997,21 @@ This work is "author-maintained" by Will Robertson.
 % \tablabel{uptriangles}
 % \end{table}
 %
+% \subsubsection{Warning messages}
+%
+% This package can produce a number of informational messages to try and inform the user when something might be going wrong due to package conflicts or something else.
+% As an experimental feature, these can be turn off on an individual basis with the package option |warnings-off| which takes a comma-separated list of warnings to suppress.
+% A warning will give you its name when printed on the console output; e.g.,
+% \begin{Verbatim}
+% * unicode-math warning: "mathtools-colon"
+% *
+% * ... <warning message> ...
+% \end{Verbatim}
+% This warning could be suppressed by loading the package as follows:
+% \begin{Verbatim}
+% \usepackage[warnings-off={mathtools-colon}]{unicode-math}
+% \end{Verbatim}
+%
 % \iffalse
 % \subsubsection{Normalising some input characters}
 %
@@ -1427,6 +1442,19 @@ This work is "author-maintained" by Will Robertson.
 %    \end{macrocode}
 %
 % \paragraph{Debug/tracing}
+%
+%
+%    \begin{macrocode}
+\keys_define:nn {unicode-math}
+  {
+    warnings-off .code:n =
+      {
+        \clist_map_inline:nn {#1}
+          { \msg_redirect_name:nnn { unicode-math } { ##1 } { none } }
+      }
+  }
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \keys_define:nn {unicode-math} {
   trace .choice: ,
@@ -2755,6 +2783,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_
 % \begin{macro}{\um_setup_delcodes:}
 %    \begin{macrocode}
 \cs_new:Npn \um_setup_delcodes: {
+  \um_assign_delcode:nn {`\.} {\c_zero} % ensure \left. and \right. work
   \um_assign_delcode:nn {`\/}   {\g_um_slash_delimiter_usv}
   \um_assign_delcode:nn {"2044} {\g_um_slash_delimiter_usv} % fracslash
   \um_assign_delcode:nn {"2215} {\g_um_slash_delimiter_usv} % divslash
@@ -5436,10 +5465,10 @@ luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_
         }
     } } \limits
   }
-\DeclareDocumentCommand \overbrace    {m} { \um_over_bracket:nN  {#1} \{ }
+\RenewDocumentCommand   \overbrace    {m} { \um_over_bracket:nN  {#1} \{ }
 \DeclareDocumentCommand \overbracket  {m} { \um_over_bracket:nN  {#1}  [ }
 \DeclareDocumentCommand \overparen    {m} { \um_over_bracket:nN  {#1}  ( }
-\DeclareDocumentCommand \underbrace   {m} { \um_under_bracket:nN {#1} \} }
+\RenewDocumentCommand   \underbrace   {m} { \um_under_bracket:nN {#1} \} }
 \DeclareDocumentCommand \underbracket {m} { \um_under_bracket:nN {#1}  ] }
 \DeclareDocumentCommand \underparen   {m} { \um_under_bracket:nN {#1}  ) }
 %</XE>
@@ -5964,7 +5993,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_
 %   \cmd{\providecommand} \cmd{\AtBeginDocument}, we can just define the
 %   offending commands here.
 %    \begin{macrocode}
-  \msg_warning:nn { unicode-math } { mathtools }
+  \msg_warning:nn { unicode-math } { mathtools-colon }
   \NewDocumentCommand \dblcolon { } { \Colon }
   \NewDocumentCommand \coloneqq { } { \coloneq }
   \NewDocumentCommand \Coloneqq { } { \Coloneq }
@@ -6054,13 +6083,13 @@ luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_
   Setup~ alphabet:~ #1.
 }
 \msg_new:nnnn { unicode-math } { no-font-selected } {
-  You've~ loaded~ the~ unicode-math~ package,~ but~ you~ forgot~ to~ select \\
+  You've~ loaded~ the~ unicode-math~ package,~ but~ you~ forgot~ to~ select~
   a~ Unicode~ math~ font.~ Please~ select~ one~ with~ the~ \token_to_str:N \setmathfont \\
   command.
 } {
-  Loading~ the~ unicode-math~ package~ without~ using~ a~ Unicode~ math~ font \\
-  is~ not~ supported.~ Either~ select~ a~ Unicode~ math~ font,~ or~ don't~ load \\
-  the~ unicode-math~ package.
+  Loading~ the~ unicode-math~ package~ without~ using~ a~ Unicode~ math~ font~
+  is~ not~ supported.~ Either~ select~ a~ Unicode~ math~ font,~ or~ don't~
+  load~ the~ unicode-math~ package.
 }
 \msg_new:nnn { unicode-math } { missing-alphabets }
   {
@@ -6080,29 +6109,29 @@ luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_
 {
   I'm~ going~ to~ patch~ macro~ #1.
 }
-\msg_new:nnn { unicode-math } { mathtools } {
-  I'm~ going~ to~ overwrite~ the~ following~ commands~ from \\
-  the~ `mathtools'~ package: \\
-  \token_to_str:N \dblcolon,~
+\msg_new:nnn { unicode-math } { mathtools-colon } {
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `mathtools'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \dblcolon,~
   \token_to_str:N \coloneqq,~
   \token_to_str:N \Coloneqq,~
-  \token_to_str:N \eqqcolon. \\
-  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like \\
+  \token_to_str:N \eqqcolon. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
   commands,~ using~ them~ will~ lead~ to~ inconsistencies.
 }
 \msg_new:nnn { unicode-math } { colonequals } {
-  I'm~ going~ to~ overwrite~ the~ following~ commands~ from \\
-  the~ `colonequals'~ package: \\
-  \token_to_str:N \ratio,~
-  \token_to_str:N \coloncolon,~
-  \token_to_str:N \minuscolon, \\
-  \token_to_str:N \colonequals,~
-  \token_to_str:N \equalscolon,~
-  \token_to_str:N \coloncolonequals. \\
-  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like \\
-  commands,~ using~ them~ will~ lead~ to~ inconsistencies. \\
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `colonequals'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \ratio,~
+          \token_to_str:N \coloncolon,~
+          \token_to_str:N \minuscolon, \\
+  \ \ \ \ \token_to_str:N \colonequals,~
+          \token_to_str:N \equalscolon,~
+          \token_to_str:N \coloncolonequals. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
+  commands,~ using~ them~ will~ lead~ to~ inconsistencies.~
   Furthermore,~ changing~ \token_to_str:N \colonsep \c_space_tl
-  or~ \token_to_str:N \doublecolonsep \c_space_tl won't~ have \\
+  or~ \token_to_str:N \doublecolonsep \c_space_tl won't~ have~
   any~ effect~ on~ the~ re-defined~ commands.
 }
 %    \end{macrocode}