diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-16 21:50:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-16 21:50:36 +0000 |
commit | a79508fde36800f3210ef48833ad94c7b486348e (patch) | |
tree | 4fcaebcee25355fb3ea7639d45d020f30ef04c81 /Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx | |
parent | cd1e10881c760bc30c40a7845554fc9e32358a6c (diff) |
unicode-math (16may13)
git-svn-id: svn://tug.org/texlive/trunk@30504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx | 54 |
1 files changed, 36 insertions, 18 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 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. %<preamble&XE>\ProvidesPackage{unicode-math-xetex} %<preamble&LU>\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] %</preamble> %<*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") %</lua> % \end{macrocode} % |