summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-04-07 22:31:24 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-04-07 22:31:24 +0000
commit7f5d796e43772d5941569dcab6ce341d9949a2cd (patch)
tree14a9db99bbc2590feff8e4b510b6dd8ef00c9fb2 /Build
parentb51eb65b2794a2f4821fa9067d23579a4cd3ca8e (diff)
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@40337 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lnodelib.c8
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lpdflib.c28
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfgen.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdftables.h86
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texnodes.h1
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texnodes.w6
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/textoken.w2
7 files changed, 68 insertions, 65 deletions
diff --git a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
index e5863c61ad9..5967a67c790 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -1960,6 +1960,7 @@ static int lua_nodelib_subtypes(lua_State * L)
else if (lua_key_eq(s,kern)) subtypes = node_subtypes_kern;
else if (lua_key_eq(s,rule)) subtypes = node_subtypes_rule;
else if (lua_key_eq(s,list)) subtypes = node_subtypes_list;
+ else if (lua_key_eq(s,adjust)) subtypes = node_subtypes_adjust;
else if (lua_key_eq(s,disc)) subtypes = node_subtypes_disc;
else if (lua_key_eq(s,fill)) subtypes = node_subtypes_fill;
else if (lua_key_eq(s,leader)) { subtypes = node_subtypes_leader; l = 2; }
@@ -1982,6 +1983,7 @@ static int lua_nodelib_subtypes(lua_State * L)
else if (t == rule_node) subtypes = node_subtypes_rule;
else if (t == hlist_node) subtypes = node_subtypes_list;
else if (t == vlist_node) subtypes = node_subtypes_list;
+ else if (t == adjust_node) subtypes = node_subtypes_adjust;
else if (t == disc_node) subtypes = node_subtypes_disc;
else if (t == glue_spec_node) subtypes = node_subtypes_fill;
else if (t == margin_kern_node) subtypes = node_subtypes_marginkern;
@@ -2943,8 +2945,6 @@ static void lua_nodelib_getfield_whatsit(lua_State * L, int n, const char *s)
lua_pushinteger(L, pdf_action_new_window(n));
} else if (lua_key_eq(s, data)) {
tokenlist_to_luastring(L, pdf_action_tokens(n));
- } else if (lua_key_eq(s, ref_count)) {
- lua_pushinteger(L, pdf_action_refcount(n));
} else {
lua_pushnil(L);
}
@@ -3709,8 +3709,6 @@ static void lua_nodelib_direct_getfield_whatsit(lua_State * L, int n, const char
lua_pushinteger(L, pdf_action_new_window(n));
} else if (lua_key_eq(s, data)) {
tokenlist_to_luastring(L, pdf_action_tokens(n));
- } else if (lua_key_eq(s, ref_count)) {
- lua_pushinteger(L, pdf_action_refcount(n));
} else {
lua_pushnil(L);
}
@@ -4973,8 +4971,6 @@ static int lua_nodelib_setfield_whatsit(lua_State * L, int n, const char *s)
pdf_action_new_window(n) = (halfword) lua_tointeger(L, 3);
} else if (lua_key_eq(s, data)) {
pdf_action_tokens(n) = nodelib_gettoks(L, 3);
- /* } else if (lua_key_eq(s, ref_count)) {
- pdf_action_refcount(n) = (halfword) lua_tointeger(L, 3); */
} else {
return nodelib_cantset(L, n, s);
}
diff --git a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
index 7991f234f0e..2161d791108 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
+++ b/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
@@ -745,19 +745,19 @@ static int l_get_lastannot(lua_State * L)
*/
-static int l_get_compresslevel(lua_State * L)
+static int l_get_compress_level(lua_State * L)
{
lua_pushinteger(L, (pdf_compress_level));
return 1 ;
}
-static int l_get_objcompresslevel(lua_State * L)
+static int l_get_obj_compress_level(lua_State * L)
{
- lua_pushinteger(L, (pdf_objcompresslevel));
+ lua_pushinteger(L, (pdf_obj_compress_level));
return 1 ;
}
-static int l_set_compresslevel(lua_State * L)
+static int l_set_compress_level(lua_State * L)
{
if (lua_type(L, 1) == LUA_TNUMBER) {
int c = (int) lua_tointeger(L, 1);
@@ -765,12 +765,12 @@ static int l_set_compresslevel(lua_State * L)
c = 0 ;
else if (c>9)
c = 9 ;
- set_pdf_objcompresslevel(c);
+ set_pdf_compress_level(c);
}
return 0 ;
}
-static int l_set_objcompresslevel(lua_State * L)
+static int l_set_obj_compress_level(lua_State * L)
{
if (lua_type(L, 1) == LUA_TNUMBER) {
int c = (int) lua_tointeger(L, 1);
@@ -778,7 +778,7 @@ static int l_set_objcompresslevel(lua_State * L)
c = 0 ;
else if (c>9)
c = 9 ;
- set_pdf_compress_level(c);
+ set_pdf_obj_compress_level(c);
}
return 0 ;
}
@@ -874,6 +874,8 @@ static int getpdffontsize(lua_State * L)
return 1 ;
}
+/*
+
static int getpdfpageref(lua_State * L)
{
if (lua_type(L, 1) == LUA_TNUMBER) {
@@ -885,6 +887,8 @@ static int getpdfpageref(lua_State * L)
return 1 ;
}
+*/
+
static int getpdfxformname(lua_State * L)
{
if (lua_type(L, 1) == LUA_TNUMBER) {
@@ -1070,7 +1074,7 @@ static const struct luaL_Reg pdflib[] = {
{ "registerannot", l_registerannot },
{ "reserveobj", l_reserveobj },
{ "getpos", l_getpos },
- { "pageref", getpdfpageref },
+ /* { "pageref", getpdfpageref }, */
{ "maxobjnum", l_maxobjnum },
{ "pageref", l_pageref },
{ "print", luapdfprint },
@@ -1101,10 +1105,10 @@ static const struct luaL_Reg pdflib[] = {
{ "getretval", l_get_retval },
{ "getlastobj", l_get_lastobj },
{ "getlastannot", l_get_lastannot },
- { "getcompresslevel", l_get_compresslevel },
- { "getobjcompresslevel", l_get_objcompresslevel },
- { "setcompresslevel", l_set_compresslevel },
- { "setobjcompresslevel", l_set_objcompresslevel },
+ { "getcompresslevel", l_get_compress_level },
+ { "getobjcompresslevel", l_get_obj_compress_level },
+ { "setcompresslevel", l_set_compress_level },
+ { "setobjcompresslevel", l_set_obj_compress_level },
{ "getdecimaldigits", l_get_decimal_digits },
{ "setdecimaldigits", l_set_decimal_digits },
{ "getpkresolution", l_get_pk_resolution },
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
index 5f6756b1e7d..f65055ac623 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -968,7 +968,7 @@ static void init_pdf_outputparameters(PDF pdf)
pdf->image_gamma = fix_int(pdf_image_gamma, 0, 1000000);
pdf->image_hicolor = fix_int(pdf_image_hicolor, 0, 1);
pdf->image_apply_gamma = fix_int(pdf_image_apply_gamma, 0, 1);
- pdf->objcompresslevel = fix_int(pdf_objcompresslevel, 0, MAX_OBJ_COMPRESS_LEVEL);
+ pdf->objcompresslevel = fix_int(pdf_obj_compress_level, 0, MAX_OBJ_COMPRESS_LEVEL);
pdf->inclusion_copy_font = fix_int(pdf_inclusion_copy_font, 0, 1);
pdf->pk_resolution = fix_int(pdf_pk_resolution, 72, 8000);
pdf->pk_fixed_dpi = fix_int(pdf_pk_fixed_dpi, 0, 1);
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdftables.h b/Build/source/texk/web2c/luatexdir/pdf/pdftables.h
index f185ab5c11e..47dee7c6949 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdftables.h
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdftables.h
@@ -128,7 +128,7 @@ typedef enum {
c_pdf_image_gamma,
c_pdf_image_hicolor,
c_pdf_image_addfilename,
- c_pdf_objcompresslevel,
+ c_pdf_obj_compress_level,
c_pdf_inclusion_copy_font,
c_pdf_gen_tounicode,
c_pdf_pk_fixed_dpi,
@@ -159,48 +159,48 @@ extern int pdf_last_link;
extern int pdf_last_obj;
extern int pdf_retval;
-# define pdf_compress_level get_tex_extension_count_register(c_pdf_compress_level)
-# define pdf_decimal_digits get_tex_extension_count_register(c_pdf_decimal_digits)
-# define pdf_image_resolution get_tex_extension_count_register(c_pdf_image_resolution)
-# define pdf_pk_resolution get_tex_extension_count_register(c_pdf_pk_resolution)
-# define pdf_unique_resname get_tex_extension_count_register(c_pdf_unique_resname)
-# define pdf_minor_version get_tex_extension_count_register(c_pdf_minor_version)
-# define pdf_pagebox get_tex_extension_count_register(c_pdf_pagebox)
-# define pdf_inclusion_errorlevel get_tex_extension_count_register(c_pdf_inclusion_errorlevel)
-# define pdf_ignore_unknown_images get_tex_extension_count_register(c_pdf_ignore_unknown_images)
-# define pdf_gamma get_tex_extension_count_register(c_pdf_gamma)
-# define pdf_image_apply_gamma get_tex_extension_count_register(c_pdf_image_apply_gamma)
-# define pdf_image_gamma get_tex_extension_count_register(c_pdf_image_gamma)
-# define pdf_image_hicolor get_tex_extension_count_register(c_pdf_image_hicolor)
-# define pdf_image_addfilename get_tex_extension_count_register(c_pdf_image_addfilename)
-# define pdf_objcompresslevel get_tex_extension_count_register(c_pdf_objcompresslevel)
-# define pdf_inclusion_copy_font get_tex_extension_count_register(c_pdf_inclusion_copy_font)
-# define pdf_gen_tounicode get_tex_extension_count_register(c_pdf_gen_tounicode)
-# define pdf_pk_fixed_dpi get_tex_extension_count_register(c_pdf_pk_fixed_dpi)
-# define pdf_suppress_optional_info get_tex_extension_count_register(c_pdf_suppress_optional_info)
-
-# define pdf_h_origin get_tex_extension_dimen_register(d_pdf_h_origin)
-# define pdf_v_origin get_tex_extension_dimen_register(d_pdf_v_origin)
-# define pdf_thread_margin get_tex_extension_dimen_register(d_pdf_thread_margin)
-# define pdf_dest_margin get_tex_extension_dimen_register(d_pdf_dest_margin)
-# define pdf_link_margin get_tex_extension_dimen_register(d_pdf_link_margin)
-# define pdf_xform_margin get_tex_extension_dimen_register(d_pdf_xform_margin)
-
-# define pdf_page_attr get_tex_extension_toks_register(t_pdf_page_attr)
-# define pdf_page_resources get_tex_extension_toks_register(t_pdf_page_resources)
-# define pdf_pages_attr get_tex_extension_toks_register(t_pdf_pages_attr)
-# define pdf_xform_attr get_tex_extension_toks_register(t_pdf_xform_attr)
-# define pdf_xform_resources get_tex_extension_toks_register(t_pdf_xform_resources)
-# define pdf_pk_mode get_tex_extension_toks_register(t_pdf_pk_mode)
-# define pdf_trailer_id get_tex_extension_toks_register(t_pdf_trailer_id)
-
-# define set_pdf_minor_version(i) set_tex_extension_count_register(c_pdf_minor_version,i)
-# define set_pdf_compress_level(i) set_tex_extension_count_register(c_pdf_compress_level,i)
-# define set_pdf_objcompresslevel(i) set_tex_extension_count_register(c_pdf_objcompresslevel,i)
-
-# define set_pdf_decimal_digits(i) set_tex_extension_count_register(c_pdf_decimal_digits,i)
-# define set_pdf_pk_resolution(i) set_tex_extension_count_register(c_pdf_pk_resolution,i)
-# define set_pdf_pk_fixed_dpi(i) set_tex_extension_count_register(c_pdf_pk_fixed_dpi,i)
+# define pdf_compress_level get_tex_extension_count_register(c_pdf_compress_level)
+# define pdf_obj_compress_level get_tex_extension_count_register(c_pdf_obj_compress_level)
+# define pdf_decimal_digits get_tex_extension_count_register(c_pdf_decimal_digits)
+# define pdf_image_resolution get_tex_extension_count_register(c_pdf_image_resolution)
+# define pdf_pk_resolution get_tex_extension_count_register(c_pdf_pk_resolution)
+# define pdf_unique_resname get_tex_extension_count_register(c_pdf_unique_resname)
+# define pdf_minor_version get_tex_extension_count_register(c_pdf_minor_version)
+# define pdf_pagebox get_tex_extension_count_register(c_pdf_pagebox)
+# define pdf_inclusion_errorlevel get_tex_extension_count_register(c_pdf_inclusion_errorlevel)
+# define pdf_ignore_unknown_images get_tex_extension_count_register(c_pdf_ignore_unknown_images)
+# define pdf_gamma get_tex_extension_count_register(c_pdf_gamma)
+# define pdf_image_apply_gamma get_tex_extension_count_register(c_pdf_image_apply_gamma)
+# define pdf_image_gamma get_tex_extension_count_register(c_pdf_image_gamma)
+# define pdf_image_hicolor get_tex_extension_count_register(c_pdf_image_hicolor)
+# define pdf_image_addfilename get_tex_extension_count_register(c_pdf_image_addfilename)
+# define pdf_inclusion_copy_font get_tex_extension_count_register(c_pdf_inclusion_copy_font)
+# define pdf_gen_tounicode get_tex_extension_count_register(c_pdf_gen_tounicode)
+# define pdf_pk_fixed_dpi get_tex_extension_count_register(c_pdf_pk_fixed_dpi)
+# define pdf_suppress_optional_info get_tex_extension_count_register(c_pdf_suppress_optional_info)
+
+# define pdf_h_origin get_tex_extension_dimen_register(d_pdf_h_origin)
+# define pdf_v_origin get_tex_extension_dimen_register(d_pdf_v_origin)
+# define pdf_thread_margin get_tex_extension_dimen_register(d_pdf_thread_margin)
+# define pdf_dest_margin get_tex_extension_dimen_register(d_pdf_dest_margin)
+# define pdf_link_margin get_tex_extension_dimen_register(d_pdf_link_margin)
+# define pdf_xform_margin get_tex_extension_dimen_register(d_pdf_xform_margin)
+
+# define pdf_page_attr get_tex_extension_toks_register(t_pdf_page_attr)
+# define pdf_page_resources get_tex_extension_toks_register(t_pdf_page_resources)
+# define pdf_pages_attr get_tex_extension_toks_register(t_pdf_pages_attr)
+# define pdf_xform_attr get_tex_extension_toks_register(t_pdf_xform_attr)
+# define pdf_xform_resources get_tex_extension_toks_register(t_pdf_xform_resources)
+# define pdf_pk_mode get_tex_extension_toks_register(t_pdf_pk_mode)
+# define pdf_trailer_id get_tex_extension_toks_register(t_pdf_trailer_id)
+
+# define set_pdf_minor_version(i) set_tex_extension_count_register(c_pdf_minor_version,i)
+# define set_pdf_compress_level(i) set_tex_extension_count_register(c_pdf_compress_level,i)
+# define set_pdf_obj_compress_level(i) set_tex_extension_count_register(c_pdf_obj_compress_level,i)
+
+# define set_pdf_decimal_digits(i) set_tex_extension_count_register(c_pdf_decimal_digits,i)
+# define set_pdf_pk_resolution(i) set_tex_extension_count_register(c_pdf_pk_resolution,i)
+# define set_pdf_pk_fixed_dpi(i) set_tex_extension_count_register(c_pdf_pk_fixed_dpi,i)
# define pk_decimal_digits(pdf,delta) ((pdf->decimal_digits > 4 ? 4 : 3) + delta)
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.h b/Build/source/texk/web2c/luatexdir/tex/texnodes.h
index 0da84945184..20189f130f4 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texnodes.h
+++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.h
@@ -879,6 +879,7 @@ extern const char *node_subtypes_glyph[];
extern const char *node_subtypes_disc[];
extern const char *node_subtypes_marginkern[];
extern const char *node_subtypes_list[];
+extern const char *node_subtypes_adjust[];
extern const char *node_subtypes_math[];
extern const char *node_subtypes_noad[];
extern const char *node_subtypes_radical[];
diff --git a/Build/source/texk/web2c/luatexdir/tex/texnodes.w b/Build/source/texk/web2c/luatexdir/tex/texnodes.w
index ef88d489845..d5d2d2364b6 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texnodes.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texnodes.w
@@ -237,8 +237,7 @@ const char *node_fields_whatsit_pdf_dest[] = {
"xyz_zoom", "objnum", NULL
};
const char *node_fields_whatsit_pdf_action[] = {
- "action_type", "named_id", "action_id", "file", "new_window", "data",
- "ref_count", NULL
+ "action_type", "named_id", "action_id", "file", "new_window", "data", NULL
};
const char *node_fields_whatsit_pdf_thread[] = {
"attr", "width", "depth", "height", "named_id", "thread_id", "thread_attr", NULL
@@ -300,6 +299,9 @@ const char *node_subtypes_marginkern[] = {
const char *node_subtypes_list[] = {
"unknown", "line", "box", "indent", "alignment", "cell", "equation", "equationnumber", NULL
};
+const char *node_subtypes_adjust[] = {
+ "normal", "pre", NULL
+};
const char *node_subtypes_math[] = {
"beginmath", "endmath", NULL
};
diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.w b/Build/source/texk/web2c/luatexdir/tex/textoken.w
index 98889cced7c..8d147f4e2a8 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textoken.w
+++ b/Build/source/texk/web2c/luatexdir/tex/textoken.w
@@ -2331,7 +2331,7 @@ static int do_variable_pdf(halfword c)
else if (scan_keyword("imagegamma")) { do_variable_backend_int(c_pdf_image_gamma); }
else if (scan_keyword("imagehicolor")) { do_variable_backend_int(c_pdf_image_hicolor); }
else if (scan_keyword("imageaddfilename")) { do_variable_backend_int(c_pdf_image_addfilename); }
- else if (scan_keyword("objcompresslevel")) { do_variable_backend_int(c_pdf_objcompresslevel); }
+ else if (scan_keyword("objcompresslevel")) { do_variable_backend_int(c_pdf_obj_compress_level); }
else if (scan_keyword("inclusioncopyfonts")) { do_variable_backend_int(c_pdf_inclusion_copy_font); }
else if (scan_keyword("gentounicode")) { do_variable_backend_int(c_pdf_gen_tounicode); }
else if (scan_keyword("pkfixeddpi")) { do_variable_backend_int(c_pdf_pk_fixed_dpi); }