diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font/luafont.w')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/font/luafont.w | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/luafont.w b/Build/source/texk/web2c/luatexdir/font/luafont.w index ed986525ed1..5d8e3030859 100644 --- a/Build/source/texk/web2c/luatexdir/font/luafont.w +++ b/Build/source/texk/web2c/luatexdir/font/luafont.w @@ -19,8 +19,8 @@ @ @c static const char _svn_version[] = - "$Id: luafont.w 4524 2012-12-20 15:38:02Z taco $" - "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/font/luafont.w $"; + "$Id: luafont.w 4679 2013-12-19 15:47:53Z luigi $" + "$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/font/luafont.w $"; #include "ptexlib.h" #include "lua/luatex-api.h" @@ -475,27 +475,15 @@ int font_to_lua(lua_State * L, int f) lua_pushnumber(L,pdf_font_num(f)); lua_setfield(L,-2,"pdf_num"); } - if (pdf_font_blink(f) != null_font) { - lua_pushnumber(L,pdf_font_blink(f)); - lua_setfield(L,-2,"pdf_blink"); - } - if (pdf_font_elink(f) != null_font) { - lua_pushnumber(L,pdf_font_elink(f)); - lua_setfield(L,-2,"pdf_elink"); - } #endif /* the next one is read only */ - if (font_expand_ratio(f) != 0) { - lua_pushnumber(L, font_expand_ratio(f)); - lua_setfield(L, -2, "expand_ratio"); - } - if (font_shrink(f) != 0) { - lua_pushnumber(L, font_shrink(f)); - lua_setfield(L, -2, "shrink"); + if (font_max_shrink(f) != 0) { + lua_pushnumber(L, font_max_shrink(f)); + lua_setfield(L, -2, "max_shrink"); } - if (font_stretch(f) != 0) { - lua_pushnumber(L, font_stretch(f)); - lua_setfield(L, -2, "stretch"); + if (font_max_stretch(f) != 0) { + lua_pushnumber(L, font_max_stretch(f)); + lua_setfield(L, -2, "max_stretch"); } if (font_step(f) != 0) { lua_pushnumber(L, font_step(f)); @@ -1746,7 +1734,7 @@ int font_from_lua(lua_State * L, int f) fstretch -= (fstretch % fstep); if (fstretch < 0) fstretch = 0; - set_expand_params(f, fexpand, fstretch, fshrink, fstep, 0); + set_expand_params(f, fexpand, fstretch, fshrink, fstep); } } |