From 391cf0df013f7e615d8f7e925d5e8b0ab7ac49f3 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 8 Apr 2014 11:45:57 +0200 Subject: [PATCH] Fix latexpand when the .tex file is not at the toplevel We need to cd to the right directory so that relative \input statements work. --- git-latexdiff | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-latexdiff b/git-latexdiff index 70e4717..d4b587f 100755 --- a/git-latexdiff +++ b/git-latexdiff @@ -455,8 +455,16 @@ fi # Create flattened documents and keep for debugging if test "$flatten" = 1; then verbose "Running latexpand" - latexpand old/"$main" > old/"$mainbase"-fl.tex "${latexpand[@]}" $oldbbl - latexpand new/"$main" > new/"$mainbase"-fl.tex "${latexpand[@]}" $newbbl + ( + cd old/"$maindir" && + latexpand "$mainbase".tex "${latexpand[@]}" $oldbbl + ) > old/"$mainbase"-fl.tex \ + || die "latexpand failed for old version" + ( + cd new/"$maindir" && + latexpand "$mainbase".tex "${latexpand[@]}" $newbbl + ) > new/"$mainbase"-fl.tex \ + || die "latexpand failed for new version" verbose_done verbose "Running latexdiff ${latexdiffopt[@]} old/"$mainbase"-fl.tex new/"$mainbase"-fl.tex > ./diff.tex"