From 68370bca95774296cb8890136f563b902022e6db Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 20 Jul 2011 15:20:14 +0300 Subject: beta 2011.07.20 14:10 --- tex/generic/context/luatex/luatex-fonts-merged.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tex/generic') diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 046532dd8..5d19f5649 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/19/11 11:22:19 +-- merge date : 07/20/11 14:10:55 do -- begin closure to overcome local limits and interference @@ -3482,10 +3482,10 @@ function constructors.scale(tfmdata,specification) targetparameters.descender = delta * descender end -- copies, might disappear - targetparameters.xheight = targetparameters.xheight or parameters.x_height - targetparameters.extraspace = targetparameters.extraspace or parameters.extra_space - targetparameters.spacestretch = targetparameters.spacestretch or parameters.space_stretch - targetparameters.spaceshrink = targetparameters.spaceshrink or parameters.space_shrink + targetparameters.xheight = targetparameters.xheight or targetparameters.x_height or parameters.x_height + targetparameters.extraspace = targetparameters.extraspace or targetparameters.extra_space or parameters.extra_space + targetparameters.spacestretch = targetparameters.spacestretch or targetparameters.space_stretch or parameters.space_stretch + targetparameters.spaceshrink = targetparameters.spaceshrink or targetparameters.space_shrink or parameters.space_shrink -- local protrusionfactor = (targetquad ~= 0 and 1000/targetquad) or 0 local scaledwidth = defaultwidth * hdelta -- cgit v1.2.3