From efe439a05915472e0f602b1912c0779ff95c6758 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Feb 2013 22:57:16 +0000 Subject: unicode-math (22feb13) git-svn-id: svn://tug.org/texlive/trunk@29204 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/unicode-math/README | 24 +++++--- .../doc/latex/unicode-math/unicode-math.pdf | Bin 406852 -> 406024 bytes .../doc/latex/unicode-math/unimath-example.ltx | 2 +- .../doc/latex/unicode-math/unimath-symbols.pdf | Bin 1796753 -> 1824239 bytes .../source/latex/unicode-math/unicode-math.dtx | 68 ++++++++++++--------- .../source/latex/unicode-math/unimath-symbols.ltx | 4 +- .../tex/latex/unicode-math/unicode-math-luatex.sty | 57 +++++++---------- .../tex/latex/unicode-math/unicode-math-xetex.sty | 44 ++++++------- .../tex/latex/unicode-math/unicode-math.sty | 8 +-- 9 files changed, 105 insertions(+), 102 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 615e66e0981..512973e12f2 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/README +++ b/Master/texmf-dist/doc/latex/unicode-math/README @@ -57,7 +57,7 @@ Furthermore, it will be in a different font. REQUIREMENTS ------------ -If you're using an up-to-date TeX Live 2011/2012 or MiKTeX 2.9 then there'll +If you're using an up-to-date TeX Live 2011/2012 or MiKTeX 2.9 then there'll be no problems. Otherwise, read on. As well as running XeTeX or LuaTeX, this package requires recent versions of @@ -82,8 +82,8 @@ Please file bug reports with minimal examples: INSTALLATION ------------ -If you are using the currently supported version of TeX Live (about to be 2012 -at time of writing), you may install the latest release version of the package +If you are using the currently supported version of TeX Live (about to be 2012 +at time of writing), you may install the latest release version of the package with sudo tlmgr update unicode-math @@ -142,26 +142,30 @@ Subsequently, the test suite may be executed with make check -Both of these operations will take quite some time and require ImageMagick's +Both of these operations will take quite some time and require ImageMagick's `convert` tool to be installed. -They are only necessary if you wish to make changes to unicode-math yourself -(be sure to initialise the test suite *before* any changes are made to the -package) and you wish to ensure that your changes have not affected the +They are only necessary if you wish to make changes to unicode-math yourself +(be sure to initialise the test suite *before* any changes are made to the +package) and you wish to ensure that your changes have not affected the standard behaviour. CHANGE HISTORY -------------- +- v0.7b (2013/02/22) + + * Keep in sync with expl3 changes. + - v0.7a (2012/07/28) * Keep in sync with expl3 changes. - v0.7 (2012/05/30): The TeX Live 2012 release. - * Most changes (and all significant ones) in this release thanks to Khaled + * Most changes (and all significant ones) in this release thanks to Khaled Hosny, who is now credited as an author of the package. - * Many improvements for XeTeX support to take advantage of the new engine + * Many improvements for XeTeX support to take advantage of the new engine (v0.9998) in TL2012. * As a result, `\resetmathfont` is no longer required. * Improve `\not` to use pre-combined glyphs where possible. @@ -308,4 +312,4 @@ and the test suite for this package ____________________________________ Copyright 2006-2012 Will Robertson Copyright 2010-2011 Philipp Stephani -Copyright 2012 Khaled Hosny \ No newline at end of file +Copyright 2012 Khaled Hosny 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 c6244056b0b..bc4bb310767 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/doc/latex/unicode-math/unimath-example.ltx b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.ltx index bec1e8283e9..d9190366a7a 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/unimath-example.ltx +++ b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.ltx @@ -11,7 +11,7 @@ % Load unicode-math and define a math font: \usepackage{unicode-math} -\setmathfont{Asana Math} +\setmathfont{texgyrepagellamath-regular.otf} \begin{document} \title{An example of \textsf{unicode-math}} diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf index 90ba414785a..2d89e9be8f9 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.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 33b2a23260f..ecd20cd2d80 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx @@ -8,9 +8,9 @@ \keepsilent \let\MetaPrefix\DoubleperCent \declarepreamble\texpreamble -Copyright 2006-2012 Will Robertson -Copyright 2010-2011 Philipp Stephani -Copyright 2012 Khaled Hosny +Copyright 2006-2013 Will Robertson +Copyright 2010-2013 Philipp Stephani +Copyright 2012-2013 Khaled Hosny 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 @@ -60,7 +60,7 @@ This work is "author-maintained" by Will Robertson. %\ProvidesPackage{unicode-math-xetex} %\ProvidesPackage{unicode-math-luatex} %<*preamble> - [2012/07/28 v0.7a Unicode maths in XeLaTeX and LuaLaTeX] + [2013/02/22 v0.7b Unicode maths in XeLaTeX and LuaLaTeX] % %<*internal> \documentclass[a4paper]{ltxdoc} @@ -164,7 +164,7 @@ This work is "author-maintained" by Will Robertson. % with both \XeLaTeX\ and \LuaLaTeX; resp., % \begin{quote} % \begin{verbatim} -% \setmathfont{lmmath-regular.otf} +% \setmathfont{latinmodernmath-regular.otf} % \setmathfont{Asana-Math.otf} % \setmathfont{xits-math.otf} % \end{verbatim} @@ -430,7 +430,7 @@ This work is "author-maintained" by Will Robertson. % either switches to upright for Latin letters (|bold-style=TeX|) as well or % keeps them italic (|bold-style=ISO|). % -% To match the package options for non-bold characters, for +% To match the package options for non-bold characters, with option % |bold-style=upright| all bold characters are upright, and % |bold-style=literal| does not change the upright/italic shape of the letter. % @@ -490,7 +490,7 @@ This work is "author-maintained" by Will Robertson. % your bold sans serif upright (or all vice versa, if that's even conceivable). Therefore, bold sans % serif follows from the setting for sans serif; it is completely independent of the setting for bold. % -% In other words, \cs{mathbfsf} is \cs{mathbfsfup} or \cs{mathbfsfit} based on |[sans-style=upright]| or |[sans-style=italic]|, respectively. And |[sans-style=literal]| causes \cs{mathbfsf} to retain the same italic or upright shape as the input, and turns it bold sans serif. +% In other words, \cs{mathbfsf} is either \cs{mathbfsfup} or \cs{mathbfsfit} based on |[sans-style=upright]| or |[sans-style=italic]|, respectively. And |[sans-style=literal]| causes \cs{mathbfsf} to retain the same italic or upright shape as the input, and turns it bold sans serif. % % Note well! There is no medium-weight sans serif Greek alphabet in Unicode; therefore, |\mathsf{\alpha}| does not make sense (simply produces `$\mathsf{\alpha}$') while |\mathbfsf{\alpha}| gives `$\mathsf{\alpha}$'. % @@ -501,7 +501,7 @@ This work is "author-maintained" by Will Robertson. % shape one may wish to use in mathematical notation. The complete list is shown % in \tabref{mathalphabets}. Some of these have been covered in the previous sections. % -% At present, the math font switching commands do not nest; therefore if you want +% The math font switching commands do not nest; therefore if you want % sans serif bold, you must write |\mathsfbf{...}| rather than |\mathbf{\mathsf{...}}|. % This may change in the future. % @@ -670,7 +670,7 @@ This work is "author-maintained" by Will Robertson. % confused that what they think as `normal epsilon' is actual the `variant % epsilon'. And the same problem exists for `phi'. % -% We have a package option to control this behaviour. +% We have an option to control this behaviour. % With |vargreek-shape=TeX|, % \cs{phi} and \cs{epsilon} produce $\phi$ and $\epsilon$ and % \cs{varphi} and \cs{varepsilon} produce $\varphi$ and $\varepsilon$. @@ -860,7 +860,6 @@ This work is "author-maintained" by Will Robertson. % Of the above characters, the following are allowed to be used after % \cs{left}, \cs{middle}, and \cs{right}: % \begin{itemize} -% \item \cs{solidus}; % \item \cs{fracslash}; % \item \cs{slash}; and, % \item \cs{backslash} (the only reverse slash). @@ -1502,18 +1501,25 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria % % \subsection{Engine differences} % +% \XeTeX\ before version 0.9999 did not support |\U| prefix for extended math +% primitives, and while \LuaTeX\ had it from the start, prior 0.75.0 the +% \LaTeX\ format did not provide them without the |\luatex| prefix. +% % \begin{macrocode} -\cs_new:Nn \um_cs_compat:n -% { \cs_set_eq:cc {U#1} {XeTeX#1} } -% { \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} +%\ifdim\number\XeTeXversion\XeTeXrevision in<0.9999in +%\ifnum\luatexversion<75% + \cs_new:Nn \um_cs_compat:n +% { \cs_set_eq:cc {U#1} {XeTeX#1} } +% { \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 % \end{macrocode} % % \begin{macrocode} @@ -2127,7 +2133,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria % The following assignments should all be fairly straightforward. % \begin{macrocode} \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 { @@ -3597,7 +3603,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria \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: }{ @@ -3614,7 +3620,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria \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} }{ @@ -3707,7 +3713,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria % First the function with numbers: % \begin{macrocode} \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} } } @@ -3840,7 +3846,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria % First the version that uses numbers: % \begin{macrocode} \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} @@ -4717,7 +4723,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria \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} } } % \end{macrocode} @@ -4797,7 +4803,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria } } \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} @@ -4819,7 +4825,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria } } \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} @@ -5705,6 +5711,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria % \paragraph{\pkg{amsopn}} % This code is to improve the output of analphabetic symbols in text of operator names (\cs{sin}, \cs{cos}, etc.). Just comment out the offending lines for now: % \begin{macrocode} +%<*XE> \AtEndOfPackageFile * {amsopn} { \cs_set:Npn \newmcodes@ { \mathcode`\'39\scan_stop: @@ -5718,6 +5725,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria \mathcode`\:"603A\scan_stop: } } +% % \end{macrocode} % \paragraph{Symbols} % \begin{macrocode} @@ -6419,7 +6427,7 @@ luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria \setmainfont[Ligatures=TeX]{TeX Gyre Pagella} \setsansfont[Scale=MatchLowercase,Ligatures=TeX]{Candara} \setmonofont[Scale=MatchLowercase]{Consolas} -\setmathfont{Cambria Math} +\setmathfont{texgyrepagellamath-regular.otf} \newfontface\umfont{XITS Math} \usepackage{hypdoc} diff --git a/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx b/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx index 7488731ccd3..b8f9394e006 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx +++ b/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx @@ -31,13 +31,13 @@ } \ExplSyntaxOff -\defmathfont{lm}{lmmath-regular.otf}{CC6666} +\defmathfont{lm}{latinmodernmath-regular.otf}{CC6666} \defmathfont{xits}{xits-math.otf}{CCCC66} \defmathfont{lucida}{Lucida Bright Math OT}{66CC66} \defmathfont{lucibold}{Lucida Bright Math OT Demibold}{66CC66} \defmathfont{cambria}{Cambria Math}{66CCCC} \defmathfont{asana}{Asana-Math.otf}{6666CC} -\defmathfont{pagella}{texgyrepagella-math.otf}{AA6666} +\defmathfont{pagella}{texgyrepagellamath-regular.otf}{AA6666} \defmathfont{euler}{Neo Euler}{CC66CC} \def\INPUT{\input{unicode-math-table.tex}} 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 -%% Copyright 2010-2011 Philipp Stephani -%% Copyright 2012 Khaled Hosny +%% Copyright 2006-2013 Will Robertson +%% Copyright 2010-2013 Philipp Stephani +%% Copyright 2012-2013 Khaled Hosny %% %% 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 -%% Copyright 2010-2011 Philipp Stephani -%% Copyright 2012 Khaled Hosny +%% Copyright 2006-2013 Will Robertson +%% Copyright 2010-2013 Philipp Stephani +%% Copyright 2012-2013 Khaled Hosny %% %% 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 -%% Copyright 2010-2011 Philipp Stephani -%% Copyright 2012 Khaled Hosny +%% Copyright 2006-2013 Will Robertson +%% Copyright 2010-2013 Philipp Stephani +%% Copyright 2012-2013 Khaled Hosny %% %% 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% -- cgit v1.2.3