From 017d7edcd26d81f68ed094c2ecfaaec9dbe584ab Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 16 Apr 2011 12:06:54 +0000 Subject: synctex: small bug fix luaTeX: drop private copies of synctex files git-svn-id: svn://tug.org/texlive/trunk@22094 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/synctexdir/ChangeLog | 13 ++++ .../source/texk/web2c/synctexdir/synctex-luatex.h | 75 ++++++++++++++++++++++ Build/source/texk/web2c/synctexdir/synctex.c | 11 ++-- 3 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 Build/source/texk/web2c/synctexdir/synctex-luatex.h (limited to 'Build/source/texk/web2c/synctexdir') diff --git a/Build/source/texk/web2c/synctexdir/ChangeLog b/Build/source/texk/web2c/synctexdir/ChangeLog index e41c576a85c..7c969e81018 100644 --- a/Build/source/texk/web2c/synctexdir/ChangeLog +++ b/Build/source/texk/web2c/synctexdir/ChangeLog @@ -1,3 +1,16 @@ +2011-04-16 Taco Hoekwater + + * synctex.c: Rename flags member output => output_p to avoid + conflict with macro defined for MinGW32. + +2011-04-16 Peter Breitenlohner + + * synctex-luatex.h (new): moved from ../luatexdir/utils to here. + + * synctex.c (synctexstartinput): When SYNCTEX_GET_CURRENT_NAME() + returns "", don't assign "texput" which might later get freed + but rather xrealloc and strcpy. + 2011-04-03 Peter Breitenlohner * synctex-e-mem.ch0: Adapt to ../etexdir/etex.ch. diff --git a/Build/source/texk/web2c/synctexdir/synctex-luatex.h b/Build/source/texk/web2c/synctexdir/synctex-luatex.h new file mode 100644 index 00000000000..28ee3dd3efd --- /dev/null +++ b/Build/source/texk/web2c/synctexdir/synctex-luatex.h @@ -0,0 +1,75 @@ +/* synctex-luatex.h + + Copyright (c) 2010 Taco Hoekwater + + This file is part of LuaTeX. + +License: +-------- +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE + +Except as contained in this notice, the name of the copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written +authorization from the copyright holder. + +*/ + +/* $Id: synctex-luatex.h 4064 2011-01-12 22:12:22Z hhenkel $ */ + +#define SYNCTEX_TAG_MODEL(NODE,TYPE)\ + vinfo(NODE+TYPE##_node_size-synchronization_field_size) +#define SYNCTEX_LINE_MODEL(NODE,TYPE)\ + vlink(NODE+TYPE##_node_size-synchronization_field_size) + +#define SYNCTEX_TYPE(NODE) type(NODE) +#define SYNCTEX_SUBTYPE(NODE) subtype(NODE) +#define SYNCTEX_WIDTH(NODE) width(NODE) +#define SYNCTEX_DEPTH(NODE) depth(NODE) +#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_GET_JOB_NAME() makecstring(job_name) +#define SYNCTEX_GET_LOG_NAME() get_full_log_name() + +#define SYNCTEX_RULE_WD width(p) +#define SYNCTEX_RULE_HT height(p) +#define SYNCTEX_RULE_DP depth(p) + +#define SYNCTEX_CURRENT_TAG (cur_input.synctex_tag_field) +#define SYNCTEX_GET_CURRENT_NAME() (makecstring(cur_input.name_field)) +#define SYNCTEX_GET_TOTAL_PAGES() (total_pages) + +#include "ptexlib.h" + +/* We observe static_pdf->o_mode in order to determine whether output mode is + * pdf or dvi. + * We will assume that pdf->o_mode is set before entering + * the synctex_sheet function below. */ +#define SYNCTEX_OFFSET_IS_PDF (static_pdf->o_mode==OMODE_PDF) +#define SYNCTEX_OUTPUT ((static_pdf->o_mode==OMODE_PDF)?"pdf":"dvi") + +#define __SyncTeX__ 1 +#define SYNCTEX_DO_NOT_LOG_OUTPUT_DIRECTORY 1 diff --git a/Build/source/texk/web2c/synctexdir/synctex.c b/Build/source/texk/web2c/synctexdir/synctex.c index d5b6bac0c1f..04da2c2bb2b 100644 --- a/Build/source/texk/web2c/synctexdir/synctex.c +++ b/Build/source/texk/web2c/synctexdir/synctex.c @@ -395,7 +395,7 @@ static struct { unsigned int not_void:1; /* Whether it really contains synchronization material */ unsigned int warn:1; /* One shot warning flag */ unsigned int quoted:1; /* Whether the input file name was quoted by tex or not, for example "\"my input file.tex\"", unused by XeTeX */ - unsigned int output:1; /* Whether the output_directory is used */ + unsigned int output_p:1; /* Whether the output_directory is used */ unsigned int reserved:SYNCTEX_BITS_PER_BYTE*sizeof(int)-7; /* Align */ } flags; } synctex_ctxt = { @@ -527,7 +527,7 @@ static void *synctex_dot_open(void) the_busy_name[0] = (char)0; /* If an output directory was specified, use it instead of cwd. */ if (output_directory && !kpse_absolute_p(tmp, false)) { - synctex_ctxt.flags.output = 1; + synctex_ctxt.flags.output_p = 1; strcat(the_busy_name, output_directory); strcat(the_busy_name, DIR_SEP_STRING); } @@ -641,7 +641,7 @@ void synctexstartinput(void) printf("\nwarning: SYNCTEX_VALUE=%i", SYNCTEX_VALUE); printf("\nwarning: synctex_options=%0X", synctex_options); # endif - + if (SYNCTEX_IS_OFF) { return; } @@ -666,7 +666,8 @@ void synctexstartinput(void) * This is necessary because \jobname can be different */ synctex_ctxt.root_name = SYNCTEX_GET_CURRENT_NAME(); if (!strlen(synctex_ctxt.root_name)) { - synctex_ctxt.root_name = "texput"; + synctex_ctxt.root_name = xrealloc(synctex_ctxt.root_name, strlen("texput") + 1); + strcpy(synctex_ctxt.root_name, "texput"); } # if SYNCTEX_DEBUG printf("\nwarning: Synchronize DEBUG: synctexstartinput first END\n"); @@ -764,7 +765,7 @@ void synctexterminate(boolean log_opened) if (log_opened) { tmp = the_real_syncname; # if SYNCTEX_DO_NOT_LOG_OUTPUT_DIRECTORY - if (synctex_ctxt.flags.output) { + if (synctex_ctxt.flags.output_p) { tmp += strlen(output_directory) + strlen(DIR_SEP_STRING); } # endif -- cgit v1.2.3