summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/tex
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-11 13:32:26 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-01-11 13:32:26 +0000
commit453a9f4421fd7a166fa69189572f11c70a1acf4b (patch)
tree25b5af72cb4b07fe4fc78a0f71d155489c9df263 /Build/source/texk/web2c/luatexdir/tex
parent4e25170b7c9bc4a0790412e731d36ed28106df66 (diff)
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@39348 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/tex')
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/extensions.w4
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texfileio.w9
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/textoken.w43
3 files changed, 35 insertions, 21 deletions
diff --git a/Build/source/texk/web2c/luatexdir/tex/extensions.w b/Build/source/texk/web2c/luatexdir/tex/extensions.w
index 0e178f01516..a6161dcf243 100644
--- a/Build/source/texk/web2c/luatexdir/tex/extensions.w
+++ b/Build/source/texk/web2c/luatexdir/tex/extensions.w
@@ -423,10 +423,10 @@ void do_extension(int immediate)
case save_image_resource_code:
switch (get_o_mode()) {
case OMODE_DVI:
- do_resource_dvi(0,cur_chr);
+ do_resource_dvi(immediate,cur_chr);
break;
case OMODE_PDF:
- do_resource_pdf(0,cur_chr);
+ do_resource_pdf(immediate,cur_chr);
break;
default:
break;
diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
index d274f6d3439..e04bf991afb 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
@@ -1220,11 +1220,10 @@ int readbinfile(FILE * f, unsigned char **tfm_buffer, int *tfm_size)
return 0;
}
-
-@ Like |runsystem()|, the |runpopen()| function is called only when
- |shellenabledp == 1|. Unlike |runsystem()|, here we write errors to
- stderr, since we have nowhere better to use; and of course we return
- a file handle (or NULL) instead of a status indicator.
+@ Like |os.execute()|, the |runpopen()| function is called only when
+|shellenabledp == 1|. Unlike |os.execute()| we write errors to stderr, since we
+have nowhere better to use; and of course we return a file handle (or NULL)
+instead of a status indicator.
@c
static FILE *runpopen(char *cmd, const char *mode)
diff --git a/Build/source/texk/web2c/luatexdir/tex/textoken.w b/Build/source/texk/web2c/luatexdir/tex/textoken.w
index 0c11bb0f290..996e3cf2303 100644
--- a/Build/source/texk/web2c/luatexdir/tex/textoken.w
+++ b/Build/source/texk/web2c/luatexdir/tex/textoken.w
@@ -2317,6 +2317,7 @@ static int do_variable_pdf(halfword c)
else if (scan_keyword("threadmargin")) { do_variable_backend_dimen(d_pdf_thread_margin); }
else if (scan_keyword("destmargin")) { do_variable_backend_dimen(d_pdf_dest_margin); }
else if (scan_keyword("linkmargin")) { do_variable_backend_dimen(d_pdf_link_margin); }
+ else if (scan_keyword("xformmargin")) { do_variable_backend_dimen(d_pdf_xform_margin); }
else if (scan_keyword("pageattr")) { do_variable_backend_toks(t_pdf_page_attr); }
else if (scan_keyword("pageresources")) { do_variable_backend_toks(t_pdf_page_resources); }
@@ -2792,24 +2793,34 @@ void do_feedback(void)
int done = 1;
switch (c) {
case dvi_feedback_code:
- if (get_o_mode() == OMODE_DVI)
+ if (get_o_mode() == OMODE_DVI) {
done = do_feedback_dvi(c);
- else
- done = 0;
- if (done==0)
+ } else {
tex_error("unexpected use of \\dvifeedback",null);
- else if (done==2)
+ return ;
+ }
+ if (done==0) {
+ /* we recover */
+ normal_warning("dvi backend","unexpected use of \\dvifeedback");
return;
+ } else if (done==2) {
+ return;
+ }
break;
case pdf_feedback_code:
- if (get_o_mode() == OMODE_PDF)
+ if (get_o_mode() == OMODE_PDF) {
done = do_feedback_pdf(c);
- else
- done = 0;
- if (done==0)
+ } else {
tex_error("unexpected use of \\pdffeedback",null);
- else if (done==2)
+ return ;
+ }
+ if (done==0) {
+ /* we recover */
+ normal_warning("pdf backend","unexpected use of \\pdffeedback");
+ return;
+ } else if (done==2) {
return;
+ }
break;
default:
confusion("feedback");
@@ -2828,14 +2839,18 @@ void do_variable(void)
switch (c) {
case dvi_variable_code:
done = do_variable_dvi(c);
- if (done==0)
- tex_error("unexpected use of \\dvivariable",null);
+ if (done==0) {
+ /* we recover */
+ normal_warning("dvi backend","unexpected use of \\dvivariable");
+ }
return;
break;
case pdf_variable_code:
done = do_variable_pdf(c);
- if (done==0)
- tex_error("unexpected use of \\pdfvariable",null);
+ if (done==0) {
+ /* we recover */
+ normal_warning("pdf backend","unexpected use of \\pdfvariable");
+ }
return;
break;
default: