summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-26 23:29:30 +0000
committerKarl Berry <karl@freefriends.org>2011-08-26 23:29:30 +0000
commit1e500b3951d7d1ef632f2302a5f837ab0dc9b079 (patch)
treef1cf220414fdf014dcad8394833831d3131bf492
parent759c6e1193b880881336c43e390c91fa33a448dc (diff)
branch2011: import synctex coordinate fix from trunk r23644
git-svn-id: svn://tug.org/texlive/branches/branch2011@23716 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/synctexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-luatex.h9
-rw-r--r--Build/source/texk/web2c/synctexdir/synctex-xetex.h7
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 <kakuto@fuk.kindai.ac.jp>
+
+ * 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 <kakuto@fuk.kindai.ac.jp>
* 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 <taco@luatex.org>
+ Copyright (c) 2010, 2011 Taco Hoekwater <taco@luatex.org>
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
*/