diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-07-20 14:10:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-07-20 14:10:00 +0200 |
| commit | 1f45bef04262b5172d130ce3ebe0609b11a2beb7 (patch) | |
| tree | 0ca5e3ae69e61fb17ca8792c4b3b4fd5c8778ae7 /tex/generic | |
| parent | dfbf71b34821fd33a63009e77dce020670c2d438 (diff) | |
| download | context-1f45bef04262b5172d130ce3ebe0609b11a2beb7.tar.gz | |
beta 2011.07.20 14:10
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index bf34d9bd4..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:04:40 +-- 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 |