summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-21 09:49:06 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-21 09:49:06 +0000
commit2b504f86dbc16352ac0ad43a9121b6e3fcdea7d1 (patch)
tree4aeb3362fbf314cf16e38ce76f31aaceb972f3f9 /Build
parent633bd2c9d51c7a9193633effa2c927b8bc1684e2 (diff)
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@39446 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writet3.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/texluac.w7
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfpage.w2
3 files changed, 9 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/writet3.w b/Build/source/texk/web2c/luatexdir/font/writet3.w
index 1d33330716c..fcb1b30d72b 100644
--- a/Build/source/texk/web2c/luatexdir/font/writet3.w
+++ b/Build/source/texk/web2c/luatexdir/font/writet3.w
@@ -145,7 +145,7 @@ static boolean writepk(PDF pdf, internal_font_number f)
callback_id = callback_defined(read_pk_file_callback);
if (callback_id > 0) {
if (!(run_callback(callback_id, "S->bSd", name, &file_opened, &t3_buffer, &t3_size) && file_opened && t3_size > 0)) {
- formatted_warning("font %s at %i not found", cur_file_name, (int) dpi);
+ formatted_warning("type 3","font %s at %i not found", cur_file_name, (int) dpi);
cur_file_name = NULL;
return false;
}
diff --git a/Build/source/texk/web2c/luatexdir/lua/texluac.w b/Build/source/texk/web2c/luatexdir/lua/texluac.w
index 396121cba6c..6ae7672482c 100644
--- a/Build/source/texk/web2c/luatexdir/lua/texluac.w
+++ b/Build/source/texk/web2c/luatexdir/lua/texluac.w
@@ -214,6 +214,13 @@ static int pmain(lua_State* L)
const Proto* f;
int i;
if (!lua_checkstack(L,argc)) fatal("too many input files");
+ /* open standard libraries: */
+ /* we need to to this to keep */
+ /* the symbol luaL_openlibs */
+ luaL_checkversion(L);
+ lua_gc(L, LUA_GCSTOP, 0); /* stop collector during initialization */
+ luaL_openlibs(L); /* open libraries */
+ lua_gc(L, LUA_GCRESTART, 0);
for (i=0; i<argc; i++)
{
const char* filename=IS("-") ? NULL : argv[i];
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
index 73c83c64234..34bb5d1e933 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfpage.w
@@ -42,7 +42,7 @@ void init_pdf_pagecalculations(PDF pdf)
setpdffloat(p->pdf.h, 0, decimal_digits);
setpdffloat(p->pdf.v, 0, decimal_digits);
p->cw.e = 1;
- p->fs_cur.e = p->fs.e = decimal_digits + 2; /* "+ 2" makes less corrections inside []TJ */
+ p->fs_cur.e = p->fs.e = (decimal_digits < 4 ? 5 : 6); /* "+ 2" makes less corrections inside []TJ */
/* for placement outside BT...ET */
setpdffloat(p->cm[0], 1, 0);
setpdffloat(p->cm[1], 0, 0);