From a79508fde36800f3210ef48833ad94c7b486348e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 May 2013 21:50:36 +0000 Subject: unicode-math (16may13) git-svn-id: svn://tug.org/texlive/trunk@30504 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/unicode-math/unicode-math.dtx | 54 ++++++++++++++-------- .../source/latex/unicode-math/unimath-symbols.ltx | 14 ++---- 2 files changed, 39 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/source/latex/unicode-math') 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 62eda4fee8e..e536cfe1435 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx @@ -60,7 +60,7 @@ This work is "maintained" by Will Robertson. %\ProvidesPackage{unicode-math-xetex} %\ProvidesPackage{unicode-math-luatex} %<*preamble> - [2013/03/16 v0.7d Unicode maths in XeLaTeX and LuaLaTeX] + [2013/05/04 v0.7e Unicode maths in XeLaTeX and LuaLaTeX] % %<*internal> \documentclass[a4paper]{ltxdoc} @@ -1438,8 +1438,8 @@ This work is "maintained" by Will Robertson. %<*lua> local err, warn, info, log = luatexbase.provides_module({ name = "unicode-math", - date = "2012/04/23", - version = 0.1, + date = "2013/05/04", + version = 0.3, description = "Unicode math typesetting for LuaLaTeX", author = "Khaled Hosny, Will Robertson, Philipp Stephani", licence = "LPPL v1.3+" @@ -1449,31 +1449,49 @@ local err, warn, info, log = luatexbase.provides_module({ % \texttt{(Script)ScriptPercentScaleDown} math constants, so we % emulate \XeTeX\ behaviour by setting \cs{fontdimen10} and % \cs{fontdimen11}. -% \begin{macrocode} -local function set_sscale_dimens(fontdata) - local mc = fontdata.MathConstants - if mc then - fontdata.parameters[10] = mc.ScriptPercentScaleDown or 70 - fontdata.parameters[11] = mc.ScriptScriptPercentScaleDown or 50 +% +% |luaotfload| now provides these, they shoud be removed in the +% next version. +% \begin{macrocode} +if luaotfload and luaotfload.module and luaotfload.module.version < 2 then + local function set_sscale_dimens(fontdata) + local mc = fontdata.MathConstants + if mc then + fontdata.parameters[10] = mc.ScriptPercentScaleDown or 70 + fontdata.parameters[11] = mc.ScriptScriptPercentScaleDown or 50 + end end -end -luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_math.set_sscale_dimens") + luatexbase.add_to_callback("luaotfload.patch_font", set_sscale_dimens, "unicode_math.set_sscale_dimens") % \end{macrocode} % % Cambria Math has too small \texttt{DisplayOperatorMinHeight} constant, so we % patch it to amore accebtable value. % % \begin{macrocode} -local function patch_cambria_domh(fontdata) - local mc = fontdata.MathConstants - local mh = 2800 / fontdata.units * fontdata.size - if fontdata.psname == "CambriaMath" and mc then - if mc.DisplayOperatorMinHeight < mh then - mc.DisplayOperatorMinHeight = mh + local function patch_cambria_domh(fontdata) + local mc = fontdata.MathConstants + if mc and fontdata.psname == "CambriaMath" then + -- keeping backward compatibility with luaotfload v1 + local units_per_em + local metadata = fontdata.shared and fontdata.shared.rawdata.metadata + if metadata and metadata.units_per_em then + units_per_em = metadata.units_per_em + elseif fontdata.parameters.units then + units_per_em = fontdata.parameters.units + elseif fontdata.units then + units_per_em = fontdata.units + else + units_per_em = 1000 + end + local sz = fontdata.parameters.size or fontdata.size + local mh = 2800 / units_per_em * sz + if mc.DisplayOperatorMinHeight < mh then + mc.DisplayOperatorMinHeight = mh + end end end + luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria.domh") end -luatexbase.add_to_callback("luaotfload.patch_font", patch_cambria_domh, "cambria.domh") % % \end{macrocode} % 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 b759e47033b..96211735e86 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx +++ b/Master/texmf-dist/source/latex/unicode-math/unimath-symbols.ltx @@ -1,4 +1,4 @@ -%!TEX TS-program = LuaLaTeX +%!TEX TS-program = XeLaTeX %%%%%%%%%%%%%%%%%%%%%%% % SYMBOLS DEFINED BY UNICODE-MATH @@ -33,8 +33,6 @@ \defmathfont{lm}{latinmodern-math.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} @@ -43,9 +41,9 @@ \def\INPUT{\input{unicode-math-table.tex}} \def\TABLE{% \par\noindent -\begin{longtable}[l]{@{}lccccccccll@{}} +\begin{longtable}[l]{@{}lccccccll@{}} \toprule - \textsc{usv} & M & X & C & L & D & A & P & E & Macro & Description \\ + \textsc{usv} & M & X & C & A & P & E & Macro & Description \\ \midrule \endhead \INPUT\\ \bottomrule @@ -73,8 +71,6 @@ \SYMB{#2}{lm}{#1} & \SYMB{#2}{xits}{#1} & \SYMB{#2}{cambria}{#1} & - \SYMB{#2}{lucida}{#1} & - \SYMB{#2}{lucibold}{#1} & \SYMB{#2}{asana}{#1} & \SYMB{#2}{pagella}{#1} & \SYMB{#2}{euler}{#1} & @@ -122,8 +118,6 @@ Eight fonts are shown: (with approximate symbol counts) \item[M] \mathversion{lm} $\mathup{Latin\ Modern\ Math}$ (\ref{count:lm}) \item[X] \mathversion{xits} $\mathup{XITS\ Math}$ (\ref{count:xits}) \item[C] \mathversion{cambria} $\mathup{Cambria\ Math}$ (\ref{count:cambria}) -\item[L] \mathversion{lucida} $\mathup{Lucida\ Math}$ (\ref{count:lucida}) -\item[D] \mathversion{lucibold} $\mathup{Lucida\ Math\ Demibold}$ (\ref{count:lucibold}) \item[A] \mathversion{asana} $\mathup{Asana\ Math}$ (\ref{count:asana}) \item[P] \mathversion{pagella} $\mathup{TeX\ Gyre\ Pagella\ Math}$ (\ref{count:pagella}) \item[E] \mathversion{euler} $\mathup{Neo\ Euler}$ (\ref{count:euler}) @@ -400,8 +394,6 @@ The limits behaviour as specified by \textsf{unicode-math} are shown with grey s \refstepcounter{lm}\label{count:lm} \refstepcounter{xits}\label{count:xits} \refstepcounter{cambria}\label{count:cambria} -\refstepcounter{lucida}\label{count:lucida} -\refstepcounter{lucibold}\label{count:lucibold} \refstepcounter{asana}\label{count:asana} \refstepcounter{pagella}\label{count:pagella} \refstepcounter{euler}\label{count:euler} -- cgit v1.2.3