From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 2 Aug 2010 18:56:59 +0000 (+0200)
Subject: [synctex] Update synctex parser from TexLive SVN repository
X-Git-Tag: EVINCE_2_31_6~1
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=285b6ff60ce020c63e457792472422d6de7a9551;p=evince.git

[synctex] Update synctex parser from TexLive SVN repository

Fixes bug #624532.
---

diff --git a/cut-n-paste/synctex/synctex_parser.c b/cut-n-paste/synctex/synctex_parser.c
index d6957009..060f32d1 100644
--- a/cut-n-paste/synctex/synctex_parser.c
+++ b/cut-n-paste/synctex/synctex_parser.c
@@ -1,12 +1,12 @@
 /* 
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008, 2009; 2010 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
 
-Version: 1.9
+Version: 1.12
 See synctex_parser_readme.txt for more details
 
-Latest Revision: Wed Jul  1 11:18:18 UTC 2009
+Latest Revision: Mon Jul 19 21:50:36 UTC 2010
 
 License:
 --------
@@ -2544,9 +2544,9 @@ int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_
 int __synctex_open(const char * output, char ** synctex_name_ref, gzFile * file_ref, synctex_bool_t add_quotes, synctex_io_mode_t * io_modeRef) {
 #	define synctex_name (*synctex_name_ref)
 #	define the_file (*file_ref)
-#	define io_mode (*io_modeRef)
 	if(synctex_name_ref && file_ref) {
 		char * quoteless = NULL;
+		synctex_io_mode_t io_mode = *io_modeRef;
 		const char * mode = synctex_io_modes[io_mode];
 		size_t size = 0;
 		/*  now create the synctex file name */
@@ -2650,12 +2650,13 @@ return_on_error:
 				quoteless = NULL;
 			}
 		}
+		/* We are returning properly so we can also return the proper io_mode */
+		*io_modeRef = io_mode;
 		return 0;
 	}
 	return 3;	/*	Bad parameter.	*/
 #	undef synctex_name
 #	undef the_file
-#	undef io_mode
 }
 
 /*	Opens the ouput file, taking into account the eventual build_directory.
diff --git a/cut-n-paste/synctex/synctex_parser.h b/cut-n-paste/synctex/synctex_parser.h
index a8e07dfb..b164b7fb 100644
--- a/cut-n-paste/synctex/synctex_parser.h
+++ b/cut-n-paste/synctex/synctex_parser.h
@@ -1,11 +1,11 @@
 /* 
-Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
+Copyright (c) 2008, 2009, 2010 jerome DOT laurens AT u-bourgogne DOT fr
 
 This file is part of the SyncTeX package.
 
 Latest Revision: Wed Jul  1 11:16:51 UTC 2009
 
-Version: 1.8
+Version: 1.12
 See synctex_parser_readme.txt for more details
 
 License:
diff --git a/cut-n-paste/synctex/synctex_parser_local.h b/cut-n-paste/synctex/synctex_parser_local.h
index d84f5ee0..0a127afe 100644
--- a/cut-n-paste/synctex/synctex_parser_local.h
+++ b/cut-n-paste/synctex/synctex_parser_local.h
@@ -36,6 +36,6 @@ authorization from the copyright holder.
 */
 
 /* This local header file is for TEXLIVE, use your own header to fit your system */
-#   include "c-auto.h" /* for inline && HAVE_xxx */
+#   include <w2c/c-auto.h> /* for inline && HAVE_xxx */
 /*	No inlining for synctex tool in texlive. */
 #	define SYNCTEX_INLINE
diff --git a/cut-n-paste/synctex/synctex_parser_version.txt b/cut-n-paste/synctex/synctex_parser_version.txt
index 09601587..b8162070 100644
--- a/cut-n-paste/synctex/synctex_parser_version.txt
+++ b/cut-n-paste/synctex/synctex_parser_version.txt
@@ -1 +1 @@
-1.11
+1.11
\ No newline at end of file