From cddb7efdd31657bda6113ecfbd467b12fa22f5ca Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Sep 2011 23:44:47 +0000 Subject: unicode-math (19sep11) git-svn-id: svn://tug.org/texlive/trunk@24022 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/unicode-math/README | 6 ++ .../doc/latex/unicode-math/unicode-math.pdf | Bin 395820 -> 396188 bytes .../source/latex/unicode-math/unicode-math.dtx | 79 ++++++++++++++------- .../tex/latex/unicode-math/unicode-math-luatex.sty | 3 +- .../tex/latex/unicode-math/unicode-math-xetex.sty | 7 +- .../tex/latex/unicode-math/unicode-math.sty | 52 ++++++++------ 6 files changed, 96 insertions(+), 51 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/unicode-math/README b/Master/texmf-dist/doc/latex/unicode-math/README index 0e578f4f007..e2083c21d84 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/README +++ b/Master/texmf-dist/doc/latex/unicode-math/README @@ -154,6 +154,12 @@ changes have not affected the standard behaviour. CHANGE HISTORY -------------- +- v0.6a (2011/09/19) + + * Always a bug that slips through the cracks! Fixes `\left.` and `\right.` + * Add experimental package option `warnings-off=...` which allows warnings + to be suppressed on an individual basis. + - v0.6 (2011/09/18) * Keep in sync with fontspec internals diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf index 3773e1ab9ca..a56d49b31b3 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf differ 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. %\ProvidesPackage{unicode-math-xetex} %\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] % %<*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" +% * +% * ... ... +% \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} ) } % @@ -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} 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 bf6589a5a06..06a26505ba4 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 @@ -609,6 +609,7 @@ } \cs_new:Nn \um_assign_delcode:n { \um_assign_delcode:nn {#1} {#1} } \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 @@ -2477,7 +2478,7 @@ \mode_if_math:TF {\mathslash} {\um_text_slash:} } \AtEndOfPackageFile * { mathtools } { - \msg_warning:nn { unicode-math } { mathtools } + \msg_warning:nn { unicode-math } { mathtools-colon } \NewDocumentCommand \dblcolon { } { \Colon } \NewDocumentCommand \coloneqq { } { \coloneq } \NewDocumentCommand \Coloneqq { } { \Coloneq } 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 339f67ff4cd..a50bdaadcea 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 @@ -583,6 +583,7 @@ } \cs_new:Nn \um_assign_delcode:n { \um_assign_delcode:nn {#1} {#1} } \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 @@ -2303,10 +2304,10 @@ } } } \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} ) } \def\to{\rightarrow} @@ -2612,7 +2613,7 @@ } \box_use_clear:N \l_tmpa_box } - \msg_warning:nn { unicode-math } { mathtools } + \msg_warning:nn { unicode-math } { mathtools-colon } \NewDocumentCommand \dblcolon { } { \Colon } \NewDocumentCommand \coloneqq { } { \coloneq } \NewDocumentCommand \Coloneqq { } { \Coloneq } 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 39631028f3f..33c2786fa08 100644 --- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty +++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty @@ -16,7 +16,7 @@ %% %% This work is "author-maintained" by Will Robertson. \ProvidesPackage{unicode-math} - [2011/09/18 v0.6 Unicode maths in XeLaTeX and LuaLaTeX] + [2011/09/19 v0.6a Unicode maths in XeLaTeX and LuaLaTeX] \usepackage{ifxetex,ifluatex} \ifxetex\else\ifluatex\else \PackageError{unicode-math}{% @@ -280,6 +280,14 @@ \use:c{um_setup_active_frac:} } } +\keys_define:nn {unicode-math} + { + warnings-off .code:n = + { + \clist_map_inline:nn {#1} + { \msg_redirect_name:nnn { unicode-math } { ##1 } { none } } + } + } \keys_define:nn {unicode-math} { trace .choice: , trace / debug .code:n = { @@ -328,13 +336,13 @@ 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 } { @@ -354,29 +362,29 @@ { 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. } \luatex_if_engine:T { \usepackage{unicode-math-luatex} \endinput } -- cgit v1.2.3