From 1e500b3951d7d1ef632f2302a5f837ab0dc9b079 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 26 Aug 2011 23:29:30 +0000 Subject: branch2011: import synctex coordinate fix from trunk r23644 git-svn-id: svn://tug.org/texlive/branches/branch2011@23716 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/synctexdir/ChangeLog | 5 +++++ Build/source/texk/web2c/synctexdir/synctex-luatex.h | 9 ++++++--- Build/source/texk/web2c/synctexdir/synctex-xetex.h | 7 +++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index dc50ff4f15e..e688bdf8cef 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,8 @@ +2011-08-22 Akira Kakuto + + * synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and + SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode. + 2011-06-11 Akira Kakuto * synctex_parser_utils.c: fix a typo. diff --git a/Build/source/texk/web2c/synctexdir/synctex-luatex.h b/Build/source/texk/web2c/synctexdir/synctex-luatex.h index 7e9043c9a7b..8b75228aa79 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-luatex.h +++ b/Build/source/texk/web2c/synctexdir/synctex-luatex.h @@ -1,6 +1,6 @@ /* synctex-luatex.h - Copyright (c) 2010 Taco Hoekwater + Copyright (c) 2010, 2011 Taco Hoekwater This file is part of LuaTeX. @@ -50,8 +50,11 @@ authorization from the copyright holder. #define SYNCTEX_HEIGHT(NODE) height(NODE) #define SYNCTEX_VALUE int_par(synctex_code) -#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) -#define SYNCTEX_CURH static_pdf->posstruct->pos.h +#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v) +#define SYNCTEX_CURHH static_pdf->posstruct->pos.h + +#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287) +#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287) #define SYNCTEX_GET_JOB_NAME() makecstring(job_name) #define SYNCTEX_GET_LOG_NAME() get_full_log_name() diff --git a/Build/source/texk/web2c/synctexdir/synctex-xetex.h b/Build/source/texk/web2c/synctexdir/synctex-xetex.h index a34a5dd8ffa..e4404f08131 100644 --- a/Build/source/texk/web2c/synctexdir/synctex-xetex.h +++ b/Build/source/texk/web2c/synctexdir/synctex-xetex.h @@ -1,9 +1,9 @@ /* -Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr +Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr This file is part of the SyncTeX package. -Latest Revision: Wed Jul 1 11:16:29 UTC 2009 +Latest Revision: Wed Aug 22 07:20:29 UTC 2011 License: -------- @@ -57,6 +57,9 @@ Thu Jun 19 09:39:21 UTC 2008 # define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0) # define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf") +#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh) +#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv) + /* WARNING: The definition below must be in sync with their eponym declarations in synctex-xetex.ch1 */ -- cgit v1.2.3