summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/pdf
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-10-07 02:16:02 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-10-07 02:16:02 +0000
commita021762e6ccc1101fefbac38abb168b69a11f0ca (patch)
treebaf31827b9c7c7af518a3f4aa58ccba0de18b640 /Build/source/texk/web2c/luatexdir/pdf
parent4ca2692153042a0c2f7db8d681e190b867ae2faf (diff)
web2c/luatexdir: Sync with the upstream trunk.
git-svn-id: svn://tug.org/texlive/trunk@38575 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/pdf')
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdffont.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfimage.w2
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdflistout.w4
3 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
index 174e1b6289e..57332605d42 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdffont.w
@@ -281,7 +281,7 @@ void read_expand_font(void)
pdf_error("font expansion", "invalid font identifier");
//if (pdf_font_blink(f) != null_font)
// pdf_error("font expansion",
- // "\\pdffontexpand cannot be used this way (the base font has been expanded)");
+ // "\\fontexpand cannot be used this way (the base font has been expanded)");
scan_optional_equals();
scan_int();
stretch_limit = fix_int(cur_val, 0, 1000);
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w b/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w
index 008f8f383ba..f9b6cf52619 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfimage.w
@@ -38,7 +38,7 @@ void place_img(PDF pdf, image_dict * idict, scaled_whd dim, int transform)
assert(p != NULL);
a[0] = a[3] = 1.0e6;
a[1] = a[2] = 0;
- if (img_type(idict) == IMG_TYPE_PDF
+ if (img_type(idict) == IMG_TYPE_PDF || img_type(idict) == IMG_TYPE_PDFMEMSTREAM
|| img_type(idict) == IMG_TYPE_PDFSTREAM) {
a[0] /= (float) img_xsize(idict);
a[3] /= (float) img_ysize(idict);
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
index 1c3b40de36f..c1764f49c0c 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdflistout.w
@@ -482,7 +482,7 @@ void hlist_out(PDF pdf, halfword this_box)
case whatsit_node:
/* Output the whatsit node |p| in |hlist_out| */
switch (subtype(p)) {
- case pdf_save_pos_node:
+ case save_pos_node:
pdf_last_pos = pdf->posstruct->pos;
pos_info.curpos = pdf->posstruct->pos;
pos_info.boxpos.pos = refpos->pos;
@@ -928,7 +928,7 @@ void vlist_out(PDF pdf, halfword this_box)
case whatsit_node:
/* Output the whatsit node |p| in |vlist_out| */
switch (subtype(p)) {
- case pdf_save_pos_node:
+ case save_pos_node:
pdf_last_pos = pdf->posstruct->pos;
pos_info.curpos = pdf->posstruct->pos;
pos_info.boxpos.pos = refpos->pos;