summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/luafontloader
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-02-11 06:15:25 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2014-02-11 06:15:25 +0000
commitf4c24b082d377124c0e5de05766d758ec059e964 (patch)
tree28d9b3d26c084c3ff16942f387ece9c7664ebec6 /Build/source/texk/web2c/luatexdir/luafontloader
parent0a23d9a053200b27239415d5bb3c1452a6416050 (diff)
Import from LuaTeX r4794
git-svn-id: svn://tug.org/texlive/trunk@32938 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luafontloader')
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c8
-rw-r--r--Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c20
2 files changed, 19 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c
index c682146b352..339f99ffc29 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/parsettf.c
@@ -5899,6 +5899,11 @@ static SplineFont *SFFillFromTTF(struct ttfinfo *info) {
++k;
} while ( k<sf->subfontcnt );
}
+ /* more info */
+ sf->units_per_em = info->emsize ;
+ sf->pfminfo = info->pfminfo ;
+ sf->names = info->names ;
+
SFRelativeWinAsDs(sf);
free(info->savetab);
sf->loadvalidation_state =
@@ -6041,6 +6046,9 @@ static SplineFont *SFFillFromTTFInfo(struct ttfinfo *info) {
free( info->weight );
sf->version = info->version;
sf->italicangle = info->italicAngle;
+ sf->names = info->names;
+ sf->units_per_em = info->emsize ;
+ sf->pfminfo = info->pfminfo ;
return( sf );
}
diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
index 7edd93fd6b3..7163fb2f026 100644
--- a/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
+++ b/Build/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c
@@ -33,7 +33,7 @@
#include <locale.h>
static const char _svn_version[] =
- "$Id: luafflib.c 4744 2014-01-11 11:42:36Z luigi $ "
+ "$Id: luafflib.c 4768 2014-01-28 15:38:54Z luigi $ "
"$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/luafontloader/src/luafflib.c $";
extern char **gww_errors;
@@ -2306,19 +2306,21 @@ void do_ff_info(lua_State * L, SplineFont * sf)
dump_stringfield(L, "weight", sf->weight);
dump_intfield(L, "units_per_em", sf->units_per_em);
- dump_intfield(L, "design_range_bottom", sf->design_range_bottom);
- dump_intfield(L, "design_range_top", sf->design_range_top);
- dump_intfield(L, "design_size", sf->design_size);
+ /* These are not assigned in info... */
+ /*dump_intfield(L, "design_range_bottom", sf->design_range_bottom);*/
+ /*dump_intfield(L, "design_range_top", sf->design_range_top);*/
+ /*dump_intfield(L, "design_size", sf->design_size);*/
lua_createtable(L, 0, 40);
handle_pfminfo(L, sf->pfminfo);
lua_setfield(L, -2, "pfminfo");
- if (sf->names != NULL) {
- lua_newtable(L);
- handle_ttflangname(L, sf->names);
- lua_setfield(L, -2, "names");
- }
+ /* Do we need this ? */
+ if (sf->names != NULL) {
+ lua_newtable(L);
+ handle_ttflangname(L, sf->names);
+ lua_setfield(L, -2, "names");
+ }
}
typedef enum {