summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-04-12 12:33:54 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-04-12 12:33:54 +0000
commitee3d1582b2c9946b8b4fea9c6951c5da03a4c5df (patch)
tree9cd1a1f4c8b6f35600ac19ae1add536c5f06bc91
parente4df06d26de27893e94db0f98d4b41c57e1a2320 (diff)
web2c/luatexdir: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@40471 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfgen.w12
-rw-r--r--Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w3
2 files changed, 2 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
index f65055ac623..7786d83a125 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -963,7 +963,6 @@ static void init_pdf_outputparameters(PDF pdf)
pdf->draftmode = fix_int(int_par(draft_mode_code), 0, 1);
pdf->compress_level = fix_int(pdf_compress_level, 0, 9);
pdf->decimal_digits = fix_int(pdf_decimal_digits, 3, 5);
-/* pdf->decimal_digits = fix_int(pdf_decimal_digits, 3, 6);*//* later, maybe (LS)*/
pdf->gamma = fix_int(pdf_gamma, 0, 1000000);
pdf->image_gamma = fix_int(pdf_image_gamma, 0, 1000000);
pdf->image_hicolor = fix_int(pdf_image_hicolor, 0, 1);
@@ -1693,7 +1692,6 @@ char *get_resname_prefix(PDF pdf)
void pdf_begin_page(PDF pdf)
{
- pdffloat f;
int xform_attributes;
scaled form_margin = pdf_xform_margin; /* was one_bp until SVN4066 */
ensure_output_state(pdf, ST_HEADER_WRITTEN);
@@ -1755,16 +1753,6 @@ void pdf_begin_page(PDF pdf)
pdf_dict_add_streaminfo(pdf);
pdf_end_dict(pdf);
pdf_begin_stream(pdf);
- if (global_shipping_mode == SHIPPING_PAGE) {
- /* Adjust transformation matrix for the magnification ratio */
- if (mag != 1000) {
- setpdffloat(f, mag, 3);
- print_pdffloat(pdf, f);
- pdf_puts(pdf, " 0 0 ");
- print_pdffloat(pdf, f);
- pdf_puts(pdf, " 0 0 cm\n");
- }
- }
pos_stack_used = 0; /* start with empty stack */
if (global_shipping_mode == SHIPPING_PAGE) {
colorstackpagestart();
diff --git a/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w b/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w
index d60b4a0dc75..b867ce2ca8e 100644
--- a/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w
+++ b/Build/source/texk/web2c/luatexdir/pdf/pdfshipout.w
@@ -61,8 +61,9 @@ void ship_out(PDF pdf, halfword p, shipping_mode_e shipping_mode)
Start sheet {\sl Sync\TeX} information record; we assume that |pdf_output| is
properly set up.
*/
- if (int_par(synctex_code))
+ if ((output_mode_used == OMODE_DVI) && int_par(synctex_code)) {
synctexsheet(mag);
+ }
pre_callback_id = callback_defined(start_page_number_callback);
post_callback_id = callback_defined(stop_page_number_callback);
if ((tracing_output > 0) && (pre_callback_id == 0)) {