From e8f5cf0a3074ca90d2d75684738cabfeccc620a8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 26 Nov 2010 02:02:16 +0000 Subject: propagate fix from heiko in pdftex svn git-svn-id: svn://tug.org/texlive/trunk@20570 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++ Build/source/texk/web2c/pdftexdir/pdftex.web | 63 ++++++++++++++-------------- 2 files changed, 37 insertions(+), 31 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index a8105480599..dcd0cb7fb12 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,8 @@ +2010-11-26 Heiko Oberdiek + + * pdftex.web (Display the whatsit...): avoid erroneous return. + http://sarovar.org/tracker/?func=detail&group_id=106&aid=4317&atid=493 + 2010-11-16 Peter Breitenlohner * pdftex.web (pdf_out_colorstack): There are no 'othercases'. diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index 0ab37ce8734..728608ef562 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -34956,40 +34956,41 @@ pdf_start_link_node: begin if pdf_action_type(pdf_link_action(p)) = pdf_action_user then begin print(" user"); print_mark(pdf_action_user_tokens(pdf_link_action(p))); - return; - end; - if pdf_action_file(pdf_link_action(p)) <> null then begin - print(" file"); - print_mark(pdf_action_file(pdf_link_action(p))); - end; - case pdf_action_type(pdf_link_action(p)) of - pdf_action_goto: begin - if pdf_action_named_id(pdf_link_action(p)) > 0 then begin - print(" goto name"); - print_mark(pdf_action_id(pdf_link_action(p))); - end - else begin - print(" goto num"); - print_int(pdf_action_id(pdf_link_action(p))) + end + else begin + if pdf_action_file(pdf_link_action(p)) <> null then begin + print(" file"); + print_mark(pdf_action_file(pdf_link_action(p))); end; - end; - pdf_action_page: begin - print(" page"); - print_int(pdf_action_id(pdf_link_action(p))); - print_mark(pdf_action_page_tokens(pdf_link_action(p))); - end; - pdf_action_thread: begin - if pdf_action_named_id(pdf_link_action(p)) > 0 then begin - print(" thread name"); - print_mark(pdf_action_id(pdf_link_action(p))); - end - else begin - print(" thread num"); + case pdf_action_type(pdf_link_action(p)) of + pdf_action_goto: begin + if pdf_action_named_id(pdf_link_action(p)) > 0 then begin + print(" goto name"); + print_mark(pdf_action_id(pdf_link_action(p))); + end + else begin + print(" goto num"); + print_int(pdf_action_id(pdf_link_action(p))) + end; + end; + pdf_action_page: begin + print(" page"); print_int(pdf_action_id(pdf_link_action(p))); + print_mark(pdf_action_page_tokens(pdf_link_action(p))); end; - end; - othercases pdf_error("displaying", "unknown action type"); - endcases; + pdf_action_thread: begin + if pdf_action_named_id(pdf_link_action(p)) > 0 then begin + print(" thread name"); + print_mark(pdf_action_id(pdf_link_action(p))); + end + else begin + print(" thread num"); + print_int(pdf_action_id(pdf_link_action(p))); + end; + end; + othercases pdf_error("displaying", "unknown action type"); + endcases; + end end; pdf_end_link_node: print_esc("pdfendlink"); pdf_dest_node: begin -- cgit v1.2.3